You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by am...@apache.org on 2019/05/28 21:24:49 UTC
[cxf-dosgi] branch master updated (966be4c -> b3a3ee4)
This is an automated email from the ASF dual-hosted git repository.
amichai pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-dosgi.git.
from 966be4c Merge pull request #5 from amichair/DOSGI-280
new 5a905be Fix typo in bundle name
new 230db05 Remove extra blank lines
new 5c1e2c9 Remove leading whitespace
new d0b8731 Add explicit block quotes in readme
new 5c9c12a Remove redundant throws clause
new 84309c1 Simplify MultiBundleTools
new ef22f0e Fix typos
new 77448df Delete unused empty test class
new 6818159 Simplify array initialization
new 7cc135d Fix skipped tests
new 153eef0 Add missing @Override annotations
new 97564d0 Migrate to diamond operator
new 68591a2 Tiny simplifications
new 47133d4 Fix mixed indentation styles
new 344ab76 Upgrade tests to junit 4
new b3a3ee4 Remove trailing whitespace
The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 1 -
Readme.md | 6 +-
buildtools/cxf-checkstyle-suppressions.xml | 8 +-
buildtools/cxf-checkstyle.xml | 89 ++--
buildtools/notice-supplements.xml | 1 -
common/Readme.md | 2 +-
common/bnd.bnd | 1 -
.../cxf/dosgi/common/endpoint/ServerEndpoint.java | 6 +-
.../common/httpservice/HttpServiceManager.java | 3 +-
.../httpservice/SecurityDelegatingHttpContext.java | 4 +
.../cxf/dosgi/common/intent/IntentManager.java | 2 +-
.../common/intent/impl/IntentManagerImpl.java | 42 +-
.../cxf/dosgi/common/proxy/ExceptionMapper.java | 12 +-
.../common/proxy/ServiceInvocationHandler.java | 3 +-
.../common/httpservice/HttpServiceManagerTest.java | 20 +-
.../SecurityDelegatingHttpContextTest.java | 83 ++--
.../common/intent/impl/IntentManagerImplTest.java | 2 +-
.../common/proxy/ServiceInvocationHandlerTest.java | 16 +-
.../cxf/dosgi/common/util/PropertyHelperTest.java | 24 +-
.../org/apache/cxf/dosgi/common/util/Provider.java | 23 -
.../apache/cxf/dosgi/dsw/decorator/Activator.java | 6 +-
.../cxf/dosgi/dsw/decorator/DecorationParser.java | 2 +-
.../cxf/dosgi/dsw/decorator/InterfaceRule.java | 8 +-
.../decorator/ServiceDecoratorBundleListener.java | 5 +-
.../dosgi/dsw/decorator/ServiceDecoratorImpl.java | 7 +-
.../cxf/dosgi/dsw/decorator/InterfaceRuleTest.java | 52 +-
.../ServiceDecoratorBundleListenerTest.java | 4 +-
.../dsw/decorator/ServiceDecoratorImplTest.java | 66 +--
distribution/Readme.md | 8 +-
.../features/src/main/resources/features.xml | 2 +-
distribution/multi-bundle/pom.xml | 530 ++++++++++-----------
.../multi-bundle/src/main/assembly/assembly.xml | 118 ++---
distribution/repository/pom.xml | 4 +-
itests/multi-bundle/pom.xml | 43 +-
.../cxf/dosgi/itests/multi/AbstractDosgiTest.java | 21 +-
.../cxf/dosgi/itests/multi/MultiBundleTools.java | 50 +-
.../cxf/dosgi/itests/multi/TestCustomIntent.java | 7 +-
.../cxf/dosgi/itests/multi/TestExportPolicy.java | 9 +-
.../cxf/dosgi/itests/multi/TestExportService.java | 17 +-
.../cxf/dosgi/itests/multi/TestImportService.java | 4 +-
.../multi/customintent/ChangeTitleInterceptor.java | 3 +-
.../multi/customintent/CustomIntentActivator.java | 12 +-
.../multi-bundle/src/test/resources/rs-test1.xml | 1 -
parent/pom.xml | 20 +-
pom.xml | 7 +-
provider-rs/pom.xml | 20 +-
.../cxf/dosgi/dsw/handlers/rest/RsProvider.java | 21 +-
.../rest/provider/RsProviderCustomTest.java | 5 +-
.../cxf/dosgi/dsw/handlers/rest/provider/Task.java | 4 +-
.../dsw/handlers/rest/simple/RsProviderTest.java | 10 +-
.../cxf/dosgi/dsw/handlers/rest/simple/Task.java | 4 +-
provider-ws/Readme.md | 3 +-
provider-ws/pom.xml | 2 +-
.../cxf/dosgi/dsw/handlers/ws/WsProvider.java | 21 +-
.../cxf/dosgi/dsw/handlers/ws/WsdlSupport.java | 6 +-
.../ws/PojoConfigurationTypeHandlerTest.java | 103 ++--
release_notes.md | 34 +-
samples/Readme.md | 7 +-
samples/features/src/main/resources/features.xml | 6 +-
samples/pom.xml | 2 +-
samples/repository/pom.xml | 5 +-
samples/rest/README.md | 8 +-
.../org/apache/cxf/dosgi/samples/rest/Task.java | 4 +-
.../cxf/dosgi/samples/rest/TaskResource.java | 2 +-
.../samples/rest/client/TaskResourceCommand.java | 4 +-
samples/rest/impl-jackson/pom.xml | 36 +-
.../cxf/dosgi/samples/rest/impl/JacksonIntent.java | 3 +-
.../dosgi/samples/rest/impl/TaskResourceImpl.java | 4 +-
samples/rest/impl/pom.xml | 6 +-
.../dosgi/samples/rest/impl/TaskResourceImpl.java | 6 +-
.../samples/security/SampleSecurityFilter.java | 5 +-
samples/soap/README.md | 6 +-
samples/soap/api/pom.xml | 2 +-
.../org/apache/cxf/dosgi/samples/soap/Task.java | 4 +-
.../apache/cxf/dosgi/samples/soap/TaskService.java | 2 +-
samples/soap/client/pom.xml | 2 +-
.../samples/soap/client/TaskServiceCommand.java | 4 +-
samples/soap/impl/pom.xml | 2 +-
.../dosgi/samples/soap/impl/TaskServiceImpl.java | 4 +-
samples/soap/soap.bndrun | 4 +-
samples/ssl/README.md | 43 +-
samples/ssl/etc/org.ops4j.pax.web.cfg | 1 -
samples/ssl/pom.xml | 2 +-
.../apache/cxf/dosgi/samples/ssl/SslIntent.java | 4 +-
84 files changed, 905 insertions(+), 860 deletions(-)
delete mode 100644 common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java
[cxf-dosgi] 15/16: Upgrade tests to junit 4
Posted by am...@apache.org.
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 344ab766905477c2b77f039fb1bff6c8da5932fe
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed May 29 00:02:52 2019 +0300
Upgrade tests to junit 4
---
.../common/httpservice/HttpServiceManagerTest.java | 11 ++---
.../SecurityDelegatingHttpContextTest.java | 48 +++++++++++++---------
.../cxf/dosgi/common/util/PropertyHelperTest.java | 20 ++++++---
.../cxf/dosgi/dsw/decorator/InterfaceRuleTest.java | 17 ++++++--
.../dsw/decorator/ServiceDecoratorImplTest.java | 20 ++++++---
.../ws/PojoConfigurationTypeHandlerTest.java | 32 +++++++++++----
6 files changed, 100 insertions(+), 48 deletions(-)
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 cc7dfa9..29acce1 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
@@ -20,6 +20,7 @@ package org.apache.cxf.dosgi.common.httpservice;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
+import static org.junit.Assert.assertEquals;
import java.util.Dictionary;
@@ -33,7 +34,7 @@ import org.apache.cxf.BusFactory;
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-import org.junit.Assert;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.ServiceEvent;
@@ -42,10 +43,9 @@ import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
-import junit.framework.TestCase;
-
-public class HttpServiceManagerTest extends TestCase {
+public class HttpServiceManagerTest {
+ @Test
public void testGetAbsoluteAddress() {
HttpServiceManager manager = new HttpServiceManager();
manager.initFromConfig(null);
@@ -57,6 +57,7 @@ public class HttpServiceManagerTest extends TestCase {
assertEquals("http://localhost:8181/mycontext/myservice", address2);
}
+ @Test
public void testRegisterAndUnregisterServlet() throws Exception {
IMocksControl c = EasyMock.createControl();
BundleContext dswContext = c.createMock(BundleContext.class);
@@ -99,7 +100,7 @@ public class HttpServiceManagerTest extends TestCase {
@SuppressWarnings("rawtypes")
public void registerServlet(String alias, Servlet servlet, Dictionary initparams, HttpContext context)
throws ServletException {
- Assert.assertEquals("/myService", alias);
+ assertEquals("/myService", alias);
servlet.init(config);
}
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 aceff54..068de12 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
@@ -30,17 +30,20 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.easymock.EasyMock;
-import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpContext;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
@SuppressWarnings({
"unchecked", "rawtypes"
})
-public class SecurityDelegatingHttpContextTest extends TestCase {
+public class SecurityDelegatingHttpContextTest {
protected HttpContext defaultHttpContext;
protected SecurityDelegatingHttpContext httpContext;
@@ -50,7 +53,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
protected String mimeType;
protected URL url; // does not need to exist
- @Override
+ @Before
public void setUp() throws Exception {
mimeType = "text/xml";
url = new URL("file:test.xml"); // does not need to exist
@@ -67,6 +70,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
EasyMock.replay(defaultHttpContext);
}
+ @Test
public void testFilterRequired() throws Exception {
// Mock up the service references
ServiceReference[] serviceReferences = {};
@@ -89,14 +93,15 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
HttpServletResponse response = EasyMock.createNiceMock(HttpServletResponse.class);
EasyMock.replay(response);
boolean requestAllowed = httpContext.handleSecurity(request, response);
- Assert.assertFalse(requestAllowed);
+ assertFalse(requestAllowed);
// Ensure that the httpContext returns true if there is no requirement for registered servlet filters
httpContext.requireFilter = false;
requestAllowed = httpContext.handleSecurity(request, response);
- Assert.assertTrue(requestAllowed);
+ assertTrue(requestAllowed);
}
+ @Test
public void testSingleCommitFilter() throws Exception {
// Mock up the service references
ServiceReference filterReference = EasyMock.createNiceMock(ServiceReference.class);
@@ -123,14 +128,15 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
// return value
EasyMock.expect(response.getWriter()).andReturn(new PrintWriter(System.out));
EasyMock.replay(response);
- Assert.assertFalse(httpContext.handleSecurity(request, response));
+ assertFalse(httpContext.handleSecurity(request, response));
// Ensure that the appropriate filters were called
- Assert.assertTrue(commitFilter.called);
- Assert.assertFalse(doNothingFilter.called);
- Assert.assertFalse(accessDeniedFilter.called);
+ assertTrue(commitFilter.called);
+ assertFalse(doNothingFilter.called);
+ assertFalse(accessDeniedFilter.called);
}
+ @Test
public void testFilterChain() throws Exception {
// Mock up the service references
ServiceReference filterReference = EasyMock.createNiceMock(ServiceReference.class);
@@ -158,14 +164,15 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
EasyMock.expect(response.isCommitted()).andReturn(true); // the commit filter indicating that it committed the
// response
EasyMock.replay(response);
- Assert.assertFalse(httpContext.handleSecurity(request, response));
+ assertFalse(httpContext.handleSecurity(request, response));
// Ensure that the appropriate filters were called
- Assert.assertTrue(doNothingFilter.called);
- Assert.assertTrue(commitFilter.called);
- Assert.assertFalse(accessDeniedFilter.called);
+ assertTrue(doNothingFilter.called);
+ assertTrue(commitFilter.called);
+ assertFalse(accessDeniedFilter.called);
}
+ @Test
public void testAllowRequest() throws Exception {
// Mock up the service references
ServiceReference filterReference = EasyMock.createNiceMock(ServiceReference.class);
@@ -188,14 +195,15 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
HttpServletResponse response = EasyMock.createNiceMock(HttpServletResponse.class);
EasyMock.expect(response.isCommitted()).andReturn(false);
EasyMock.replay(response);
- Assert.assertTrue(httpContext.handleSecurity(request, response));
+ assertTrue(httpContext.handleSecurity(request, response));
// Ensure that the appropriate filters were called
- Assert.assertTrue(doNothingFilter.called);
- Assert.assertFalse(commitFilter.called);
- Assert.assertFalse(accessDeniedFilter.called);
+ assertTrue(doNothingFilter.called);
+ assertFalse(commitFilter.called);
+ assertFalse(accessDeniedFilter.called);
}
+ @Test
public void testDelegation() {
BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
EasyMock.replay(bundleContext);
@@ -204,8 +212,8 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
httpContext = new SecurityDelegatingHttpContext(bundleContext, defaultHttpContext);
// Ensure that it delegates non-security calls to the wrapped implementation (in this case, the mock)
- Assert.assertEquals(mimeType, httpContext.getMimeType(""));
- Assert.assertEquals(url, httpContext.getResource(""));
+ assertEquals(mimeType, httpContext.getMimeType(""));
+ assertEquals(url, httpContext.getResource(""));
}
}
diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java
index f842caf..aaefb46 100644
--- a/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java
@@ -25,23 +25,29 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Test;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.RemoteConstants;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-public class PropertyHelperTest extends TestCase {
+public class PropertyHelperTest {
+ @Test
public void testMultiValuePropertyAsString() {
assertEquals(Collections.singleton("hi"),
- PropertyHelper.getMultiValueProperty("hi"));
+ PropertyHelper.getMultiValueProperty("hi"));
}
+ @Test
public void testMultiValuePropertyAsArray() {
assertEquals(Arrays.asList("a", "b"),
- PropertyHelper.getMultiValueProperty(new String[] {"a", "b"}));
+ PropertyHelper.getMultiValueProperty(new String[]{"a", "b"}));
}
+ @Test
public void testMultiValuePropertyAsCollection() {
List<String> list = new ArrayList<>();
list.add("1");
@@ -50,10 +56,12 @@ public class PropertyHelperTest extends TestCase {
assertEquals(list, PropertyHelper.getMultiValueProperty(list));
}
+ @Test
public void testMultiValuePropertyNull() {
assertTrue(PropertyHelper.getMultiValueProperty(null).isEmpty());
}
+ @Test
public void testGetProperty() {
Map<String, Object> p = new HashMap<>();
p.put(RemoteConstants.ENDPOINT_ID, "http://google.de");
@@ -64,8 +72,8 @@ public class PropertyHelperTest extends TestCase {
EndpointDescription endpoint = new EndpointDescription(p);
assertNull(PropertyHelper.getProperty(endpoint.getProperties(), "unknownProp"));
- assertEquals(p.get(RemoteConstants.ENDPOINT_ID),
+ assertEquals(p.get(RemoteConstants.ENDPOINT_ID),
PropertyHelper.getProperty(endpoint.getProperties(), RemoteConstants.ENDPOINT_ID));
- assertEquals(null, PropertyHelper.getProperty(endpoint.getProperties(), "notAString"));
+ assertNull(PropertyHelper.getProperty(endpoint.getProperties(), "notAString"));
}
}
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 fed8706..42c1282 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
@@ -21,21 +21,26 @@ package org.apache.cxf.dosgi.dsw.decorator;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.easymock.IAnswer;
+import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
@SuppressWarnings("rawtypes")
-public class InterfaceRuleTest extends TestCase {
+public class InterfaceRuleTest {
+ @Test
public void testDUMMY() {
assertTrue(true);
}
+ @Test
public void testInterfaceRuleGetBundle() {
Bundle b = EasyMock.createMock(Bundle.class);
EasyMock.replay(b);
@@ -43,6 +48,7 @@ public class InterfaceRuleTest extends TestCase {
assertSame(b, ir.getBundle());
}
+ @Test
public void testInterfaceRule1() {
InterfaceRule ir = new InterfaceRule(null, "org.apache.Foo");
ir.addProperty("x", "y", String.class.getName());
@@ -60,6 +66,7 @@ public class InterfaceRuleTest extends TestCase {
assertEquals(expected, m);
}
+ @Test
public void testInterfaceRule2() {
InterfaceRule ir = new InterfaceRule(null, "org.apache.F(.*)");
ir.addPropMatch("boo", "baah");
@@ -79,6 +86,7 @@ public class InterfaceRuleTest extends TestCase {
assertEquals(expected, m);
}
+ @Test
public void testInterfaceRule3() {
InterfaceRule ir = new InterfaceRule(null, "org.apache.F(.*)");
ir.addProperty("x", "y", String.class.getName());
@@ -93,6 +101,7 @@ public class InterfaceRuleTest extends TestCase {
assertEquals(0, m.size());
}
+ @Test
public void testInterfaceRule4() {
InterfaceRule ir = new InterfaceRule(null, "org.apache.F(.*)");
ir.addPropMatch("boo", "baah");
@@ -107,6 +116,7 @@ public class InterfaceRuleTest extends TestCase {
assertEquals(0, m.size());
}
+ @Test
public void testInterfaceRule5() {
InterfaceRule ir = new InterfaceRule(null, "org.apache.Foo");
ir.addPropMatch("test.int", "42");
@@ -127,6 +137,7 @@ public class InterfaceRuleTest extends TestCase {
assertEquals(expected, m);
}
+ @Test
public void testInterfaceRule6() {
InterfaceRule ir = new InterfaceRule(null, "org.apache.Foo");
ir.addPropMatch("test.int", "42");
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 4e870e5..c50997e 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
@@ -24,16 +24,17 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.easymock.EasyMock;
import org.easymock.IAnswer;
-import org.junit.Assert;
+import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-public class ServiceDecoratorImplTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class ServiceDecoratorImplTest {
private static final Map<String, Object> EMPTY = new HashMap<>();
private static final URL RES_SD = getResource("/test-resources/sd.xml");
private static final URL RES_SD1 = getResource("/test-resources/sd1.xml");
@@ -41,6 +42,7 @@ public class ServiceDecoratorImplTest extends TestCase {
private static final URL RES_SD0 = getResource("/test-resources/sd0.xml");
private static final URL RES_SD_1 = getResource("/test-resources/sd-1.xml");
+ @Test
@SuppressWarnings("rawtypes")
public void testAddRemoveDecorations() {
final Map<String, Object> serviceProps = new HashMap<>();
@@ -76,6 +78,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertEquals(EMPTY, target2);
}
+ @Test
public void testAddDecorations() {
final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.acme.foo.Bar"});
@@ -86,6 +89,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, expected, RES_SD);
}
+ @Test
public void testAddDecorations1() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.A"});
@@ -96,6 +100,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, expected, RES_SD1, RES_SD2);
}
+ @Test
public void testAddDecorations2() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.D"});
@@ -103,6 +108,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, EMPTY, RES_SD1, RES_SD2);
}
+ @Test
public void testAddDecorations3() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.B"});
@@ -113,6 +119,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, expected, RES_SD1, RES_SD2);
}
+ @Test
public void testAddDecorations4() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.C"});
@@ -123,6 +130,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, expected, RES_SD1, RES_SD2);
}
+ @Test
public void testAddDecorations5() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.C"});
@@ -131,6 +139,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, EMPTY, RES_SD1, RES_SD2);
}
+ @Test
public void testAddDecorations6() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.D"});
@@ -138,6 +147,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, EMPTY, RES_SD0);
}
+ @Test
public void testAddDecorations7() {
Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.D"});
@@ -182,7 +192,7 @@ public class ServiceDecoratorImplTest extends TestCase {
private static URL getResource(String path) {
URL resource = ServiceDecoratorImplTest.class.getResource(path);
- Assert.assertNotNull("Resource " + path + " not found!", resource);
+ assertNotNull("Resource " + path + " not found!", resource);
return resource;
}
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 306d8be..3308093 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
@@ -48,17 +48,22 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IMocksControl;
-import org.junit.Assert;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.RemoteConstants;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class PojoConfigurationTypeHandlerTest extends TestCase {
+public class PojoConfigurationTypeHandlerTest {
+ @Test
public void testGetPojoAddressEndpointURI() {
IntentManager intentManager = new IntentManagerImpl();
WsProvider handler = new WsProvider();
@@ -74,6 +79,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
return new HttpServiceManager();
}
+ @Test
public void testGetPojoAddressEndpointCxf() {
IntentManager intentManager = new IntentManagerImpl();
WsProvider handler = new WsProvider();
@@ -85,6 +91,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
assertEquals(url, handler.getServerAddress(sd, String.class));
}
+ @Test
public void testGetDefaultPojoAddress() {
IntentManager intentManager = new IntentManagerImpl();
WsProvider handler = new WsProvider();
@@ -95,6 +102,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
}
// todo: add test for data bindings
+ @Test
public void testCreateProxy() {
IMocksControl c = EasyMock.createNiceControl();
BundleContext bc1 = c.createMock(BundleContext.class);
@@ -139,6 +147,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
c.verify();
}
+ @Test
public void testCreateServerWithAddressProperty() {
BundleContext dswContext = EasyMock.createNiceMock(BundleContext.class);
EasyMock.replay(dswContext);
@@ -175,6 +184,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
assertEquals("http://alternate_host:80/myString", edProps.get(RemoteConstants.ENDPOINT_ID));
}
+ @Test
public void testAddressing() {
runAddressingTest(new HashMap<String, Object>(), "http://localhost:9000/java/lang/Runnable");
@@ -223,12 +233,13 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
Endpoint result = handler.exportService(myService, bundleContext, properties, exportedInterface);
Map<String, Object> props = result.description().getProperties();
assertEquals(expectedAddress, props.get("org.apache.cxf.ws.address"));
- Assert.assertArrayEquals(new String[] {"org.apache.cxf.ws"},
+ assertArrayEquals(new String[] {"org.apache.cxf.ws"},
(String[])props.get(RemoteConstants.SERVICE_IMPORTED_CONFIGS));
- Assert.assertArrayEquals(new String[] {"java.lang.Runnable"},
+ assertArrayEquals(new String[] {"java.lang.Runnable"},
(String[])props.get(org.osgi.framework.Constants.OBJECTCLASS));
}
+ @Test
public void testCreateServerException() {
BundleContext dswContext = EasyMock.createNiceMock(BundleContext.class);
EasyMock.replay(dswContext);
@@ -317,6 +328,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
return server;
}
+ @Test
public void testCreateEndpointProps() {
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.getProperty("org.osgi.framework.uuid")).andReturn("some_uuid1");
@@ -344,6 +356,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
assertEquals(new Version("0.0.0"), epd.getPackageVersion("java.lang"));
}
+ @Test
public void testCreateJaxWsEndpointWithoutIntents() {
IMocksControl c = EasyMock.createNiceControl();
BundleContext dswBC = c.createMock(BundleContext.class);
@@ -368,12 +381,13 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
org.apache.cxf.endpoint.Endpoint ep = serverWrapper.getServer().getEndpoint();
QName bindingName = ep.getEndpointInfo().getBinding().getName();
- Assert.assertEquals(JaxWsEndpointImpl.class, ep.getClass());
- Assert.assertEquals(new QName("http://jaxws.handlers.dsw.dosgi.cxf.apache.org/",
+ assertEquals(JaxWsEndpointImpl.class, ep.getClass());
+ assertEquals(new QName("http://jaxws.handlers.dsw.dosgi.cxf.apache.org/",
"MyJaxWsEchoServiceServiceSoapBinding"),
bindingName);
}
+ @Test
public void testCreateSimpleEndpointWithoutIntents() {
IMocksControl c = EasyMock.createNiceControl();
BundleContext dswBC = c.createMock(BundleContext.class);
@@ -395,8 +409,8 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
org.apache.cxf.endpoint.Endpoint ep = serverWrapper.getServer().getEndpoint();
QName bindingName = ep.getEndpointInfo().getBinding().getName();
- Assert.assertEquals(EndpointImpl.class, ep.getClass());
- Assert.assertEquals(new QName("http://simple.handlers.dsw.dosgi.cxf.apache.org/",
+ assertEquals(EndpointImpl.class, ep.getClass());
+ assertEquals(new QName("http://simple.handlers.dsw.dosgi.cxf.apache.org/",
"MySimpleEchoServiceSoapBinding"),
bindingName);
}
[cxf-dosgi] 04/16: Add explicit block quotes in readme
Posted by am...@apache.org.
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 d0b87315a1876f80205320496dfe519268ddaeb5
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 15:21:47 2019 +0300
Add explicit block quotes in readme
---
samples/ssl/README.md | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/samples/ssl/README.md b/samples/ssl/README.md
index ac53836..056c2df 100644
--- a/samples/ssl/README.md
+++ b/samples/ssl/README.md
@@ -15,21 +15,20 @@ We want the karaf HttpService to be secured by https and require a client certif
* Create client and server keys.
* Add client certificate to server
-
- mkdir -p etc/keystores
- # Create server key
- keytool -genkey -dname CN=localhost -keyalg RSA -validity 100000 -alias serverkey -keypass password -storepass password -keystore etc/keystores/keystore.jks
- # Create client key and add to keystore as trusted
- keytool -genkey -dname CN=chris -keyalg RSA -validity 100000 -alias clientkey -keypass password -storepass password -keystore etc/keystores/client.jks
- keytool -export -rfc -keystore etc/keystores/client.jks -storepass password -alias clientkey -file client.cer
- keytool -import -trustcacerts -keystore etc/keystores/keystore.jks -storepass password -alias clientkey -file client.cer
-
-
- # Export server cert
- keytool -exportcert -storepass password -keystore etc/keystores/keystore.jks -alias serverKey -file server.cert
- # Import server cert into client store
- keytool -importcert -storepass password -keystore etc/keystores/client.jks -alias serverKey -file server.cert
-
+```
+mkdir -p etc/keystores
+# Create server key
+keytool -genkey -dname CN=localhost -keyalg RSA -validity 100000 -alias serverkey -keypass password -storepass password -keystore etc/keystores/keystore.jks
+# Create client key and add to keystore as trusted
+keytool -genkey -dname CN=chris -keyalg RSA -validity 100000 -alias clientkey -keypass password -storepass password -keystore etc/keystores/client.jks
+keytool -export -rfc -keystore etc/keystores/client.jks -storepass password -alias clientkey -file client.cer
+keytool -import -trustcacerts -keystore etc/keystores/keystore.jks -storepass password -alias clientkey -file client.cer
+
+# Export server cert
+keytool -exportcert -storepass password -keystore etc/keystores/keystore.jks -alias serverKey -file server.cert
+# Import server cert into client store
+keytool -importcert -storepass password -keystore etc/keystores/client.jks -alias serverKey -file server.cert
+```
- Copy thes files in etc to the karaf etc dir
- Copy the keystores (*.jks) into the karaf etc directory.
@@ -50,8 +49,10 @@ install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-ssl-intent/2.0.0
If you want to access the service using your browser then you have to export it in pkcs12 format and import it into your browser.
- # Export client cert as pkcs12 for browser
- keytool -importkeystore -srckeystore etc/keystores/client.jks -destkeystore etc/keystores/client.p12 -deststoretype PKCS12
+```
+# Export client cert as pkcs12 for browser
+keytool -importkeystore -srckeystore etc/keystores/client.jks -destkeystore etc/keystores/client.p12 -deststoretype PKCS12
+```
Access the service as [](https://localhost:8443/cxf/echo "echo service").
Add a security exemption to accept the server certificate.
[cxf-dosgi] 03/16: Remove leading whitespace
Posted by am...@apache.org.
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 5c1e2c963efca73af157339532a68e08f44e7075
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 14:49:53 2019 +0300
Remove leading whitespace
---
buildtools/cxf-checkstyle-suppressions.xml | 6 +++---
buildtools/cxf-checkstyle.xml | 8 ++++----
.../apache/cxf/dosgi/common/endpoint/ServerEndpoint.java | 2 +-
.../apache/cxf/dosgi/common/intent/IntentManager.java | 2 +-
.../cxf/dosgi/common/intent/impl/IntentManagerImpl.java | 16 ++++++++--------
.../apache/cxf/dosgi/common/proxy/ExceptionMapper.java | 6 +++---
.../dosgi/common/intent/impl/IntentManagerImplTest.java | 2 +-
.../dosgi/common/proxy/ServiceInvocationHandlerTest.java | 4 ++--
.../cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java | 2 +-
.../decorator/ServiceDecoratorBundleListenerTest.java | 2 +-
.../dosgi/dsw/decorator/ServiceDecoratorImplTest.java | 2 +-
distribution/features/src/main/resources/features.xml | 2 +-
distribution/multi-bundle/pom.xml | 2 +-
distribution/repository/pom.xml | 2 +-
itests/multi-bundle/pom.xml | 12 ++++++------
.../apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java | 14 +++++++-------
.../apache/cxf/dosgi/itests/multi/TestCustomIntent.java | 2 +-
.../apache/cxf/dosgi/itests/multi/TestExportPolicy.java | 4 ++--
.../apache/cxf/dosgi/itests/multi/TestExportService.java | 8 ++++----
.../itests/multi/customintent/CustomIntentActivator.java | 2 +-
parent/pom.xml | 6 +++---
pom.xml | 6 +++---
provider-rs/pom.xml | 4 ++--
.../apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java | 8 ++++----
.../dsw/handlers/rest/provider/RsProviderCustomTest.java | 2 +-
.../cxf/dosgi/dsw/handlers/rest/provider/Task.java | 4 ++--
.../dosgi/dsw/handlers/rest/simple/RsProviderTest.java | 8 ++++----
.../apache/cxf/dosgi/dsw/handlers/rest/simple/Task.java | 4 ++--
provider-ws/pom.xml | 2 +-
.../org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java | 12 ++++++------
.../apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java | 2 +-
release_notes.md | 4 ++--
samples/features/src/main/resources/features.xml | 6 +++---
samples/pom.xml | 2 +-
samples/repository/pom.xml | 4 ++--
.../java/org/apache/cxf/dosgi/samples/rest/Task.java | 2 +-
.../org/apache/cxf/dosgi/samples/rest/TaskResource.java | 2 +-
.../dosgi/samples/rest/client/TaskResourceCommand.java | 4 ++--
.../cxf/dosgi/samples/rest/impl/JacksonIntent.java | 2 +-
.../cxf/dosgi/samples/rest/impl/TaskResourceImpl.java | 2 +-
.../cxf/dosgi/samples/rest/impl/TaskResourceImpl.java | 2 +-
samples/soap/api/pom.xml | 2 +-
.../java/org/apache/cxf/dosgi/samples/soap/Task.java | 2 +-
.../org/apache/cxf/dosgi/samples/soap/TaskService.java | 2 +-
samples/soap/client/pom.xml | 2 +-
.../dosgi/samples/soap/client/TaskServiceCommand.java | 4 ++--
samples/soap/impl/pom.xml | 2 +-
samples/soap/soap.bndrun | 2 +-
samples/ssl/README.md | 4 ++--
samples/ssl/pom.xml | 2 +-
50 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/buildtools/cxf-checkstyle-suppressions.xml b/buildtools/cxf-checkstyle-suppressions.xml
index b15b6ac..d27656f 100644
--- a/buildtools/cxf-checkstyle-suppressions.xml
+++ b/buildtools/cxf-checkstyle-suppressions.xml
@@ -10,9 +10,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@
<suppress checks=".*"
files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
/>
-
+
<suppress checks=".*"
files=".+[\\\/]contrib[\\\/].+\.java"
/>
diff --git a/buildtools/cxf-checkstyle.xml b/buildtools/cxf-checkstyle.xml
index 521192b..9d54896 100644
--- a/buildtools/cxf-checkstyle.xml
+++ b/buildtools/cxf-checkstyle.xml
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,14 +25,14 @@
Checks to make sure the code meets the CXF coding guidelines which
are similar to the Sun guidelines at:
http://java.sun.com/docs/codeconv/index.html
-
+
It also enforces aa bunch of other "BestPractices like method
lengths, if/try depths, etc...
-->
<module name="Checker">
<property name="severity" value="error"/>
-
+
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
<!--
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java b/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java
index 080b1c5..a0ad662 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java
@@ -32,7 +32,7 @@ public class ServerEndpoint implements Endpoint {
this.desc = desc;
this.server = server;
}
-
+
public Server getServer() {
return this.server;
}
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
index de7a5fa..e98be90 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/intent/IntentManager.java
@@ -29,7 +29,7 @@ public interface IntentManager {
Set<String> getExported(Map<String, Object> sd);
Set<String> getImported(Map<String, Object> sd);
-
+
List<Object> getRequiredIntents(Set<String> requiredIntents);
<T> List<T> getIntents(Class<? extends T> type, List<Object> intents);
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 2571fef..779b76e 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
@@ -81,7 +81,7 @@ public class IntentManagerImpl implements IntentManager {
};
tracker.open();
}
-
+
@Deactivate
public void deactivate() {
tracker.close();
@@ -123,7 +123,7 @@ public class IntentManagerImpl implements IntentManager {
}
return intents;
}
-
+
public <T> T getIntent(Class<? extends T> type, List<Object> intents) {
List<T> selectedIntents = getIntents(type, intents);
if (selectedIntents.isEmpty()) {
@@ -134,7 +134,7 @@ public class IntentManagerImpl implements IntentManager {
}
return (T)selectedIntents.iterator().next();
}
-
+
public <T> List<T> getIntents(Class<? extends T> type, List<Object> intents) {
List<T> result = new ArrayList<T>();
for (Object intent : intents) {
@@ -162,7 +162,7 @@ public class IntentManagerImpl implements IntentManager {
LOG.debug(msg, Arrays.toString(unsupportedIntents.toArray()), remainingSeconds);
}
}
-
+
try {
wait(1000);
} catch (InterruptedException e) {
@@ -188,7 +188,7 @@ public class IntentManagerImpl implements IntentManager {
}
return unsupportedIntents;
}
-
+
public Set<String> getExported(Map<String, Object> sd) {
Set<String> allIntents = new HashSet<String>();
Collection<String> intents = PropertyHelper
@@ -199,7 +199,7 @@ public class IntentManagerImpl implements IntentManager {
allIntents.addAll(parseIntents(intents2));
return allIntents;
}
-
+
public List<Object> getIntentsFromService(Object serviceBean) {
List<Object> intents = new ArrayList<>();
if (serviceBean instanceof IntentsProvider) {
@@ -217,12 +217,12 @@ public class IntentManagerImpl implements IntentManager {
}
return intents;
}
-
+
public Set<String> getImported(Map<String, Object> sd) {
Collection<String> intents = PropertyHelper.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_INTENTS));
return new HashSet<String>(intents);
}
-
+
private static Collection<String> parseIntents(Collection<String> intents) {
List<String> parsed = new ArrayList<String>();
for (String intent : intents) {
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
index 2e3044b..4601d9c 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
@@ -29,11 +29,11 @@ import org.osgi.framework.ServiceException;
public class ExceptionMapper {
private static final String REMOTE_EXCEPTION_TYPE = "REMOTE";
private Map<Method, Set<Class<?>>> exceptionsMap = new HashMap<Method, Set<Class<?>>>();
-
+
public ExceptionMapper(Class<?> iType) {
introspectTypeForExceptions(iType);
}
-
+
public Throwable mapException(Method m, Throwable ex) throws Throwable {
Throwable cause = ex.getCause() == null ? ex : ex.getCause();
Set<Class<?>> excTypes = exceptionsMap.get(m);
@@ -49,7 +49,7 @@ public class ExceptionMapper {
}
return new ServiceException(REMOTE_EXCEPTION_TYPE, ex);
}
-
+
private void introspectTypeForExceptions(Class<?> iType) {
for (Method m : iType.getDeclaredMethods()) {
addExceptions(m);
diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImplTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImplTest.java
index 4f55b54..3f8fdce 100644
--- a/common/src/test/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImplTest.java
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImplTest.java
@@ -34,7 +34,7 @@ public class IntentManagerImplTest {
Object feature = intents.iterator().next();
Assert.assertEquals(GZIPFeature.class, feature.getClass());
}
-
+
@Test
public void testIntentsFromIntentsProvider() {
IntentManagerImpl im = new IntentManagerImpl();
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 af31b4d..5b60075 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
@@ -82,11 +82,11 @@ public class ServiceInvocationHandlerTest {
MySubService proxy = ProxyFactory.create(new MyServiceImpl(), MySubService.class);
proxy.throwException2();
}
-
+
@Test(expected = IOException.class)
public void testInheritedException() throws IOException {
MySubService proxy = ProxyFactory.create(new MyServiceImpl(), MySubService.class);
proxy.throwException1();
}
-
+
}
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 20130c3..cf0ada7 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
@@ -44,7 +44,7 @@ public class ServiceDecoratorImpl implements ServiceDecorator {
public ServiceDecoratorImpl() {
parser = new DecorationParser();
}
-
+
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/ServiceDecoratorBundleListenerTest.java b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java
index 1ca33fc..1b09bea 100644
--- a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java
+++ b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java
@@ -52,7 +52,7 @@ public class ServiceDecoratorBundleListenerTest {
Bundle b = EasyMock.createMock(Bundle.class);
EasyMock.replay(b);
-
+
ServiceDecoratorBundleListener listener = new ServiceDecoratorBundleListener(serviceDecorator);
assertEquals("Precondition failed", 0, called.size());
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 1b4a44d..da8928a 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
@@ -143,7 +143,7 @@ public class ServiceDecoratorImplTest extends TestCase {
assertDecorate(serviceProps, EMPTY, RES_SD_1);
}
-
+
private void assertDecorate(final Map<String, Object> serviceProps,
Map<String, Object> expected, URL... resources) {
Map<String, Object> actual = testDecorate(serviceProps, resources);
diff --git a/distribution/features/src/main/resources/features.xml b/distribution/features/src/main/resources/features.xml
index 435e610..ab57657 100644
--- a/distribution/features/src/main/resources/features.xml
+++ b/distribution/features/src/main/resources/features.xml
@@ -19,7 +19,7 @@
<feature>cxf-databinding-aegis</feature>
<bundle>mvn:${project.groupId}/cxf-dosgi-provider-ws/${project.version}</bundle>
</feature>
-
+
<feature name="cxf-dosgi-provider-rs" version="${project.version}">
<feature>cxf-dosgi-common</feature>
<feature>cxf-jaxrs</feature>
diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index 6f1924f..ff35945 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -264,7 +264,7 @@
</execution>
</executions>
</plugin>
-
+
<!-- Unzip the archive created by bnd export plugin. To then repackage it in the assembly phase -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 1a1691b..e3e591c 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -16,7 +16,7 @@
<version>${aries.rsa.version}</version>
<type>pom</type>
</dependency>
-
+
<!-- Workaround for missing dependency in rsa repo -->
<dependency>
<groupId>org.fusesource.jansi</groupId>
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 2329529..facde78 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -32,11 +32,11 @@
<artifactId>cxf-dosgi-itests-multibundle</artifactId>
<packaging>jar</packaging>
<name>CXF DOSGi Integration Tests Multi-Bundle</name>
-
+
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
</properties>
-
+
<!--
When changing code make sure to run the distro before testing
or you will be testing the old code.
@@ -82,7 +82,7 @@
<artifactId>pax-exam-link-mvn</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
@@ -152,7 +152,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Samples -->
<dependency>
<groupId>org.apache.cxf.dosgi.samples</groupId>
@@ -206,7 +206,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
@@ -220,7 +220,7 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
</build>
</project>
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
index 673a2f6..2c14c84 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
@@ -59,19 +59,19 @@ public class AbstractDosgiTest {
static final String HTTP_HOST = "localhost"; // can specify specific bound IP
static final String HTTP_BASE_URI = "http://" + HTTP_HOST + ":" + HTTP_PORT;
private static final int TIMEOUT = 20;
-
+
@Inject
BundleContext bundleContext;
-
+
@BeforeClass
public static void log() {
System.out.println("-----------------------------------------------------------------");
}
-
+
public <T> T tryTo(String message, Callable<T> func) throws TimeoutException {
return tryTo(message, func, 5000);
}
-
+
public <T> T tryTo(String message, Callable<T> func, long timeout) throws TimeoutException {
Throwable lastException = null;
long startTime = System.currentTimeMillis();
@@ -256,7 +256,7 @@ public class AbstractDosgiTest {
.put("clientPort", "" + ZK_PORT) //
.asOption();
}
-
+
protected static Option configLogging() {
return ConfigurationAdminOptions.configurationFolder(new File("src/test/resources/cfg"));
}
@@ -265,7 +265,7 @@ public class AbstractDosgiTest {
return mavenBundle().groupId("org.apache.cxf.dosgi.samples")
.artifactId("cxf-dosgi-samples-soap-api").versionAsInProject();
}
-
+
protected static MavenArtifactProvisionOption taskServiceImpl() {
return mavenBundle().groupId("org.apache.cxf.dosgi.samples")
.artifactId("cxf-dosgi-samples-soap-impl").versionAsInProject();
@@ -296,7 +296,7 @@ public class AbstractDosgiTest {
mavenBundle("org.ops4j.pax.tinybundles", "tinybundles").versionAsInProject(),
mavenBundle("biz.aQute.bnd", "biz.aQute.bndlib").versionAsInProject(),
-
+
systemProperty("org.osgi.service.http.port").value("" + HTTP_PORT),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), //
systemProperty("pax.exam.osgi.unresolved.fail").value("true"), //
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 814066a..06eafd4 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
@@ -61,7 +61,7 @@ public class TestCustomIntent extends AbstractDosgiTest {
return taskService.get(1);
}
});
-
+
Assert.assertEquals("changed", task.getTitle());
}
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
index c55dc97..d7ba62d 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
@@ -38,11 +38,11 @@ import org.ops4j.pax.exam.util.Filter;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class TestExportPolicy extends AbstractDosgiTest {
-
+
@Inject
@Filter("(name=cxf)")
ExportPolicy policy;
-
+
@Configuration
public static Option[] configure() throws Exception {
return new Option[] //
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 6e54d6f..ba2b2a5 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
@@ -50,7 +50,7 @@ public class TestExportService extends AbstractDosgiTest {
private static final String SERVICE_URI = HTTP_BASE_URI + "/cxf/taskservice";
private static final String REST_SERVICE_URI = HTTP_BASE_URI + "/cxf/tasks";
-
+
private static final String GREETER_ZOOKEEPER_NODE = //
"/osgi/service_registry/http:##localhost:8181#cxf#taskservice";
@@ -76,7 +76,7 @@ public class TestExportService extends AbstractDosgiTest {
Task task = taskService.get(1);
Assert.assertEquals("Buy some coffee", task.getTitle());
}
-
+
@Test
public void testRESTCall() throws Exception {
waitWebPage(REST_SERVICE_URI);
@@ -94,7 +94,7 @@ public class TestExportService extends AbstractDosgiTest {
String swaggerJson = swaggerClient.get(String.class);
Assert.assertEquals("{\"swagger\":\"2.0\"", swaggerJson.substring(0, 16));
}
-
+
@Test
public void testDiscoveryExport() throws Exception {
ZooKeeper zk = createZookeeperClient();
@@ -112,7 +112,7 @@ public class TestExportService extends AbstractDosgiTest {
return db.parse(wsdlURL.openStream());
}
});
-
+
Element el = doc.getDocumentElement();
Assert.assertEquals("definitions", el.getLocalName());
Assert.assertEquals("http://schemas.xmlsoap.org/wsdl/", el.getNamespaceURI());
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 8c99ddb..7765ef3 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
@@ -33,7 +33,7 @@ public class CustomIntentActivator implements BundleActivator {
Dictionary<String, String> props = new Hashtable<String, String>();
props.put("org.apache.cxf.dosgi.IntentName", "myIntent");
context.registerService(CustomFeatureProvider.class, new CustomFeatureProvider(), props);
-
+
Dictionary<String, String> props2 = new Hashtable<String, String>();
props2.put(RemoteConstants.SERVICE_EXPORTED_CONFIGS, "org.apache.cxf.ws");
props2.put("org.apache.cxf.ws.address", "/taskservice");
diff --git a/parent/pom.xml b/parent/pom.xml
index 951752b..7c6d958 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -140,7 +140,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -157,7 +157,7 @@
<version>1.3.0</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
@@ -170,7 +170,7 @@
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
-
+
<!-- Just for the remote service admin spec -->
<dependency>
<groupId>org.apache.aries.rsa</groupId>
diff --git a/pom.xml b/pom.xml
index 17826a1..e5f5b82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<name>CXF DOSGi main</name>
-
+
<scm>
<connection>scm:git:http://gitbox.apache.org/repos/asf/cxf-dosgi.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/cxf-dosgi.git</developerConnection>
@@ -90,7 +90,7 @@
<build>
<defaultGoal>install</defaultGoal>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index 5336bc0..202e229 100644
--- a/provider-rs/pom.xml
+++ b/provider-rs/pom.xml
@@ -41,7 +41,7 @@
<artifactId>cxf-dosgi-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
@@ -57,7 +57,7 @@
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
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 160f185..c87b2f9 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
@@ -74,12 +74,12 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
public void setHttpServiceManager(HttpServiceManager httpServiceManager) {
this.httpServiceManager = httpServiceManager;
}
-
+
@Reference
public void setIntentManager(IntentManager intentManager) {
this.intentManager = intentManager;
}
-
+
public String[] getSupportedTypes() {
return new String[] {RsConstants.RS_CONFIG_TYPE};
}
@@ -163,7 +163,7 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
if (binding != null) {
factory.setBindingConfig(binding);
}
-
+
List<Object> providers = new ArrayList<Object>();
for (Object intent : intents) {
if (isProvider(intent)) {
@@ -172,7 +172,7 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
}
factory.setProviders(providers);
}
-
+
private boolean isProvider(Object intent) {
return intent.getClass().getAnnotation(Provider.class) != null //
|| (intent instanceof ExceptionMapper) //
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
index 5198371..2bb31bd 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
@@ -54,7 +54,7 @@ public class RsProviderCustomTest {
rsProvider.setIntentManager(intentManager);
TaskServiceImpl taskService = new TaskServiceImpl();
BundleContext callingContext = EasyMock.createMock(BundleContext.class);
-
+
Map<String, Object> props = new HashMap<>();
props.put(Constants.OBJECTCLASS, new String[]{TaskService.class.getName()});
String serviceAddress = "http://localhost:9181/";
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/Task.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/Task.java
index d45dee6..9011aa4 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/Task.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/Task.java
@@ -23,7 +23,7 @@ public class Task {
public Task() {
}
-
+
public Task(String name) {
this.name = name;
}
@@ -31,7 +31,7 @@ public class Task {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java
index adc3df6..379a880 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java
@@ -49,22 +49,22 @@ public class RsProviderTest {
rsProvider.setIntentManager(intentManager);
TaskServiceImpl taskService = new TaskServiceImpl();
BundleContext callingContext = EasyMock.createMock(BundleContext.class);
-
+
Map<String, Object> props = new HashMap<>();
props.put(Constants.OBJECTCLASS, new String[]{TaskService.class.getName()});
String serviceAddress = "http://localhost:9181/";
props.put(RsConstants.RS_ADDRESS_PROPERTY, serviceAddress);
Class<?>[] ifaces = new Class[]{TaskService.class};
-
+
try (Endpoint endpoint = rsProvider.exportService(taskService,
callingContext,
props,
ifaces)) {
Assert.assertEquals(serviceAddress, endpoint.description().getId());
-
+
Task task1 = WebClient.create(serviceAddress).path("/task").get(Task.class);
Assert.assertEquals("test", task1.getName());
-
+
TaskService proxy = (TaskService)rsProvider.importEndpoint(TaskService.class.getClassLoader(),
callingContext, ifaces, endpoint.description());
Task task = proxy.getTask();
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/Task.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/Task.java
index 23c6c8a..cc1760a 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/Task.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/Task.java
@@ -26,7 +26,7 @@ public class Task {
public Task() {
}
-
+
public Task(String name) {
this.name = name;
}
@@ -34,7 +34,7 @@ public class Task {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
diff --git a/provider-ws/pom.xml b/provider-ws/pom.xml
index 5d37eb6..93b6c4c 100644
--- a/provider-ws/pom.xml
+++ b/provider-ws/pom.xml
@@ -41,7 +41,7 @@
<artifactId>cxf-dosgi-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
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 0c953c4..7584f02 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
@@ -74,12 +74,12 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
public void setHttpServiceManager(HttpServiceManager httpServiceManager) {
this.httpServiceManager = httpServiceManager;
}
-
+
@Reference
public void setIntentManager(IntentManager intentManager) {
this.intentManager = intentManager;
}
-
+
@Activate
public void activate(BundleContext context) {
this.bundleContext = context;
@@ -128,7 +128,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
factory.setDataBinding(dataBinding);
}
BindingConfiguration binding = copy(intentManager.getIntent(BindingConfiguration.class, intents));
-
+
if (binding != null) {
factory.setBindingConfig(binding);
}
@@ -194,7 +194,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
throw new RuntimeException("Error exporting service with adress " + completeEndpointAddress, e);
}
}
-
+
private void applyIntents(List<Object> intents, AbstractEndpointFactory factory) {
List<Feature> features = intentManager.getIntents(Feature.class, intents);
factory.setFeatures(features);
@@ -207,7 +207,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
factory.setBindingConfig(binding);
}
}
-
+
protected EndpointDescription createEndpointDesc(Map<String, Object> props, String[] importedConfigs,
String address, Collection<String> intents) {
return super.createEndpointDesc(props, importedConfigs, WsConstants.WS_ADDRESS_PROPERTY, address, intents);
@@ -230,7 +230,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
LOG.info("Using a default address: " + address);
return address;
}
-
+
protected String getClientAddress(Map<String, Object> sd) {
return PropertyHelper.getFirstNonEmptyStringProperty(sd, WsConstants.WS_ADDRESS_PROPERTY,
RemoteConstants.ENDPOINT_ID);
diff --git a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java
index 83794c5..83b8e8e 100644
--- a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java
+++ b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java
@@ -32,7 +32,7 @@ public final class WsdlSupport {
private WsdlSupport() {
}
-
+
public static void setWsdlProperties(AbstractWSDLBasedEndpointFactory factory, //
BundleContext context, //
Map<String, Object> sd) {
diff --git a/release_notes.md b/release_notes.md
index 5542ca2..1c70343 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -31,7 +31,7 @@ Release Notes - CXF Distributed OSGi
* [DOSGI-261] - Sample for rest with jackson provider
* [DOSGI-266] - Support for org.apache.cxf.jaxrs.ext.ContextProvider
* [DOSGI-270] - Create sample for swagger documentation
-
+
2.1.0
=====
@@ -121,7 +121,7 @@ Release Notes - CXF Distributed OSGi
* Improvement
* [DOSGI-220] - Upgrade to cxf 3.1.1
-
+
1.6.0
=====
diff --git a/samples/features/src/main/resources/features.xml b/samples/features/src/main/resources/features.xml
index 6d62713..187b7b5 100644
--- a/samples/features/src/main/resources/features.xml
+++ b/samples/features/src/main/resources/features.xml
@@ -8,14 +8,14 @@
<bundle>mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-api/${project.version}</bundle>
<bundle>mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-impl/${project.version}</bundle>
</feature>
-
+
<feature name="cxf-dosgi-sample-soap-client" version="${project.version}">
<feature>cxf-dosgi-provider-ws</feature>
<feature>aries-rsa-discovery-zookeeper</feature>
<bundle>mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-api/${project.version}</bundle>
<bundle>mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-client/${project.version}</bundle>
</feature>
-
+
<feature name="cxf-dosgi-sample-rest-impl" version="${project.version}">
<feature>cxf-dosgi-provider-rs</feature>
<feature>aries-rsa-discovery-zookeeper-server</feature>
@@ -25,7 +25,7 @@
<bundle>mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-rest-api/${project.version}</bundle>
<bundle>mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-rest-impl/${project.version}</bundle>
</feature>
-
+
<feature name="cxf-dosgi-sample-rest-client" version="${project.version}">
<feature>cxf-dosgi-provider-rs</feature>
<feature>aries-rsa-discovery-zookeeper</feature>
diff --git a/samples/pom.xml b/samples/pom.xml
index 9f49646..3fdd9fc 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -33,7 +33,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
-
+
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
</properties>
diff --git a/samples/repository/pom.xml b/samples/repository/pom.xml
index 5726293..0fc1e54 100644
--- a/samples/repository/pom.xml
+++ b/samples/repository/pom.xml
@@ -113,7 +113,7 @@
<artifactId>jline</artifactId>
<version>3.10.0</version>
</dependency>
-
+
<!-- rsa -->
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
@@ -141,7 +141,7 @@
<artifactId>cxf-dosgi-samples-rest-client</artifactId>
<version>${project.version}</version>
</dependency>
-
+
</dependencies>
<build>
diff --git a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java
index 6ae15a1..6decde1 100644
--- a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java
+++ b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java
@@ -29,7 +29,7 @@ public class Task {
String description;
Date dueDate;
boolean finished;
-
+
public Task() {
}
diff --git a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
index 07a6ae7..7976f75 100644
--- a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
+++ b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
@@ -49,7 +49,7 @@ public interface TaskResource {
@ApiOperation(value = "Add task")
@POST
void add(Task task);
-
+
@ApiOperation(value = "Update existing task")
@PUT
@Path("/{id}")
diff --git a/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java b/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
index e84bc97..76ee6c3 100644
--- a/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
+++ b/samples/rest/client/src/main/java/org/apache/cxf/dosgi/samples/rest/client/TaskResourceCommand.java
@@ -46,12 +46,12 @@ public class TaskResourceCommand {
System.out.println(line);
}
}
-
+
public void add(Integer id, String title) {
Task task = new Task(id, title, "");
taskService.add(task);
}
-
+
public void delete(Integer id) {
taskService.delete(id);
}
diff --git a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
index 63674e4..8649be0 100644
--- a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
+++ b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
@@ -39,5 +39,5 @@ public class JacksonIntent implements IntentsProvider {
public List<?> getIntents() {
return Arrays.asList((Object)new JacksonJaxbJsonProvider());
}
-
+
}
diff --git a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index 7753ea3..eca3bc7 100644
--- a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -66,7 +66,7 @@ public class TaskResourceImpl implements TaskResource, IntentsProvider {
task.setDescription("");
add(task);
}
-
+
@Override
public Task get(Integer id) {
return taskMap.get(id);
diff --git a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index 1ee6f4c..e8c3e92 100644
--- a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -67,7 +67,7 @@ public class TaskResourceImpl implements TaskResource, IntentsProvider {
public void add(Task task) {
taskMap.put(task.getId(), task);
}
-
+
@Override
public void update(Integer id, Task task) {
taskMap.put(id, task);
diff --git a/samples/soap/api/pom.xml b/samples/soap/api/pom.xml
index 4523a30..0125b69 100644
--- a/samples/soap/api/pom.xml
+++ b/samples/soap/api/pom.xml
@@ -30,7 +30,7 @@
<version>2.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
</properties>
diff --git a/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java b/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java
index a689ed4..2609f4c 100644
--- a/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java
+++ b/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java
@@ -29,7 +29,7 @@ public class Task {
String description;
Date dueDate;
boolean finished;
-
+
public Task() {
}
diff --git a/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/TaskService.java b/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/TaskService.java
index 45face5..d37643e 100644
--- a/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/TaskService.java
+++ b/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/TaskService.java
@@ -29,6 +29,6 @@ public interface TaskService {
void addOrUpdate(Task task);
void delete(Integer id);
-
+
Collection<Task> getAll();
}
diff --git a/samples/soap/client/pom.xml b/samples/soap/client/pom.xml
index aba9906..9c96e70 100644
--- a/samples/soap/client/pom.xml
+++ b/samples/soap/client/pom.xml
@@ -21,7 +21,7 @@
<version>2.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
</properties>
diff --git a/samples/soap/client/src/main/java/org/apache/cxf/dosgi/samples/soap/client/TaskServiceCommand.java b/samples/soap/client/src/main/java/org/apache/cxf/dosgi/samples/soap/client/TaskServiceCommand.java
index a249d38..81b5572 100644
--- a/samples/soap/client/src/main/java/org/apache/cxf/dosgi/samples/soap/client/TaskServiceCommand.java
+++ b/samples/soap/client/src/main/java/org/apache/cxf/dosgi/samples/soap/client/TaskServiceCommand.java
@@ -48,12 +48,12 @@ public class TaskServiceCommand {
System.out.println(line);
}
}
-
+
public void add(Integer id, String title) {
Task task = new Task(id, title, "");
taskService.addOrUpdate(task);
}
-
+
public void delete(Integer id) {
taskService.delete(id);
}
diff --git a/samples/soap/impl/pom.xml b/samples/soap/impl/pom.xml
index 486455b..4de4aae 100644
--- a/samples/soap/impl/pom.xml
+++ b/samples/soap/impl/pom.xml
@@ -29,7 +29,7 @@
<version>2.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
</properties>
diff --git a/samples/soap/soap.bndrun b/samples/soap/soap.bndrun
index e31bce0..653dada 100644
--- a/samples/soap/soap.bndrun
+++ b/samples/soap/soap.bndrun
@@ -13,7 +13,7 @@
org.apache.felix.http.jettyEnabled=true,\
org.osgi.framework.bootdelegation=com.sun.*,\
org.osgi.framework.system.packages.extra='sun.misc,javax.xml.bind.annotation;version=2.2.1,javax.xml.bind;version=2.2.1'
-
+
# felix.cm.loglevel=4,\
# felix.fileinstall.dir=./etc,\
# felix.fileinstall.noInitialDelay=true,\
diff --git a/samples/ssl/README.md b/samples/ssl/README.md
index feb5563..ac53836 100644
--- a/samples/ssl/README.md
+++ b/samples/ssl/README.md
@@ -24,12 +24,12 @@ We want the karaf HttpService to be secured by https and require a client certif
keytool -export -rfc -keystore etc/keystores/client.jks -storepass password -alias clientkey -file client.cer
keytool -import -trustcacerts -keystore etc/keystores/keystore.jks -storepass password -alias clientkey -file client.cer
-
+
# Export server cert
keytool -exportcert -storepass password -keystore etc/keystores/keystore.jks -alias serverKey -file server.cert
# Import server cert into client store
keytool -importcert -storepass password -keystore etc/keystores/client.jks -alias serverKey -file server.cert
-
+
- Copy thes files in etc to the karaf etc dir
- Copy the keystores (*.jks) into the karaf etc directory.
diff --git a/samples/ssl/pom.xml b/samples/ssl/pom.xml
index bcbd690..d0e2025 100644
--- a/samples/ssl/pom.xml
+++ b/samples/ssl/pom.xml
@@ -30,7 +30,7 @@
<version>2.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
[cxf-dosgi] 08/16: Delete unused empty test class
Posted by am...@apache.org.
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 77448df0a25ce753871c4e7dcaf28b06b8601181
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 21:04:25 2019 +0300
Delete unused empty test class
---
.../org/apache/cxf/dosgi/common/util/Provider.java | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java b/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java
deleted file mode 100644
index 009c4a1..0000000
--- a/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.dosgi.common.util;
-
-public class Provider {
-}
[cxf-dosgi] 16/16: Remove trailing whitespace
Posted by am...@apache.org.
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 b3a3ee467a2c94c1f81bcdfc5f99cff315878921
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Wed May 29 00:17:18 2019 +0300
Remove trailing whitespace
---
Readme.md | 4 ++--
buildtools/cxf-checkstyle.xml | 6 +++---
common/Readme.md | 2 +-
.../cxf/dosgi/common/intent/impl/IntentManagerImpl.java | 4 ++--
.../dsw/decorator/ServiceDecoratorBundleListener.java | 2 +-
.../dosgi/dsw/decorator/ServiceDecoratorImplTest.java | 2 +-
distribution/Readme.md | 6 +++---
itests/multi-bundle/pom.xml | 6 +++---
.../apache/cxf/dosgi/itests/multi/TestExportService.java | 2 +-
.../apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java | 8 ++++----
.../dosgi/dsw/handlers/rest/simple/RsProviderTest.java | 2 +-
.../org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java | 4 ++--
.../apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java | 4 ++--
.../handlers/ws/PojoConfigurationTypeHandlerTest.java | 6 +++---
release_notes.md | 16 ++++++++--------
samples/Readme.md | 6 +++---
samples/rest/README.md | 8 ++++----
samples/soap/README.md | 6 +++---
samples/ssl/README.md | 6 +++---
.../java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java | 2 +-
20 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/Readme.md b/Readme.md
index 22c95cd..afd8450 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,7 +7,7 @@ CXF DOSGi allows to easily publish and consume SOAP and REST services without us
## Modules
* [common - Common services like intents and HTTPService support](common).
-* [provider-ws - SOAP transport](provider-ws)
+* [provider-ws - SOAP transport](provider-ws)
* [provider-rs - REST transport](provider-rs)
* [decorator - Support for exporting existing services](decorator)
@@ -16,7 +16,7 @@ CXF DOSGi allows to easily publish and consume SOAP and REST services without us
## Intents
-Intents allow a service to leverage CXF extensions like features. A service can list the named intents it requires.
+Intents allow a service to leverage CXF extensions like features. A service can list the named intents it requires.
It will then only be exported / imported once all the intents are available. This allows for example security restrictions or logging.
For more information see [common module](common).
diff --git a/buildtools/cxf-checkstyle.xml b/buildtools/cxf-checkstyle.xml
index ce59e05..36dd94b 100644
--- a/buildtools/cxf-checkstyle.xml
+++ b/buildtools/cxf-checkstyle.xml
@@ -22,7 +22,7 @@
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<!--
- Checks to make sure the code meets the CXF coding guidelines which
+ Checks to make sure the code meets the CXF coding guidelines which
are similar to the Sun guidelines at:
http://java.sun.com/docs/codeconv/index.html
@@ -210,7 +210,7 @@
<module name="VisibilityModifier">
<property name="protectedAllowed" value="true" />
<property name="packageAllowed" value="true" />
- <!-- this is needed for the resource injection unit tests. It will removed
+ <!-- this is needed for the resource injection unit tests. It will removed
when private member inject is supported.
-->
<property name="publicMemberPattern" value="resource[12].*" />
@@ -231,7 +231,7 @@
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
- <!--
+ <!--
<module name="ArrayTypeStyle"/>
<module name="FinalParameters"/>
-->
diff --git a/common/Readme.md b/common/Readme.md
index fe2959d..2d6ccf3 100644
--- a/common/Readme.md
+++ b/common/Readme.md
@@ -7,7 +7,7 @@ Handles communication with the HttpService and Intents.
In case a custom http context is used the providers will register a custom servlet.
Besides this the HttpServiceManager also handles the creation of a default address if none is given and the conversion from the relative address specified on the service property to a fully qualified address.
-Config pid `org.apache.cxf.dosgi.http`
+Config pid `org.apache.cxf.dosgi.http`
Key | Default | Description
----------------|---------|------------
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 f1fd5ce..c3f6cb8 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
@@ -108,7 +108,7 @@ public class IntentManagerImpl implements IntentManager {
List<Object> curIntents = ((Callable<List<Object>>)intent).call();
intents.addAll(curIntents);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeException(e);
}
} else if (intent instanceof IntentsProvider) {
try {
@@ -116,7 +116,7 @@ public class IntentManagerImpl implements IntentManager {
List<?> curIntents = provider.getIntents();
intents.addAll(curIntents);
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeException(e);
}
} else {
intents.add(intent);
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 e463d66..c05cc8e 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
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleListener;
public class ServiceDecoratorBundleListener implements BundleListener {
/**
- *
+ *
*/
private final ServiceDecoratorImpl serviceDecorator;
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 c50997e..1567d99 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
@@ -155,7 +155,7 @@ public class ServiceDecoratorImplTest {
assertDecorate(serviceProps, EMPTY, RES_SD_1);
}
- private void assertDecorate(final Map<String, Object> serviceProps,
+ private void assertDecorate(final Map<String, Object> serviceProps,
Map<String, Object> expected, URL... resources) {
Map<String, Object> actual = testDecorate(serviceProps, resources);
assertEquals(expected, actual);
diff --git a/distribution/Readme.md b/distribution/Readme.md
index e0ce8f9..9bee73a 100644
--- a/distribution/Readme.md
+++ b/distribution/Readme.md
@@ -2,7 +2,7 @@
## Apache karaf features
-Installing CXF DOSGi in apache karaf is very easy.
+Installing CXF DOSGi in apache karaf is very easy.
```
feature:repo-add cxf-dosgi 2.0.0
@@ -19,13 +19,13 @@ In CXF-DOSGi we provide all necessary bundles in the [repository](repository) mo
Any example for this is the [samples/repository](../samples/repository) module. This pom refers to the Aries RSA and CXF DOSGi repository poms and adds other bundles needed to create a complete OSGi deployment.
-The [SOAP sample](../samples/soap) contains a bndrun file to describe the setup of the SOAP sample.
+The [SOAP sample](../samples/soap) contains a bndrun file to describe the setup of the SOAP sample.
## Multi-Bundle
Provides an archive of the dependencies of CXF DOSGi as well as configs for felix and equinox to start the bundles.
-This distribution is deprecated as it is quite tedious to create an automated build for your own application based on the archive.
+This distribution is deprecated as it is quite tedious to create an automated build for your own application based on the archive.
## Source
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 55a9b9b..e8c7dae 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -37,7 +37,7 @@
<topDirectoryLocation>../..</topDirectoryLocation>
</properties>
- <!--
+ <!--
When changing code make sure to run the distro before testing
or you will be testing the old code.
-->
@@ -89,12 +89,12 @@
<version>2.6.1</version>
</dependency>
-<!--
+ <!--
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
- -->
+ -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
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 69bccb4..ce6cbe0 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
@@ -82,7 +82,7 @@ public class TestExportService extends AbstractDosgiTest {
waitWebPage(REST_SERVICE_URI);
final WebClient client = WebClient.create(REST_SERVICE_URI + "/1");
client.accept(MediaType.APPLICATION_XML_TYPE);
- org.apache.cxf.dosgi.samples.rest.Task task = tryTo("Call REST Resource",
+ 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() {
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 6cf8ff4..1f8693a 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
@@ -108,7 +108,7 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
private Object createJaxrsProxy(String address,
Class<?> iClass,
ClassLoader loader,
- EndpointDescription endpoint,
+ EndpointDescription endpoint,
List<Object> intents) {
JAXRSClientFactoryBean factory = new JAXRSClientFactoryBean();
factory.setAddress(address);
@@ -144,7 +144,7 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
Bus bus = createBus(sid, callingContext, contextRoot, endpointProps);
LOG.info("Creating JAXRS endpoint for " + iClass.getName() + " with address " + address);
- JAXRSServerFactoryBean factory = createServerFactory(callingContext, endpointProps,
+ JAXRSServerFactoryBean factory = createServerFactory(callingContext, endpointProps,
iClass, serviceBean, address, bus);
applyIntents(intents, factory);
String completeEndpointAddress = httpServiceManager.getAbsoluteAddress(contextRoot, address);
@@ -178,11 +178,11 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
private boolean isProvider(Object intent) {
return intent.getClass().getAnnotation(Provider.class) != null //
- || (intent instanceof ExceptionMapper) //
+ || (intent instanceof ExceptionMapper) //
|| (intent instanceof MessageBodyReader) //
|| (intent instanceof MessageBodyWriter) //
|| (intent instanceof ContextResolver) //
- || (intent instanceof ContextProvider);
+ || (intent instanceof ContextProvider);
}
private Endpoint createServerFromFactory(JAXRSServerFactoryBean factory,
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java
index 379a880..4395a2f 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/simple/RsProviderTest.java
@@ -65,7 +65,7 @@ public class RsProviderTest {
Task task1 = WebClient.create(serviceAddress).path("/task").get(Task.class);
Assert.assertEquals("test", task1.getName());
- TaskService proxy = (TaskService)rsProvider.importEndpoint(TaskService.class.getClassLoader(),
+ TaskService proxy = (TaskService)rsProvider.importEndpoint(TaskService.class.getClassLoader(),
callingContext, ifaces, endpoint.description());
Task task = proxy.getTask();
Assert.assertEquals("test", task.getName());
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 956766c..7b3b6a4 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
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
@Component(configurationPid = "cxf-dsw", property = //
{//
REMOTE_CONFIGS_SUPPORTED + "=" + WsConstants.WS_CONFIG_TYPE,
- REMOTE_INTENTS_SUPPORTED + "="
+ REMOTE_INTENTS_SUPPORTED + "="
})
public class WsProvider extends BaseDistributionProvider implements DistributionProvider {
@@ -137,7 +137,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
}
private BindingConfiguration copy(BindingConfiguration bindingCfg) {
- return bindingCfg instanceof SoapBindingConfiguration
+ return bindingCfg instanceof SoapBindingConfiguration
? copy((SoapBindingConfiguration)bindingCfg) : bindingCfg;
}
diff --git a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java
index 83b8e8e..b7ad285 100644
--- a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java
+++ b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsdlSupport.java
@@ -34,7 +34,7 @@ public final class WsdlSupport {
}
public static void setWsdlProperties(AbstractWSDLBasedEndpointFactory factory, //
- BundleContext context, //
+ BundleContext context, //
Map<String, Object> sd) {
String location = PropertyHelper.getProperty(sd, WsConstants.WS_WSDL_LOCATION);
if (location != null) {
@@ -42,7 +42,7 @@ public final class WsdlSupport {
if (wsdlURL != null) {
factory.setWsdlURL(wsdlURL.toString());
}
- QName serviceName = getServiceQName(null, sd,
+ QName serviceName = getServiceQName(null, sd,
WsConstants.WS_WSDL_SERVICE_NAMESPACE,
WsConstants.WS_WSDL_SERVICE_NAME);
if (serviceName != null) {
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 3308093..4d03a23 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
@@ -344,9 +344,9 @@ public class PojoConfigurationTypeHandlerTest {
sd.put(org.osgi.framework.Constants.SERVICE_ID, 42);
EndpointHelper.addObjectClass(sd, exportedInterfaces);
List<String> intents = Arrays.asList("my_intent", "your_intent");
- EndpointDescription epd = pch.createEndpointDesc(sd,
- new String[] {"org.apache.cxf.ws"},
- "http://localhost:12345",
+ EndpointDescription epd = pch.createEndpointDesc(sd,
+ new String[] {"org.apache.cxf.ws"},
+ "http://localhost:12345",
intents);
assertEquals("http://localhost:12345", epd.getId());
diff --git a/release_notes.md b/release_notes.md
index 23f7ec5..9d3d17a 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -30,7 +30,7 @@ Release Notes - CXF Distributed OSGi
* New Feature
* [DOSGI-261] - Sample for rest with jackson provider
* [DOSGI-266] - Support for org.apache.cxf.jaxrs.ext.ContextProvider
- * [DOSGI-270] - Create sample for swagger documentation
+ * [DOSGI-270] - Create sample for swagger documentation
2.1.0
@@ -42,7 +42,7 @@ Release Notes - CXF Distributed OSGi
* Improvement
* [DOSGI-251] - Allow to export services with less service properties
* [DOSGI-256] - ContextResolver intents should be registered as providers
- * [DOSGI-257] - Allow to set bus properties
+ * [DOSGI-257] - Allow to set bus properties
2.0.0
@@ -91,7 +91,7 @@ Release Notes - CXF Distributed OSGi
* [DOSGI-211] - Support SOAP over JMS in DOSGI
* Task
- * [DOSGI-194] - Decide how DOSGi needs to handle service.exported.interfaces with multiple values
+ * [DOSGI-194] - Decide how DOSGi needs to handle service.exported.interfaces with multiple values
1.8.0
@@ -108,7 +108,7 @@ Release Notes - CXF Distributed OSGi
* New Feature
* [DOSGI-230] - Create TCP provider
- * [DOSGI-231] - Create ExportPolicy SPI
+ * [DOSGI-231] - Create ExportPolicy SPI
1.7.0
@@ -120,7 +120,7 @@ Release Notes - CXF Distributed OSGi
* [DOSGI-216] - ZookeeperStarter restarts ZooKeeper too easily
* Improvement
- * [DOSGI-220] - Upgrade to cxf 3.1.1
+ * [DOSGI-220] - Upgrade to cxf 3.1.1
1.6.0
@@ -198,7 +198,7 @@ Release Notes - CXF Distributed OSGi - Version 1.5.0
* [DOSGI-10] - Spring schema handling (intents) doesn't work properly
* for the single-bundle case
* [DOSGI-18] - RESTful Proxies can not be created in multibundle DOSGI
- * distributions
+ * distributions
* [DOSGI-63] - The discovery can be used be used before the connection
* to the server is completely established
* [DOSGI-69] - CXF-DOSGi requires internet access when reading XML
@@ -208,7 +208,7 @@ Release Notes - CXF Distributed OSGi - Version 1.5.0
* stop
* [DOSGI-110] - Unable to export multiple services
* [DOSGI-111] - DOSGi bundle attempts to load WSDL using wrong bundle in
- * WSDL-first configuration
+ * WSDL-first configuration
* [DOSGI-113] - Integration with pax-logging not possible
* [DOSGI-114] - RemoteServiceAdmin is not available warnings in DOSGi
* 1.3
@@ -228,7 +228,7 @@ Release Notes - CXF Distributed OSGi - Version 1.5.0
* an Endpoint is already imported
* [DOSGI-142] - Upgrade CXF to 2.7.0
* [DOSGI-145] - Multiple services using HTTP Service and published from
- * the same bundle do not work
+ * the same bundle do not work
* [DOSGI-150] - Update to Java 1.6
* [DOSGI-153] - Error starting greeter sample in karaf 2.3.0 in aegis
* setup: ExceptionInInitializerError ... failed to create an
diff --git a/samples/Readme.md b/samples/Readme.md
index fcaf3e2..e3b6f0e 100644
--- a/samples/Readme.md
+++ b/samples/Readme.md
@@ -7,7 +7,7 @@ The features module provides Apache Karaf features for the examples. So using ka
The SOAP example also provides a bndrun file for bndtools that allows to directly start/debug the service from Eclipse and export it into a runnable jar.
-## Checkout and Build
+## Checkout and Build
```
git clone git@github.com:apache/cxf-dosgi.git
@@ -28,11 +28,11 @@ To use the bndrun files you need the [bndtools](http://bndtools.org/) eclipse ex
## Preparing Apache Karaf
[Download Apache karaf 4.x](http://karaf.apache.org/download.html). Extract the archive and
-start Apache Karaf using `bin/karaf`
+start Apache Karaf using `bin/karaf`
## Examples
* [soap - Publish and Consume JAXWS SOAP services](soap)
-* [rest - Publish and Consume REST services] (rest)
+* [rest - Publish and Consume REST services] (rest)
* [security-filter - Custom HTTP filter] (security filter)
* [ssl - SSL support and client cert based auth] (ssl)
diff --git a/samples/rest/README.md b/samples/rest/README.md
index d05989a..9a06d01 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -6,12 +6,12 @@ The API module defines the TaskResource interface which is annotated using JAXRS
The impl module implements the TaskService using a simple HashMap internally. It allows to manage Task objects which represent items of a to do list.
-
+
## Installation
Unpack karaf 4 into a server and client directory.
-### Install server
+### Install server
Start the server karaf
@@ -33,7 +33,7 @@ Check that task was added
curl --header "Accept:application/json" http://localhost:8181/cxf/tasks/3
```
-### Install client
+### Install client
Start the client karaf
@@ -68,7 +68,7 @@ endpoint http://localhost:8181/cxf/tasks
This installs the CXF logging feature and adds the logging intent to the
rest sample component. The command endpoint should then show that the intent
-logging is applied.
+logging is applied.
Any http requests to the service should now show as a logging message in the
karaf log.
diff --git a/samples/soap/README.md b/samples/soap/README.md
index 95bde9c..8f61e70 100644
--- a/samples/soap/README.md
+++ b/samples/soap/README.md
@@ -7,12 +7,12 @@ we want to create a JAXWS based SOAP service.
The impl module implements the TaskService using a simple HashMap internally. It allows to manage Task objects which represent items of a to do list.
-
+
## Installation
Unpack karaf 4 into a server and client directory.
-### Install server
+### Install server
Start the server karaf
@@ -24,7 +24,7 @@ rsa:endpoints
The last command should show one endpoint with a URI as id. You should be able to open the url in the browser.
-### Install client
+### Install client
Start the client karaf
diff --git a/samples/ssl/README.md b/samples/ssl/README.md
index fe83e4b..771d953 100644
--- a/samples/ssl/README.md
+++ b/samples/ssl/README.md
@@ -13,7 +13,7 @@ We want the karaf HttpService to be secured by https and require a client certif
# Keystore generation
* Create client and server keys.
-* Add client certificate to server
+* Add client certificate to server
```
mkdir -p etc/keystores
@@ -35,11 +35,11 @@ keytool -importcert -storepass password -keystore etc/keystores/client.jks -alia
## Installation
-- Copy the server side ssl config org.apache.cxf.http.jetty-ssl.cfg into etc
+- Copy the server side ssl config org.apache.cxf.http.jetty-ssl.cfg into etc
- Install the CXF DOSGi features
- Install the example
-```
+```
feature:repo-add cxf-dosgi-samples 2.0.0
feature:install cxf-dosgi-sample-soap-impl cxf-dosgi-sample-soap-client
install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-ssl-intent/2.0.0
diff --git a/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java b/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java
index 1ca89a2..725901a 100644
--- a/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java
+++ b/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java
@@ -56,7 +56,7 @@ public class SslIntent implements Callable<List<Object>> {
HttpConduitConfig conduitConfig = new HttpConduitConfig();
TLSClientParameters tls = new TLSClientParameters();
String karafHome = System.getProperty("karaf.home");
- tls.setKeyManagers(keyManager(keystore(karafHome + "/etc/keystores/client.jks", CLIENT_PASSWORD),
+ tls.setKeyManagers(keyManager(keystore(karafHome + "/etc/keystores/client.jks", CLIENT_PASSWORD),
CLIENT_PASSWORD));
tls.setTrustManagers(trustManager(keystore(karafHome + "/etc/keystores/client.jks", CLIENT_PASSWORD)));
//tls.setTrustManagers(new TrustManager[]{new DefaultTrustManager()});
[cxf-dosgi] 11/16: Add missing @Override annotations
Posted by am...@apache.org.
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 <am...@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()");
}
[cxf-dosgi] 10/16: Fix skipped tests
Posted by am...@apache.org.
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 7cc135df4c8e4f120c22d3475eaeff71e03fd410
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 22:01:13 2019 +0300
Fix skipped tests
---
.../common/proxy/ServiceInvocationHandlerTest.java | 1 +
.../ws/PojoConfigurationTypeHandlerTest.java | 22 ++++++++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
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 5b60075..bd1b38e 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
@@ -46,6 +46,7 @@ public class ServiceInvocationHandlerTest {
assertEquals(5, sih.invoke(null, m, new Object[] {}));
}
+ @Test
public void testInvokeObjectMethod() throws Throwable {
final List<String> called = new ArrayList<String>();
ServiceInvocationHandler sih = new ServiceInvocationHandler("hi", String.class) {
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 f234014..0f3db95 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
@@ -230,12 +230,11 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
(String[])props.get(org.osgi.framework.Constants.OBJECTCLASS));
}
- public void t2estCreateServerException() {
+ public void testCreateServerException() {
BundleContext dswContext = EasyMock.createNiceMock(BundleContext.class);
EasyMock.replay(dswContext);
- IntentManager intentManager = EasyMock.createNiceMock(IntentManager.class);
- EasyMock.replay(intentManager);
+ IntentManager intentManager = new IntentManagerImpl();
WsProvider handler = new WsProvider() {
@Override
@@ -247,15 +246,21 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
handler.setHttpServiceManager(dummyHttpServiceManager());
handler.activate(dswContext);
+ Class[] exportedInterfaces = {Runnable.class};
Map<String, Object> props = new HashMap<String, Object>();
+ EndpointHelper.addObjectClass(props, exportedInterfaces);
Runnable myService = EasyMock.createMock(Runnable.class);
EasyMock.replay(myService);
try {
- handler.exportService(myService, null, props, new Class[] {Runnable.class});
+ handler.exportService(myService, null, props, exportedInterfaces);
fail("Expected TestException");
} catch (TestException e) {
// Expected
+ } catch (RuntimeException re) {
+ if (!(re.getCause() instanceof TestException)) {
+ fail("Expected TestException");
+ }
}
}
@@ -337,7 +342,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
assertEquals(new Version("0.0.0"), epd.getPackageVersion("java.lang"));
}
- public void t2estCreateJaxWsEndpointWithoutIntents() {
+ public void testCreateJaxWsEndpointWithoutIntents() {
IMocksControl c = EasyMock.createNiceControl();
BundleContext dswBC = c.createMock(BundleContext.class);
@@ -347,15 +352,16 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
handler.setHttpServiceManager(dummyHttpServiceManager());
handler.activate(dswBC);
+ Class<?>[] exportedInterfaces = new Class[] {MyJaxWsEchoService.class};
Map<String, Object> sd = new HashMap<String, Object>();
sd.put(WsConstants.WS_ADDRESS_PROPERTY, "/somewhere");
+ EndpointHelper.addObjectClass(sd, exportedInterfaces);
BundleContext serviceBC = c.createMock(BundleContext.class);
- Object myService = null;
+ Object myService = c.createMock(MyJaxWsEchoService.class);
c.replay();
- Class<?>[] ifaces = new Class[] {MyJaxWsEchoService.class};
ServerEndpoint serverWrapper = (ServerEndpoint)handler.exportService(myService, serviceBC, sd,
- ifaces);
+ exportedInterfaces);
c.verify();
org.apache.cxf.endpoint.Endpoint ep = serverWrapper.getServer().getEndpoint();
[cxf-dosgi] 01/16: Fix typo in bundle name
Posted by am...@apache.org.
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 5a905be4528f80d42d867bf2f35a4df975efc4e4
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Mon May 27 23:01:20 2019 +0300
Fix typo in bundle name
---
itests/multi-bundle/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 0b6aa6b..2a9d711 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.cxf.dosgi.systests</groupId>
<artifactId>cxf-dosgi-itests-multibundle</artifactId>
<packaging>jar</packaging>
- <name>CXF DOSGi Integration Tests Multi Bundle</name>
+ <name>CXF DOSGi Integration Tests Multi-Bundle</name>
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
[cxf-dosgi] 02/16: Remove extra blank lines
Posted by am...@apache.org.
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 230db05ea227923f70f32faab341a63aa27afb24
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 14:28:49 2019 +0300
Remove extra blank lines
---
NOTICE | 1 -
buildtools/cxf-checkstyle-suppressions.xml | 2 +-
buildtools/cxf-checkstyle.xml | 11 -----------
buildtools/notice-supplements.xml | 1 -
common/bnd.bnd | 1 -
.../cxf/dosgi/common/proxy/ServiceInvocationHandler.java | 1 -
.../test/java/org/apache/cxf/dosgi/common/util/Provider.java | 1 -
itests/multi-bundle/pom.xml | 1 -
.../org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java | 5 -----
.../org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java | 1 -
.../org/apache/cxf/dosgi/itests/multi/TestExportService.java | 1 -
itests/multi-bundle/src/test/resources/rs-test1.xml | 1 -
pom.xml | 1 -
.../dsw/handlers/rest/provider/RsProviderCustomTest.java | 1 -
provider-ws/Readme.md | 1 -
.../dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java | 1 -
release_notes.md | 6 +++++-
samples/Readme.md | 1 -
samples/repository/pom.xml | 1 -
.../org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java | 1 -
samples/soap/soap.bndrun | 2 +-
samples/ssl/etc/org.ops4j.pax.web.cfg | 1 -
.../main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java | 2 --
23 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/NOTICE b/NOTICE
index 51527cd..eb55f8e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,4 +6,3 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product contains interfaces and specifications Copyright The OSGi Alliance.
-
diff --git a/buildtools/cxf-checkstyle-suppressions.xml b/buildtools/cxf-checkstyle-suppressions.xml
index 60c70ab..b15b6ac 100644
--- a/buildtools/cxf-checkstyle-suppressions.xml
+++ b/buildtools/cxf-checkstyle-suppressions.xml
@@ -35,4 +35,4 @@
<suppress checks=".*"
files=".+log4j.properties"
/>
-</suppressions>
\ No newline at end of file
+</suppressions>
diff --git a/buildtools/cxf-checkstyle.xml b/buildtools/cxf-checkstyle.xml
index 87dd736..521192b 100644
--- a/buildtools/cxf-checkstyle.xml
+++ b/buildtools/cxf-checkstyle.xml
@@ -58,7 +58,6 @@
<module name="JavadocStyle"/>
-->
-
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
<module name="ConstantName" />
@@ -71,7 +70,6 @@
<module name="StaticVariableName" />
<module name="TypeName" />
-
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport">
@@ -87,7 +85,6 @@
</module>
-->
-
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="AnonInnerLength">
@@ -129,13 +126,11 @@
value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND" />
</module>
-
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
<!-- <module name="ModifierOrder" />-->
<module name="RedundantModifier" />
-
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks">
@@ -148,7 +143,6 @@
<module name="NeedBraces" />
<module name="RightCurly" />
-
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!--<module name="ArrayTrailingComma"/>-->
@@ -203,8 +197,6 @@
<!--<module name="RequireThis"/>-->
<module name="UnnecessaryParentheses" />
-
-
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
<!--<module name="DesignForExtension"/>-->
@@ -224,8 +216,6 @@
<property name="publicMemberPattern" value="resource[12].*" />
</module>
-
-
<!-- Metrics checks. -->
<!-- See http://checkstyle.sf.net/config_metrics.html -->
<module name="BooleanExpressionComplexity">
@@ -239,7 +229,6 @@
<property name="methodMaximum" value="100" />
</module>
-
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<!--
diff --git a/buildtools/notice-supplements.xml b/buildtools/notice-supplements.xml
index 06caf61..5b866d5 100644
--- a/buildtools/notice-supplements.xml
+++ b/buildtools/notice-supplements.xml
@@ -191,7 +191,6 @@
</project>
</supplement>
-
<supplement>
<project>
<groupId>commons-collections</groupId>
diff --git a/common/bnd.bnd b/common/bnd.bnd
index c036a77..6b21833 100644
--- a/common/bnd.bnd
+++ b/common/bnd.bnd
@@ -7,4 +7,3 @@ Export-Package: \
org.apache.cxf.dosgi.common.proxy,\
org.apache.cxf.dosgi.common.util,\
org.apache.cxf.dosgi.common.api
-
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 6f9e7e9..2ed32ad 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
@@ -62,5 +62,4 @@ public class ServiceInvocationHandler implements InvocationHandler {
}
}
-
}
diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java b/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java
index baec66d..009c4a1 100644
--- a/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/util/Provider.java
@@ -18,6 +18,5 @@
*/
package org.apache.cxf.dosgi.common.util;
-
public class Provider {
}
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 2a9d711..2329529 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -40,7 +40,6 @@
<!--
When changing code make sure to run the distro before testing
or you will be testing the old code.
-
-->
<dependencies>
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
index 9be797e..673a2f6 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
@@ -97,7 +97,6 @@ public class AbstractDosgiTest {
}
throw ex;
}
-
/**
* Sleeps for a short interval, throwing an exception if timeout has been reached. Used to facilitate a
@@ -261,7 +260,6 @@ public class AbstractDosgiTest {
protected static Option configLogging() {
return ConfigurationAdminOptions.configurationFolder(new File("src/test/resources/cfg"));
}
-
protected static MavenArtifactProvisionOption taskServiceAPI() {
return mavenBundle().groupId("org.apache.cxf.dosgi.samples")
@@ -273,19 +271,16 @@ public class AbstractDosgiTest {
.artifactId("cxf-dosgi-samples-soap-impl").versionAsInProject();
}
-
protected static MavenArtifactProvisionOption taskRESTAPI() {
return mavenBundle().groupId("org.apache.cxf.dosgi.samples")
.artifactId("cxf-dosgi-samples-rest-api").versionAsInProject();
}
-
protected static MavenArtifactProvisionOption taskRESTImpl() {
return mavenBundle().groupId("org.apache.cxf.dosgi.samples")
.artifactId("cxf-dosgi-samples-rest-impl").versionAsInProject();
}
-
protected static Option basicTestOptions() throws Exception {
return composite(CoreOptions.junitBundles(), //
MultiBundleTools.getDistro(), //
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
index 8f4f136..c55dc97 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
@@ -56,6 +56,5 @@ public class TestExportPolicy extends AbstractDosgiTest {
public void testPolicyPresent() throws Exception {
Assert.assertNotNull(policy);
}
-
}
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 052d369..6e54d6f 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
@@ -93,7 +93,6 @@ public class TestExportService extends AbstractDosgiTest {
final WebClient swaggerClient = WebClient.create(REST_SERVICE_URI + "/swagger.json");
String swaggerJson = swaggerClient.get(String.class);
Assert.assertEquals("{\"swagger\":\"2.0\"", swaggerJson.substring(0, 16));
-
}
@Test
diff --git a/itests/multi-bundle/src/test/resources/rs-test1.xml b/itests/multi-bundle/src/test/resources/rs-test1.xml
index 60c449d..5731fbd 100644
--- a/itests/multi-bundle/src/test/resources/rs-test1.xml
+++ b/itests/multi-bundle/src/test/resources/rs-test1.xml
@@ -25,4 +25,3 @@
<property name="service.imported.configs">org.apache.cxf.ws</property>
</endpoint-description>
</endpoint-descriptions>
-
diff --git a/pom.xml b/pom.xml
index d1c3854..17826a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,6 @@
</executions>
</plugin>
</plugins>
-
<pluginManagement>
<plugins>
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
index 47cec18..5198371 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
@@ -84,7 +84,6 @@ public class RsProviderCustomTest {
private Callable<List<Object>> intentProvider(final Object... intents) {
return new Callable<List<Object>>() {
-
@Override
public List<Object> call() throws Exception {
return Arrays.asList(intents);
diff --git a/provider-ws/Readme.md b/provider-ws/Readme.md
index 874d270..6632058 100644
--- a/provider-ws/Readme.md
+++ b/provider-ws/Readme.md
@@ -29,4 +29,3 @@ the CXF JAX-WS frontend and the JAXB databinding. It can be customized using the
# Samples
See [sample soap](../samples/soap).
-
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 46859ba..0b87da4 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
@@ -213,7 +213,6 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
handler.setHttpServiceManager(dummyHttpServiceManager());
handler.activate(dswContext);
Runnable myService = new Runnable() {
-
@Override
public void run() {
}
diff --git a/release_notes.md b/release_notes.md
index be74e53..5542ca2 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -1,6 +1,7 @@
Release Notes - CXF Distributed OSGi
====================================
+
2.3.0
=====
@@ -13,6 +14,7 @@ Release Notes - CXF Distributed OSGi
* [DOSGI-273] - Use bnd resolver to create multibundle distro
* [DOSGI-274] - Upgrade to CXF 3.2.0
+
2.2.0
=====
@@ -120,6 +122,7 @@ Release Notes - CXF Distributed OSGi
* Improvement
* [DOSGI-220] - Upgrade to cxf 3.1.1
+
1.6.0
=====
@@ -262,6 +265,7 @@ Release Notes - CXF Distributed OSGi - Version 1.5.0
* New Feature
* [DOSGI-115] - Use Spring DM and Eclipse Gemini Blueprint with DOSGi
+
1.3.1
=====
@@ -272,6 +276,7 @@ Fixes needed in order to pass the OSGi 4.3 Remote Service Admin TCK.
* Fixed ExportReferenceImpl.equals() and hashCode()
* Fixed RemoteServiceAdminCore.exportService()
+
1.3
===
@@ -402,7 +407,6 @@ New features in this release include:
* [CXF-2385] - Discovery doesn't fully translate 'localhost' into a proper machine name
* [CXF-2200] - Consuming more than 1 service using Spring-DM doesn't work
-
Known limitations :
* Schema validation can not be done for JAX-RS-based endpoints which use
diff --git a/samples/Readme.md b/samples/Readme.md
index 934384f..fcaf3e2 100644
--- a/samples/Readme.md
+++ b/samples/Readme.md
@@ -36,4 +36,3 @@ start Apache Karaf using `bin/karaf`
* [rest - Publish and Consume REST services] (rest)
* [security-filter - Custom HTTP filter] (security filter)
* [ssl - SSL support and client cert based auth] (ssl)
-
diff --git a/samples/repository/pom.xml b/samples/repository/pom.xml
index 8250887..5726293 100644
--- a/samples/repository/pom.xml
+++ b/samples/repository/pom.xml
@@ -144,7 +144,6 @@
</dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
index 980fcbe..63674e4 100644
--- a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
+++ b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.apache.cxf.dosgi.common.api.IntentsProvider;
import org.osgi.service.component.annotations.Component;
-
/**
* Not needed in the current example config.
* This shows how to export a custom intent.
diff --git a/samples/soap/soap.bndrun b/samples/soap/soap.bndrun
index 151fafd..e31bce0 100644
--- a/samples/soap/soap.bndrun
+++ b/samples/soap/soap.bndrun
@@ -77,4 +77,4 @@
org.apache.ws.xmlschema.core;version='[2.2.2,2.2.3)',\
org.apache.cxf.dosgi.samples.cxf-dosgi-samples-soap-api;version='[2.3.0,2.3.1)',\
org.apache.cxf.dosgi.samples.cxf-dosgi-samples-soap-impl;version='[2.3.0,2.3.1)',\
- org.apache.felix.scr;version='[2.0.12,2.0.13)'
\ No newline at end of file
+ org.apache.felix.scr;version='[2.0.12,2.0.13)'
diff --git a/samples/ssl/etc/org.ops4j.pax.web.cfg b/samples/ssl/etc/org.ops4j.pax.web.cfg
index 8061c7f..cae4a64 100644
--- a/samples/ssl/etc/org.ops4j.pax.web.cfg
+++ b/samples/ssl/etc/org.ops4j.pax.web.cfg
@@ -9,4 +9,3 @@ org.ops4j.pax.web.ssl.password=password
org.ops4j.pax.web.ssl.keypassword=password
org.osgi.service.http.port.secure=8443
org.ops4j.pax.web.ssl.clientauthneeded=true
-
diff --git a/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java b/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java
index 558f7a7..1ca89a2 100644
--- a/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java
+++ b/samples/ssl/ssl-intent/src/main/java/org/apache/cxf/dosgi/samples/ssl/SslIntent.java
@@ -61,7 +61,6 @@ public class SslIntent implements Callable<List<Object>> {
tls.setTrustManagers(trustManager(keystore(karafHome + "/etc/keystores/client.jks", CLIENT_PASSWORD)));
//tls.setTrustManagers(new TrustManager[]{new DefaultTrustManager()});
HostnameVerifier verifier = new HostnameVerifier() {
-
@Override
public boolean verify(String hostname, SSLSession session) {
return true;
@@ -94,5 +93,4 @@ public class SslIntent implements Callable<List<Object>> {
return ks;
}
-
}
[cxf-dosgi] 06/16: Simplify MultiBundleTools
Posted by am...@apache.org.
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 84309c10cd1e9a1afc2f33f906614e0bae83bbc0
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 15:39:44 2019 +0300
Simplify MultiBundleTools
---
.../cxf/dosgi/itests/multi/MultiBundleTools.java | 46 +++++++++-------------
1 file changed, 18 insertions(+), 28 deletions(-)
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java
index e3d96ba..3603aea 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java
@@ -19,7 +19,6 @@
package org.apache.cxf.dosgi.itests.multi;
import java.io.File;
-import java.io.FilenameFilter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -36,42 +35,33 @@ public final class MultiBundleTools {
private static Collection<String> getDistroBundles(File distroDir) {
List<String> bundles = new ArrayList<>();
File bundlesDir = new File(distroDir, "bundle");
- File[] files = bundlesDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.toLowerCase().endsWith(".jar");
- }
+ for (File file : bundlesDir.listFiles()) {
+ if (file.getName().toLowerCase().endsWith(".jar")) {
+ bundles.add(file.toURI().toASCIIString());
}
- );
- for (File file : files) {
- bundles.add(file.toURI().toASCIIString());
}
return bundles;
}
private static File getRootDirectory() {
- String resourceName = "/" + MultiBundleTools.class.getName().replace('.', '/') + ".class";
- URL curURL = MultiBundleTools.class.getResource(resourceName);
- File curFile = new File(curURL.getFile());
- String curString = curFile.getAbsolutePath();
- File curBase = new File(curString.substring(0, curString.length() - resourceName.length()));
- return curBase.getParentFile().getParentFile();
+ URL url = MultiBundleTools.class.getResource("/"); // get ${root}/target/test-classes
+ File dir = new File(url.getFile()).getAbsoluteFile();
+ return dir.getParentFile().getParentFile();
}
public static Option getDistro() {
- File root = getRootDirectory();
- File depRoot = new File(root, "target/dependency");
- File distroDir = depRoot.listFiles()[0];
- Collection<String> bundles = getDistroBundles(distroDir);
- List<Option> opts = new ArrayList<Option>();
- // Make sure annotation bundle is loaded first to make sure it is used for resolution
- for (String bundleUri : bundles) {
- if (bundleUri.contains("javax.annotation")) {
- opts.add(CoreOptions.bundle(bundleUri));
- }
- }
- for (String bundleUri : bundles) {
- if (!bundleUri.contains("javax.annotation")) {
- opts.add(CoreOptions.bundle(bundleUri));
+ File rootDir = getRootDirectory();
+ File depsDir = new File(rootDir, "target/dependency");
+ File distroDir = depsDir.listFiles()[0];
+ Collection<String> bundleUris = getDistroBundles(distroDir);
+ List<Option> opts = new ArrayList<>();
+ for (String uri : bundleUris) {
+ Option opt = CoreOptions.bundle(uri);
+ // Make sure annotation bundle is loaded first to make sure it is used for resolution
+ if (uri.contains("javax.annotation")) {
+ opts.add(0, opt);
+ } else {
+ opts.add(opt);
}
}
return CoreOptions.composite(opts.toArray(new Option[opts.size()]));
[cxf-dosgi] 07/16: Fix typos
Posted by am...@apache.org.
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 ef22f0e7180bc158b7d7aa41e282047c825aeec7
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 21:02:24 2019 +0300
Fix typos
---
Readme.md | 2 +-
distribution/Readme.md | 2 +-
provider-ws/Readme.md | 2 +-
.../java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java | 2 +-
release_notes.md | 8 ++++----
.../org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java | 2 +-
samples/ssl/README.md | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Readme.md b/Readme.md
index 16ff485..22c95cd 100644
--- a/Readme.md
+++ b/Readme.md
@@ -18,7 +18,7 @@ CXF DOSGi allows to easily publish and consume SOAP and REST services without us
Intents allow a service to leverage CXF extensions like features. A service can list the named intents it requires.
It will then only be exported / imported once all the intents are available. This allows for example security restrictions or logging.
-For more informations see [common module](common).
+For more information see [common module](common).
## Build
diff --git a/distribution/Readme.md b/distribution/Readme.md
index 651bf9d..e0ce8f9 100644
--- a/distribution/Readme.md
+++ b/distribution/Readme.md
@@ -1,4 +1,4 @@
-# CXF DOSGi Distribtions
+# CXF DOSGi Distributions
## Apache karaf features
diff --git a/provider-ws/Readme.md b/provider-ws/Readme.md
index 6632058..c6b7a8c 100644
--- a/provider-ws/Readme.md
+++ b/provider-ws/Readme.md
@@ -18,7 +18,7 @@ then JAX-WS mode is used else simple mode is used.
## Simple
-This mode uses the CXF simple frontend and the Aegis Databinding. It can export almost any service but is not much configureable. Aegis is also not very popular anymore. So this
+This mode uses the CXF simple frontend and the Aegis Databinding. It can export almost any service but is not much configurable. Aegis is also not very popular anymore. So this
mode for exporting existing services and small tests. For most cases the JAX-WS mode is recommended.
## JAX-WS
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 7584f02..6006fe8 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
@@ -191,7 +191,7 @@ public class WsProvider extends BaseDistributionProvider implements Distribution
completeEndpointAddress, intentNames);
return createServerFromFactory(factory, epd);
} catch (Exception e) {
- throw new RuntimeException("Error exporting service with adress " + completeEndpointAddress, e);
+ throw new RuntimeException("Error exporting service with address " + completeEndpointAddress, e);
}
}
diff --git a/release_notes.md b/release_notes.md
index 1c70343..23f7ec5 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -204,7 +204,7 @@ Release Notes - CXF Distributed OSGi - Version 1.5.0
* [DOSGI-69] - CXF-DOSGi requires internet access when reading XML
* [DOSGI-90] - Do not use/assume that endpoint.id is an address
* [DOSGI-92] - Exception : Applying intent: SOAP via binding config
- * [DOSGI-109] - NullPointerException in ToloplogyManager during bundle
+ * [DOSGI-109] - NullPointerException in TopologyManager during bundle
* stop
* [DOSGI-110] - Unable to export multiple services
* [DOSGI-111] - DOSGi bundle attempts to load WSDL using wrong bundle in
@@ -280,7 +280,7 @@ Fixes needed in order to pass the OSGi 4.3 Remote Service Admin TCK.
1.3
===
-The following modules have been removed from the destribution:
+The following modules have been removed from the distribution:
* org.apache.cxf.dosgi:cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper
@@ -288,7 +288,7 @@ The following modules have been removed from the destribution:
* org.apache.cxf.dosgi:cxf-dosgi-remote-service-admin-interfaces
- org.osgi:org.osgi.enterprize:4.2.0 artifact is now available. See DOSGI-104 for more information.
+ org.osgi:org.osgi.enterprise:4.2.0 artifact is now available. See DOSGI-104 for more information.
Many dependencies have been updated, including the update to CXF 2.5.1. See also DOSGI-96.
@@ -365,7 +365,7 @@ Additionally, a number of bugs has been fixed including:
* [DOSGI-43] - ClassCastException with Declarative Services
* [DOSGI-44] - Existing OSGi Services are not remoted when CXF-DOSGi is started
* [DOSGI-50] - Need to automatically infer SOAP/HTTP transport intents if not
- explicily set via osgi.remote.requires.intents
+ explicitly set via osgi.remote.requires.intents
* [DOSGI-54] - RemoteServiceAdmin interfaces/classes out of sync with official version
* [DOSGI-61] - The Zookeeper Discovery only supports primitive types as service properties
* [DOSGI-62] - The DSW creates endpoints with localhost URLs
diff --git a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index e8c3e92..52a6afe 100644
--- a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -90,7 +90,7 @@ public class TaskResourceImpl implements TaskResource, IntentsProvider {
private Swagger2Feature createSwaggerFeature() {
Swagger2Feature swagger = new Swagger2Feature();
- swagger.setDescription("Sample jaxrs application to organize taks");
+ swagger.setDescription("Sample jaxrs application to organize tasks");
swagger.setTitle("Tasks sample");
swagger.setUsePathBasedConfig(true); // Necessary for OSGi
// swagger.setScan(false); // Must be set for cxf < 3.2.x
diff --git a/samples/ssl/README.md b/samples/ssl/README.md
index 056c2df..fe83e4b 100644
--- a/samples/ssl/README.md
+++ b/samples/ssl/README.md
@@ -30,7 +30,7 @@ keytool -exportcert -storepass password -keystore etc/keystores/keystore.jks -al
keytool -importcert -storepass password -keystore etc/keystores/client.jks -alias serverKey -file server.cert
```
-- Copy thes files in etc to the karaf etc dir
+- Copy these files in etc to the karaf etc dir
- Copy the keystores (*.jks) into the karaf etc directory.
## Installation
[cxf-dosgi] 09/16: Simplify array initialization
Posted by am...@apache.org.
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 6818159ff1002cd9a6d5a3b1b0420f277cac53c8
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 21:10:09 2019 +0300
Simplify array initialization
---
.../httpservice/SecurityDelegatingHttpContextTest.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
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 8b36548..84a3545 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
@@ -68,7 +68,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
public void testFilterRequired() throws Exception {
// Mock up the service references
- ServiceReference[] serviceReferences = new ServiceReference[] {};
+ ServiceReference[] serviceReferences = {};
// Mock up the bundle context
BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
@@ -100,9 +100,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
// Mock up the service references
ServiceReference filterReference = EasyMock.createNiceMock(ServiceReference.class);
EasyMock.replay(filterReference);
- ServiceReference[] serviceReferences = new ServiceReference[] {
- filterReference
- };
+ ServiceReference[] serviceReferences = {filterReference};
// Mock up the bundle context
BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
@@ -136,9 +134,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
// Mock up the service references
ServiceReference filterReference = EasyMock.createNiceMock(ServiceReference.class);
EasyMock.replay(filterReference);
- ServiceReference[] serviceReferences = new ServiceReference[] {
- filterReference, filterReference
- };
+ ServiceReference[] serviceReferences = {filterReference, filterReference};
// Mock up the bundle context
BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
@@ -173,9 +169,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
// Mock up the service references
ServiceReference filterReference = EasyMock.createNiceMock(ServiceReference.class);
EasyMock.replay(filterReference);
- ServiceReference[] serviceReferences = new ServiceReference[] {
- filterReference
- };
+ ServiceReference[] serviceReferences = {filterReference};
// Mock up the bundle context
BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
[cxf-dosgi] 13/16: Tiny simplifications
Posted by am...@apache.org.
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 68591a25ac72c977ec02994c674469745d00b293
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 22:27:38 2019 +0300
Tiny simplifications
---
.../org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java | 2 +-
.../apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java | 6 ++++--
.../main/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java | 2 +-
.../cxf/dosgi/itests/multi/customintent/ChangeTitleInterceptor.java | 2 +-
.../cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java | 3 +--
.../api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java | 2 +-
.../api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
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 b9b4525..f1fd5ce 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
@@ -134,7 +134,7 @@ public class IntentManagerImpl implements IntentManager {
if (selectedIntents.size() > 1) {
LOG.warn("More than one intent of type " + type + " present. Using only the first one.");
}
- return (T)selectedIntents.iterator().next();
+ return selectedIntents.iterator().next();
}
@Override
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 985a9a0..fbdeaa7 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
@@ -33,7 +33,9 @@ import org.junit.Test;
public class ServiceInvocationHandlerTest {
- private static final Map<String, Method> OBJECT_METHODS = new HashMap<>(); {
+ private static final Map<String, Method> OBJECT_METHODS = new HashMap<>();
+
+ {
for (Method m : Object.class.getMethods()) {
OBJECT_METHODS.put(m.getName(), m);
}
@@ -42,7 +44,7 @@ public class ServiceInvocationHandlerTest {
@Test
public void testInvoke() throws Throwable {
ServiceInvocationHandler sih = new ServiceInvocationHandler("hello", String.class);
- Method m = String.class.getMethod("length", new Class[] {});
+ Method m = String.class.getMethod("length");
assertEquals(5, sih.invoke(null, m, new Object[] {}));
}
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 02578f3..00c2848 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
@@ -54,7 +54,7 @@ public class InterfaceRule implements Rule {
if (type != null && !String.class.getName().equals(type)) {
try {
Class<?> cls = getClass().getClassLoader().loadClass(type);
- Constructor<?> ctor = cls.getConstructor(new Class[] {String.class});
+ Constructor<?> ctor = cls.getConstructor(String.class);
obj = ctor.newInstance(value);
} catch (Throwable th) {
LOG.warn("Could not handle property '" + name
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 066117b..a3c0bef 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
@@ -41,7 +41,7 @@ public final class ChangeTitleInterceptor extends AbstractPhaseInterceptor<Messa
try {
MessageContentsList contents = MessageContentsList.getContentsList(message);
Object response = contents.get(0);
- Method method = response.getClass().getMethod("getReturn", new Class[]{});
+ Method method = response.getClass().getMethod("getReturn");
Task task = (Task)method.invoke(response);
task.setTitle("changed");
} catch (Exception e) {
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 9e232d9..306d8be 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
@@ -133,8 +133,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
EasyMock.expectLastCall().atLeastOnce();
c.replay();
- ClassLoader cl = null;
- Object proxy = p.importEndpoint(cl, requestingContext, exportedInterfaces, endpoint);
+ Object proxy = p.importEndpoint(null, requestingContext, exportedInterfaces, endpoint);
assertNotNull(proxy);
assertTrue("Proxy is not of the requested type! ", proxy instanceof Runnable);
c.verify();
diff --git a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java
index 6decde1..7d9e295 100644
--- a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java
+++ b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/Task.java
@@ -45,7 +45,7 @@ public class Task {
}
public void setId(Integer id) {
- this.id = new Integer(id);
+ this.id = id;
}
public String getTitle() {
diff --git a/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java b/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java
index 2609f4c..50e4c0e 100644
--- a/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java
+++ b/samples/soap/api/src/main/java/org/apache/cxf/dosgi/samples/soap/Task.java
@@ -45,7 +45,7 @@ public class Task {
}
public void setId(Integer id) {
- this.id = new Integer(id);
+ this.id = id;
}
public String getTitle() {
[cxf-dosgi] 05/16: Remove redundant throws clause
Posted by am...@apache.org.
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 5c9c12a6e06e51b4dec7ee0042789101dc712f57
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 15:30:58 2019 +0300
Remove redundant throws clause
---
.../apache/cxf/dosgi/common/endpoint/ServerEndpoint.java | 4 +---
.../org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java | 2 +-
.../dosgi/common/httpservice/HttpServiceManagerTest.java | 5 ++---
.../httpservice/SecurityDelegatingHttpContextTest.java | 13 ++++++-------
.../java/org/apache/cxf/dosgi/dsw/decorator/Activator.java | 4 ++--
.../apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java | 2 +-
.../cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java | 4 ++--
.../apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java | 2 +-
.../org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java | 4 ++--
.../org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java | 4 ++--
.../org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java | 4 ++--
.../apache/cxf/dosgi/itests/multi/TestExportService.java | 4 ++--
.../apache/cxf/dosgi/itests/multi/TestImportService.java | 4 ++--
.../itests/multi/customintent/CustomIntentActivator.java | 4 ++--
.../dsw/handlers/rest/provider/RsProviderCustomTest.java | 2 +-
.../dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java | 12 ++++++------
.../cxf/dosgi/samples/security/SampleSecurityFilter.java | 2 +-
17 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java b/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java
index a0ad662..08f5eb7 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/endpoint/ServerEndpoint.java
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.dosgi.common.endpoint;
-import java.io.IOException;
-
import org.apache.aries.rsa.spi.Endpoint;
import org.apache.cxf.endpoint.Server;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
@@ -38,7 +36,7 @@ public class ServerEndpoint implements Endpoint {
}
@Override
- public void close() throws IOException {
+ public void close() {
this.server.destroy();
}
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
index 4601d9c..01d7ef4 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
@@ -34,7 +34,7 @@ public class ExceptionMapper {
introspectTypeForExceptions(iType);
}
- public Throwable mapException(Method m, Throwable ex) throws Throwable {
+ public Throwable mapException(Method m, Throwable ex) {
Throwable cause = ex.getCause() == null ? ex : ex.getCause();
Set<Class<?>> excTypes = exceptionsMap.get(m);
if (excTypes != null) {
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 1f49f09..a97a330 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
@@ -41,7 +41,6 @@ import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpContext;
import org.osgi.service.http.HttpService;
-import org.osgi.service.http.NamespaceException;
import junit.framework.TestCase;
@@ -98,12 +97,12 @@ public class HttpServiceManagerTest extends TestCase {
@SuppressWarnings("rawtypes")
public void registerServlet(String alias, Servlet servlet, Dictionary initparams, HttpContext context)
- throws ServletException, NamespaceException {
+ throws ServletException {
Assert.assertEquals("/myService", alias);
servlet.init(config);
}
- public void registerResources(String alias, String name, HttpContext context) throws NamespaceException {
+ public void registerResources(String alias, String name, HttpContext context) {
throw new RuntimeException("This method should not be called");
}
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 aac1204..8b36548 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
@@ -24,7 +24,6 @@ import java.net.URL;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
@@ -202,7 +201,7 @@ public class SecurityDelegatingHttpContextTest extends TestCase {
Assert.assertFalse(accessDeniedFilter.called);
}
- public void testDelegation() throws Exception {
+ public void testDelegation() {
BundleContext bundleContext = EasyMock.createNiceMock(BundleContext.class);
EasyMock.replay(bundleContext);
@@ -219,14 +218,14 @@ class CommitResponseFilter implements Filter {
boolean called;
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig filterConfig) {
}
public void destroy() {
}
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws java.io.IOException, javax.servlet.ServletException {
+ throws java.io.IOException {
called = true;
response.getWriter().write("committing the response");
}
@@ -236,7 +235,7 @@ class DoNothingFilter implements Filter {
boolean called;
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig filterConfig) {
}
public void destroy() {
@@ -253,14 +252,14 @@ class AccessDeniedFilter implements Filter {
boolean called;
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig filterConfig) {
}
public void destroy() {
}
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws java.io.IOException, javax.servlet.ServletException {
+ throws java.io.IOException {
called = true;
((HttpServletResponse)response).sendError(HttpServletResponse.SC_FORBIDDEN);
}
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 372d7b1..673ebfc 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,14 +27,14 @@ public class Activator implements BundleActivator {
private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
private ServiceDecoratorBundleListener bundleListener;
- public void start(BundleContext context) throws Exception {
+ public void start(BundleContext context) {
ServiceDecoratorImpl serviceDecorator = new ServiceDecoratorImpl();
bundleListener = new ServiceDecoratorBundleListener(serviceDecorator);
context.addBundleListener(bundleListener);
context.registerService(ServiceDecorator.class.getName(), serviceDecorator, null);
}
- public void stop(BundleContext context) throws Exception {
+ public void stop(BundleContext context) {
LOG.debug("RemoteServiceAdmin Implementation is shutting down now");
if (bundleListener != null) {
context.removeBundleListener(bundleListener);
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 c66642b..c0a685b 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,7 +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>() {
- public Object answer() throws Throwable {
+ public Object answer() {
return serviceProps.get(EasyMock.getCurrentArguments()[0]);
}
}).anyTimes();
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 da8928a..72d2476 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,7 +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>() {
- public Object answer() throws Throwable {
+ public Object answer() {
return serviceProps.get(EasyMock.getCurrentArguments()[0]);
}
}).anyTimes();
@@ -160,7 +160,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>() {
- public Object answer() throws Throwable {
+ public Object answer() {
return serviceProps.get(EasyMock.getCurrentArguments()[0]);
}
}).anyTimes();
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
index 2c14c84..4f37af4 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/AbstractDosgiTest.java
@@ -281,7 +281,7 @@ public class AbstractDosgiTest {
.artifactId("cxf-dosgi-samples-rest-impl").versionAsInProject();
}
- protected static Option basicTestOptions() throws Exception {
+ protected static Option basicTestOptions() {
return composite(CoreOptions.junitBundles(), //
MultiBundleTools.getDistro(), //
// javax.xml.soap is imported since CXF 3.3.0 (CXF-7872, commit a95593cf),
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java
index 4fd49ab..e3d96ba 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/MultiBundleTools.java
@@ -33,7 +33,7 @@ public final class MultiBundleTools {
private MultiBundleTools() {
}
- private static Collection<String> getDistroBundles(File distroDir) throws Exception {
+ private static Collection<String> getDistroBundles(File distroDir) {
List<String> bundles = new ArrayList<>();
File bundlesDir = new File(distroDir, "bundle");
File[] files = bundlesDir.listFiles(new FilenameFilter() {
@@ -57,7 +57,7 @@ public final class MultiBundleTools {
return curBase.getParentFile().getParentFile();
}
- public static Option getDistro() throws Exception {
+ public static Option getDistro() {
File root = getRootDirectory();
File depRoot = new File(root, "target/dependency");
File distroDir = depRoot.listFiles()[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 06eafd4..1c12e07 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
@@ -42,7 +42,7 @@ import org.osgi.framework.Constants;
public class TestCustomIntent extends AbstractDosgiTest {
@Configuration
- public static Option[] configure() throws Exception {
+ public static Option[] configure() {
return new Option[] //
{
basicTestOptions(), //
@@ -57,7 +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>() {
- public Task call() throws Exception {
+ public Task call() {
return taskService.get(1);
}
});
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
index d7ba62d..056dc9b 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestExportPolicy.java
@@ -44,7 +44,7 @@ public class TestExportPolicy extends AbstractDosgiTest {
ExportPolicy policy;
@Configuration
- public static Option[] configure() throws Exception {
+ public static Option[] configure() {
return new Option[] //
{//
basicTestOptions(), //
@@ -53,7 +53,7 @@ public class TestExportPolicy extends AbstractDosgiTest {
}
@Test
- public void testPolicyPresent() throws Exception {
+ public void testPolicyPresent() {
Assert.assertNotNull(policy);
}
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 ba2b2a5..7b08d1d 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
@@ -55,7 +55,7 @@ public class TestExportService extends AbstractDosgiTest {
"/osgi/service_registry/http:##localhost:8181#cxf#taskservice";
@Configuration
- public static Option[] configure() throws Exception {
+ public static Option[] configure() {
return new Option[] //
{//
basicTestOptions(), //
@@ -84,7 +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>() {
- public org.apache.cxf.dosgi.samples.rest.Task call() throws Exception {
+ public org.apache.cxf.dosgi.samples.rest.Task call() {
return client.get(org.apache.cxf.dosgi.samples.rest.Task.class);
}
}
diff --git a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestImportService.java b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestImportService.java
index af840f1..344d297 100644
--- a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestImportService.java
+++ b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestImportService.java
@@ -52,7 +52,7 @@ public class TestImportService extends AbstractDosgiTest {
private Server server;
@Configuration
- public static Option[] configure() throws Exception {
+ public static Option[] configure() {
return new Option[] //
{//
basicTestOptions(), //
@@ -78,7 +78,7 @@ public class TestImportService extends AbstractDosgiTest {
}
@Test
- public void testClientConsumer() throws Exception {
+ public void testClientConsumer() {
Task task = taskService.get(1);
Assert.assertEquals("test", task.getTitle());
}
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 7765ef3..b0555fd 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,7 +29,7 @@ import org.osgi.service.remoteserviceadmin.RemoteConstants;
public class CustomIntentActivator implements BundleActivator {
- public void start(BundleContext context) throws Exception {
+ public void start(BundleContext context) {
Dictionary<String, String> props = new Hashtable<String, String>();
props.put("org.apache.cxf.dosgi.IntentName", "myIntent");
context.registerService(CustomFeatureProvider.class, new CustomFeatureProvider(), props);
@@ -42,6 +42,6 @@ public class CustomIntentActivator implements BundleActivator {
context.registerService(TaskService.class, new DummyTaskServiceImpl(), props2);
}
- public void stop(BundleContext context) throws Exception {
+ public void stop(BundleContext context) {
}
}
diff --git a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
index 2bb31bd..a127ffb 100644
--- a/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
+++ b/provider-rs/src/test/java/org/apache/cxf/dosgi/dsw/handlers/rest/provider/RsProviderCustomTest.java
@@ -85,7 +85,7 @@ public class RsProviderCustomTest {
private Callable<List<Object>> intentProvider(final Object... intents) {
return new Callable<List<Object>>() {
@Override
- public List<Object> call() throws Exception {
+ public List<Object> call() {
return Arrays.asList(intents);
}
};
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 0b87da4..f234014 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
@@ -140,7 +140,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
c.verify();
}
- public void testCreateServerWithAddressProperty() throws Exception {
+ public void testCreateServerWithAddressProperty() {
BundleContext dswContext = EasyMock.createNiceMock(BundleContext.class);
EasyMock.replay(dswContext);
@@ -176,7 +176,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
assertEquals("http://alternate_host:80/myString", edProps.get(RemoteConstants.ENDPOINT_ID));
}
- public void testAddressing() throws Exception {
+ public void testAddressing() {
runAddressingTest(new HashMap<String, Object>(), "http://localhost:9000/java/lang/Runnable");
Map<String, Object> p1 = new HashMap<String, Object>();
@@ -192,7 +192,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
runAddressingTest(p4, "http://localhost:8181/java/lang/Runnable");
}
- private void runAddressingTest(Map<String, Object> properties, String expectedAddress) throws Exception {
+ private void runAddressingTest(Map<String, Object> properties, String expectedAddress) {
Class<?>[] exportedInterface = new Class[] {Runnable.class};
EndpointHelper.addObjectClass(properties, exportedInterface);
BundleContext dswContext = EasyMock.createNiceMock(BundleContext.class);
@@ -272,14 +272,14 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
EasyMock.expect(sfb.create()).andReturn(server);
sfb.setAddress((String)EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
- public Object answer() throws Throwable {
+ public Object answer() {
serverURI.setLength(0);
serverURI.append(EasyMock.getCurrentArguments()[0]);
return null;
}
});
EasyMock.expect(sfb.getAddress()).andAnswer(new IAnswer<String>() {
- public String answer() throws Throwable {
+ public String answer() {
return serverURI.toString();
}
});
@@ -290,7 +290,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>() {
- public String answer() throws Throwable {
+ 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 92c65b3..4da2894 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
@@ -65,7 +65,7 @@ public class SampleSecurityFilter implements Filter {
}
}
- public void init(FilterConfig config) throws ServletException {
+ public void init(FilterConfig config) {
LOG.info("init()");
}
}
[cxf-dosgi] 14/16: Fix mixed indentation styles
Posted by am...@apache.org.
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 47133d4b479704f17b9657a88e8bbba104994afa
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 22:52:39 2019 +0300
Fix mixed indentation styles
---
buildtools/cxf-checkstyle.xml | 64 +--
distribution/multi-bundle/pom.xml | 528 ++++++++++-----------
.../multi-bundle/src/main/assembly/assembly.xml | 118 ++---
distribution/repository/pom.xml | 2 +-
itests/multi-bundle/pom.xml | 22 +-
parent/pom.xml | 14 +-
provider-rs/pom.xml | 16 +-
samples/rest/impl-jackson/pom.xml | 36 +-
samples/rest/impl/pom.xml | 6 +-
9 files changed, 403 insertions(+), 403 deletions(-)
diff --git a/buildtools/cxf-checkstyle.xml b/buildtools/cxf-checkstyle.xml
index 9d54896..ce59e05 100644
--- a/buildtools/cxf-checkstyle.xml
+++ b/buildtools/cxf-checkstyle.xml
@@ -18,8 +18,8 @@
under the License.
-->
<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<!--
Checks to make sure the code meets the CXF coding guidelines which
@@ -31,7 +31,7 @@
-->
<module name="Checker">
- <property name="severity" value="error"/>
+ <property name="severity" value="error"/>
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -102,7 +102,7 @@
</module>
<module name="ParameterNumber">
<property name="max" value="7" />
- <property name="ignoreOverriddenMethods" value="true"/>
+ <property name="ignoreOverriddenMethods" value="true"/>
</module>
<!-- Checks for whitespace -->
@@ -258,35 +258,35 @@
<!--<module name="UncommentedMain"/>-->
<!--module name="TrailingComment"/-->
<module name="Indentation">
- <property name="caseIndent" value="0" />
- <property name="lineWrappingIndentation" value="0"/>
+ <property name="caseIndent" value="0" />
+ <property name="lineWrappingIndentation" value="0"/>
</module>
<!--<module name="RequiredRegexp">-->
- <module name="SuppressWarningsHolder" />
+ <module name="SuppressWarningsHolder" />
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
+ <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
+ <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
+ <module name="SuppressWarningsFilter"/>
+ <module name="SuppressionFilter">
+ <property name="file" value="${checkstyle.suppressions.file}" />
+ </module>
+ <!-- Header checks -->
+ <module name="Header">
+ <property name="header"
+ value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * "License"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LIC [...]
+ </module>
+ <!-- <module name="RegexpHeader"/> -->
+ <module name="FileLength">
+ <property name="max" value="3000" />
+ </module>
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
</module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
- <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
- <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
- </module>
- <module name="SuppressWarningsFilter"/>
- <module name="SuppressionFilter">
- <property name="file" value="${checkstyle.suppressions.file}" />
- </module>
- <!-- Header checks -->
- <module name="Header">
- <property name="header"
- value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * "License"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org [...]
- </module>
- <!-- <module name="RegexpHeader"/> -->
- <module name="FileLength">
- <property name="max" value="3000" />
- </module>
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
</module>
diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index ff35945..550470e 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -1,66 +1,66 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-multibundle-distribution</artifactId>
- <name>CXF DOSGi Multi-Bundle Distribution</name>
- <url>http://cxf.apache.org</url>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cxf-dosgi-multibundle-distribution</artifactId>
+ <name>CXF DOSGi Multi-Bundle Distribution</name>
+ <url>http://cxf.apache.org</url>
- <parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-distribution-parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-distribution-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <properties>
- <dosgi.version>${project.version}</dosgi.version>
- <topDirectoryLocation>../..</topDirectoryLocation>
- <karaf.version>4.1.2</karaf.version>
- </properties>
+ <properties>
+ <dosgi.version>${project.version}</dosgi.version>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ <karaf.version>4.1.2</karaf.version>
+ </properties>
- <dependencies>
- <!-- Basic Felix bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.4.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>1.1.2</version>
- <exclusions>
- <exclusion>
- <artifactId>kxml2</artifactId>
- <groupId>net.sf.kxml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>3.5.2</version>
- </dependency>
+ <dependencies>
+ <!-- Basic Felix bundles -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.8.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>1.1.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>kxml2</artifactId>
+ <groupId>net.sf.kxml</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>3.5.2</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
@@ -81,81 +81,81 @@
<artifactId>jline</artifactId>
<version>3.10.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.12</version>
- <exclusions>
- <exclusion>
- <artifactId>animal-sniffer-annotations</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.base</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>2.0.12</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.base</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <version>1.10.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>1.10.1</version>
+ </dependency>
- <!-- rsa -->
- <dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-repository</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- rsa -->
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-repository</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-soap-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-soap-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-rest-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-samples-rest-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jaxrs</artifactId>
- <version>1.5.16</version>
- <exclusions>
- <exclusion>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-soap-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-soap-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-rest-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-rest-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jaxrs</artifactId>
+ <version>1.5.16</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
@@ -163,145 +163,145 @@
<version>1.4.0</version>
</dependency>
- <!-- Swagger dependencies -->
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>swagger-ui</artifactId>
- <version>2.2.10-1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.reflections</artifactId>
- <version>0.9.10_3</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.7</version>
- </dependency>
- </dependencies>
+ <!-- Swagger dependencies -->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>2.2.10-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.reflections</artifactId>
+ <version>0.9.10_3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.9.7</version>
+ </dependency>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>${felix.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>target/bin</outputDirectory>
- <destFileName>felix.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-indexer-maven-plugin</artifactId>
- <version>4.0.0</version>
- <configuration>
- <includeGzip>false</includeGzip>
- <localURLs>REQUIRED</localURLs>
- <addMvnURLs>
- </addMvnURLs>
- </configuration>
- <executions>
- <execution>
- <id>index</id>
- <goals>
- <goal>index</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-export-maven-plugin</artifactId>
- <version>4.2.0</version>
- <configuration>
- <resolve>true</resolve>
- <failOnChanges>false</failOnChanges>
- <bndruns>
- <bndrun>distro.bndrun</bndrun>
- </bndruns>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>export</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>${felix.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin</outputDirectory>
+ <destFileName>felix.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-indexer-maven-plugin</artifactId>
+ <version>4.0.0</version>
+ <configuration>
+ <includeGzip>false</includeGzip>
+ <localURLs>REQUIRED</localURLs>
+ <addMvnURLs>
+ </addMvnURLs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>index</id>
+ <goals>
+ <goal>index</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-export-maven-plugin</artifactId>
+ <version>4.2.0</version>
+ <configuration>
+ <resolve>true</resolve>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>distro.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <!-- Unzip the archive created by bnd export plugin. To then repackage it in the assembly phase -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <target>
- <unzip src="target/distro.jar" dest="target/distro-unzip" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!-- Unzip the archive created by bnd export plugin. To then repackage it in the assembly phase -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <unzip src="target/distro.jar" dest="target/distro-unzip" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>cxf-dosgi</finalName>
- <descriptors>
- <descriptor>./src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>cxf-dosgi</finalName>
+ <descriptors>
+ <descriptor>./src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml b/distribution/multi-bundle/src/main/assembly/assembly.xml
index 071928b..bb595e2 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -1,5 +1,5 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -19,62 +19,62 @@
specific language governing permissions and limitations
under the License.
-->
- <id>dir</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>cxf-dosgi-${project.version}</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-api</include>
- <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-impl</include>
- <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-client</include>
- <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-api</include>
- <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-impl</include>
- <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-client</include>
- </includes>
- <outputDirectory>
- samples
- </outputDirectory>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <includes>
- <include>release_notes.md</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/bin</directory>
- <outputDirectory>bin</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/distro-unzip/jar</directory>
- <excludes>
- <exclude>org.apache.felix.framework*</exclude>
- <exclude>biz.aQute.launcher*</exclude>
- </excludes>
- <outputDirectory>bundle</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/maven-shared-archive-resources/META-INF</directory>
- <excludes>
- <exclude>DEPENDENCIES</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- </fileSets>
+ <id>dir</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>cxf-dosgi-${project.version}</baseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-api</include>
+ <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-impl</include>
+ <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-soap-client</include>
+ <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-api</include>
+ <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-impl</include>
+ <include>org.apache.cxf.dosgi.samples:cxf-dosgi-samples-rest-client</include>
+ </includes>
+ <outputDirectory>
+ samples
+ </outputDirectory>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <includes>
+ <include>release_notes.md</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/distro-unzip/jar</directory>
+ <excludes>
+ <exclude>org.apache.felix.framework*</exclude>
+ <exclude>biz.aQute.launcher*</exclude>
+ </excludes>
+ <outputDirectory>bundle</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index e3e591c..2dcefc5 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -59,6 +59,6 @@
</dependencies>
<properties>
- <checkstyle.skip>true</checkstyle.skip>
+ <checkstyle.skip>true</checkstyle.skip>
</properties>
</project>
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index facde78..55a9b9b 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -43,17 +43,17 @@
-->
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Pax Exam -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Pax Exam -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7c6d958..a4b6edb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,17 +165,17 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http</artifactId>
- <version>1.2.1</version>
- <scope>provided</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>provided</scope>
</dependency>
<!-- Just for the remote service admin spec -->
<dependency>
- <groupId>org.apache.aries.rsa</groupId>
- <artifactId>org.apache.aries.rsa.core</artifactId>
- <version>${aries.rsa.version}</version>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.core</artifactId>
+ <version>${aries.rsa.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.rsa</groupId>
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index 202e229..8359fc5 100644
--- a/provider-rs/pom.xml
+++ b/provider-rs/pom.xml
@@ -47,12 +47,12 @@
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
@@ -70,12 +70,12 @@
<version>${cxf.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>${cxf.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-search</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
diff --git a/samples/rest/impl-jackson/pom.xml b/samples/rest/impl-jackson/pom.xml
index f708adf..bd1b034 100644
--- a/samples/rest/impl-jackson/pom.xml
+++ b/samples/rest/impl-jackson/pom.xml
@@ -45,25 +45,25 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.rsa</groupId>
- <artifactId>org.apache.aries.rsa.spi</artifactId>
- <version>${aries.rsa.version}</version>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.spi</artifactId>
+ <version>${aries.rsa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.9.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.9.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-features-logging</artifactId>
- <version>${cxf.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/samples/rest/impl/pom.xml b/samples/rest/impl/pom.xml
index 4fa4244..e3a8560 100644
--- a/samples/rest/impl/pom.xml
+++ b/samples/rest/impl/pom.xml
@@ -34,9 +34,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.rsa</groupId>
- <artifactId>org.apache.aries.rsa.spi</artifactId>
- <version>${aries.rsa.version}</version>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.spi</artifactId>
+ <version>${aries.rsa.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
[cxf-dosgi] 12/16: Migrate to diamond operator
Posted by am...@apache.org.
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 97564d0a37d87210e6582e393e2cb3c5f86480cf
Author: Amichai Rothman <am...@apache.org>
AuthorDate: Tue May 28 22:11:30 2019 +0300
Migrate to diamond operator
---
.../common/httpservice/HttpServiceManager.java | 2 +-
.../common/intent/impl/IntentManagerImpl.java | 14 ++++-----
.../cxf/dosgi/common/proxy/ExceptionMapper.java | 4 +--
.../common/proxy/ServiceInvocationHandlerTest.java | 4 +--
.../cxf/dosgi/common/util/PropertyHelperTest.java | 4 +--
.../cxf/dosgi/dsw/decorator/DecorationParser.java | 2 +-
.../cxf/dosgi/dsw/decorator/InterfaceRule.java | 4 +--
.../dosgi/dsw/decorator/ServiceDecoratorImpl.java | 4 +--
.../cxf/dosgi/dsw/decorator/InterfaceRuleTest.java | 32 +++++++++----------
.../ServiceDecoratorBundleListenerTest.java | 2 +-
.../dsw/decorator/ServiceDecoratorImplTest.java | 36 +++++++++++-----------
.../multi/customintent/CustomIntentActivator.java | 4 +--
.../cxf/dosgi/dsw/handlers/rest/RsProvider.java | 2 +-
.../ws/PojoConfigurationTypeHandlerTest.java | 24 +++++++--------
.../dosgi/samples/rest/impl/TaskResourceImpl.java | 2 +-
.../dosgi/samples/rest/impl/TaskResourceImpl.java | 2 +-
.../dosgi/samples/soap/impl/TaskServiceImpl.java | 4 +--
17 files changed, 73 insertions(+), 73 deletions(-)
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 188cccc..45f9723 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
@@ -74,7 +74,7 @@ public class HttpServiceManager {
public void initFromConfig(Dictionary<String, Object> config) {
if (config == null) {
- config = new Hashtable<String, Object>();
+ config = new Hashtable<>();
}
this.httpBase = getWithDefault(config.get(KEY_HTTP_BASE), "http://localhost:8181");
this.cxfServletAlias = getWithDefault(config.get(KEY_CXF_SERVLET_ALIAS), "/cxf");
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 1cf26cf..b9b4525 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
@@ -51,7 +51,7 @@ public class IntentManagerImpl implements IntentManager {
static final Logger LOG = LoggerFactory.getLogger(IntentManagerImpl.class);
private static final int DEFAULT_INTENT_TIMEOUT = 30000;
- private final Map<String, Object> intentMap = new HashMap<String, Object>();
+ private final Map<String, Object> intentMap = new HashMap<>();
private final long maxIntentWaitTime = DEFAULT_INTENT_TIMEOUT;
private ServiceTracker<Object, Object> tracker;
@@ -100,7 +100,7 @@ public class IntentManagerImpl implements IntentManager {
@SuppressWarnings("unchecked")
public synchronized List<Object> getRequiredIntents(Set<String> requiredIntents) {
String[] intentNames = assertAllIntentsSupported(requiredIntents);
- List<Object> intents = new ArrayList<Object>();
+ List<Object> intents = new ArrayList<>();
for (String intentName : intentNames) {
Object intent = intentMap.get(intentName);
if (intent instanceof Callable<?>) {
@@ -139,7 +139,7 @@ public class IntentManagerImpl implements IntentManager {
@Override
public <T> List<T> getIntents(Class<? extends T> type, List<Object> intents) {
- List<T> result = new ArrayList<T>();
+ List<T> result = new ArrayList<>();
for (Object intent : intents) {
if (type.isInstance(intent)) {
result.add(type.cast(intent));
@@ -182,7 +182,7 @@ public class IntentManagerImpl implements IntentManager {
}
private synchronized Set<String> getMissingIntents(Collection<String> requiredIntents) {
- Set<String> unsupportedIntents = new HashSet<String>();
+ Set<String> unsupportedIntents = new HashSet<>();
unsupportedIntents.clear();
for (String ri : requiredIntents) {
if (!intentMap.containsKey(ri)) {
@@ -194,7 +194,7 @@ public class IntentManagerImpl implements IntentManager {
@Override
public Set<String> getExported(Map<String, Object> sd) {
- Set<String> allIntents = new HashSet<String>();
+ Set<String> allIntents = new HashSet<>();
Collection<String> intents = PropertyHelper
.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_EXPORTED_INTENTS));
allIntents.addAll(parseIntents(intents));
@@ -226,11 +226,11 @@ public class IntentManagerImpl implements IntentManager {
@Override
public Set<String> getImported(Map<String, Object> sd) {
Collection<String> intents = PropertyHelper.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_INTENTS));
- return new HashSet<String>(intents);
+ return new HashSet<>(intents);
}
private static Collection<String> parseIntents(Collection<String> intents) {
- List<String> parsed = new ArrayList<String>();
+ List<String> parsed = new ArrayList<>();
for (String intent : intents) {
parsed.addAll(Arrays.asList(intent.split("[ ]")));
}
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
index 01d7ef4..ce03ae4 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
@@ -28,7 +28,7 @@ import org.osgi.framework.ServiceException;
public class ExceptionMapper {
private static final String REMOTE_EXCEPTION_TYPE = "REMOTE";
- private Map<Method, Set<Class<?>>> exceptionsMap = new HashMap<Method, Set<Class<?>>>();
+ private Map<Method, Set<Class<?>>> exceptionsMap = new HashMap<>();
public ExceptionMapper(Class<?> iType) {
introspectTypeForExceptions(iType);
@@ -70,7 +70,7 @@ public class ExceptionMapper {
private Set<Class<?>> getCurrentExTypes(Method m) {
Set<Class<?>> types = exceptionsMap.get(m);
if (types == null) {
- types = new HashSet<Class<?>>();
+ types = new HashSet<>();
exceptionsMap.put(m, types);
}
return types;
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 aeb620e..985a9a0 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
@@ -33,7 +33,7 @@ import org.junit.Test;
public class ServiceInvocationHandlerTest {
- private static final Map<String, Method> OBJECT_METHODS = new HashMap<String, Method>(); {
+ private static final Map<String, Method> OBJECT_METHODS = new HashMap<>(); {
for (Method m : Object.class.getMethods()) {
OBJECT_METHODS.put(m.getName(), m);
}
@@ -48,7 +48,7 @@ public class ServiceInvocationHandlerTest {
@Test
public void testInvokeObjectMethod() throws Throwable {
- final List<String> called = new ArrayList<String>();
+ final List<String> called = new ArrayList<>();
ServiceInvocationHandler sih = new ServiceInvocationHandler("hi", String.class) {
@Override
public boolean equals(Object obj) {
diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java
index 41e8115..f842caf 100644
--- a/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/util/PropertyHelperTest.java
@@ -43,7 +43,7 @@ public class PropertyHelperTest extends TestCase {
}
public void testMultiValuePropertyAsCollection() {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("1");
list.add("2");
list.add("3");
@@ -55,7 +55,7 @@ public class PropertyHelperTest extends TestCase {
}
public void testGetProperty() {
- Map<String, Object> p = new HashMap<String, Object>();
+ Map<String, Object> p = new HashMap<>();
p.put(RemoteConstants.ENDPOINT_ID, "http://google.de");
p.put("notAString", new Object());
p.put(org.osgi.framework.Constants.OBJECTCLASS, new String[]{"my.class"});
diff --git a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/DecorationParser.java b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/DecorationParser.java
index 1f35820..e8f51b4 100644
--- a/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/DecorationParser.java
+++ b/decorator/src/main/java/org/apache/cxf/dosgi/dsw/decorator/DecorationParser.java
@@ -59,7 +59,7 @@ class DecorationParser {
List<ServiceDecorationType> getDecorations(URL resourceURL) throws JAXBException, IOException {
if (resourceURL == null || !decorationType(resourceURL)) {
- return new ArrayList<ServiceDecorationType>();
+ return new ArrayList<>();
}
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
unmarshaller.setSchema(schema);
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 1510cf7..02578f3 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
@@ -36,8 +36,8 @@ public class InterfaceRule implements Rule {
private final Bundle bundle;
private final Pattern matchPattern;
- private final Map<String, String> propMatches = new HashMap<String, String>();
- private final Map<String, Object> addProps = new HashMap<String, Object>();
+ private final Map<String, String> propMatches = new HashMap<>();
+ private final Map<String, Object> addProps = new HashMap<>();
public InterfaceRule(Bundle b, String im) {
bundle = b;
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 e850c92..c00bbb9 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
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
public class ServiceDecoratorImpl implements ServiceDecorator {
private static final Logger LOG = LoggerFactory.getLogger(ServiceDecoratorImpl.class);
- final List<Rule> decorations = new CopyOnWriteArrayList<Rule>();
+ final List<Rule> decorations = new CopyOnWriteArrayList<>();
private DecorationParser parser;
@@ -77,7 +77,7 @@ public class ServiceDecoratorImpl implements ServiceDecorator {
if (entries == null) {
return Collections.emptyList();
}
- List<ServiceDecorationType> elements = new ArrayList<ServiceDecorationType>();
+ List<ServiceDecorationType> elements = new ArrayList<>();
while (entries.hasMoreElements()) {
try {
elements.addAll(parser.getDecorations((URL)entries.nextElement()));
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 c74e08a..fed8706 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
@@ -47,14 +47,14 @@ public class InterfaceRuleTest extends TestCase {
InterfaceRule ir = new InterfaceRule(null, "org.apache.Foo");
ir.addProperty("x", "y", String.class.getName());
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"a.b.C", "org.apache.Foo"});
ServiceReference sref = mockServiceReference(serviceProps);
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
m.put("a", "b");
ir.apply(sref, m);
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("a", "b");
expected.put("x", "y");
assertEquals(expected, m);
@@ -66,14 +66,14 @@ public class InterfaceRuleTest extends TestCase {
ir.addProperty("x", "1", Integer.class.getName());
ir.addProperty("aaa.bbb", "true", Boolean.class.getName());
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put("boo", "baah");
serviceProps.put(Constants.OBJECTCLASS, new String[] {"a.b.C", "org.apache.Foo"});
ServiceReference sref = mockServiceReference(serviceProps);
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
ir.apply(sref, m);
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("x", 1);
expected.put("aaa.bbb", Boolean.TRUE);
assertEquals(expected, m);
@@ -83,12 +83,12 @@ public class InterfaceRuleTest extends TestCase {
InterfaceRule ir = new InterfaceRule(null, "org.apache.F(.*)");
ir.addProperty("x", "y", String.class.getName());
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put("boo", "baah");
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.apache.Boo"});
ServiceReference sref = mockServiceReference(serviceProps);
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
ir.apply(sref, m);
assertEquals(0, m.size());
}
@@ -98,11 +98,11 @@ public class InterfaceRuleTest extends TestCase {
ir.addPropMatch("boo", "baah");
ir.addProperty("x", "y", String.class.getName());
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.apache.Foo"});
ServiceReference sref = mockServiceReference(serviceProps);
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
ir.apply(sref, m);
assertEquals(0, m.size());
}
@@ -112,16 +112,16 @@ public class InterfaceRuleTest extends TestCase {
ir.addPropMatch("test.int", "42");
ir.addProperty("x", "1", Long.class.getName());
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put("test.int", 42);
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.apache.Foo"});
ServiceReference sref = mockServiceReference(serviceProps);
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
m.put("x", "foo");
m.put("aaa.bbb", Boolean.TRUE);
ir.apply(sref, m);
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("x", 1L);
expected.put("aaa.bbb", Boolean.TRUE);
assertEquals(expected, m);
@@ -132,16 +132,16 @@ public class InterfaceRuleTest extends TestCase {
ir.addPropMatch("test.int", "42");
ir.addProperty("x", "1", Long.class.getName());
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put("test.int", 51);
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.apache.Foo"});
ServiceReference sref = mockServiceReference(serviceProps);
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
m.put("x", "foo");
m.put("aaa.bbb", Boolean.TRUE);
ir.apply(sref, m);
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("x", "foo");
expected.put("aaa.bbb", Boolean.TRUE);
assertEquals(expected, m);
diff --git a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java
index 1b09bea..fda2edb 100644
--- a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java
+++ b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorBundleListenerTest.java
@@ -37,7 +37,7 @@ public class ServiceDecoratorBundleListenerTest {
BundleContext bc = EasyMock.createMock(BundleContext.class);
EasyMock.replay(bc);
- final List<String> called = new ArrayList<String>();
+ final List<String> called = new ArrayList<>();
ServiceDecoratorImpl serviceDecorator = new ServiceDecoratorImpl() {
@Override
void addDecorations(Bundle bundle) {
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 aac3b00..4e870e5 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
@@ -34,7 +34,7 @@ import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
public class ServiceDecoratorImplTest extends TestCase {
- private static final Map<String, Object> EMPTY = new HashMap<String, Object>();
+ private static final Map<String, Object> EMPTY = new HashMap<>();
private static final URL RES_SD = getResource("/test-resources/sd.xml");
private static final URL RES_SD1 = getResource("/test-resources/sd1.xml");
private static final URL RES_SD2 = getResource("/test-resources/sd2.xml");
@@ -43,7 +43,7 @@ public class ServiceDecoratorImplTest extends TestCase {
@SuppressWarnings("rawtypes")
public void testAddRemoveDecorations() {
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.acme.foo.Bar"});
serviceProps.put("test.prop", "xyz");
@@ -53,7 +53,7 @@ public class ServiceDecoratorImplTest extends TestCase {
sd.addDecorations(b);
assertEquals(1, sd.decorations.size());
- Map<String, Object> target = new HashMap<String, Object>();
+ Map<String, Object> target = new HashMap<>();
ServiceReference sref = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
@Override
@@ -64,67 +64,67 @@ public class ServiceDecoratorImplTest extends TestCase {
EasyMock.replay(sref);
sd.decorate(sref, target);
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("test.too", "ahaha");
assertEquals(expected, target);
// remove it again
sd.removeDecorations(b);
assertEquals(0, sd.decorations.size());
- Map<String, Object> target2 = new HashMap<String, Object>();
+ Map<String, Object> target2 = new HashMap<>();
sd.decorate(sref, target2);
assertEquals(EMPTY, target2);
}
public void testAddDecorations() {
- final Map<String, Object> serviceProps = new HashMap<String, Object>();
+ final Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.acme.foo.Bar"});
serviceProps.put("test.prop", "xyz");
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("test.too", "ahaha");
assertDecorate(serviceProps, expected, RES_SD);
}
public void testAddDecorations1() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.A"});
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("A", "B");
expected.put("C", 2);
assertDecorate(serviceProps, expected, RES_SD1, RES_SD2);
}
public void testAddDecorations2() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.D"});
assertDecorate(serviceProps, EMPTY, RES_SD1, RES_SD2);
}
public void testAddDecorations3() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.B"});
serviceProps.put("x", "y");
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("bool", Boolean.TRUE);
assertDecorate(serviceProps, expected, RES_SD1, RES_SD2);
}
public void testAddDecorations4() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.C"});
serviceProps.put("x", "z");
- Map<String, Object> expected = new HashMap<String, Object>();
+ Map<String, Object> expected = new HashMap<>();
expected.put("bool", Boolean.FALSE);
assertDecorate(serviceProps, expected, RES_SD1, RES_SD2);
}
public void testAddDecorations5() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.C"});
serviceProps.put("x", "x");
@@ -132,14 +132,14 @@ public class ServiceDecoratorImplTest extends TestCase {
}
public void testAddDecorations6() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.D"});
assertDecorate(serviceProps, EMPTY, RES_SD0);
}
public void testAddDecorations7() {
- Map<String, Object> serviceProps = new HashMap<String, Object>();
+ Map<String, Object> serviceProps = new HashMap<>();
serviceProps.put(Constants.OBJECTCLASS, new String[] {"org.test.D"});
assertDecorate(serviceProps, EMPTY, RES_SD_1);
@@ -158,7 +158,7 @@ public class ServiceDecoratorImplTest extends TestCase {
ServiceDecoratorImpl sd = new ServiceDecoratorImpl();
sd.addDecorations(b);
- Map<String, Object> target = new HashMap<String, Object>();
+ Map<String, Object> target = new HashMap<>();
ServiceReference sref = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
@Override
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 c5782f3..b077969 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
@@ -31,11 +31,11 @@ public class CustomIntentActivator implements BundleActivator {
@Override
public void start(BundleContext context) {
- Dictionary<String, String> props = new Hashtable<String, String>();
+ Dictionary<String, String> props = new Hashtable<>();
props.put("org.apache.cxf.dosgi.IntentName", "myIntent");
context.registerService(CustomFeatureProvider.class, new CustomFeatureProvider(), props);
- Dictionary<String, String> props2 = new Hashtable<String, String>();
+ Dictionary<String, String> props2 = new Hashtable<>();
props2.put(RemoteConstants.SERVICE_EXPORTED_CONFIGS, "org.apache.cxf.ws");
props2.put("org.apache.cxf.ws.address", "/taskservice");
props2.put(RemoteConstants.SERVICE_EXPORTED_INTERFACES, "*");
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 7e5c20e..6cf8ff4 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
@@ -167,7 +167,7 @@ public class RsProvider extends BaseDistributionProvider implements Distribution
factory.setBindingConfig(binding);
}
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
for (Object intent : intents) {
if (isProvider(intent)) {
providers.add(intent);
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 c36aecc..9e232d9 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
@@ -64,7 +64,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
WsProvider handler = new WsProvider();
handler.setIntentManager(intentManager);
handler.setHttpServiceManager(dummyHttpServiceManager());
- Map<String, Object> sd = new HashMap<String, Object>();
+ Map<String, Object> sd = new HashMap<>();
String url = "http://somewhere:1234/blah";
sd.put(RemoteConstants.ENDPOINT_ID, url);
assertEquals(url, handler.getServerAddress(sd, String.class));
@@ -79,7 +79,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
WsProvider handler = new WsProvider();
handler.setIntentManager(intentManager);
handler.setHttpServiceManager(dummyHttpServiceManager());
- Map<String, Object> sd = new HashMap<String, Object>();
+ Map<String, Object> sd = new HashMap<>();
String url = "http://somewhere:29/boo";
sd.put("org.apache.cxf.ws.address", url);
assertEquals(url, handler.getServerAddress(sd, String.class));
@@ -90,7 +90,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
WsProvider handler = new WsProvider();
handler.setIntentManager(intentManager);
handler.setHttpServiceManager(dummyHttpServiceManager());
- Map<String, Object> sd = new HashMap<String, Object>();
+ Map<String, Object> sd = new HashMap<>();
assertEquals("/java/lang/String", handler.getServerAddress(sd, String.class));
}
@@ -120,7 +120,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
Class<?>[] exportedInterfaces = new Class[] {Runnable.class};
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
props.put(RemoteConstants.ENDPOINT_ID, "http://google.de/");
EndpointHelper.addObjectClass(props, exportedInterfaces);
props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, new String[] {"my.config"});
@@ -162,7 +162,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
Class<?>[] exportedInterface = new Class[] {String.class
};
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
EndpointHelper.addObjectClass(props, exportedInterface);
props.put(WsConstants.WS_ADDRESS_PROPERTY, "http://alternate_host:80/myString");
@@ -179,15 +179,15 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
public void testAddressing() {
runAddressingTest(new HashMap<String, Object>(), "http://localhost:9000/java/lang/Runnable");
- Map<String, Object> p1 = new HashMap<String, Object>();
+ Map<String, Object> p1 = new HashMap<>();
p1.put("org.apache.cxf.ws.address", "http://somewhere");
runAddressingTest(p1, "http://somewhere");
- Map<String, Object> p3 = new HashMap<String, Object>();
+ Map<String, Object> p3 = new HashMap<>();
p3.put("org.apache.cxf.ws.port", 65535);
runAddressingTest(p3, "http://localhost:65535/java/lang/Runnable");
- Map<String, Object> p4 = new HashMap<String, Object>();
+ Map<String, Object> p4 = new HashMap<>();
p4.put("org.apache.cxf.ws.port", "8181");
runAddressingTest(p4, "http://localhost:8181/java/lang/Runnable");
}
@@ -247,7 +247,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
handler.activate(dswContext);
Class[] exportedInterfaces = {Runnable.class};
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
EndpointHelper.addObjectClass(props, exportedInterfaces);
Runnable myService = EasyMock.createMock(Runnable.class);
@@ -329,7 +329,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
pch.setHttpServiceManager(dummyHttpServiceManager());
pch.activate(bc);
Class<?>[] exportedInterfaces = new Class[] {String.class};
- Map<String, Object> sd = new HashMap<String, Object>();
+ Map<String, Object> sd = new HashMap<>();
sd.put(org.osgi.framework.Constants.SERVICE_ID, 42);
EndpointHelper.addObjectClass(sd, exportedInterfaces);
List<String> intents = Arrays.asList("my_intent", "your_intent");
@@ -356,7 +356,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
handler.activate(dswBC);
Class<?>[] exportedInterfaces = new Class[] {MyJaxWsEchoService.class};
- Map<String, Object> sd = new HashMap<String, Object>();
+ Map<String, Object> sd = new HashMap<>();
sd.put(WsConstants.WS_ADDRESS_PROPERTY, "/somewhere");
EndpointHelper.addObjectClass(sd, exportedInterfaces);
BundleContext serviceBC = c.createMock(BundleContext.class);
@@ -384,7 +384,7 @@ public class PojoConfigurationTypeHandlerTest extends TestCase {
handler.setIntentManager(intentManager);
handler.setHttpServiceManager(dummyHttpServiceManager());
handler.activate(dswBC);
- Map<String, Object> sd = new HashMap<String, Object>();
+ Map<String, Object> sd = new HashMap<>();
sd.put(Constants.OBJECTCLASS, new String[]{MySimpleEchoService.class.getName()});
sd.put(WsConstants.WS_ADDRESS_PROPERTY, "/somewhere_else");
BundleContext serviceBC = c.createMock(BundleContext.class);
diff --git a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index eca3bc7..0f9856b 100644
--- a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -54,7 +54,7 @@ public class TaskResourceImpl implements TaskResource, IntentsProvider {
Map<Integer, Task> taskMap;
public TaskResourceImpl() {
- taskMap = new HashMap<Integer, Task>();
+ taskMap = new HashMap<>();
Task task = new Task();
task.setId(1);
task.setTitle("Buy some coffee");
diff --git a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
index 52a6afe..7262aae 100644
--- a/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
+++ b/samples/rest/impl/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/TaskResourceImpl.java
@@ -45,7 +45,7 @@ public class TaskResourceImpl implements TaskResource, IntentsProvider {
Map<Integer, Task> taskMap;
public TaskResourceImpl() {
- taskMap = new HashMap<Integer, Task>();
+ taskMap = new HashMap<>();
Task task = new Task();
task.setId(1);
task.setTitle("Buy some coffee");
diff --git a/samples/soap/impl/src/main/java/org/apache/cxf/dosgi/samples/soap/impl/TaskServiceImpl.java b/samples/soap/impl/src/main/java/org/apache/cxf/dosgi/samples/soap/impl/TaskServiceImpl.java
index 4bf4dbe..241ff99 100644
--- a/samples/soap/impl/src/main/java/org/apache/cxf/dosgi/samples/soap/impl/TaskServiceImpl.java
+++ b/samples/soap/impl/src/main/java/org/apache/cxf/dosgi/samples/soap/impl/TaskServiceImpl.java
@@ -42,7 +42,7 @@ public class TaskServiceImpl implements TaskService {
Map<Integer, Task> taskMap;
public TaskServiceImpl() {
- taskMap = new HashMap<Integer, Task>();
+ taskMap = new HashMap<>();
Task task = new Task();
task.setId(1);
task.setTitle("Buy some coffee");
@@ -68,7 +68,7 @@ public class TaskServiceImpl implements TaskService {
@Override
public Collection<Task> getAll() {
// taskMap.values is not serializable
- return new ArrayList<Task>(taskMap.values());
+ return new ArrayList<>(taskMap.values());
}
@Override