You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:26 UTC
[21/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index c8846d8..5ecd26f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -36,7 +36,7 @@ import org.junit.Before;
import org.junit.Test;
public class ConnectionFactoryImplTest extends Assert {
-
+
ManagedConnectionFactory mockConnectionFactory;
ConnectionManager mockConnectionManager;
CXFConnectionRequestInfo param;
@@ -46,10 +46,10 @@ public class ConnectionFactoryImplTest extends Assert {
public void setUp() throws Exception {
mockConnectionFactory = EasyMock.createMock(ManagedConnectionFactory.class);
mockConnectionManager = EasyMock.createMock(ConnectionManager.class);
-
+
param = new CXFConnectionRequestInfo();
param.setInterface(Runnable.class);
-
+
cf = new ConnectionFactoryImpl(mockConnectionFactory, mockConnectionManager);
}
@@ -71,66 +71,66 @@ public class ConnectionFactoryImplTest extends Assert {
@Test
public void testGetConnectionReturnsConnectionWithRightManager() throws Exception {
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- new URL("file:/tmp/foo"),
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ new URL("file:/tmp/foo"),
+ new QName(""),
new QName(""));
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(mockConnectionManager);
-
+
param.setWsdlLocation(new URL("file:/tmp/foo"));
param.setServiceName(new QName(""));
param.setPortName(new QName(""));
Object o = cf.getConnection(param);
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
- EasyMock.verify(mockConnectionManager);
+ EasyMock.verify(mockConnectionManager);
}
@Test
public void testGetConnectionWithNoPortReturnsConnectionWithRightManager() throws Exception {
-
+
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- new URL("file:/tmp/foo"),
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ new URL("file:/tmp/foo"),
+ new QName(""),
null);
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(mockConnectionManager);
-
+
param.setWsdlLocation(new URL("file:/tmp/foo"));
param.setServiceName(new QName(""));
Object o = cf.getConnection(param);
-
+
EasyMock.verify(mockConnectionManager);
-
+
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
-
-
+
+
}
@Test
public void testGetConnectionWithNoWsdlLocationReturnsConnectionWithRightManager() throws Exception {
-
+
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- null,
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ null,
+ new QName(""),
new QName(""));
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
@@ -140,34 +140,34 @@ public class ConnectionFactoryImplTest extends Assert {
param.setPortName(new QName(""));
Object o = cf.getConnection(param);
EasyMock.verify(mockConnectionManager);
-
+
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
-
+
}
@Test
public void testGetConnectionWithNoWsdlLocationAndNoPortReturnsConnectionWithRightManager()
throws Exception {
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- null,
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ null,
+ new QName(""),
null);
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(mockConnectionManager);
-
+
cf = new ConnectionFactoryImpl(mockConnectionFactory, mockConnectionManager);
param.setServiceName(new QName(""));
Object o = cf.getConnection(param);
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
-
+
}
@@ -195,5 +195,5 @@ public class ConnectionFactoryImplTest extends Assert {
assertTrue(true);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
index 67f7a00..e8c6706 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
@@ -25,8 +25,8 @@ import javax.jws.WebService;
@WebService
public class Imple implements HelloInterface {
-
-
+
+
public String sayHi(String s) {
return "hello world ." + s;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
index 5b5100c..1793b42 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
@@ -33,15 +33,15 @@ import org.junit.Ignore;
import org.junit.Test;
public class JCABusFactoryTest extends AbstractCXFTest {
-
-
+
+
@Test
public void testSetAppserverClassLoader() {
ClassLoader loader = new DummyClassLoader();
JCABusFactory bf = new JCABusFactory(new ManagedConnectionFactoryImpl());
bf.setAppserverClassLoader(loader);
assertSame("Checking appserverClassLoader.", loader, bf.getAppserverClassLoader());
- }
+ }
@Test
public void testLoadNonexistentProperties() throws Exception {
@@ -55,7 +55,7 @@ public class JCABusFactoryTest extends AbstractCXFTest {
re.getCause() instanceof FileNotFoundException);
}
}
-
+
@Test
public void testInvalidMonitorConfigNoPropsURL() throws Exception {
ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl();
@@ -71,12 +71,12 @@ public class JCABusFactoryTest extends AbstractCXFTest {
.indexOf("EJBServicePropertiesURL is not set") != -1);
}
}
-
+
@Ignore
@Test
public void testInitServants() throws Exception {
ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl();
- //get resource
+ //get resource
URL propFile = getClass().getResource("resources/ejb_servants.properties");
mcf.setEJBServicePropertiesURL(propFile.toString());
JCABusFactory jcaBusFactory = new JCABusFactory(mcf);
@@ -84,10 +84,10 @@ public class JCABusFactoryTest extends AbstractCXFTest {
jcaBusFactory.setBus(mockBus);
jcaBusFactory.initializeServants();
-
+
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 6a7c681..1a3cafb 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -55,18 +55,18 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Before
public void setUp() throws Exception {
-
+
mci = createManagedConnectionFactoryImpl();
-
+
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
-
- QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-
+
+ QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
+
QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-
+
cri = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName,
portName);
-
+
cri2 = new CXFConnectionRequestInfo(Greeter.class, wsdl, new QName("service2"),
new QName("fooPort2"));
cri3 = new CXFConnectionRequestInfo(Greeter.class, wsdl, new QName("service3"),
@@ -116,7 +116,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
propsmcf.setLogLevel(logLevel);
assertTrue("prop is set", props.containsValue(logLevel));
}
-
+
@Test
public void testGetPropsURLFromBadURL() throws Exception {
@@ -161,9 +161,9 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Test
public void testMatchManagedConnectionsWithBoundConnections() throws Exception {
-
+
Subject subj = new Subject();
- BusFactory bf = BusFactory.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
BusFactory.setDefaultBus(bus);
ManagedConnectionFactoryImpl factory = EasyMock.createMock(ManagedConnectionFactoryImpl.class);
@@ -171,9 +171,9 @@ public class ManagedConnectionFactoryImplTest extends Assert {
// In ManagedConnectionImpl:
// one for getCXFServiceFromBus , another for createInvocationHandler
EasyMock.expectLastCall().andReturn(bus).times(4);
-
+
EasyMock.replay(factory);
-
+
ManagedConnectionImpl mc1 = new ManagedConnectionImpl(factory, cri, subj);
Object connection = mc1.getConnection(subj, cri);
@@ -185,7 +185,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
assertNotNull("connection must not be null.", connection);
*/
// EasyMock.verify(factory);
-
+
Set<ManagedConnection> mcSet = new HashSet<>();
mcSet.add(mc1);
//mcSet.add(mc2);
@@ -208,7 +208,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
mci.createConnectionFactory();
fail("expect non managed not supported on null MC");
} catch (ResourceException expectd) {
- // do nothing here
+ // do nothing here
}
}
@@ -305,7 +305,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
return new ManagedConnectionFactoryImpl();
}
-
+
}
class ManagedConnectionFactoryImplTester extends ManagedConnectionFactoryImpl {
@@ -321,5 +321,5 @@ class ManagedConnectionFactoryImplTester extends ManagedConnectionFactoryImpl {
//busFactory = new BusFactory(this);
initCalledCount++;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index d0e9e1e..e42cfda 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -58,15 +58,15 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertTrue(o instanceof Foo);
}
-
+
@Ignore("Need to check the classloader")
public void testThreadContextClassLoaderIsSet() throws Exception {
- //set the threadContextClassLoader for Bus
+ //set the threadContextClassLoader for Bus
//TODO njiang classloader things
- //check the threadContextClassLoader
+ //check the threadContextClassLoader
mci.getConnection(subj, cri);
}
-
+
@Test
public void testGetConnectionWithNoWSDLInvokesCreateClientWithTwoParameters() throws Exception {
cri = new CXFConnectionRequestInfo(Greeter.class, null, serviceName, portName);
@@ -76,7 +76,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertTrue("Checking implementation of Connection interface", o instanceof Connection);
assertTrue("Checking implementation of passed interface", o instanceof Greeter);
}
-
+
@Test
public void testGetConnectionWithNoWSDLInvokesCreateClientWithTwoArgs()
@@ -90,11 +90,11 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
@Ignore
public void testGetConnectionWithNoPortReturnsConnection() throws Exception {
- cri = new CXFConnectionRequestInfo(Greeter.class,
+ cri = new CXFConnectionRequestInfo(Greeter.class,
wsdl,
serviceName,
null);
-
+
Object o = mci.getConnection(subj, cri);
assertTrue("Returned connection does not implement Connection interface", o instanceof Connection);
@@ -111,7 +111,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
private void verifyProxyInterceptors(Object o) {
assertTrue(o instanceof Proxy);
- assertEquals("First handler must be a ProxyInvocation Handler", ProxyInvocationHandler.class,
+ assertEquals("First handler must be a ProxyInvocation Handler", ProxyInvocationHandler.class,
Proxy.getInvocationHandler(o).getClass());
}
@@ -130,7 +130,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
PasswordCredential creds = new PasswordCredential(user, password);
subj.getPrivateCredentials().add(creds);
Object o = mci.getConnection(subj, cri);
-
+
verifyProxyInterceptors(o);
}
@@ -146,10 +146,10 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
verifyProxyInterceptors(o);
}
-
+
@Test
- public void testCloseConnection() throws Exception {
+ public void testCloseConnection() throws Exception {
Connection conn = (Connection)mci.getConnection(subj, cri);
EasyMock.reset(mockListener);
mockListener.connectionClosed(EasyMock.isA(ConnectionEvent.class));
@@ -161,7 +161,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
@Test
public void testAssociateConnection() throws Exception {
-
+
CXFConnectionRequestInfo cri2 = new CXFConnectionRequestInfo(Greeter.class,
new URL("file:/tmp/foo2"),
new QName("service2"),
@@ -199,7 +199,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
public void testAssociateConnectionThrowsException() throws Throwable {
InvocationHandler ih = EasyMock.createMock(InvocationHandler.class);
-
+
Object dodgyHandle = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {Foo.class}, ih);
try {
@@ -218,5 +218,5 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertEquals("Checking the EISProductionVersion", "1.1", data.getEISProductVersion());
assertEquals("Checking the EISProductName", "WS-based-EIS", data.getEISProductName());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 8ab1f2e..80a23f7 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -49,47 +49,47 @@ public abstract class ManagedConnectionTestBase extends Assert {
protected ManagedConnectionFactoryImpl factory = EasyMock.createMock(ManagedConnectionFactoryImpl.class);
protected Bus bus;
-
+
protected ConnectionEventListener mockListener = EasyMock.createMock(ConnectionEventListener.class);
-
+
public ManagedConnectionTestBase() {
-
+
}
-
+
@Before
public void setUp() throws ResourceException, MalformedURLException, BusException {
-
+
subj = new Subject();
-
+
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
-
+
QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-
+
QName serviceName2 = new QName("http://apache.org/hello_world_soap_http", "SOAPService2");
-
+
QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-
+
QName portName2 = new QName("http://apache.org/hello_world_soap_http", "SoapPort2");
cri = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName, portName);
cri2 = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName2, portName2);
-
+
BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
BusFactory.setDefaultBus(bus);
-
-
- EasyMock.reset(factory);
-
+
+
+ EasyMock.reset(factory);
+
factory.getBus();
-
+
EasyMock.expectLastCall().andReturn(bus).anyTimes();
EasyMock.replay(factory);
-
- mci = new ManagedConnectionImpl(factory, cri, subj);
-
+
+ mci = new ManagedConnectionImpl(factory, cri, subj);
+
mci.addConnectionEventListener(mockListener);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index f4a03c0..3929e55 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
public class ResourceAdapterImplTest extends Assert {
public ResourceAdapterImplTest() {
-
+
}
@Test
@@ -152,11 +152,11 @@ public class ResourceAdapterImplTest extends Assert {
Bus bus = EasyMock.createMock(Bus.class);
bus.shutdown(true);
EasyMock.expectLastCall();
- EasyMock.replay(bus);
+ EasyMock.replay(bus);
rai.registerBus(bus);
rai.stop();
EasyMock.verify(bus);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
index b0759e6..276a8ee 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
@@ -23,23 +23,23 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFManagedConnectionFactory;
import org.junit.Test;
-public abstract class AbstractInvocationHandlerTest
+public abstract class AbstractInvocationHandlerTest
extends HandlerTestBase {
-
+
public AbstractInvocationHandlerTest() {
-
+
}
// seach for the setNext method
@Test
public void testHandlerInvokesNext() throws Throwable {
Object[] args = new Object[0];
-
+
CXFInvocationHandler handler = getHandler();
- handler.setNext(mockHandler);
-
- handler.invoke(target, testMethod, args);
-
+ handler.setNext(mockHandler);
+
+ handler.invoke(target, testMethod, args);
+
assertTrue("target object must not be called", !target.methodInvoked);
}
@@ -80,5 +80,5 @@ public abstract class AbstractInvocationHandlerTest
return mcf;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
index 8d437c8..f8bfea1 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.jca.cxf.handlers;
+package org.apache.cxf.jca.cxf.handlers;
import java.lang.reflect.Method;
@@ -24,31 +24,31 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
-public class DummyHandler implements CXFInvocationHandler {
+public class DummyHandler implements CXFInvocationHandler {
- boolean invokeCalled;
+ boolean invokeCalled;
public CXFInvocationHandlerData getData() {
return new CXFInvocationHandlerDataImpl();
}
-
+
// Implementation of java.lang.reflect.InvocationHandler
- public final Object invoke(final Object object,
- final Method method,
+ public final Object invoke(final Object object,
+ final Method method,
final Object[] objectArray) throws Throwable {
- invokeCalled = true;
+ invokeCalled = true;
return null;
}
public void setNext(CXFInvocationHandler next) {
-
+
}
public CXFInvocationHandler getNext() {
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index e62efcb..f5acf2f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -32,19 +32,19 @@ import org.junit.Test;
public class HandlerTestBase extends Assert {
protected Bus mockBus = EasyMock.createMock(Bus.class);
- protected CXFManagedConnection mockManagedConnection =
+ protected CXFManagedConnection mockManagedConnection =
EasyMock.createMock(CXFManagedConnection.class);
- protected CXFInvocationHandler mockHandler =
+ protected CXFInvocationHandler mockHandler =
EasyMock.createMock(CXFInvocationHandler.class);
- protected ManagedConnectionFactoryImpl mcf =
+ protected ManagedConnectionFactoryImpl mcf =
EasyMock.createMock(ManagedConnectionFactoryImpl.class);
protected ManagedConnectionImpl mci =
EasyMock.createMock(ManagedConnectionImpl.class);
protected Method testMethod;
protected TestTarget target = new TestTarget();
-
+
public HandlerTestBase() {
}
@@ -53,11 +53,11 @@ public class HandlerTestBase extends Assert {
public void setUp() {
EasyMock.reset(mcf);
EasyMock.reset(mci);
-
+
mcf.getBus();
EasyMock.expectLastCall().andReturn(mockBus);
EasyMock.replay(mcf);
-
+
mci.getManagedConnectionFactory();
EasyMock.expectLastCall().andReturn(mcf);
EasyMock.replay(mci);
@@ -66,12 +66,12 @@ public class HandlerTestBase extends Assert {
} catch (NoSuchMethodException ex) {
fail(ex.toString());
}
-
+
}
@Test
public void testNullTestTarget() {
// do nothing here ,just for avoid the junit test warning
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
index 6b18e1f..5df1b5e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
@@ -32,16 +32,16 @@ import org.junit.Before;
import org.junit.Test;
public class InvocationHandlerFactoryTest extends HandlerTestBase {
-
+
private CXFInvocationHandler handler;
-
+
private Subject testSubject;
-
+
public InvocationHandlerFactoryTest() {
super();
}
-
-
+
+
@Before
public void setUp() {
super.setUp();
@@ -53,10 +53,10 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
fail();
}
}
-
+
@Test
public void testCreateHandlerChain() throws ResourceAdapterInternalException {
-
+
CXFInvocationHandler first = handler;
CXFInvocationHandler last = null;
@@ -85,8 +85,8 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
assertTrue("last handler must be an InvokingInvocationHandler",
last instanceof InvokingInvocationHandler);
- Class<?>[] types
- = {ProxyInvocationHandler.class,
+ Class<?>[] types
+ = {ProxyInvocationHandler.class,
ObjectMethodInvocationHandler.class,
InvokingInvocationHandler.class,
SecurityTestHandler.class};
@@ -102,8 +102,8 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
assertEquals(ObjectMethodInvocationHandler.class, handler.getNext().getClass());
assertEquals(SecurityTestHandler.class, handler.getNext().getNext().getClass());
}
-
-
+
+
public static class SecurityTestHandler extends CXFInvocationHandlerBase {
public SecurityTestHandler(CXFInvocationHandlerData data) {
@@ -111,10 +111,10 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-
+
return invokeNext(proxy, method, args);
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
index 008b500..992f2c7 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
@@ -26,7 +26,7 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.junit.Before;
import org.junit.Test;
-public class InvokingInvocationHandlerTest
+public class InvokingInvocationHandlerTest
extends AbstractInvocationHandlerTest {
TestInterface test;
@@ -82,5 +82,5 @@ public class InvokingInvocationHandlerTest
return handler;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
index b134f66..af7c8a0 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
@@ -30,109 +30,109 @@ import org.junit.Test;
public class ObjectMethodInvocationHandlerTest extends AbstractInvocationHandlerTest {
- ObjectMethodInvocationHandler handler;
+ ObjectMethodInvocationHandler handler;
CXFInvocationHandlerData data;
- TestTarget testTarget = new TestTarget();
+ TestTarget testTarget = new TestTarget();
DummyHandler dummyHandler = new DummyHandler();
-
+
public ObjectMethodInvocationHandlerTest() {
super();
}
@Before
- public void setUp() {
- super.setUp();
- target.lastMethod = null;
- dummyHandler.invokeCalled = false;
+ public void setUp() {
+ super.setUp();
+ target.lastMethod = null;
+ dummyHandler.invokeCalled = false;
data = new CXFInvocationHandlerDataImpl();
data.setTarget(target);
handler = new ObjectMethodInvocationHandler(data);
- handler.setNext(dummyHandler);
- }
+ handler.setNext(dummyHandler);
+ }
@Test
- public void testToString() throws Throwable {
+ public void testToString() throws Throwable {
Method toString = Object.class.getMethod("toString", new Class[0]);
-
- Object result = handler.invoke(testTarget, toString, null);
- assertTrue("object method must not be passed to next handler in chain",
- !dummyHandler.invokeCalled);
+
+ Object result = handler.invoke(testTarget, toString, null);
+ assertTrue("object method must not be passed to next handler in chain",
+ !dummyHandler.invokeCalled);
assertTrue("object must be a String", result instanceof String);
assertTrue("checking toString method ", ((String)result).startsWith("ConnectionHandle"));
- }
+ }
@Test
- public void testHashCode() throws Throwable {
+ public void testHashCode() throws Throwable {
- Method hashCode = Object.class.getMethod("hashCode", new Class[0]);
- doObjectMethodTest(hashCode);
- }
+ Method hashCode = Object.class.getMethod("hashCode", new Class[0]);
+ doObjectMethodTest(hashCode);
+ }
@Test
- public void testEqualsDoesNotCallNext() throws Throwable {
-
- Method equals = Object.class.getMethod("equals", new Class[] {Object.class});
- handler.invoke(testTarget, equals, new Object[] {this});
- assertTrue("object method must not be passed to next handler in chain",
- !dummyHandler.invokeCalled);
- }
-
+ public void testEqualsDoesNotCallNext() throws Throwable {
+
+ Method equals = Object.class.getMethod("equals", new Class[] {Object.class});
+ handler.invoke(testTarget, equals, new Object[] {this});
+ assertTrue("object method must not be passed to next handler in chain",
+ !dummyHandler.invokeCalled);
+ }
+
@Test
- public void testNonObjecMethod() throws Throwable {
+ public void testNonObjecMethod() throws Throwable {
- DummyHandler dummyHandler1 = new DummyHandler();
- handler.setNext(dummyHandler1);
+ DummyHandler dummyHandler1 = new DummyHandler();
+ handler.setNext(dummyHandler1);
- final Method method = TestTarget.class.getMethod("testMethod", new Class[0]);
-
- handler.invoke(testTarget, method, new Object[0]);
+ final Method method = TestTarget.class.getMethod("testMethod", new Class[0]);
- assertTrue("non object method must be passed to next handler in chain", dummyHandler1.invokeCalled);
+ handler.invoke(testTarget, method, new Object[0]);
+
+ assertTrue("non object method must be passed to next handler in chain", dummyHandler1.invokeCalled);
}
@Test
- public void testEqualsThroughProxies() {
+ public void testEqualsThroughProxies() {
Class<?>[] interfaces = {TestInterface.class};
CXFInvocationHandlerData data1 = new CXFInvocationHandlerDataImpl();
CXFInvocationHandlerData data2 = new CXFInvocationHandlerDataImpl();
data1.setTarget(new TestTarget());
data2.setTarget(new TestTarget());
- ObjectMethodInvocationHandler handler1 = new ObjectMethodInvocationHandler(data1);
- handler1.setNext(mockHandler);
- ObjectMethodInvocationHandler handler2 = new ObjectMethodInvocationHandler(data2);
- handler2.setNext(mockHandler);
+ ObjectMethodInvocationHandler handler1 = new ObjectMethodInvocationHandler(data1);
+ handler1.setNext(mockHandler);
+ ObjectMethodInvocationHandler handler2 = new ObjectMethodInvocationHandler(data2);
+ handler2.setNext(mockHandler);
- TestInterface proxy1 =
+ TestInterface proxy1 =
(TestInterface)Proxy.newProxyInstance(TestInterface.class.getClassLoader(), interfaces, handler1);
- TestInterface proxy2 =
+ TestInterface proxy2 =
(TestInterface)Proxy.newProxyInstance(TestInterface.class.getClassLoader(), interfaces, handler2);
- assertEquals(proxy1, proxy1);
- assertTrue(!proxy1.equals(proxy2));
- }
+ assertEquals(proxy1, proxy1);
+ assertTrue(!proxy1.equals(proxy2));
+ }
- protected void doObjectMethodTest(Method method) throws Throwable {
- doObjectMethodTest(method, null);
- }
+ protected void doObjectMethodTest(Method method) throws Throwable {
+ doObjectMethodTest(method, null);
+ }
- protected void doObjectMethodTest(Method method, Object[] args) throws Throwable {
+ protected void doObjectMethodTest(Method method, Object[] args) throws Throwable {
- handler.invoke(testTarget, method, args);
+ handler.invoke(testTarget, method, args);
assertTrue("object method must not be passed to next handler in chain",
- !dummyHandler.invokeCalled);
+ !dummyHandler.invokeCalled);
assertEquals(method + " must be invoked directly on target object",
- method.getName(), target.lastMethod.getName());
- }
+ method.getName(), target.lastMethod.getName());
+ }
- public CXFInvocationHandler getHandler() {
+ public CXFInvocationHandler getHandler() {
return handler;
- }
+ }
+
-
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
index 2934f2d..e16cbd5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
@@ -37,29 +37,29 @@ public class ProxyInvocationHandlerTest extends AbstractInvocationHandlerTest {
@Before
- public void setUp() {
- super.setUp();
+ public void setUp() {
+ super.setUp();
data = new CXFInvocationHandlerDataImpl();
testObject = new ProxyInvocationHandler(data);
testObject.getData().setManagedConnection(mci);
- }
+ }
- public CXFInvocationHandler getHandler() {
+ public CXFInvocationHandler getHandler() {
return testObject;
}
-
+
@Test
public void testInvokeSetsBusCurrent() throws Throwable {
Bus oldBus = BusFactory.getDefaultBus();
-
+
testObject.invoke(target, testMethod, new Object[] {});
Bus newBus = BusFactory.getDefaultBus();
-
+
assertSame("Current Bus has been set and is as expected, val=" + newBus, newBus, mockBus);
- // set back the JVM current local variable
+ // set back the JVM current local variable
BusFactory.setDefaultBus(oldBus);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
index bee7d82..79ea798 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
@@ -21,54 +21,54 @@ package org.apache.cxf.jca.cxf.handlers;
import java.lang.reflect.Method;
-public class TestTarget implements TestInterface {
- boolean methodInvoked;
+public class TestTarget implements TestInterface {
+ boolean methodInvoked;
- Method lastMethod;
+ Method lastMethod;
- public void testMethod() {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("testMethod", new Class[0]);
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
- }
+ public void testMethod() {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("testMethod", new Class[0]);
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
- public String toString() {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("toString", new Class[0]);
- return "TestTarget";
+ public String toString() {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("toString", new Class[0]);
+ return "TestTarget";
// don't delegate to super as this
// calls hashCode which messes up the
- // test
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
- }
+ // test
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
- public int hashCode() {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("hashCode", new Class[0]);
- return super.hashCode();
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
+ public int hashCode() {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("hashCode", new Class[0]);
+ return super.hashCode();
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
- }
+ }
- public boolean equals(Object obj) {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("equals", new Class[] {Object.class});
- return super.equals(obj);
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
+ public boolean equals(Object obj) {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("equals", new Class[] {Object.class});
+ return super.equals(obj);
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
- }
+ }
-}
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
index 09034ea..b7e1f7c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
@@ -32,48 +32,48 @@ import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
-public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
+public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
// for initialise behaviours
static int initializeCount;
static int shutdownCount;
static boolean correctThreadContextClassLoader;
static boolean throwException;
static Bus bus = new DummyBus();
-
-
+
+
static String[] invokeArgs;
static String cxfHome = "File:/local/temp";
-
-
+
+
public static void reset() {
initializeCount = 0;
- shutdownCount = 0;
+ shutdownCount = 0;
correctThreadContextClassLoader = false;
throwException = false;
}
-
+
public boolean hasExtensionByName(String name) {
return false;
}
public static Bus init(String[] args) throws BusException {
-
+
initializeCount++;
- correctThreadContextClassLoader =
- Thread.currentThread().getContextClassLoader()
+ correctThreadContextClassLoader =
+ Thread.currentThread().getContextClassLoader()
== org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl.class.getClassLoader();
if (throwException) {
- throw new BusException(new Message("tested bus exception!",
+ throw new BusException(new Message("tested bus exception!",
(ResourceBundle)null, new Object[]{}));
}
return bus;
-
+
}
-
+
public void shutdown(boolean wait) {
- shutdownCount++;
-
+ shutdownCount++;
+
}
@@ -87,7 +87,7 @@ public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
public <T> void setExtension(T extension, Class<T> extensionType) {
}
-
+
// @Override
public String getId() {
// TODO Auto-generated method stub
@@ -104,7 +104,7 @@ public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
// @Override
public void run() {
// TODO Auto-generated method stub
-
+
}
public static boolean isCorrectThreadContextClassLoader() {
@@ -152,17 +152,17 @@ public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
public void setId(String i) {
// TODO Auto-generated method stub
-
+
}
public void setProperties(Map<String, Object> properties) {
// TODO Auto-generated method stub
-
+
}
public void setFeatures(Collection<? extends Feature> features) {
// TODO Auto-generated method stub
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index f154cd3..027117a 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -38,8 +38,8 @@ public class JarLoaderTest extends Assert {
@Before
public void setUp() throws Exception {
exampleRarURL = getClass().getClassLoader().getResource("blackbox-notx.rar");
- }
-
+ }
+
@Test
public void testGetBytesFromImputStream() throws Exception {
byte[] bytes = JarLoader.getBytesFromInputStream(exampleRarURL
@@ -52,7 +52,7 @@ public class JarLoaderTest extends Assert {
@Test
public void testGetJarContents() throws Exception {
String urlPath = exampleRarURL.toString();
-
+
LOG.info("URLPath: " + urlPath);
Map<?, ?> map = JarLoader.getJarContents(urlPath + "!/blackbox-notx.jar!/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
index 320e687..959274c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
@@ -41,7 +41,7 @@ public class ManagedConnectionImplTest {
@Test
public void testHandleEqualsMethod() throws Exception {
BusFactory.setDefaultBus(null);
-
+
IMocksControl control = EasyMock.createNiceControl();
ManagedConnectionFactoryImpl mcf = control.createMock(ManagedConnectionFactoryImpl.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
index 0ec3b8f..8bc1a50 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
@@ -28,33 +28,33 @@ import org.junit.Test;
/**
- *
+ *
*/
public class EJBEndpointTest extends Assert {
-
+
private EJBEndpoint endpoint;
-
+
@Before
public void setUp() throws Exception {
endpoint = new EJBEndpoint(null);
}
-
+
@Test
public void testGetAddressPort() throws Exception {
int port = endpoint.getAddressPort("http://localhost:8080/services");
assertEquals(8080, port);
}
-
- @Test
+
+ @Test
public void testGetAddress80Port() throws Exception {
int port = endpoint.getAddressPort("http://localhost/services");
assertEquals(80, port);
}
-
+
@Test
public void testGetAddressEndPort() throws Exception {
int port = endpoint.getAddressPort("http://localhost:9999");
assertEquals(9999, port);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
index 3061114..74bf5f9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class EJBServantConfigTest extends Assert {
-
+
@Test
public void testNoWsdl() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}Greeter";
@@ -35,7 +35,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals(result, config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testNoWsdlNoLocalPart() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}";
@@ -44,7 +44,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals(result, config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testNoWsdlNoNamespace() throws Exception {
String value = "Greeter";
@@ -53,7 +53,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals(result, config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testAllNull() throws Exception {
String value = "";
@@ -61,7 +61,7 @@ public class EJBServantConfigTest extends Assert {
assertNull(config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testWithNullWsdl() throws Exception {
String value = "@";
@@ -69,15 +69,15 @@ public class EJBServantConfigTest extends Assert {
assertNull(config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testWithNullServiceName() throws Exception {
String value = "@wsdl/hello_world.wsdl";
EJBServantConfig config = new EJBServantConfig(null, value);
assertNull(config.getServiceName());
- assertEquals("wsdl/hello_world.wsdl", config.getWsdlURL());
+ assertEquals("wsdl/hello_world.wsdl", config.getWsdlURL());
}
-
+
@Test
public void testFullValue() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}SOAPService@file:/wsdl/hello_world.wsdl";
@@ -86,7 +86,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals("file:/wsdl/hello_world.wsdl", config.getWsdlURL());
assertEquals(result, config.getServiceName());
}
-
+
@Test
public void testGetServiceClassName() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}Greeter@file:";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
index 47cd9f8..d87eaff 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
@@ -20,4 +20,4 @@ package org.apache.cxf.jca.servant;
public interface Greeter extends java.rmi.Remote {
String sayHi() throws java.rmi.RemoteException;
-}
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
index 931f2a5..0d2b127 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
@@ -21,7 +21,7 @@ package org.apache.cxf.jca.servant;
import java.rmi.RemoteException;
-public class GreeterImpl implements Greeter {
+public class GreeterImpl implements Greeter {
private boolean sayHiCalled;
public GreeterImpl() {
@@ -37,5 +37,5 @@ public class GreeterImpl implements Greeter {
public String sayHi() throws RemoteException {
sayHiCalled = true;
return "hi";
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
index 974d9d2..7a8e828 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
@@ -47,16 +47,16 @@ public class ThreadContextCheckerHome implements EJBHome {
current, cl);
return ejb;
}
-
+
// default impemenations
public void remove(Handle handle) throws RemoteException, RemoveException {
// do nothing here
}
-
+
public void remove(Object primaryKey) throws RemoteException, RemoveException {
// do nothing here
}
-
+
public EJBMetaData getEJBMetaData() throws RemoteException {
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
index 22d0b74..d6eda2e 100644
--- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
+++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
@@ -75,21 +75,21 @@ public class CxfAutoConfiguration {
protected static class SpringBusConfiguration {
}
-
+
@Configuration
@ConditionalOnClass(JAXRSServerFactoryBean.class)
@ConditionalOnExpression("'${cxf.jaxrs.component-scan}'=='true' && '${cxf.jaxrs.classes-scan}'!='true'")
@Import(SpringComponentScanServer.class)
protected static class JaxRsComponentConfiguration {
-
+
}
-
+
@Configuration
@ConditionalOnClass(JAXRSServerFactoryBean.class)
@ConditionalOnExpression("'${cxf.jaxrs.classes-scan}'=='true' && '${cxf.jaxrs.component-scan}'!='true'")
@Import(SpringJaxrsClassesScanServer.class)
protected static class JaxRsClassesConfiguration {
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
index 1780f56..dc1ec08 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
@@ -27,16 +27,16 @@ import com.github.kristofa.brave.Brave;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
-public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
+public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
implements PhaseInterceptor<Message> {
-
+
private String phase;
protected AbstractBraveClientInterceptor(final String phase, final Brave brave) {
super(brave);
this.phase = phase;
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
@@ -56,7 +56,7 @@ public abstract class AbstractBraveClientInterceptor extends AbstractBraveClient
public String getPhase() {
return phase;
}
-
+
public void handleFault(Message message) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index e396cda..22ddc60 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -36,50 +36,50 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.tracing.AbstractTracingProvider;
-public abstract class AbstractBraveClientProvider extends AbstractTracingProvider {
+public abstract class AbstractBraveClientProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractBraveClientProvider.class);
protected static final String TRACE_SPAN = "org.apache.cxf.tracing.client.brave.span";
-
+
private final Brave brave;
private final SpanNameProvider spanNameProvider;
-
+
public AbstractBraveClientProvider(final Brave brave) {
this.brave = brave;
this.spanNameProvider = new ClientSpanNameProvider();
}
- protected TraceScopeHolder<Span> startTraceSpan(final Map<String, List<String>> requestHeaders,
+ protected TraceScopeHolder<Span> startTraceSpan(final Map<String, List<String>> requestHeaders,
URI uri, String method) {
final HttpClientRequest request = new HttpClientRequest() {
@Override
public URI getUri() {
return uri;
}
-
+
@Override
public String getHttpMethod() {
return method;
}
-
+
@Override
public void addHeader(String header, String value) {
requestHeaders.put(header, Collections.singletonList(value));
}
};
-
+
brave.clientRequestInterceptor().handle(new HttpClientRequestAdapter(request, spanNameProvider));
final Span span = brave.clientSpanThreadBinder().getCurrentClientSpan();
- // In case of asynchronous client invocation, the span should be detached as JAX-RS
+ // In case of asynchronous client invocation, the span should be detached as JAX-RS
// client request / response filters are going to be executed in different threads.
boolean detached = false;
if (isAsyncInvocation() && span != null) {
brave.clientSpanThreadBinder().setCurrentSpan(null);
detached = true;
}
-
+
return new TraceScopeHolder<Span>(span, detached);
}
-
+
private boolean isAsyncInvocation() {
return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous();
}
@@ -88,15 +88,15 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
if (holder == null) {
return;
}
-
+
final Span span = holder.getScope();
if (span != null) {
- // If the client invocation was asynchronous , the trace span has been created
+ // If the client invocation was asynchronous , the trace span has been created
// in another thread and should be re-attached to the current one.
if (holder.isDetached()) {
brave.clientSpanThreadBinder().setCurrentSpan(span);
}
-
+
final HttpResponse response = () -> responseStatus;
brave.clientResponseInterceptor().handle(new HttpClientResponseAdapter(response));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
index 001fc8e..79184d9 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -38,14 +38,14 @@ import org.apache.cxf.phase.PhaseInterceptor;
public abstract class AbstractBraveInterceptor extends AbstractBraveProvider implements PhaseInterceptor<Message> {
private final String phase;
-
+
protected static class ParsedMessage {
private Message message;
ParsedMessage(Message message) {
this.message = message;
}
-
+
String safeGet(String key) {
if (!message.containsKey(key)) {
return null;
@@ -53,7 +53,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
Object value = message.get(key);
return (value instanceof String) ? value.toString() : null;
}
-
+
private String getUriSt() {
String uri = safeGet(Message.REQUEST_URL);
if (uri == null) {
@@ -77,7 +77,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
return uri;
}
}
-
+
URI getUri() {
try {
String uriSt = getUriSt();
@@ -86,7 +86,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
throw new RuntimeException(e.getMessage(), e);
}
}
-
+
Message getEffectiveMessage() {
boolean isRequestor = MessageUtils.isRequestor(message);
boolean isOutbound = MessageUtils.isOutbound(message);
@@ -96,7 +96,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
return isOutbound ? message.getExchange().getInMessage() : message;
}
}
-
+
Map<String, List<String>> getHeaders() {
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
@@ -106,7 +106,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
return headers;
}
-
+
void addHeader(String key, String value) {
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers == null) {
@@ -126,7 +126,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
super(brave, spanNameProvider);
this.phase = phase;
}
-
+
@Override
public Set<String> getAfter() {
return Collections.emptySet();
@@ -146,12 +146,12 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
public String getPhase() {
return phase;
}
-
+
@Override
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
-
+
@Override
public void handleFault(Message message) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
index 3a656eb..c9e4029 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
@@ -37,17 +37,17 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.tracing.AbstractTracingProvider;
-public abstract class AbstractBraveProvider extends AbstractTracingProvider {
+public abstract class AbstractBraveProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractBraveProvider.class);
protected static final String TRACE_SPAN = "org.apache.cxf.tracing.brave.span";
-
+
protected final Brave brave;
protected final SpanNameProvider spanNameProvider;
-
+
protected AbstractBraveProvider(final Brave brave) {
this(brave, new ServerSpanNameProvider());
}
-
+
protected AbstractBraveProvider(final Brave brave, final SpanNameProvider spanNameProvider) {
this.brave = brave;
this.spanNameProvider = spanNameProvider;
@@ -61,27 +61,27 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
public URI getUri() {
return uri;
}
-
+
@Override
public String getHttpMethod() {
return method;
}
-
+
@Override
public String getHttpHeaderValue(String headerName) {
List<String> value = requestHeaders.get(headerName);
-
+
if (value != null && !value.isEmpty()) {
return value.get(0);
}
-
+
return null;
}
};
-
+
brave.serverRequestInterceptor().handle(new HttpServerRequestAdapter(request, spanNameProvider));
final ServerSpan serverSpan = brave.serverSpanThreadBinder().getCurrentServerSpan();
-
+
// If the service resource is using asynchronous processing mode, the trace
// scope will be closed in another thread and as such should be detached.
boolean detached = false;
@@ -90,10 +90,10 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
propagateContinuationSpan(serverSpan);
detached = true;
}
-
+
return new TraceScopeHolder<ServerSpan>(serverSpan, detached);
}
-
+
private void transferRequestHeader(final Map<String, List<String>> requestHeaders,
final Map<String, List<Object>> responseHeaders, final BraveHttpHeaders header) {
if (requestHeaders.containsKey(header.getName())) {
@@ -111,29 +111,29 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
transferRequestHeader(requestHeaders, responseHeaders, BraveHttpHeaders.Sampled);
transferRequestHeader(requestHeaders, responseHeaders, BraveHttpHeaders.ParentSpanId);
transferRequestHeader(requestHeaders, responseHeaders, BraveHttpHeaders.TraceId);
-
+
if (holder == null) {
return;
}
-
+
final ServerSpan span = holder.getScope();
if (span != null) {
// If the service resource is using asynchronous processing mode, the trace
- // scope has been created in another thread and should be re-attached to the current
+ // scope has been created in another thread and should be re-attached to the current
// one.
if (holder.isDetached()) {
brave.serverSpanThreadBinder().setCurrentSpan(span);
- }
-
+ }
+
final HttpResponse response = () -> responseStatus;
brave.serverResponseInterceptor().handle(new HttpServerResponseAdapter(response));
}
}
-
+
private void propagateContinuationSpan(final ServerSpan continuationScope) {
PhaseInterceptorChain.getCurrentMessage().put(ServerSpan.class, continuationScope);
}
-
+
protected boolean isAsyncResponse() {
return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
index d6775e9..0eb23ad 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
@@ -38,13 +38,13 @@ public class BraveClientStartInterceptor extends AbstractBraveClientInterceptor
@Override
public void handleMessage(Message message) throws Fault {
final ParsedMessage parsed = new ParsedMessage(message);
-
- final TraceScopeHolder<Span> holder = super.startTraceSpan(parsed.getHeaders(),
+
+ final TraceScopeHolder<Span> holder = super.startTraceSpan(parsed.getHeaders(),
parsed.getUri(), parsed.getHttpMethod());
-
+
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
index 583227c..dd6162d 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
@@ -29,7 +29,7 @@ public class BraveClientStopInterceptor extends AbstractBraveClientInterceptor {
public BraveClientStopInterceptor(final Brave brave) {
this(Phase.RECEIVE, brave);
}
-
+
public BraveClientStopInterceptor(final String phase, final Brave brave) {
super(phase, brave);
}
@@ -37,14 +37,14 @@ public class BraveClientStopInterceptor extends AbstractBraveClientInterceptor {
@Override
public void handleMessage(Message message) throws Fault {
@SuppressWarnings("unchecked")
- final TraceScopeHolder<Span> holder =
+ final TraceScopeHolder<Span> holder =
(TraceScopeHolder<Span>)message.getExchange().get(TRACE_SPAN);
-
+
Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
if (responseCode == null) {
responseCode = 200;
}
-
+
super.stopTraceSpan(holder, responseCode);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
index 08702b5..8489ef9 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -39,7 +39,7 @@ public class BraveFeature extends AbstractFeature {
public BraveFeature() {
this("cxf-svc-" + UUID.randomUUID().toString());
}
-
+
public BraveFeature(final String name) {
this(new Brave.Builder(name).build());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
index 466482e..be58bb8 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
@@ -33,12 +33,12 @@ public class BraveStartInterceptor extends AbstractBraveInterceptor {
}
@Override
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) throws Fault {
final ParsedMessage parsed = new ParsedMessage(message);
-
- final TraceScopeHolder<ServerSpan> holder = super.startTraceSpan(parsed.getHeaders(),
+
+ final TraceScopeHolder<ServerSpan> holder = super.startTraceSpan(parsed.getHeaders(),
parsed.getUri(), parsed.getHttpMethod());
-
+
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
index 616af9f..bd89f09 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
@NoJSR250Annotations
public class BraveStopInterceptor extends AbstractBraveInterceptor {
@@ -44,27 +44,27 @@ public class BraveStopInterceptor extends AbstractBraveInterceptor {
@Override
public void handleMessage(Message message) throws Fault {
Map<String, List<Object>> responseHeaders = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
-
+
if (responseHeaders == null) {
responseHeaders = new HashMap<String, List<Object>>();
message.put(Message.PROTOCOL_HEADERS, responseHeaders);
}
-
+
boolean isRequestor = MessageUtils.isRequestor(message);
- Message requestMessage = isRequestor ? message.getExchange().getOutMessage()
+ Message requestMessage = isRequestor ? message.getExchange().getOutMessage()
: message.getExchange().getInMessage();
- Map<String, List<String>> requestHeaders =
+ Map<String, List<String>> requestHeaders =
CastUtils.cast((Map<?, ?>)requestMessage.get(Message.PROTOCOL_HEADERS));
-
+
@SuppressWarnings("unchecked")
- final TraceScopeHolder<ServerSpan> holder =
+ final TraceScopeHolder<ServerSpan> holder =
(TraceScopeHolder<ServerSpan>)message.getExchange().get(TRACE_SPAN);
-
+
Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
if (responseCode == null) {
- responseCode = 200;
+ responseCode = 200;
}
-
+
super.stopTraceSpan(requestHeaders, responseHeaders, responseCode, holder);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
index 044495f..79a167c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
@@ -33,26 +33,26 @@ public class BraveTracerContext implements TracerContext {
private final Brave brave;
private final ServerSpan continuationSpan;
private final ServerSpanThreadBinder serverSpanThreadBinder;
-
+
public BraveTracerContext(final Brave brave) {
this(brave, null);
}
-
+
public BraveTracerContext(final Brave brave, final ServerSpan continuationSpan) {
this.brave = brave;
this.continuationSpan = continuationSpan;
this.serverSpanThreadBinder = brave.serverSpanThreadBinder();
}
-
+
@Override
@SuppressWarnings("unchecked")
public TraceScope startSpan(final String description) {
- return new TraceScope(brave,
+ return new TraceScope(brave,
brave
.localTracer()
.startNewSpan(Constants.LOCAL_COMPONENT, description));
}
-
+
@Override
public <T> T continueSpan(final Traceable<T> traceable) throws Exception {
boolean attached = false;
@@ -60,7 +60,7 @@ public class BraveTracerContext implements TracerContext {
serverSpanThreadBinder.setCurrentSpan(continuationSpan);
attached = true;
}
-
+
try {
return traceable.call(new BraveTracerContext(brave));
} finally {
@@ -69,7 +69,7 @@ public class BraveTracerContext implements TracerContext {
}
}
}
-
+
@Override
public <T> Callable<T> wrap(final String description, final Traceable<T> traceable) {
final Callable<T> callable = new Callable<T>() {
@@ -78,7 +78,7 @@ public class BraveTracerContext implements TracerContext {
return traceable.call(new BraveTracerContext(brave));
}
};
-
+
return () -> {
try {
startSpan(description);
@@ -88,7 +88,7 @@ public class BraveTracerContext implements TracerContext {
}
};
}
-
+
@Override
public void annotate(String key, String value) {
if (brave.localSpanThreadBinder().getCurrentLocalSpan() != null) {
@@ -97,7 +97,7 @@ public class BraveTracerContext implements TracerContext {
brave.serverTracer().submitBinaryAnnotation(key, value);
}
}
-
+
@Override
public void timeline(String message) {
if (brave.localSpanThreadBinder().getCurrentLocalSpan() != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
index f0927f2..ade423c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
@@ -28,7 +28,7 @@ public class ClientSpanNameProvider implements SpanNameProvider {
public String spanName(HttpRequest request) {
return buildSpanDescription(request.getUri().toString(), request.getHttpMethod());
}
-
+
private String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
index 73a665e..5be81c1 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
@@ -28,7 +28,7 @@ public class ServerSpanNameProvider implements SpanNameProvider {
public String spanName(HttpRequest request) {
return buildSpanDescription(request.getUri().getPath(), request.getHttpMethod());
}
-
+
private String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
index 32f0f59..144824f 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
@@ -27,15 +27,15 @@ import com.twitter.zipkin.gen.Span;
public class TraceScope implements Closeable {
final Brave brave;
final SpanId spanId;
-
+
TraceScope(final Brave brave, final SpanId spanId) {
this.brave = brave;
this.spanId = spanId;
}
-
+
@Override
public void close() {
- final Span span = brave.localSpanThreadBinder().getCurrentLocalSpan();
+ final Span span = brave.localSpanThreadBinder().getCurrentLocalSpan();
if (span != null && span.getTrace_id() == spanId.traceId && span.getId() == spanId.spanId) {
brave.localTracer().finishSpan();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
index 1d384ec..23b149c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
@@ -32,28 +32,28 @@ import com.twitter.zipkin.gen.Span;
import org.apache.cxf.tracing.brave.AbstractBraveClientProvider;
@Provider
-public class BraveClientProvider extends AbstractBraveClientProvider
+public class BraveClientProvider extends AbstractBraveClientProvider
implements ClientRequestFilter, ClientResponseFilter {
-
+
public BraveClientProvider(final Brave brave) {
super(brave);
}
@Override
public void filter(final ClientRequestContext requestContext) throws IOException {
- final TraceScopeHolder<Span> holder = super.startTraceSpan(requestContext.getStringHeaders(),
+ final TraceScopeHolder<Span> holder = super.startTraceSpan(requestContext.getStringHeaders(),
requestContext.getUri(), requestContext.getMethod());
if (holder != null) {
requestContext.setProperty(TRACE_SPAN, holder);
}
}
-
+
@SuppressWarnings("unchecked")
@Override
public void filter(final ClientRequestContext requestContext,
final ClientResponseContext responseContext) throws IOException {
- final TraceScopeHolder<Span> holder =
+ final TraceScopeHolder<Span> holder =
(TraceScopeHolder<Span>)requestContext.getProperty(TRACE_SPAN);
super.stopTraceSpan(holder, responseContext.getStatus());
}