Author: markt
Date: Wed Jun 5 10:21:56 2013
New Revision: 1489794
URL: http://svn.apache.org/r1489794
Log:
Fix backport from Tomcat 8. Servlet 3.1 / Java 7 issues.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java?rev=1489794&r1=1489793&r2=1489794&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
Wed Jun 5 10:21:56 2013
@@ -1166,7 +1166,7 @@ public class TestCorsFilter {
@Test
public void testJoin() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = ",";
elements.add("world");
elements.add("peace");
@@ -1176,7 +1176,7 @@ public class TestCorsFilter {
@Test
public void testJoinSingleElement() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = ",";
elements.add("world");
String join = CorsFilter.join(elements, separator);
@@ -1185,7 +1185,7 @@ public class TestCorsFilter {
@Test
public void testJoinSepNull() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = null;
elements.add("world");
elements.add("peace");
@@ -1204,7 +1204,7 @@ public class TestCorsFilter {
@Test
public void testJoinOneNullElement() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = ",";
elements.add(null);
elements.add("peace");
@@ -1214,7 +1214,7 @@ public class TestCorsFilter {
@Test
public void testJoinAllNullElements() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = ",";
elements.add(null);
elements.add(null);
@@ -1224,7 +1224,7 @@ public class TestCorsFilter {
@Test
public void testJoinAllEmptyElements() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = ",";
elements.add("");
elements.add("");
@@ -1234,7 +1234,7 @@ public class TestCorsFilter {
@Test
public void testJoinPipeSeparator() {
- Set<String> elements = new LinkedHashSet<>();
+ Set<String> elements = new LinkedHashSet<String>();
String separator = "|";
elements.add("world");
elements.add("peace");
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java?rev=1489794&r1=1489793&r2=1489794&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
Wed Jun 5 10:21:56 2013
@@ -41,13 +41,13 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
public class TesterHttpServletRequest implements HttpServletRequest {
- private Map<String, Object> attributes = new HashMap<>();
- private Map<String, List<String>> headers = new HashMap<>();
+ private Map<String, Object> attributes = new HashMap<String,Object>();
+ private Map<String, List<String>> headers =
+ new HashMap<String,List<String>>();
private String method;
private String contentType;
@@ -253,7 +253,7 @@ public class TesterHttpServletRequest im
}
public void setHeader(String name, String value) {
- List<String> values = new ArrayList<>();
+ List<String> values = new ArrayList<String>();
values.add(value);
headers.put(name, values);
}
@@ -387,11 +387,6 @@ public class TesterHttpServletRequest im
}
@Override
- public long getContentLengthLong() {
- throw new RuntimeException("Not implemented");
- }
-
- @Override
public ServletContext getServletContext() {
throw new RuntimeException("Not implemented");
}
@@ -428,11 +423,6 @@ public class TesterHttpServletRequest im
}
@Override
- public String changeSessionId() {
- throw new RuntimeException("Not implemented");
- }
-
- @Override
public boolean authenticate(HttpServletResponse response)
throws IOException, ServletException {
throw new RuntimeException("Not implemented");
@@ -458,11 +448,4 @@ public class TesterHttpServletRequest im
public Part getPart(String name) throws IOException, ServletException {
throw new RuntimeException("Not implemented");
}
-
- @Override
- public <T extends HttpUpgradeHandler> T upgrade(
- Class<T> httpUpgradeHandlerClass) throws IOException {
- throw new RuntimeException("Not implemented");
- }
-
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java?rev=1489794&r1=1489793&r2=1489794&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
Wed Jun 5 10:21:56 2013
@@ -40,8 +40,8 @@ import org.apache.catalina.connector.Req
public class TesterHttpServletResponse implements HttpServletResponse {
private PrintWriter pw;
- private List<String> headerNames = new ArrayList<>();
- private List<String> headerValues = new ArrayList<>();
+ private List<String> headerNames = new ArrayList<String>();
+ private List<String> headerValues = new ArrayList<String>();
private int status;
public TesterHttpServletResponse() {
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java?rev=1489794&r1=1489793&r2=1489794&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java
Wed Jun 5 10:21:56 2013
@@ -311,10 +311,4 @@ public class TesterServletContext implem
public void declareRoles(String... roleNames) {
throw new RuntimeException("Not implemented");
}
-
- @Override
- public String getVirtualServerName() {
- throw new RuntimeException("Not implemented");
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
