diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1')
36 files changed, 135 insertions, 220 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java index 281f72f9c..2d2fef7b8 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java @@ -16,7 +16,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; import java.io.IOException; import java.io.PrintWriter; - import java.util.ArrayList; import java.util.Collection; import java.util.Dictionary; @@ -24,16 +23,13 @@ import java.util.Hashtable; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; - import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -42,14 +38,14 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestErrorPage1 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S1"); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, Object> errorProps = new Hashtable<String, Object>(); + Dictionary<String, Object> errorProps = new Hashtable<>(); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "E1"); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ERROR_PAGE, new String[] {"403", "404"}); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, errorServlet, errorProps)); @@ -64,7 +60,7 @@ public class TestErrorPage1 extends AbstractTestServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { response.sendError(403); } @@ -75,7 +71,7 @@ public class TestErrorPage1 extends AbstractTestServlet { @Override protected void service( HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { if (response.isCommitted()) { System.out.println("Problem?"); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java index b523f8833..1d4acfd07 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java @@ -33,7 +33,6 @@ import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -42,14 +41,14 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestErrorPage2 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S1"); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, Object> errorProps = new Hashtable<String, Object>(); + Dictionary<String, Object> errorProps = new Hashtable<>(); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "E1"); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ERROR_PAGE, new String[] {MyException.class.getName()}); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, errorServlet, errorProps)); @@ -64,7 +63,7 @@ public class TestErrorPage2 extends AbstractTestServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws ServletException { throw new MyException(); } @@ -76,7 +75,7 @@ public class TestErrorPage2 extends AbstractTestServlet { @Override protected void service( HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { if (response.isCommitted()) { System.out.println("Problem?"); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java index bac032a4f..f188469dc 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java @@ -16,7 +16,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; import java.io.IOException; import java.io.PrintWriter; - import java.util.ArrayList; import java.util.Collection; import java.util.Dictionary; @@ -24,16 +23,13 @@ import java.util.Hashtable; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; - import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -42,14 +38,14 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestErrorPage3 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S3"); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, Object> errorProps = new Hashtable<String, Object>(); + Dictionary<String, Object> errorProps = new Hashtable<>(); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "E3"); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ERROR_PAGE, "400"); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, errorServlet, errorProps)); @@ -64,7 +60,7 @@ public class TestErrorPage3 extends AbstractTestServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { response.sendError(400); } @@ -75,7 +71,7 @@ public class TestErrorPage3 extends AbstractTestServlet { @Override protected void service( HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { if (response.isCommitted()) { System.out.println("Problem?"); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java index 85e2f932b..e721579c2 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java @@ -16,7 +16,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; import java.io.IOException; import java.io.PrintWriter; - import java.util.ArrayList; import java.util.Collection; import java.util.Dictionary; @@ -24,16 +23,13 @@ import java.util.Hashtable; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; - import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -42,14 +38,14 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestErrorPage4 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S4"); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, Object> errorProps = new Hashtable<String, Object>(); + Dictionary<String, Object> errorProps = new Hashtable<>(); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "E4"); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ERROR_PAGE, "401"); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, errorServlet, errorProps)); @@ -64,7 +60,7 @@ public class TestErrorPage4 extends AbstractTestServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { response.setStatus(401); @@ -77,7 +73,7 @@ public class TestErrorPage4 extends AbstractTestServlet { @Override protected void service( HttpServletRequest request, HttpServletResponse response) - throws ServletException ,IOException { + throws IOException { if (response.isCommitted()) { System.out.println("Problem?"); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter1.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter1.java index 1df6cbc9f..07fac76fe 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter1.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter1.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -52,7 +49,7 @@ public class TestFilter1 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter10.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter10.java index 72ba6f9e4..dd63c5b1b 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter10.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter10.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +22,12 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -39,19 +36,19 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter10 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); - filterProps = new Hashtable<String, String>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); @@ -65,7 +62,7 @@ public class TestFilter10 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter11.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter11.java index 49a8d1dd5..0eeae9b11 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter11.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter11.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +22,12 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -39,26 +36,26 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter11 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); - filterProps = new Hashtable<String, String>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); - filterProps = new Hashtable<String, String>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F3"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f3, filterProps)); @@ -72,7 +69,7 @@ public class TestFilter11 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter12.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter12.java index a49ab7cb8..9dd448692 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter12.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter12.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +22,6 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -31,7 +29,6 @@ import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -40,25 +37,25 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter12 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); + Dictionary<String, Object> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F3"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); filterProps.put(Constants.SERVICE_RANKING, 1); @@ -73,7 +70,7 @@ public class TestFilter12 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter13.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter13.java index cf890dc95..e8d90d98e 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter13.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter13.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +22,12 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -39,14 +36,14 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter13 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); @@ -60,7 +57,7 @@ public class TestFilter13 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter14.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter14.java index 6db5f74e4..589b3b719 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter14.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter14.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +22,12 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -39,21 +36,21 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter14 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); - filterProps = new Hashtable<String, String>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); @@ -67,7 +64,7 @@ public class TestFilter14 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter15.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter15.java index dffefee9e..eae27193e 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter15.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter15.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +22,12 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -39,26 +36,26 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter15 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); - filterProps = new Hashtable<String, String>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); - filterProps = new Hashtable<String, String>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F3"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f3, filterProps)); @@ -72,7 +69,7 @@ public class TestFilter15 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter16.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter16.java index ebd704347..04adc7da9 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter16.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter16.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +22,6 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -31,7 +29,6 @@ import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -40,26 +37,26 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter16 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); + Dictionary<String, Object> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F3"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, extensionAlias()); filterProps.put(Constants.SERVICE_RANKING, 1); @@ -74,7 +71,7 @@ public class TestFilter16 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter17.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter17.java index 42fca281c..51bda130c 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter17.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter17.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +22,6 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -31,7 +29,6 @@ import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -40,12 +37,12 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter17 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "TestFilter17"); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/TestFilter17/foo/bar/baz"); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); @@ -53,25 +50,25 @@ public class TestFilter17 extends AbstractTestServlet { // Should order like: ebcdadcbe // b - Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); + Dictionary<String, Object> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/TestFilter17/foo/bar/*"); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); // c - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/TestFilter17/*"); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); // d - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F3"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/TestFilter17/foo/*"); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f3, filterProps)); // e - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F4"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_SERVLET, "TestFilter17"); filterProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); @@ -86,7 +83,7 @@ public class TestFilter17 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter18.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter18.java index 9545e2fd6..e4e254646 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter18.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter18.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +22,6 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -31,7 +29,6 @@ import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -40,12 +37,12 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestFilter18 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { + public void activate(ComponentContext componentContext) { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "TestFilter18"); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/TestFilter18/foo/bar/baz/*"); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); @@ -53,33 +50,33 @@ public class TestFilter18 extends AbstractTestServlet { // Should order like: dbcacbd // b - Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); + Dictionary<String, Object> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, "/TestFilter18/foo/bar/*"); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); // c - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F2"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_REGEX, "^/TestFilter18/.*$"); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f2, filterProps)); // d - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F3"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_REGEX, ".*18/foo/.*"); filterProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f3, filterProps)); // e - should fail to register - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F4"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_REGEX, "*"); filterProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f4, filterProps)); // f - filterProps = new Hashtable<String, Object>(); + filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F5"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_REGEX, ".*/baz/with/.*"); filterProps.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE); @@ -94,7 +91,7 @@ public class TestFilter18 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter2.java index d2771d247..2c8128cd9 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter2.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter2.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -54,7 +51,7 @@ public class TestFilter2 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter3.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter3.java index 499548bdb..bfb776c70 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter3.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter3.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -56,7 +53,7 @@ public class TestFilter3 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter4.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter4.java index 957a62804..f7f0008f7 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter4.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter4.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -43,7 +40,7 @@ public class TestFilter4 extends AbstractTestServlet { service.registerServlet(regexAlias(), this, null, null); service.registerFilter(regexAlias(), f1, new Hashtable<String, String>(), null); service.registerFilter(regexAlias(), f2, new Hashtable<String, String>(), null); - Hashtable<String, String> hashtable = new Hashtable<String, String>(); + Hashtable<String, String> hashtable = new Hashtable<>(); hashtable.put("filter-priority", "1"); service.registerFilter(regexAlias(), f3, hashtable, null); } @@ -58,7 +55,7 @@ public class TestFilter4 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter5.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter5.java index 7dc921df8..a6ac399f5 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter5.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter5.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -52,7 +49,7 @@ public class TestFilter5 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter6.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter6.java index 5c90fe502..d8b930aef 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter6.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter6.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -54,7 +51,7 @@ public class TestFilter6 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter7.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter7.java index ab781873a..0680ca4fe 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter7.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter7.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -56,7 +53,7 @@ public class TestFilter7 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter8.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter8.java index bda2d2a9b..8e6dd5554 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter8.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter8.java @@ -14,9 +14,7 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Hashtable; import javax.servlet.Filter; @@ -26,7 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -43,7 +40,7 @@ public class TestFilter8 extends AbstractTestServlet { service.registerServlet(extensionAlias(), this, null, null); service.registerFilter(extensionAlias(), f1, new Hashtable<String, String>(), null); service.registerFilter(extensionAlias(), f2, new Hashtable<String, String>(), null); - Hashtable<String, String> hashtable = new Hashtable<String, String>(); + Hashtable<String, String> hashtable = new Hashtable<>(); hashtable.put("filter-priority", "1"); service.registerFilter(extensionAlias(), f3, hashtable, null); } @@ -58,7 +55,7 @@ public class TestFilter8 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter9.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter9.java index eba6630e9..685bfb88d 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter9.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestFilter9.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +22,12 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /* @@ -40,14 +37,14 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; public class TestFilter9 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); @@ -62,7 +59,7 @@ public class TestFilter9 extends AbstractTestServlet { @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource3.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource3.java index ca7244a25..3b96d1d38 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource3.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource3.java @@ -19,22 +19,19 @@ import java.util.Collection; import java.util.Dictionary; import java.util.Hashtable; -import javax.servlet.ServletException; - import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestResource; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /** * @author Raymond Augé */ public class TestResource3 extends AbstractTestResource { - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> resourceProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> resourceProps = new Hashtable<>(); resourceProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PATTERN, regexAlias()); resourceProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PREFIX, getName()); registrations.add(componentContext.getBundleContext().registerService(TestResource3.class, this, resourceProps)); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource4.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource4.java index bbb231531..f91c960cf 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource4.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource4.java @@ -22,7 +22,6 @@ import javax.servlet.ServletException; import org.eclipse.equinox.http.servlet.ExtendedHttpService; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestResource; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; - import org.osgi.service.component.ComponentContext; import org.osgi.service.http.NamespaceException; @@ -37,7 +36,7 @@ public class TestResource4 extends AbstractTestResource { service.registerResources(regexAlias(), getName() , null); service.registerFilter(regexAlias(), f1, new Hashtable<String, String>(), null); service.registerFilter(regexAlias(), f2, new Hashtable<String, String>(), null); - Hashtable<String, String> hashtable = new Hashtable<String, String>(); + Hashtable<String, String> hashtable = new Hashtable<>(); hashtable.put("filter-priority", "1"); service.registerFilter(regexAlias(), f3, hashtable, null); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource5.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource5.java index cf0f07ccb..18b93e1a1 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource5.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestResource5.java @@ -20,14 +20,12 @@ import java.util.Dictionary; import java.util.Hashtable; import javax.servlet.Filter; -import javax.servlet.ServletException; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestResource; import org.eclipse.equinox.http.servlet.tests.util.BaseFilter; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; /** @@ -35,15 +33,15 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestResource5 extends AbstractTestResource { - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> resourceProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> resourceProps = new Hashtable<>(); resourceProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PATTERN, regexAlias()); resourceProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_RESOURCE_PREFIX, getName()); registrations.add(componentContext.getBundleContext().registerService(TestResource5.class, this, resourceProps)); - Dictionary<String, Object> filterProps = new Hashtable<String, Object>(); + Dictionary<String, Object> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); registrations.add(componentContext.getBundleContext().registerService(Filter.class, f1, filterProps)); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet10.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet10.java index e35a4c975..dbec8d0c0 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet10.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet10.java @@ -20,7 +20,6 @@ import java.io.OutputStream; import java.io.PrintWriter; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,7 +33,7 @@ public class TestServlet10 extends AbstractTestServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { ServletContext servletContext = getServletContext(); @@ -57,7 +56,7 @@ public class TestServlet10 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { // } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet11.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet11.java index 979e749f3..eb8724925 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet11.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet11.java @@ -20,7 +20,6 @@ import java.io.OutputStream; import java.io.PrintWriter; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,7 +33,7 @@ public class TestServlet11 extends AbstractTestServlet { @Override protected void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { ServletContext servletContext = getServletContext(); @@ -59,7 +58,7 @@ public class TestServlet11 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { // } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java index 641421cce..15a576781 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java @@ -13,11 +13,9 @@ *******************************************************************************/ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -36,7 +34,7 @@ public class TestServlet2 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { int version = getEffectiveMajorVersion(); writer.print(version); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet4.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet4.java index f7dce6d54..29a02e9a3 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet4.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet4.java @@ -14,11 +14,9 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -30,7 +28,7 @@ public class TestServlet4 extends AbstractTestServlet { private static final long serialVersionUID = 1L; @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { ServletContext servletContext = getServletContext(); writer.print(servletContext.getContextPath()); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet5.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet5.java index 0e0e487fc..7f46b9a53 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet5.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet5.java @@ -14,16 +14,12 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Map; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; - import org.osgi.framework.Constants; import org.osgi.service.http.runtime.HttpServiceRuntime; @@ -35,7 +31,7 @@ public class TestServlet5 extends AbstractTestServlet { private Map<String, Object> properties; @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print(properties.get(Constants.SERVICE_DESCRIPTION)); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet6.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet6.java index 8e8cb902a..5467a6788 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet6.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet6.java @@ -14,10 +14,8 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -34,7 +32,7 @@ public class TestServlet6 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet7.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet7.java index 1b3d9d605..593b41035 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet7.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet7.java @@ -14,10 +14,8 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -34,7 +32,7 @@ public class TestServlet7 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java index 5e8b7b7e5..a07d44ebe 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java @@ -56,14 +56,14 @@ public class TestServlet9 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { // } class DispatchTo extends AbstractTestServlet { private static final long serialVersionUID = 1L; @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print(TestServlet9.this.getProperties().get(Constants.SERVICE_DESCRIPTION)); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContext1.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContext1.java index ed9ff1b4f..a44afdc29 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContext1.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContext1.java @@ -14,13 +14,10 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; - import java.util.Set; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -33,7 +30,7 @@ public class TestServletContext1 extends AbstractTestServlet { private static final long serialVersionUID = 1L; @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { ServletContext servletContext = request.getServletContext(); Set<String> resourcePaths = servletContext.getResourcePaths("/org/eclipse/equinox/http/servlet/tests/tb1"); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper1.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper1.java index 8fb8f908c..3b3a635fc 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper1.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper1.java @@ -16,34 +16,42 @@ public class TestServletContextHelper1 extends ServletContextHelper { delegate = new ServletContextHelper(componentContext.getBundleContext().getBundle()) {}; } + @Override public int hashCode() { return delegate.hashCode(); } + @Override public boolean equals(Object obj) { return delegate.equals(obj); } + @Override public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException { return delegate.handleSecurity(request, response); } + @Override public URL getResource(String name) { return delegate.getResource(name); } + @Override public String toString() { return delegate.toString(); } + @Override public String getMimeType(String name) { return delegate.getMimeType(name); } + @Override public Set<String> getResourcePaths(String path) { return delegate.getResourcePaths(path); } + @Override public String getRealPath(String path) { return delegate.getRealPath(path); } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java index 6f5ce51e3..d82d550bc 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java @@ -14,7 +14,6 @@ package org.eclipse.equinox.http.servlet.tests.tb1; -import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +22,6 @@ import java.util.Hashtable; import javax.servlet.Filter; import javax.servlet.Servlet; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet; @@ -32,7 +30,6 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; -import org.osgi.service.http.NamespaceException; import org.osgi.service.http.context.ServletContextHelper; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; @@ -42,15 +39,15 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; */ public class TestServletContextHelper10 extends AbstractTestServlet { private static final long serialVersionUID = 1L; - private final Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); + private final Collection<ServiceRegistration<?>> registrations = new ArrayList<>(); @Override - public void activate(ComponentContext componentContext) throws ServletException, NamespaceException { - Dictionary<String, String> servletProps = new Hashtable<String, String>(); + public void activate(ComponentContext componentContext) { + Dictionary<String, String> servletProps = new Hashtable<>(); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, regexAlias()); servletProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=a)"); registrations.add(componentContext.getBundleContext().registerService(Servlet.class, this, servletProps)); - Dictionary<String, String> filterProps = new Hashtable<String, String>(); + Dictionary<String, String> filterProps = new Hashtable<>(); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_NAME, "F1"); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN, regexAlias()); filterProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=a)"); @@ -60,7 +57,7 @@ public class TestServletContextHelper10 extends AbstractTestServlet { Bundle bundle = bundleContext.getBundle(); ServletContextHelper servletContextHelper = new ServletContextHelper(bundle) {}; - Dictionary<String, String> contextProps = new Hashtable<String, String>(); + Dictionary<String, String> contextProps = new Hashtable<>(); contextProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "a"); contextProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH, "/a"); registrations.add(componentContext.getBundleContext().registerService(ServletContextHelper.class, servletContextHelper, contextProps)); @@ -74,7 +71,7 @@ public class TestServletContextHelper10 extends AbstractTestServlet { } @Override - protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException { + protected void handleDoGet(HttpServletRequest request, PrintWriter writer) { writer.print('a'); } |