This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git
commit 153eef0e679236a42f95e5d8e52c06aedbf1cb25 Author: Amichai Rothman <amic...@apache.org> AuthorDate: Tue May 28 22:06:41 2019 +0300 Add missing @Override annotations --- .../cxf/dosgi/common/httpservice/HttpServiceManager.java | 1 + .../common/httpservice/SecurityDelegatingHttpContext.java | 4 ++++ .../apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java | 6 ++++++ .../cxf/dosgi/common/proxy/ServiceInvocationHandler.java | 2 ++ .../cxf/dosgi/common/httpservice/HttpServiceManagerTest.java | 4 ++++ .../common/httpservice/SecurityDelegatingHttpContextTest.java | 10 ++++++++++ .../cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java | 3 +++ .../java/org/apache/cxf/dosgi/dsw/decorator/Activator.java | 2 ++ .../java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java | 2 ++ .../dosgi/dsw/decorator/ServiceDecoratorBundleListener.java | 3 ++- .../apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java | 1 + .../org/apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java | 1 + .../cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java | 2 ++ .../org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java | 1 + .../org/apache/cxf/dosgi/itests/multi/TestExportService.java | 2 ++ .../itests/multi/customintent/ChangeTitleInterceptor.java | 1 + .../dosgi/itests/multi/customintent/CustomIntentActivator.java | 2 ++ .../org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java | 3 +++ .../java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java | 3 +++ .../dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java | 3 +++ .../cxf/dosgi/samples/security/SampleSecurityFilter.java | 3 +++ 21 files changed, 58 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java b/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java index 5aab6be..188cccc 100644 --- a/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java +++ b/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java @@ -143,6 +143,7 @@ public class HttpServiceManager { private final class UnregisterListener implements ServiceListener { + @Override public void serviceChanged(ServiceEvent event) { if (!(event.getType() == ServiceEvent.UNREGISTERING)) { return; diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContext.java b/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContext.java index 4eba758..53d727f 100644 --- a/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContext.java +++ b/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContext.java @@ -64,14 +64,17 @@ class SecurityDelegatingHttpContext implements HttpContext { requireFilter = Boolean.TRUE.toString().equalsIgnoreCase(bundleContext.getProperty(FILTER_REQUIRED_PROP)); } + @Override public String getMimeType(String name) { return delegate.getMimeType(name); } + @Override public URL getResource(String name) { return delegate.getResource(name); } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -123,6 +126,7 @@ class Chain implements FilterChain { this.filters = filters; } + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { if (current < filters.length && !response.isCommitted()) { Filter filter = filters[current++]; diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java b/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java index 779b76e..1cf26cf 100644 --- a/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java +++ b/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java @@ -96,6 +96,7 @@ public class IntentManagerImpl implements IntentManager { intentMap.remove(intentName); } + @Override @SuppressWarnings("unchecked") public synchronized List<Object> getRequiredIntents(Set<String> requiredIntents) { String[] intentNames = assertAllIntentsSupported(requiredIntents); @@ -124,6 +125,7 @@ public class IntentManagerImpl implements IntentManager { return intents; } + @Override public <T> T getIntent(Class<? extends T> type, List<Object> intents) { List<T> selectedIntents = getIntents(type, intents); if (selectedIntents.isEmpty()) { @@ -135,6 +137,7 @@ public class IntentManagerImpl implements IntentManager { return (T)selectedIntents.iterator().next(); } + @Override public <T> List<T> getIntents(Class<? extends T> type, List<Object> intents) { List<T> result = new ArrayList<T>(); for (Object intent : intents) { @@ -189,6 +192,7 @@ public class IntentManagerImpl implements IntentManager { return unsupportedIntents; } + @Override public Set<String> getExported(Map<String, Object> sd) { Set<String> allIntents = new HashSet<String>(); Collection<String> intents = PropertyHelper @@ -200,6 +204,7 @@ public class IntentManagerImpl implements IntentManager { return allIntents; } + @Override public List<Object> getIntentsFromService(Object serviceBean) { List<Object> intents = new ArrayList<>(); if (serviceBean instanceof IntentsProvider) { @@ -218,6 +223,7 @@ public class IntentManagerImpl implements IntentManager { return intents; } + @Override public Set<String> getImported(Map<String, Object> sd) { Collection<String> intents = PropertyHelper.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_INTENTS)); return new HashSet<String>(intents); diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java index 2ed32ad..6582594 100644 --- a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java +++ b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandler.java @@ -37,6 +37,7 @@ public class ServiceInvocationHandler implements InvocationHandler { } + @Override public Object invoke(Object proxy, final Method m, Object[] params) throws Throwable { if (OBJECT_METHODS.contains(m)) { if (m.getName().equals("equals")) { @@ -50,6 +51,7 @@ public class ServiceInvocationHandler implements InvocationHandler { Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); final Object[] paramsFinal = params; return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { return m.invoke(serviceObject, paramsFinal); } diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManagerTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManagerTest.java index a97a330..cc7dfa9 100644 --- a/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManagerTest.java +++ b/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManagerTest.java @@ -95,6 +95,7 @@ public class HttpServiceManagerTest extends TestCase { this.config = config; } + @Override @SuppressWarnings("rawtypes") public void registerServlet(String alias, Servlet servlet, Dictionary initparams, HttpContext context) throws ServletException { @@ -102,13 +103,16 @@ public class HttpServiceManagerTest extends TestCase { servlet.init(config); } + @Override public void registerResources(String alias, String name, HttpContext context) { throw new RuntimeException("This method should not be called"); } + @Override public void unregister(String alias) { } + @Override public HttpContext createDefaultHttpContext() { return EasyMock.createNiceMock(HttpContext.class); } diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContextTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContextTest.java index 84a3545..aceff54 100644 --- a/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContextTest.java +++ b/common/src/test/java/org/apache/cxf/dosgi/common/httpservice/SecurityDelegatingHttpContextTest.java @@ -50,6 +50,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase { protected String mimeType; protected URL url; // does not need to exist + @Override public void setUp() throws Exception { mimeType = "text/xml"; url = new URL("file:test.xml"); // does not need to exist @@ -212,12 +213,15 @@ class CommitResponseFilter implements Filter { boolean called; + @Override public void init(FilterConfig filterConfig) { } + @Override public void destroy() { } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws java.io.IOException { called = true; @@ -229,12 +233,15 @@ class DoNothingFilter implements Filter { boolean called; + @Override public void init(FilterConfig filterConfig) { } + @Override public void destroy() { } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws java.io.IOException, javax.servlet.ServletException { called = true; @@ -246,12 +253,15 @@ class AccessDeniedFilter implements Filter { boolean called; + @Override public void init(FilterConfig filterConfig) { } + @Override public void destroy() { } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws java.io.IOException { called = true; diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java index bd1b38e..aeb620e 100644 --- a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java +++ b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java @@ -50,16 +50,19 @@ public class ServiceInvocationHandlerTest { public void testInvokeObjectMethod() throws Throwable { final List<String> called = new ArrayList<String>(); ServiceInvocationHandler sih = new ServiceInvocationHandler("hi", String.class) { + @Override public boolean equals(Object obj) { called.add("equals"); return super.equals(obj); } + @Override public int hashCode() { called.add("hashCode"); return super.hashCode(); } + @Override public String toString() { called.add("toString"); return "somestring"; diff --git a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/Activator.java b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/Activator.java index 673ebfc..f1835d3 100644 --- a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/Activator.java +++ b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/Activator.java @@ -27,6 +27,7 @@ public class Activator implements BundleActivator { private static final Logger LOG = LoggerFactory.getLogger(Activator.class); private ServiceDecoratorBundleListener bundleListener; + @Override public void start(BundleContext context) { ServiceDecoratorImpl serviceDecorator = new ServiceDecoratorImpl(); bundleListener = new ServiceDecoratorBundleListener(serviceDecorator); @@ -34,6 +35,7 @@ public class Activator implements BundleActivator { context.registerService(ServiceDecorator.class.getName(), serviceDecorator, null); } + @Override public void stop(BundleContext context) { LOG.debug("RemoteServiceAdmin Implementation is shutting down now"); if (bundleListener != null) { diff --git a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java index 894d01d..1510cf7 100644 --- a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java +++ b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java @@ -66,6 +66,7 @@ public class InterfaceRule implements Rule { addProps.put(name, obj); } + @Override public synchronized void apply(ServiceReference<?> sref, Map<String, Object> target) { String[] objectClass = (String[]) sref.getProperty(Constants.OBJECTCLASS); boolean matches = false; @@ -90,6 +91,7 @@ public class InterfaceRule implements Rule { target.putAll(addProps); } + @Override public Bundle getBundle() { return bundle; } diff --git a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListener.java b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListener.java index 79c2908..e463d66 100644 --- a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListener.java +++ b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListener.java @@ -34,6 +34,7 @@ public class ServiceDecoratorBundleListener implements BundleListener { this.serviceDecorator = serviceDecorator; } + @Override public void bundleChanged(BundleEvent be) { switch(be.getType()) { case BundleEvent.STARTED: @@ -45,4 +46,4 @@ public class ServiceDecoratorBundleListener implements BundleListener { default: } } -} \ No newline at end of file +} diff --git a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java index cf0ada7..e850c92 100644 --- a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java +++ b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java @@ -45,6 +45,7 @@ public class ServiceDecoratorImpl implements ServiceDecorator { parser = new DecorationParser(); } + @Override public void decorate(ServiceReference<?> sref, Map<String, Object> target) { for (Rule matcher : decorations) { matcher.apply(sref, target); diff --git a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java index c0a685b..c74e08a 100644 --- a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java +++ b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java @@ -150,6 +150,7 @@ public class InterfaceRuleTest extends TestCase { private ServiceReference mockServiceReference(final Map<String, Object> serviceProps) { ServiceReference sref = EasyMock.createMock(ServiceReference.class); EasyMock.expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() { + @Override public Object answer() { return serviceProps.get(EasyMock.getCurrentArguments()[0]); } diff --git a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java index 72d2476..aac3b00 100644 --- a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java +++ b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java @@ -56,6 +56,7 @@ public class ServiceDecoratorImplTest extends TestCase { Map<String, Object> target = new HashMap<String, Object>(); ServiceReference sref = EasyMock.createMock(ServiceReference.class); EasyMock.expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() { + @Override public Object answer() { return serviceProps.get(EasyMock.getCurrentArguments()[0]); } @@ -160,6 +161,7 @@ public class ServiceDecoratorImplTest extends TestCase { Map<String, Object> target = new HashMap<String, Object>(); ServiceReference sref = EasyMock.createMock(ServiceReference.class); EasyMock.expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() { + @Override public Object answer() { return serviceProps.get(EasyMock.getCurrentArguments()[0]); } diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java index 1c12e07..2f34525 100644 --- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java +++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java @@ -57,6 +57,7 @@ public class TestCustomIntent extends AbstractDosgiTest { String serviceUri = HTTP_BASE_URI + "/cxf/taskservice"; final TaskService taskService = TaskServiceProxyFactory.create(serviceUri); Task task = tryTo("Call TaskService", new Callable<Task>() { + @Override public Task call() { return taskService.get(1); } diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java index 7b08d1d..69bccb4 100644 --- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java +++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportService.java @@ -84,6 +84,7 @@ public class TestExportService extends AbstractDosgiTest { client.accept(MediaType.APPLICATION_XML_TYPE); org.apache.cxf.dosgi.samples.rest.Task task = tryTo("Call REST Resource", new Callable<org.apache.cxf.dosgi.samples.rest.Task>() { + @Override public org.apache.cxf.dosgi.samples.rest.Task call() { return client.get(org.apache.cxf.dosgi.samples.rest.Task.class); } @@ -108,6 +109,7 @@ public class TestExportService extends AbstractDosgiTest { dbf.setValidating(false); final DocumentBuilder db = dbf.newDocumentBuilder(); Document doc = tryTo("Parse WSDL", new Callable<Document>() { + @Override public Document call() throws Exception { return db.parse(wsdlURL.openStream()); } diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/ChangeTitleInterceptor.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/ChangeTitleInterceptor.java index ee89341..066117b 100644 --- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/ChangeTitleInterceptor.java +++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/ChangeTitleInterceptor.java @@ -36,6 +36,7 @@ public final class ChangeTitleInterceptor extends AbstractPhaseInterceptor<Messa super(Phase.USER_LOGICAL); } + @Override public void handleMessage(Message message) throws Fault { try { MessageContentsList contents = MessageContentsList.getContentsList(message); diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/CustomIntentActivator.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/CustomIntentActivator.java index b0555fd..c5782f3 100644 --- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/CustomIntentActivator.java +++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/customintent/CustomIntentActivator.java @@ -29,6 +29,7 @@ import org.osgi.service.remoteserviceadmin.RemoteConstants; public class CustomIntentActivator implements BundleActivator { + @Override public void start(BundleContext context) { Dictionary<String, String> props = new Hashtable<String, String>(); props.put("org.apache.cxf.dosgi.IntentName", "myIntent"); @@ -42,6 +43,7 @@ public class CustomIntentActivator implements BundleActivator { context.registerService(TaskService.class, new DummyTaskServiceImpl(), props2); } + @Override public void stop(BundleContext context) { } } diff --git a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java index c87b2f9..7e5c20e 100644 --- a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java +++ b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java @@ -80,10 +80,12 @@ public class RsProvider extends BaseDistributionProvider implements Distribution this.intentManager = intentManager; } + @Override public String[] getSupportedTypes() { return new String[] {RsConstants.RS_CONFIG_TYPE}; } + @Override @SuppressWarnings("rawtypes") public Object importEndpoint(ClassLoader consumerLoader, BundleContext consumerContext, @@ -119,6 +121,7 @@ public class RsProvider extends BaseDistributionProvider implements Distribution return ProxyFactory.create(factory.create(), iClass); } + @Override @SuppressWarnings("rawtypes") public Endpoint exportService(Object serviceBean, BundleContext callingContext, diff --git a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java index 6006fe8..956766c 100644 --- a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java +++ b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java @@ -85,10 +85,12 @@ public class WsProvider extends BaseDistributionProvider implements Distribution this.bundleContext = context; } + @Override public String[] getSupportedTypes() { return new String[] {WsConstants.WS_CONFIG_TYPE}; } + @Override @SuppressWarnings("rawtypes") public Object importEndpoint(ClassLoader consumerLoader, BundleContext consumerContext, @@ -153,6 +155,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution return bindingCfg; } + @Override @SuppressWarnings("rawtypes") public Endpoint exportService(Object serviceO, BundleContext serviceContext, diff --git a/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java b/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java index 0f3db95..c36aecc 100644 --- a/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java +++ b/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java @@ -277,6 +277,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase { EasyMock.expect(sfb.create()).andReturn(server); sfb.setAddress((String)EasyMock.anyObject()); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() { serverURI.setLength(0); serverURI.append(EasyMock.getCurrentArguments()[0]); @@ -284,6 +285,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase { } }); EasyMock.expect(sfb.getAddress()).andAnswer(new IAnswer<String>() { + @Override public String answer() { return serverURI.toString(); } @@ -295,6 +297,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase { private Server createMockServer(final ServerFactoryBean sfb) { AttributedURIType addr = EasyMock.createMock(AttributedURIType.class); EasyMock.expect(addr.getValue()).andAnswer(new IAnswer<String>() { + @Override public String answer() { return sfb.getAddress(); } diff --git a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java b/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java index 4da2894..810f656 100644 --- a/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java +++ b/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java @@ -50,10 +50,12 @@ public class SampleSecurityFilter implements Filter { private static final Logger LOG = LoggerFactory.getLogger(SampleSecurityFilter.class); + @Override public void destroy() { LOG.info("destroy()"); } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { if ("secure".equals(((HttpServletRequest)request).getQueryString())) { @@ -65,6 +67,7 @@ public class SampleSecurityFilter implements Filter { } } + @Override public void init(FilterConfig config) { LOG.info("init()"); }