Author: markt
Date: Wed Jun 21 21:19:27 2017
New Revision: 1799514
URL: http://svn.apache.org/viewvc?rev=1799514&view=rev
Log:
Fix various build errors and IDE warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelConfig.java
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1799514&r1=1799513&r2=1799514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/Channel.java Wed Jun 21
21:19:27 2017
@@ -16,12 +16,12 @@
*/
package org.apache.catalina.tribes;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-
import java.io.Serializable;
import java.util.StringJoiner;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Channel interface<br>
* A channel is a representation of a group of nodes all participating in some
sort of
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java?rev=1799514&r1=1799513&r2=1799514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
Wed Jun 21 21:19:27 2017
@@ -58,7 +58,8 @@ import org.apache.juli.logging.Log;
* authentication valves, as the redirection should take place before an
* authentication valve would save a request to a protected resource.</p>
*
- * @see
http://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html
+ * @see <a
href="http://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html";>Load
+ * balancer documentation</a>
*/
public class LoadBalancerDrainingValve
extends ValveBase
@@ -114,6 +115,8 @@ public class LoadBalancerDrainingValve
* Sets the HTTP response code that will be used to redirect the request
* back to the load-balancer for re-balancing. Defaults to 307
* (TEMPORARY_REDIRECT).
+ *
+ * @param code The code to use for the redirect
*/
public void setRedirectStatusCode(int code) {
_redirectStatusCode = code;
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelConfig.java?rev=1799514&r1=1799513&r2=1799514&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelConfig.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelConfig.java
Wed Jun 21 21:19:27 2017
@@ -18,10 +18,11 @@ package org.apache.catalina.tribes.test.
import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
import org.apache.catalina.ha.session.BackupManager;
-import org.apache.catalina.tribes.Channel;
import org.apache.catalina.ha.tcp.SimpleTcpCluster;
-import org.junit.Test;
+import org.apache.catalina.tribes.Channel;
public class TestChannelConfig {
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java?rev=1799514&r1=1799513&r2=1799514&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
Wed Jun 21 21:19:27 2017
@@ -44,9 +44,10 @@ public class TestLoadBalancerDrainingVal
public void addCookie(Cookie cookie)
{
if(null == cookies)
- cookies = new ArrayList<Cookie>(1);
+ cookies = new ArrayList<>(1);
cookies.add(cookie);
}
+ @Override
public List<Cookie> getCookies() {
return cookies;
}
@@ -122,23 +123,37 @@ public class TestLoadBalancerDrainingVal
// A Cookie subclass that knows how to compare itself to other Cookie
objects
static class MyCookie extends Cookie {
- public MyCookie(String name, String value) { super(name, value); }
+ private static final long serialVersionUID = 1L;
+
+ public MyCookie(String name, String value) { super(name, value); }
+
+ @Override
+ public boolean equals(Object o) {
+ if(null == o) return false;
+ MyCookie mc = (MyCookie)o;
+
+ return mc.getName().equals(this.getName())
+ && mc.getPath().equals(this.getPath())
+ && mc.getValue().equals(this.getValue())
+ && mc.getMaxAge() == this.getMaxAge();
+ }
- @Override
- public boolean equals(Object o) {
- if(null == o) return false;
- MyCookie mc = (MyCookie)o;
-
- return mc.getName().equals(this.getName())
- && mc.getPath().equals(this.getPath())
- && mc.getValue().equals(this.getValue())
- && mc.getMaxAge() == this.getMaxAge();
- }
-
- @Override
- public String toString() {
- return "Cookie { name=" + getName() + ", value=" + getValue() + ",
path=" + getPath() + ", maxAge=" + getMaxAge() + " }";
- }
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + getMaxAge();
+ result = prime * result + ((getName() == null) ? 0 :
getName().hashCode());
+ result = prime * result + ((getPath() == null) ? 0 :
getPath().hashCode());
+ result = prime * result + ((getValue() == null) ? 0 :
getValue().hashCode());
+ return result;
+ }
+
+
+ @Override
+ public String toString() {
+ return "Cookie { name=" + getName() + ", value=" + getValue() + ",
path=" + getPath() + ", maxAge=" + getMaxAge() + " }";
+ }
}
@Test
@@ -190,9 +205,9 @@ public class TestLoadBalancerDrainingVal
// Set up the actual test
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
-
EasyMock.expect(request.isRequestedSessionIdValid()).andStubReturn(validSessionId);
+
EasyMock.expect(Boolean.valueOf(request.isRequestedSessionIdValid())).andStubReturn(Boolean.valueOf(validSessionId));
- ArrayList<Cookie> cookies = new ArrayList<Cookie>();
+ ArrayList<Cookie> cookies = new ArrayList<>();
if(enableIgnore) {
cookies.add(new Cookie("ignore", "true"));
}
@@ -210,7 +225,7 @@ public class TestLoadBalancerDrainingVal
EasyMock.expect(servletContext.getSessionCookieConfig()).andStubReturn(cookieConfig);
EasyMock.expect(request.getServletContext()).andStubReturn(servletContext);
EasyMock.expect(request.getContext()).andStubReturn(ctx);
-
EasyMock.expect(ctx.getSessionCookiePathUsesTrailingSlash()).andStubReturn(true);
+
EasyMock.expect(Boolean.valueOf(ctx.getSessionCookiePathUsesTrailingSlash())).andStubReturn(Boolean.TRUE);
EasyMock.expect(servletContext.getSessionCookieConfig()).andStubReturn(cookieConfig);
EasyMock.expect(request.getQueryString()).andStubReturn(queryString);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
