You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/17 09:53:05 UTC
svn commit: r1611274 [4/15] - in /tomee/tomee/branches/tomee-1.7.x/server:
./ openejb-activemq/
openejb-activemq/src/main/java/org/apache/openejb/server/activemq/
openejb-axis/ openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/src...
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java Thu Jul 17 07:52:58 2014
@@ -27,19 +27,19 @@ import java.util.Iterator;
public class GenericServiceEndpointWrapper implements Stub {
private final GenericServiceEndpoint genericServiceEndpoint;
- public GenericServiceEndpointWrapper(GenericServiceEndpoint genericServiceEndpoint) {
+ public GenericServiceEndpointWrapper(final GenericServiceEndpoint genericServiceEndpoint) {
this.genericServiceEndpoint = genericServiceEndpoint;
}
- public void _setProperty(String s, Object o) {
+ public void _setProperty(final String s, final Object o) {
genericServiceEndpoint._setProperty(s, o);
}
- public Object _getProperty(String s) {
+ public Object _getProperty(final String s) {
return genericServiceEndpoint._getProperty(s);
}
- public Object removeProperty(String s) {
+ public Object removeProperty(final String s) {
return genericServiceEndpoint.removeProperty(s);
}
@@ -47,7 +47,7 @@ public class GenericServiceEndpointWrapp
return genericServiceEndpoint._getPropertyNames();
}
- public void setUsername(String s) {
+ public void setUsername(final String s) {
genericServiceEndpoint.setUsername(s);
}
@@ -55,7 +55,7 @@ public class GenericServiceEndpointWrapp
return genericServiceEndpoint.getUsername();
}
- public void setPassword(String s) {
+ public void setPassword(final String s) {
genericServiceEndpoint.setPassword(s);
}
@@ -67,7 +67,7 @@ public class GenericServiceEndpointWrapp
return genericServiceEndpoint.getTimeout();
}
- public void setTimeout(int i) {
+ public void setTimeout(final int i) {
genericServiceEndpoint.setTimeout(i);
}
@@ -75,39 +75,39 @@ public class GenericServiceEndpointWrapp
return genericServiceEndpoint.getPortName();
}
- public void setPortName(QName qName) {
+ public void setPortName(final QName qName) {
genericServiceEndpoint.setPortName(qName);
}
- public void setPortName(String s) {
+ public void setPortName(final String s) {
genericServiceEndpoint.setPortName(s);
}
- public void setMaintainSession(boolean b) {
+ public void setMaintainSession(final boolean b) {
genericServiceEndpoint.setMaintainSession(b);
}
- public void setHeader(String s, String s1, Object o) {
+ public void setHeader(final String s, final String s1, final Object o) {
genericServiceEndpoint.setHeader(s, s1, o);
}
- public void setHeader(SOAPHeaderElement soapHeaderElement) {
+ public void setHeader(final SOAPHeaderElement soapHeaderElement) {
genericServiceEndpoint.setHeader(soapHeaderElement);
}
- public void extractAttachments(Call call) {
+ public void extractAttachments(final Call call) {
genericServiceEndpoint.extractAttachments(call);
}
- public void addAttachment(Object o) {
+ public void addAttachment(final Object o) {
genericServiceEndpoint.addAttachment(o);
}
- public SOAPHeaderElement getHeader(String s, String s1) {
+ public SOAPHeaderElement getHeader(final String s, final String s1) {
return genericServiceEndpoint.getHeader(s, s1);
}
- public SOAPHeaderElement getResponseHeader(String s, String s1) {
+ public SOAPHeaderElement getResponseHeader(final String s, final String s1) {
return genericServiceEndpoint.getResponseHeader(s, s1);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java Thu Jul 17 07:52:58 2014
@@ -24,11 +24,11 @@ import java.lang.reflect.Modifier;
public class NoOverrideCallbackFilter implements CallbackFilter {
private Class superClass;
- public NoOverrideCallbackFilter(Class superClass) {
+ public NoOverrideCallbackFilter(final Class superClass) {
this.superClass = superClass;
}
- public int accept(Method method) {
+ public int accept(final Method method) {
// we don't intercept non-public methods like finalize
if (!Modifier.isPublic(method.getModifiers())) {
return 0;
@@ -42,12 +42,12 @@ public class NoOverrideCallbackFilter im
// if the super class defined this method don't intercept
superClass.getMethod(method.getName(), method.getParameterTypes());
return 0;
- } catch (Throwable e) {
+ } catch (final Throwable e) {
return 1;
}
}
- public boolean equals(Object other) {
+ public boolean equals(final Object other) {
if (other == null) {
return false;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/OperationInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/OperationInfo.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/OperationInfo.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/OperationInfo.java Thu Jul 17 07:52:58 2014
@@ -34,7 +34,7 @@ public class OperationInfo {
private final String methodName;
private final String methodDesc;
- public OperationInfo(OperationDesc operationDesc, boolean useSOAPAction, String soapActionURI, SOAPConstants soapVersion, QName operationName, String methodName, String methodDesc) {
+ public OperationInfo(final OperationDesc operationDesc, final boolean useSOAPAction, final String soapActionURI, final SOAPConstants soapVersion, final QName operationName, final String methodName, final String methodDesc) {
this.operationDesc = operationDesc;
this.useSOAPAction = useSOAPAction;
this.soapActionURI = soapActionURI;
@@ -68,7 +68,7 @@ public class OperationInfo {
return operationName;
}
- public void prepareCall(Call call) {
+ public void prepareCall(final Call call) {
call.setOperation(operationDesc);
call.setUseSOAPAction(useSOAPAction);
call.setSOAPActionURI(soapActionURI);
@@ -79,9 +79,9 @@ public class OperationInfo {
call.setOperationUse(operationDesc.getUse());
}
- public Throwable unwrapFault(RemoteException re) {
+ public Throwable unwrapFault(final RemoteException re) {
if (re instanceof AxisFault && re.getCause() != null) {
- Throwable t = re.getCause();
+ final Throwable t = re.getCause();
if (operationDesc.getFaultByClass(t.getClass()) != null) {
return t;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactory.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactory.java Thu Jul 17 07:52:58 2014
@@ -35,5 +35,5 @@ public interface SeiFactory {
QName getServiceName();
- URL getWSDLDocumentLocation();
+ URL getWSDLDocumentLocation();
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactoryImpl.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactoryImpl.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/SeiFactoryImpl.java Thu Jul 17 07:52:58 2014
@@ -63,14 +63,14 @@ public class SeiFactoryImpl implements S
private OperationInfo[] sortedOperationInfos;
private Class serviceEndpointClass;
- public SeiFactoryImpl(QName serviceName,
- String portName,
- String serviceEndpointClassName,
- OperationInfo[] operationInfos,
- List typeInfo,
- URL location,
- List handlerInfos,
- String credentialsName) {
+ public SeiFactoryImpl(final QName serviceName,
+ final String portName,
+ final String serviceEndpointClassName,
+ final OperationInfo[] operationInfos,
+ final List typeInfo,
+ final URL location,
+ final List handlerInfos,
+ final String credentialsName) {
this.serviceName = serviceName;
this.portQName = new QName("", portName);
this.serviceEndpointClassName = serviceEndpointClassName;
@@ -81,45 +81,45 @@ public class SeiFactoryImpl implements S
this.credentialsName = credentialsName;
}
- void initialize(Object serviceImpl, ClassLoader classLoader) throws ClassNotFoundException {
+ void initialize(final Object serviceImpl, final ClassLoader classLoader) throws ClassNotFoundException {
this.serviceImpl = serviceImpl;
- Class serviceEndpointBaseClass = classLoader.loadClass(serviceEndpointClassName);
+ final Class serviceEndpointBaseClass = classLoader.loadClass(serviceEndpointClassName);
serviceEndpointClass = enhanceServiceEndpointInterface(serviceEndpointBaseClass, classLoader);
- Class[] constructorTypes = new Class[]{classLoader.loadClass(GenericServiceEndpoint.class.getName())};
+ final Class[] constructorTypes = new Class[]{classLoader.loadClass(GenericServiceEndpoint.class.getName())};
this.constructor = FastClass.create(serviceEndpointClass).getConstructor(constructorTypes);
this.handlerInfoChainFactory = new HandlerInfoChainFactory(handlerInfos);
sortedOperationInfos = new OperationInfo[FastClass.create(serviceEndpointClass).getMaxIndex() + 1];
String encodingStyle = "";
for (int i = 0; i < operationInfos.length; i++) {
- OperationInfo operationInfo = operationInfos[i];
- Signature signature = operationInfo.getSignature();
- MethodProxy methodProxy = MethodProxy.find(serviceEndpointClass, signature);
+ final OperationInfo operationInfo = operationInfos[i];
+ final Signature signature = operationInfo.getSignature();
+ final MethodProxy methodProxy = MethodProxy.find(serviceEndpointClass, signature);
if (methodProxy == null) {
throw new ServerRuntimeException("No method proxy for operationInfo " + signature);
}
- int index = methodProxy.getSuperIndex();
+ final int index = methodProxy.getSuperIndex();
sortedOperationInfos[index] = operationInfo;
if (operationInfo.getOperationDesc().getUse() == Use.ENCODED) {
encodingStyle = org.apache.axis.Constants.URI_SOAP11_ENC;
}
}
//register our type descriptors
- Service service = ((ServiceImpl) serviceImpl).getService();
- AxisEngine axisEngine = service.getEngine();
- TypeMappingRegistry typeMappingRegistry = axisEngine.getTypeMappingRegistry();
- TypeMapping typeMapping = typeMappingRegistry.getOrMakeTypeMapping(encodingStyle);
+ final Service service = ((ServiceImpl) serviceImpl).getService();
+ final AxisEngine axisEngine = service.getEngine();
+ final TypeMappingRegistry typeMappingRegistry = axisEngine.getTypeMappingRegistry();
+ final TypeMapping typeMapping = typeMappingRegistry.getOrMakeTypeMapping(encodingStyle);
typeMapping.register(BigInteger.class, Constants.XSD_UNSIGNEDLONG, new SimpleSerializerFactory(BigInteger.class, Constants.XSD_UNSIGNEDLONG), new SimpleDeserializerFactory(BigInteger.class, Constants.XSD_UNSIGNEDLONG));
typeMapping.register(URI.class, Constants.XSD_ANYURI, new SimpleSerializerFactory(URI.class, Constants.XSD_ANYURI), new SimpleDeserializerFactory(URI.class, Constants.XSD_ANYURI));
//It is essential that the types be registered before the typeInfos create the serializer/deserializers.
- for (Iterator iter = typeInfo.iterator(); iter.hasNext();) {
- TypeInfo info = (TypeInfo) iter.next();
+ for (final Iterator iter = typeInfo.iterator(); iter.hasNext(); ) {
+ final TypeInfo info = (TypeInfo) iter.next();
TypeDesc.registerTypeDescForClass(info.getClazz(), info.buildTypeDesc());
}
TypeInfo.register(typeInfo, typeMapping);
}
- private Class enhanceServiceEndpointInterface(Class serviceEndpointInterface, ClassLoader classLoader) {
- Enhancer enhancer = new Enhancer();
+ private Class enhanceServiceEndpointInterface(final Class serviceEndpointInterface, final ClassLoader classLoader) {
+ final Enhancer enhancer = new Enhancer();
enhancer.setClassLoader(classLoader);
enhancer.setSuperclass(GenericServiceEndpointWrapper.class);
enhancer.setInterfaces(new Class[]{serviceEndpointInterface});
@@ -139,14 +139,14 @@ public class SeiFactoryImpl implements S
// initialized = true;
// }
// }
- Service service = ((ServiceImpl) serviceImpl).getService();
- GenericServiceEndpoint serviceEndpoint = new GenericServiceEndpoint(portQName, service, location);
- Callback callback = new ServiceEndpointMethodInterceptor(serviceEndpoint, sortedOperationInfos, credentialsName);
- Callback[] callbacks = new Callback[]{NoOp.INSTANCE, callback};
+ final Service service = ((ServiceImpl) serviceImpl).getService();
+ final GenericServiceEndpoint serviceEndpoint = new GenericServiceEndpoint(portQName, service, location);
+ final Callback callback = new ServiceEndpointMethodInterceptor(serviceEndpoint, sortedOperationInfos, credentialsName);
+ final Callback[] callbacks = new Callback[]{NoOp.INSTANCE, callback};
Enhancer.registerCallbacks(serviceEndpointClass, callbacks);
try {
return (Remote) constructor.newInstance(new Object[]{serviceEndpoint});
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
throw (ServiceException) new ServiceException("Could not construct service instance", e.getTargetException()).initCause(e);
}
}
@@ -176,7 +176,7 @@ public class SeiFactoryImpl implements S
public URL getWSDLDocumentLocation() {
try {
return new URL(location.toExternalForm() + "?wsdl");
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
return null;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java Thu Jul 17 07:52:58 2014
@@ -37,14 +37,14 @@ public class ServiceEndpointMethodInterc
private final OperationInfo[] operations;
private final String credentialsName;
- public ServiceEndpointMethodInterceptor(GenericServiceEndpoint stub, OperationInfo[] operations, String credentialsName) {
+ public ServiceEndpointMethodInterceptor(final GenericServiceEndpoint stub, final OperationInfo[] operations, final String credentialsName) {
this.stub = stub;
this.operations = operations;
this.credentialsName = credentialsName;
}
- public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
- SaajUniverse universe = new SaajUniverse();
+ public Object intercept(final Object o, final Method method, final Object[] objects, final MethodProxy methodProxy) throws Throwable {
+ final SaajUniverse universe = new SaajUniverse();
universe.set(SaajUniverse.AXIS1);
try {
return doIntercept(method, objects, methodProxy);
@@ -53,15 +53,15 @@ public class ServiceEndpointMethodInterc
}
}
- private Object doIntercept(Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
- int index = methodProxy.getSuperIndex();
- OperationInfo operationInfo = operations[index];
+ private Object doIntercept(final Method method, final Object[] objects, final MethodProxy methodProxy) throws Throwable {
+ final int index = methodProxy.getSuperIndex();
+ final OperationInfo operationInfo = operations[index];
if (operationInfo == null) {
throw new ServerRuntimeException("Operation not mapped: " + method.getName() + " index: " + index + "\n OperationInfos: " + Arrays.asList(operations));
}
stub.checkCachedEndpoint();
- Call call = stub.createCall();
+ final Call call = stub.createCall();
operationInfo.prepareCall(call);
@@ -89,12 +89,12 @@ public class ServiceEndpointMethodInterc
// }
}
Object response = null;
- List parameterDescs = operationInfo.getOperationDesc().getParameters();
- Object[] unwrapped = extractFromHolders(objects, parameterDescs, operationInfo.getOperationDesc().getNumInParams());
+ final List parameterDescs = operationInfo.getOperationDesc().getParameters();
+ final Object[] unwrapped = extractFromHolders(objects, parameterDescs, operationInfo.getOperationDesc().getNumInParams());
if (operationInfo.getOperationDesc().getMep() == OperationType.REQUEST_RESPONSE) {
try {
response = call.invoke(unwrapped);
- } catch (RemoteException e) {
+ } catch (final RemoteException e) {
throw operationInfo.unwrapFault(e);
}
@@ -102,9 +102,9 @@ public class ServiceEndpointMethodInterc
throw operationInfo.unwrapFault((RemoteException) response);
} else {
stub.extractAttachments(call);
- Map outputParameters = call.getOutputParams();
+ final Map outputParameters = call.getOutputParams();
putInHolders(outputParameters, objects, parameterDescs);
- Class returnType = operationInfo.getOperationDesc().getReturnClass();
+ final Class returnType = operationInfo.getOperationDesc().getReturnClass();
//return type should never be null... but we are not objecting if wsdl-return-value-mapping is not set.
if (response == null || returnType == null || returnType.isAssignableFrom(response.getClass())) {
return response;
@@ -121,15 +121,15 @@ public class ServiceEndpointMethodInterc
}
}
- private Object[] extractFromHolders(Object[] objects, List parameterDescs, int inParameterCount) throws JavaUtils.HolderException {
+ private Object[] extractFromHolders(final Object[] objects, final List parameterDescs, final int inParameterCount) throws JavaUtils.HolderException {
if (objects.length != parameterDescs.size()) {
throw new IllegalArgumentException("Mismatch parameter count: expected: " + parameterDescs.size() + ", actual: " + objects.length);
}
- Object[] unwrapped = new Object[inParameterCount];
+ final Object[] unwrapped = new Object[inParameterCount];
int j = 0;
for (int i = 0; objects != null && i < objects.length; i++) {
- Object parameter = objects[i];
- ParameterDesc parameterDesc = (ParameterDesc) parameterDescs.get(i);
+ final Object parameter = objects[i];
+ final ParameterDesc parameterDesc = (ParameterDesc) parameterDescs.get(i);
if (parameterDesc.getMode() == ParameterDesc.INOUT) {
unwrapped[j++] = JavaUtils.getHolderValue(parameter);
@@ -140,10 +140,10 @@ public class ServiceEndpointMethodInterc
return unwrapped;
}
- private void putInHolders(Map outputParameters, Object[] objects, List parameterDescs) throws JavaUtils.HolderException {
+ private void putInHolders(final Map outputParameters, final Object[] objects, final List parameterDescs) throws JavaUtils.HolderException {
for (int i = 0; i < objects.length; i++) {
- Object parameter = objects[i];
- ParameterDesc parameterDesc = (ParameterDesc) parameterDescs.get(i);
+ final Object parameter = objects[i];
+ final ParameterDesc parameterDesc = (ParameterDesc) parameterDescs.get(i);
if ((parameterDesc.getMode() == ParameterDesc.INOUT) || (parameterDesc.getMode() == ParameterDesc.OUT)) {
Object returned = outputParameters.get(parameterDesc.getQName());
if (returned instanceof Holder) {
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceImpl.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceImpl.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceImpl.java Thu Jul 17 07:52:58 2014
@@ -32,66 +32,66 @@ import java.rmi.Remote;
import java.util.Iterator;
import java.util.Map;
-public class ServiceImpl implements javax.xml.rpc.Service{
+public class ServiceImpl implements javax.xml.rpc.Service {
private final Service delegate;
private final Map seiClassNameToFactoryMap;
private final Map portToImplementationMap;
- public ServiceImpl(Map portToImplementationMap, Map seiClassNameToFactoryMap) {
+ public ServiceImpl(final Map portToImplementationMap, final Map seiClassNameToFactoryMap) {
this.portToImplementationMap = portToImplementationMap;
this.seiClassNameToFactoryMap = seiClassNameToFactoryMap;
- TypeMappingRegistryImpl typeMappingRegistry = new TypeMappingRegistryImpl();
+ final TypeMappingRegistryImpl typeMappingRegistry = new TypeMappingRegistryImpl();
typeMappingRegistry.doRegisterFromVersion("1.3");
- SimpleProvider engineConfiguration = new SimpleProvider(typeMappingRegistry);
+ final SimpleProvider engineConfiguration = new SimpleProvider(typeMappingRegistry);
engineConfiguration.deployTransport("http", new SimpleTargetedChain(new HTTPSender()));
- AxisClientImpl engine = new AxisClientImpl(engineConfiguration, this.portToImplementationMap);
+ final AxisClientImpl engine = new AxisClientImpl(engineConfiguration, this.portToImplementationMap);
delegate = new Service(engineConfiguration, engine);
}
- public Remote getPort(QName qName, Class portClass) throws ServiceException {
+ public Remote getPort(final QName qName, final Class portClass) throws ServiceException {
if (qName != null) {
- String portName = qName.getLocalPart();
- Remote port = internalGetPort(portName);
+ final String portName = qName.getLocalPart();
+ final Remote port = internalGetPort(portName);
return port;
}
return getPort(portClass);
}
- public Remote getPort(Class portClass) throws ServiceException {
- String fqcn = portClass.getName();
- Remote port = internalGetPortFromClassName(fqcn);
+ public Remote getPort(final Class portClass) throws ServiceException {
+ final String fqcn = portClass.getName();
+ final Remote port = internalGetPortFromClassName(fqcn);
return port;
}
- public Call[] getCalls(QName portName) throws ServiceException {
+ public Call[] getCalls(final QName portName) throws ServiceException {
if (portName == null) throw new ServiceException("Portname cannot be null");
- SeiFactory factory = (SeiFactory) portToImplementationMap.get(portName.getLocalPart());
+ final SeiFactory factory = (SeiFactory) portToImplementationMap.get(portName.getLocalPart());
if (factory == null) throw new ServiceException("No port for portname: " + portName);
- OperationInfo[] operationInfos = factory.getOperationInfos();
- javax.xml.rpc.Call[] array = new javax.xml.rpc.Call[operationInfos.length];
+ final OperationInfo[] operationInfos = factory.getOperationInfos();
+ final javax.xml.rpc.Call[] array = new javax.xml.rpc.Call[operationInfos.length];
for (int i = 0; i < operationInfos.length; i++) {
- OperationInfo operation = operationInfos[i];
+ final OperationInfo operation = operationInfos[i];
array[i] = delegate.createCall(factory.getPortQName(), operation.getOperationName());
}
return array;
}
- public Call createCall(QName qName) throws ServiceException {
+ public Call createCall(final QName qName) throws ServiceException {
return delegate.createCall(qName);
}
- public Call createCall(QName qName, QName qName1) throws ServiceException {
+ public Call createCall(final QName qName, final QName qName1) throws ServiceException {
return delegate.createCall(qName, qName1);
}
- public Call createCall(QName qName, String s) throws ServiceException {
+ public Call createCall(final QName qName, final String s) throws ServiceException {
return delegate.createCall(qName, s);
}
@@ -100,9 +100,9 @@ public class ServiceImpl implements java
}
public QName getServiceName() {
- Iterator iterator = portToImplementationMap.values().iterator();
+ final Iterator iterator = portToImplementationMap.values().iterator();
if (!iterator.hasNext()) return null;
- SeiFactory factory = (SeiFactory) iterator.next();
+ final SeiFactory factory = (SeiFactory) iterator.next();
return factory.getServiceName();
}
@@ -111,9 +111,9 @@ public class ServiceImpl implements java
}
public URL getWSDLDocumentLocation() {
- Iterator iterator = portToImplementationMap.values().iterator();
+ final Iterator iterator = portToImplementationMap.values().iterator();
if (!iterator.hasNext()) return null;
- SeiFactory factory = (SeiFactory) iterator.next();
+ final SeiFactory factory = (SeiFactory) iterator.next();
return factory.getWSDLDocumentLocation();
}
@@ -126,19 +126,19 @@ public class ServiceImpl implements java
throw new UnsupportedOperationException();
}
- Remote internalGetPort(String portName) throws ServiceException {
+ Remote internalGetPort(final String portName) throws ServiceException {
if (portToImplementationMap.containsKey(portName)) {
- SeiFactory seiFactory = (SeiFactory) portToImplementationMap.get(portName);
- Remote port = seiFactory.createServiceEndpoint();
+ final SeiFactory seiFactory = (SeiFactory) portToImplementationMap.get(portName);
+ final Remote port = seiFactory.createServiceEndpoint();
return port;
}
throw new ServiceException("No port for portname: " + portName);
}
- Remote internalGetPortFromClassName(String className) throws ServiceException {
+ Remote internalGetPortFromClassName(final String className) throws ServiceException {
if (seiClassNameToFactoryMap.containsKey(className)) {
- SeiFactory seiFactory = (SeiFactory) seiClassNameToFactoryMap.get(className);
- Remote port = seiFactory.createServiceEndpoint();
+ final SeiFactory seiFactory = (SeiFactory) seiClassNameToFactoryMap.get(className);
+ final Remote port = seiFactory.createServiceEndpoint();
return port;
}
throw new ServiceException("no port for class " + className);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java Thu Jul 17 07:52:58 2014
@@ -26,16 +26,16 @@ import java.util.Map;
public class ServiceMethodInterceptor implements MethodInterceptor {
private final Map seiFactoryMap;
- public ServiceMethodInterceptor(Map seiFactoryMap) {
+ public ServiceMethodInterceptor(final Map seiFactoryMap) {
this.seiFactoryMap = seiFactoryMap;
}
- public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
+ public Object intercept(final Object o, final Method method, final Object[] objects, final MethodProxy methodProxy) throws Throwable {
if (objects.length == 0) {
- String methodName = method.getName();
+ final String methodName = method.getName();
if (methodName.startsWith("get")) {
- String portName = methodName.substring(3);
- SeiFactory seiFactory = (SeiFactory) seiFactoryMap.get(portName);
+ final String portName = methodName.substring(3);
+ final SeiFactory seiFactory = (SeiFactory) seiFactoryMap.get(portName);
if (seiFactory != null) {
return seiFactory.createServiceEndpoint();
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/TypeInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/TypeInfo.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/TypeInfo.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/TypeInfo.java Thu Jul 17 07:52:58 2014
@@ -36,14 +36,14 @@ public class TypeInfo {
private final boolean canSearchParents;
private final FieldDesc[] fields;
- public static void register(List typeInfo, TypeMapping typeMapping) {
- for (Iterator iter = typeInfo.iterator(); iter.hasNext();) {
- TypeInfo info = (TypeInfo) iter.next();
+ public static void register(final List typeInfo, final TypeMapping typeMapping) {
+ for (final Iterator iter = typeInfo.iterator(); iter.hasNext(); ) {
+ final TypeInfo info = (TypeInfo) iter.next();
info.register(typeMapping);
}
}
- public TypeInfo(Class clazz, QName qName, Class serializerClass, Class deserializerClass, boolean canSearchParents, FieldDesc[] fields) {
+ public TypeInfo(final Class clazz, final QName qName, final Class serializerClass, final Class deserializerClass, final boolean canSearchParents, final FieldDesc[] fields) {
this.clazz = clazz;
this.qName = qName;
this.serFactoryClass = serializerClass;
@@ -77,15 +77,15 @@ public class TypeInfo {
}
public TypeDesc buildTypeDesc() {
- TypeDesc typeDesc = new TypeDesc(clazz, canSearchParents);
+ final TypeDesc typeDesc = new TypeDesc(clazz, canSearchParents);
typeDesc.setXmlType(qName);
typeDesc.setFields(fields);
return typeDesc;
}
- public void register(TypeMapping typeMapping) {
- SerializerFactory ser = BaseSerializerFactory.createFactory(serFactoryClass, clazz, qName);
- DeserializerFactory deser = BaseDeserializerFactory.createFactory(deserFactoryClass, clazz, qName);
+ public void register(final TypeMapping typeMapping) {
+ final SerializerFactory ser = BaseSerializerFactory.createFactory(serFactoryClass, clazz, qName);
+ final DeserializerFactory deser = BaseDeserializerFactory.createFactory(deserFactoryClass, clazz, qName);
typeMapping.register(clazz, qName, ser, deser);
}
@@ -113,27 +113,27 @@ public class TypeInfo {
return new TypeInfo(clazz, qName, serializerClass, deserializerClass, canSearchParents, fields);
}
- public void setClazz(Class clazz) {
+ public void setClazz(final Class clazz) {
this.clazz = clazz;
}
- public void setDeserializerClass(Class deserializerClass) {
+ public void setDeserializerClass(final Class deserializerClass) {
this.deserializerClass = deserializerClass;
}
- public void setFields(FieldDesc[] fields) {
+ public void setFields(final FieldDesc[] fields) {
this.fields = fields;
}
- public void setQName(QName name) {
+ public void setQName(final QName name) {
qName = name;
}
- public void setSerializerClass(Class serializerClass) {
+ public void setSerializerClass(final Class serializerClass) {
this.serializerClass = serializerClass;
}
- public void setCanSearchParents(boolean canSearchParents) {
+ public void setCanSearchParents(final boolean canSearchParents) {
this.canSearchParents = canSearchParents;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AbstractTestCase.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AbstractTestCase.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AbstractTestCase.java Thu Jul 17 07:52:58 2014
@@ -27,7 +27,7 @@ public abstract class AbstractTestCase e
protected String outDir = "target/generated/samples/";
protected String tempDir = "target/generated/temp";
- public AbstractTestCase(String testName) {
+ public AbstractTestCase(final String testName) {
super(testName);
testDir = new File(testDir).getAbsolutePath();
@@ -41,7 +41,7 @@ public abstract class AbstractTestCase e
*
* @param path Path to test input file.
*/
- public String getTestFile(String path) {
+ public String getTestFile(final String path) {
return new File(path).getAbsolutePath();
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisRequest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisRequest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisRequest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisRequest.java Thu Jul 17 07:52:58 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.server.axis;
import javax.servlet.ServletInputStream;
+
import org.apache.openejb.server.httpd.HttpRequest;
import org.apache.openejb.server.httpd.HttpRequestImpl;
import org.apache.openejb.server.httpd.HttpSession;
@@ -36,13 +37,13 @@ public class AxisRequest extends HttpReq
private Method method;
- private Map<String,String> parameters;
+ private Map<String, String> parameters;
- private Map<String,String> headers;
+ private Map<String, String> headers;
private String remoteAddress;
- public AxisRequest(int contentLength, String contentType, ServletInputStream in, Method method, Map<String,String> parameters, URI uri, Map<String,String> headers, String remoteAddress) {
+ public AxisRequest(final int contentLength, final String contentType, final ServletInputStream in, final Method method, final Map<String, String> parameters, final URI uri, final Map<String, String> headers, final String remoteAddress) {
super(uri);
this.contentLength = contentLength;
this.contentType = contentType;
@@ -61,7 +62,7 @@ public class AxisRequest extends HttpReq
return contentType;
}
- public String getHeader(String name) {
+ public String getHeader(final String name) {
return headers.get(name);
}
@@ -73,7 +74,7 @@ public class AxisRequest extends HttpReq
return method.name();
}
- public String getParameter(String name) {
+ public String getParameter(final String name) {
return parameters.get(name);
}
@@ -93,7 +94,7 @@ public class AxisRequest extends HttpReq
return "/axis2";
}
- public HttpSession getSession(boolean create) {
+ public HttpSession getSession(final boolean create) {
throw new UnsupportedOperationException();
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisResponse.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisResponse.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisResponse.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisResponse.java Thu Jul 17 07:52:58 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.server.axis;
import javax.servlet.ServletOutputStream;
+
import org.apache.openejb.server.httpd.HttpResponseImpl;
import java.io.IOException;
@@ -31,22 +32,22 @@ public class AxisResponse extends HttpRe
private String host;
private ServletOutputStream out;
private int method;
- private Map<String,String> parameters;
+ private Map<String, String> parameters;
private String path;
private URL uri;
private int port;
- private Map<String,String> headers;
+ private Map<String, String> headers;
private int statusCode;
private String statusMessage;
- public AxisResponse(String contentType, String host, String path, URL uri, int port, ServletOutputStream out) {
+ public AxisResponse(final String contentType, final String host, final String path, final URL uri, final int port, final ServletOutputStream out) {
this.contentType = contentType;
this.host = host;
- this.parameters = new HashMap<String,String>();
+ this.parameters = new HashMap<String, String>();
this.path = path;
this.uri = uri;
this.port = port;
- this.headers = new HashMap<String,String>();
+ this.headers = new HashMap<String, String>();
this.out = out;
}
@@ -55,7 +56,7 @@ public class AxisResponse extends HttpRe
}
- public String getHeader(String name) {
+ public String getHeader(final String name) {
return headers.get(name);
}
@@ -71,7 +72,7 @@ public class AxisResponse extends HttpRe
return method;
}
- public String getParameter(String name) {
+ public String getParameter(final String name) {
return parameters.get(name);
}
@@ -99,35 +100,35 @@ public class AxisResponse extends HttpRe
return uri;
}
- public void setContentLength(int i) {
+ public void setContentLength(final int i) {
contentLength = i;
}
- public void setContentType(String string) {
+ public void setContentType(final String string) {
contentType = string;
}
- public void setHost(String string) {
+ public void setHost(final String string) {
host = string;
}
- public void setMethod(int i) {
+ public void setMethod(final int i) {
method = i;
}
- public void setParameters(Map<String,String> map) {
+ public void setParameters(final Map<String, String> map) {
parameters = map;
}
- public void setPath(String string) {
+ public void setPath(final String string) {
path = string;
}
- public void setPort(int i) {
+ public void setPort(final int i) {
port = i;
}
- public void setUri(URL url) {
+ public void setUri(final URL url) {
uri = url;
}
@@ -135,7 +136,7 @@ public class AxisResponse extends HttpRe
return statusMessage;
}
- public void setStatusMessage(String responseString) {
+ public void setStatusMessage(final String responseString) {
statusMessage = responseString;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisWsContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisWsContainerTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisWsContainerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/AxisWsContainerTest.java Thu Jul 17 07:52:58 2014
@@ -40,33 +40,33 @@ import java.util.HashMap;
import java.util.Map;
public class AxisWsContainerTest extends AbstractTestCase {
- public AxisWsContainerTest(String testName) {
+ public AxisWsContainerTest(final String testName) {
super(testName);
}
public void testInvokeSOAP() throws Exception {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- JavaServiceDesc serviceDesc = new JavaServiceDesc();
+ final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ final JavaServiceDesc serviceDesc = new JavaServiceDesc();
serviceDesc.setEndpointURL("http://127.0.0.1:8080/axis/services/echo");
//serviceDesc.setWSDLFile(portInfo.getWsdlURL().toExternalForm());
serviceDesc.setStyle(Style.RPC);
serviceDesc.setUse(Use.ENCODED);
- TypeMappingRegistryImpl tmr = new TypeMappingRegistryImpl();
+ final TypeMappingRegistryImpl tmr = new TypeMappingRegistryImpl();
tmr.doRegisterFromVersion("1.3");
- TypeMapping typeMapping = tmr.getOrMakeTypeMapping(serviceDesc.getUse().getEncoding());
+ final TypeMapping typeMapping = tmr.getOrMakeTypeMapping(serviceDesc.getUse().getEncoding());
serviceDesc.setTypeMappingRegistry(tmr);
serviceDesc.setTypeMapping(typeMapping);
- OperationDesc op = new OperationDesc();
+ final OperationDesc op = new OperationDesc();
op.setName("echoString");
op.setStyle(Style.RPC);
op.setUse(Use.ENCODED);
- Class beanClass = EchoBean.class;
+ final Class beanClass = EchoBean.class;
op.setMethod(beanClass.getMethod("echoString", String.class));
- ParameterDesc parameter =
+ final ParameterDesc parameter =
new ParameterDesc(
new QName("http://ws.apache.org/echosample", "in0"),
ParameterDesc.IN,
@@ -78,46 +78,46 @@ public class AxisWsContainerTest extends
serviceDesc.addOperationDesc(op);
serviceDesc.getOperations();
- ReadOnlyServiceDesc sd = new ReadOnlyServiceDesc(serviceDesc);
+ final ReadOnlyServiceDesc sd = new ReadOnlyServiceDesc(serviceDesc);
- Class pojoClass = cl.loadClass("org.apache.openejb.server.axis.EchoBean");
+ final Class pojoClass = cl.loadClass("org.apache.openejb.server.axis.EchoBean");
- RPCProvider provider = new PojoProvider();
- SOAPService service = new SOAPService(null, provider, null);
+ final RPCProvider provider = new PojoProvider();
+ final SOAPService service = new SOAPService(null, provider, null);
service.setServiceDescription(sd);
- service.setOption("className","org.apache.openejb.server.axis.EchoBean");
- URL wsdlURL = new URL("http://fake/echo.wsdl");
- URI location = new URI(serviceDesc.getEndpointURL());
- Map wsdlMap = new HashMap();
+ service.setOption("className", "org.apache.openejb.server.axis.EchoBean");
+ final URL wsdlURL = new URL("http://fake/echo.wsdl");
+ final URI location = new URI(serviceDesc.getEndpointURL());
+ final Map wsdlMap = new HashMap();
- AxisWsContainer container = new AxisWsContainer(wsdlURL, service, wsdlMap, cl);
+ final AxisWsContainer container = new AxisWsContainer(wsdlURL, service, wsdlMap, cl);
- InputStream in = cl.getResourceAsStream("echoString-req.txt");
+ final InputStream in = cl.getResourceAsStream("echoString-req.txt");
try {
- AxisRequest req =
+ final AxisRequest req =
new AxisRequest(
504,
"text/xml; charset=utf-8",
new ServletIntputStreamAdapter(in),
HttpRequest.Method.GET,
- new HashMap<String,String>(),
+ new HashMap<String, String>(),
location,
- new HashMap<String,String>(),
+ new HashMap<String, String>(),
"127.0.0.1");
-
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- AxisResponse res = new AxisResponse("text/xml; charset=utf-8", "127.0.0.1", null, null, 8080, new ServletOutputStreamAdapter(out));
+
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
+ final AxisResponse res = new AxisResponse("text/xml; charset=utf-8", "127.0.0.1", null, null, 8080, new ServletOutputStreamAdapter(out));
req.setAttribute(WsConstants.POJO_INSTANCE, pojoClass.newInstance());
container.onMessage(req, res);
-
+
out.flush();
// log.debug(new String(out.toByteArray()));
} finally {
if (in != null) {
try {
in.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
// ignore
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoBean.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoBean.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoBean.java Thu Jul 17 07:52:58 2014
@@ -23,49 +23,49 @@ public class EchoBean implements Echo {
public void echoVoid() {
}
- public int echoInt(int in) {
+ public int echoInt(final int in) {
return in;
}
- public double echoDouble(double in) {
+ public double echoDouble(final double in) {
return in;
}
- public float echoFloat(float in) {
+ public float echoFloat(final float in) {
return in;
}
- public boolean echoBoolean(boolean in) {
+ public boolean echoBoolean(final boolean in) {
return in;
}
- public String echoString(String in) {
+ public String echoString(final String in) {
return in;
}
- public short echoShort(short in) {
+ public short echoShort(final short in) {
return in;
}
- public long echoLong(long in) {
+ public long echoLong(final long in) {
return in;
}
- public char echoChar(char in) {
+ public char echoChar(final char in) {
return in;
}
- public byte[] echoBytes(byte[] in) {
+ public byte[] echoBytes(final byte[] in) {
return in;
}
public void echoEvoid() {
}
- public EchoStruct echoStruct(EchoStruct in) {
+ public EchoStruct echoStruct(final EchoStruct in) {
return in;
}
-
+
// public EchoStruct[] echoAStruct(EchoStruct[] in){
// return in;
// }
@@ -79,6 +79,6 @@ public class EchoBean implements Echo {
public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException {
}
- public void setSessionContext(javax.ejb.SessionContext arg0) throws javax.ejb.EJBException, java.rmi.RemoteException {
+ public void setSessionContext(final javax.ejb.SessionContext arg0) throws javax.ejb.EJBException, java.rmi.RemoteException {
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoStruct.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoStruct.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoStruct.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/EchoStruct.java Thu Jul 17 07:52:58 2014
@@ -104,67 +104,67 @@ public class EchoStruct {
return strVal;
}
- public void setBoolaenaVal(boolean[] bs) {
+ public void setBoolaenaVal(final boolean[] bs) {
boolaenaVal = bs;
}
- public void setBoolaenVal(boolean b) {
+ public void setBoolaenVal(final boolean b) {
boolaenVal = b;
}
- public void setBytesaVal(byte[][] bs) {
+ public void setBytesaVal(final byte[][] bs) {
bytesaVal = bs;
}
- public void setBytesVal(byte[] bs) {
+ public void setBytesVal(final byte[] bs) {
bytesVal = bs;
}
- public void setDoubleaVal(double[] ds) {
+ public void setDoubleaVal(final double[] ds) {
doubleaVal = ds;
}
- public void setDoubleVal(double d) {
+ public void setDoubleVal(final double d) {
doubleVal = d;
}
- public void setFloataVal(float[] fs) {
+ public void setFloataVal(final float[] fs) {
floataVal = fs;
}
- public void setFloatVal(float f) {
+ public void setFloatVal(final float f) {
floatVal = f;
}
- public void setIntaVal(int[] is) {
+ public void setIntaVal(final int[] is) {
intaVal = is;
}
- public void setIntVal(int i) {
+ public void setIntVal(final int i) {
intVal = i;
}
- public void setLongaVal(long[] ls) {
+ public void setLongaVal(final long[] ls) {
longaVal = ls;
}
- public void setLongVal(long l) {
+ public void setLongVal(final long l) {
longVal = l;
}
- public void setShortaVal(short[] ses) {
+ public void setShortaVal(final short[] ses) {
shortaVal = ses;
}
- public void setShortVal(short s) {
+ public void setShortVal(final short s) {
shortVal = s;
}
- public void setStraVal(String[] strings) {
+ public void setStraVal(final String[] strings) {
straVal = strings;
}
- public void setStrVal(String string) {
+ public void setStrVal(final String string) {
strVal = string;
}
@@ -176,11 +176,11 @@ public class EchoStruct {
return sturctVal;
}
- public void setSturctaVal(SmallEchoStruct struct) {
+ public void setSturctaVal(final SmallEchoStruct struct) {
sturctaVal = struct;
}
- public void setSturctVal(SmallEchoStruct struct) {
+ public void setSturctVal(final SmallEchoStruct struct) {
sturctVal = struct;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/SmallEchoStruct.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/SmallEchoStruct.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/SmallEchoStruct.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/SmallEchoStruct.java Thu Jul 17 07:52:58 2014
@@ -28,11 +28,11 @@ public class SmallEchoStruct {
return val2;
}
- public void setVal1(String string) {
+ public void setVal1(final String string) {
val1 = string;
}
- public void setVal2(String string) {
+ public void setVal2(final String string) {
val2 = string;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java Thu Jul 17 07:52:58 2014
@@ -26,11 +26,11 @@ import java.io.InputStreamReader;
public class SchemaInfoBuilderTest extends TestCase {
public void testSimpleType() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
{
- QName xmlTypeKey = new QName("X", "type");
+ final QName xmlTypeKey = new QName("X", "type");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", "type");
xmlType.anonymous = false;
xmlType.simpleBaseType = new QName("http://www.w3.org/2001/XMLSchema", "integer");
@@ -41,16 +41,16 @@ public class SchemaInfoBuilderTest exten
expected.types.put(xmlTypeKey, xmlType);
}
- XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SimpleType.xsd");
+ final XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SimpleType.xsd");
TypeInfoTestUtil.assertEqual(expected, schemaInfo, true);
}
public void testNestedElements() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
{
- QName xmlTypeKey = new QName("X", "type");
+ final QName xmlTypeKey = new QName("X", "type");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", "type");
xmlType.anonymous = false;
xmlType.simpleBaseType = null;
@@ -61,9 +61,9 @@ public class SchemaInfoBuilderTest exten
xmlType.attributes.put("intAttribute", new QName("http://www.w3.org/2001/XMLSchema", "integer"));
{
- QName key = new QName("X", "string");
+ final QName key = new QName("X", "string");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "string");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "string");
xmlElement.minOccurs = 1;
@@ -73,9 +73,9 @@ public class SchemaInfoBuilderTest exten
xmlType.elements.put(key, xmlElement);
}
{
- QName key = new QName("X", "int");
+ final QName key = new QName("X", "int");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "int");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "integer");
xmlElement.minOccurs = 1;
@@ -95,11 +95,11 @@ public class SchemaInfoBuilderTest exten
}
public void testSoapArrayByAttribute() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
{
- QName xmlTypeKey = new QName("X", "array");
+ final QName xmlTypeKey = new QName("X", "array");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", "array");
xmlType.anonymous = false;
xmlType.simpleBaseType = null;
@@ -110,16 +110,16 @@ public class SchemaInfoBuilderTest exten
expected.types.put(xmlTypeKey, xmlType);
}
- XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SoapArrayByAttribute.xsd");
+ final XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SoapArrayByAttribute.xsd");
TypeInfoTestUtil.assertEqual(expected, schemaInfo, true);
}
public void testSoapArrayByRestriction() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
{
- QName xmlTypeKey = new QName("X", "array");
+ final QName xmlTypeKey = new QName("X", "array");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", "array");
xmlType.anonymous = false;
xmlType.simpleBaseType = null;
@@ -130,16 +130,16 @@ public class SchemaInfoBuilderTest exten
expected.types.put(xmlTypeKey, xmlType);
}
- XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SoapArrayByRestriction.xsd");
+ final XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SoapArrayByRestriction.xsd");
TypeInfoTestUtil.assertEqual(expected, schemaInfo, true);
}
public void testSimpleElement() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
{
- QName xmlElementKey = new QName("X", "element");
+ final QName xmlElementKey = new QName("X", "element");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "element");
xmlElement.xmlType = new QName("X", ">element");
xmlElement.minOccurs = 1;
@@ -149,9 +149,9 @@ public class SchemaInfoBuilderTest exten
expected.elements.put(xmlElementKey, xmlElement);
}
{
- QName xmlTypeKey = new QName("X", ">element");
+ final QName xmlTypeKey = new QName("X", ">element");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", ">element");
xmlType.anonymous = true;
xmlType.simpleBaseType = new QName("http://www.w3.org/2001/XMLSchema", "integer");
@@ -162,16 +162,16 @@ public class SchemaInfoBuilderTest exten
expected.types.put(xmlTypeKey, xmlType);
}
- XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SimpleElement.xsd");
+ final XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/SimpleElement.xsd");
TypeInfoTestUtil.assertEqual(expected, schemaInfo, true);
}
public void testComplexElement() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
{
- QName xmlElementKey = new QName("X", "element");
+ final QName xmlElementKey = new QName("X", "element");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "element");
xmlElement.xmlType = new QName("X", ">element");
xmlElement.minOccurs = 1;
@@ -181,9 +181,9 @@ public class SchemaInfoBuilderTest exten
expected.elements.put(xmlElementKey, xmlElement);
}
{
- QName xmlTypeKey = new QName("X", ">element");
+ final QName xmlTypeKey = new QName("X", ">element");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", ">element");
xmlType.anonymous = true;
xmlType.simpleBaseType = null;
@@ -194,9 +194,9 @@ public class SchemaInfoBuilderTest exten
xmlType.attributes.put("intAttribute", new QName("http://www.w3.org/2001/XMLSchema", "integer"));
{
- QName key = new QName("X", "string");
+ final QName key = new QName("X", "string");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "string");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "string");
xmlElement.minOccurs = 1;
@@ -206,9 +206,9 @@ public class SchemaInfoBuilderTest exten
xmlType.elements.put(key, xmlElement);
}
{
- QName key = new QName("X", "int");
+ final QName key = new QName("X", "int");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "int");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "integer");
xmlElement.minOccurs = 1;
@@ -228,7 +228,7 @@ public class SchemaInfoBuilderTest exten
}
public void testJaxRpcSpecExample() throws Exception {
- XmlSchemaInfo expected = new XmlSchemaInfo();
+ final XmlSchemaInfo expected = new XmlSchemaInfo();
// <complexType name="root">
// <sequence>
@@ -236,9 +236,9 @@ public class SchemaInfoBuilderTest exten
// </sequence>
// </complexType>
{
- QName xmlTypeKey = new QName("X", "root");
+ final QName xmlTypeKey = new QName("X", "root");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", "root");
xmlType.anonymous = false;
xmlType.simpleBaseType = null;
@@ -246,9 +246,9 @@ public class SchemaInfoBuilderTest exten
xmlType.listType = false;
xmlType.arrayComponentType = null;
{
- QName xmlElementKey = new QName("X", "data");
+ final QName xmlElementKey = new QName("X", "data");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "data");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "string");
xmlElement.minOccurs = 1;
@@ -276,9 +276,9 @@ public class SchemaInfoBuilderTest exten
// </complexType>
// </element>
{
- QName xmlElementKey = new QName("X", "root");
+ final QName xmlElementKey = new QName("X", "root");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "root");
xmlElement.xmlType = new QName("X", ">root");
xmlElement.minOccurs = 1;
@@ -288,9 +288,9 @@ public class SchemaInfoBuilderTest exten
expected.elements.put(xmlElementKey, xmlElement);
}
{
- QName xmlTypeKey = new QName("X", ">root");
+ final QName xmlTypeKey = new QName("X", ">root");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", ">root");
xmlType.anonymous = true;
xmlType.simpleBaseType = null;
@@ -298,9 +298,9 @@ public class SchemaInfoBuilderTest exten
xmlType.listType = false;
xmlType.arrayComponentType = null;
{
- QName xmlElementKey = new QName("X", "inside");
+ final QName xmlElementKey = new QName("X", "inside");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "inside");
xmlElement.xmlType = new QName("X", ">>root>inside");
xmlElement.minOccurs = 1;
@@ -310,9 +310,9 @@ public class SchemaInfoBuilderTest exten
xmlType.elements.put(xmlElementKey, xmlElement);
}
{
- QName xmlElementKey = new QName("X", "someOtherElement");
+ final QName xmlElementKey = new QName("X", "someOtherElement");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "someOtherElement");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "int");
xmlElement.minOccurs = 1;
@@ -325,9 +325,9 @@ public class SchemaInfoBuilderTest exten
expected.types.put(xmlTypeKey, xmlType);
}
{
- QName xmlTypeKey = new QName("X", ">>root>inside");
+ final QName xmlTypeKey = new QName("X", ">>root>inside");
- XmlTypeInfo xmlType = new XmlTypeInfo();
+ final XmlTypeInfo xmlType = new XmlTypeInfo();
xmlType.qname = new QName("X", ">>root>inside");
xmlType.anonymous = true;
xmlType.simpleBaseType = null;
@@ -335,9 +335,9 @@ public class SchemaInfoBuilderTest exten
xmlType.listType = false;
xmlType.arrayComponentType = null;
{
- QName xmlElementKey = new QName("X", "data2");
+ final QName xmlElementKey = new QName("X", "data2");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "data2");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "string");
xmlElement.minOccurs = 1;
@@ -352,9 +352,9 @@ public class SchemaInfoBuilderTest exten
// <element name="someOtherElement" type="xsd:int"/>
{
- QName xmlElementKey = new QName("X", "someOtherElement");
+ final QName xmlElementKey = new QName("X", "someOtherElement");
- XmlElementInfo xmlElement = new XmlElementInfo();
+ final XmlElementInfo xmlElement = new XmlElementInfo();
xmlElement.qname = new QName("X", "someOtherElement");
xmlElement.xmlType = new QName("http://www.w3.org/2001/XMLSchema", "int");
xmlElement.minOccurs = 1;
@@ -364,16 +364,16 @@ public class SchemaInfoBuilderTest exten
expected.elements.put(xmlElementKey, xmlElement);
}
- XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/JaxRpcSpecExample.xsd");
+ final XmlSchemaInfo schemaInfo = loadSchemaInfo("schema/JaxRpcSpecExample.xsd");
TypeInfoTestUtil.assertEqual(expected, schemaInfo, true);
}
- private XmlSchemaInfo loadSchemaInfo(String fileName) throws Exception {
- InputStream in = getClass().getClassLoader().getResourceAsStream(fileName);
- XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
+ private XmlSchemaInfo loadSchemaInfo(final String fileName) throws Exception {
+ final InputStream in = getClass().getClassLoader().getResourceAsStream(fileName);
+ final XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
xmlSchemaCollection.read(new InputStreamReader(in), null);
- CommonsSchemaInfoBuilder schemaInfoBuilder = new CommonsSchemaInfoBuilder(xmlSchemaCollection);
- XmlSchemaInfo schemaInfo = schemaInfoBuilder.createSchemaInfo();
+ final CommonsSchemaInfoBuilder schemaInfoBuilder = new CommonsSchemaInfoBuilder(xmlSchemaCollection);
+ final XmlSchemaInfo schemaInfo = schemaInfoBuilder.createSchemaInfo();
return schemaInfo;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java Thu Jul 17 07:52:58 2014
@@ -33,12 +33,12 @@ public final class TypeInfoTestUtil {
private TypeInfoTestUtil() {
}
- public static void assertEqual(InfoObject expected, InfoObject actual) throws Exception {
+ public static void assertEqual(final InfoObject expected, final InfoObject actual) throws Exception {
assertEqual(expected, actual, false);
}
- public static void assertEqual(InfoObject expected, InfoObject actual, boolean printExpected) throws Exception {
- List<String> messages = new ArrayList<String>();
+ public static void assertEqual(final InfoObject expected, final InfoObject actual, final boolean printExpected) throws Exception {
+ final List<String> messages = new ArrayList<String>();
diff(null, expected, actual, messages);
if (!messages.isEmpty()) {
if (printExpected) {
@@ -48,8 +48,8 @@ public final class TypeInfoTestUtil {
System.out.println();
}
- StringBuilder msg = new StringBuilder();
- for (String message : messages) {
+ final StringBuilder msg = new StringBuilder();
+ for (final String message : messages) {
if (msg.length() != 0) msg.append("\n");
msg.append(message);
}
@@ -58,11 +58,11 @@ public final class TypeInfoTestUtil {
}
}
- public static void diff(String name, Object expected, Object actual, List<String> messages) throws Exception {
- for (Field field : expected.getClass().getFields()) {
- String fieldName = name == null ? field.getName() : name + "." + field.getName();
- Object expectedValue = field.get(expected);
- Object actualValue = field.get(actual);
+ public static void diff(final String name, final Object expected, final Object actual, final List<String> messages) throws Exception {
+ for (final Field field : expected.getClass().getFields()) {
+ final String fieldName = name == null ? field.getName() : name + "." + field.getName();
+ final Object expectedValue = field.get(expected);
+ final Object actualValue = field.get(actual);
if (expectedValue instanceof InfoObject) {
diff(fieldName, expectedValue, actualValue, messages);
} else if (expectedValue instanceof Map) {
@@ -74,32 +74,32 @@ public final class TypeInfoTestUtil {
}
}
- private static void diffMap(String name, Map<Object,Object> expected, Map<Object,Object> actual, List<String> message) throws Exception {
+ private static void diffMap(final String name, final Map<Object, Object> expected, final Map<Object, Object> actual, final List<String> message) throws Exception {
// Added
Set<Object> keys = new HashSet<Object>(actual.keySet());
keys.removeAll(expected.keySet());
- for (Object key : keys) {
+ for (final Object key : keys) {
message.add("A " + name + "[" + key + "]");
}
// Removed
keys = new HashSet<Object>(expected.keySet());
keys.removeAll(actual.keySet());
- for (Object key : keys) {
+ for (final Object key : keys) {
message.add("R " + name + "[" + key + "]");
}
// Changed
- for (Object key : expected.keySet()) {
- Object expectValue = expected.get(key);
- Object actualValue = actual.get(key);
+ for (final Object key : expected.keySet()) {
+ final Object expectValue = expected.get(key);
+ final Object actualValue = actual.get(key);
if (actualValue != null) {
diff(name + "[" + key + "]", expectValue, actualValue, message);
}
}
}
- private static void diffSimple(String name, Object expected, Object actual, List<String> messages) {
+ private static void diffSimple(final String name, final Object expected, final Object actual, final List<String> messages) {
boolean changed = true;
if (expected == null) {
if (actual == null) changed = false;
@@ -112,7 +112,7 @@ public final class TypeInfoTestUtil {
}
}
- public static void dump(String name, Object value) throws Exception {
+ public static void dump(final String name, final Object value) throws Exception {
if (name == null) throw new NullPointerException("name is null");
if (isSimpleValue(value)) {
@@ -124,9 +124,9 @@ public final class TypeInfoTestUtil {
}
} else {
System.out.println(getTypeDecl(value.getClass(), name) + " = new " + value.getClass().getSimpleName() + "();");
- for (Field field : value.getClass().getFields()) {
- String fieldName = name == null ? field.getName() : name + "." + field.getName();
- Object fieldValue = field.get(value);
+ for (final Field field : value.getClass().getFields()) {
+ final String fieldName = name == null ? field.getName() : name + "." + field.getName();
+ final Object fieldValue = field.get(value);
if (fieldValue instanceof Map) {
//noinspection unchecked
dumpMap(fieldName, (Map) fieldValue);
@@ -137,15 +137,15 @@ public final class TypeInfoTestUtil {
}
}
- private static void dumpMap(String name, Map<Object,Object> map) throws Exception {
- for (Map.Entry<Object, Object> entry : map.entrySet()) {
- Object key = entry.getKey();
- Object value = entry.getValue();
+ private static void dumpMap(final String name, final Map<Object, Object> map) throws Exception {
+ for (final Map.Entry<Object, Object> entry : map.entrySet()) {
+ final Object key = entry.getKey();
+ final Object value = entry.getValue();
if (isSimpleValue(key) && isSimpleValue(value)) {
System.out.println(name + ".put(" + getSimpleValue(key) + ", " + getSimpleValue(value) + ");");
} else {
- String indent = name.substring(0, getIndentSize(name));
+ final String indent = name.substring(0, getIndentSize(name));
String baseName;
if (value instanceof InfoObject) {
@@ -168,14 +168,15 @@ public final class TypeInfoTestUtil {
}
}
- private static boolean isSimpleValue(Object value) {
- return value == null || value instanceof Boolean || value instanceof Number || value instanceof String|| value instanceof QName;
+ private static boolean isSimpleValue(final Object value) {
+ return value == null || value instanceof Boolean || value instanceof Number || value instanceof String || value instanceof QName;
}
- private static String getSimpleValue(Object value) {
- if (!isSimpleValue(value)) throw new IllegalArgumentException("Value is not a simple type " + value.getClass().getName());
+ private static String getSimpleValue(final Object value) {
+ if (!isSimpleValue(value))
+ throw new IllegalArgumentException("Value is not a simple type " + value.getClass().getName());
- String stringValue;
+ final String stringValue;
if (value == null) {
stringValue = "null";
} else if (value instanceof Boolean) {
@@ -183,7 +184,7 @@ public final class TypeInfoTestUtil {
} else if (value instanceof Number) {
stringValue = value.toString();
} else if (value instanceof QName) {
- QName qname = (QName) value;
+ final QName qname = (QName) value;
stringValue = "new QName(\"" + qname.getNamespaceURI() + "\", \"" + qname.getLocalPart() + "\")";
} else {
stringValue = "\"" + value + "\"";
@@ -191,16 +192,16 @@ public final class TypeInfoTestUtil {
return stringValue;
}
- private static String getTypeDecl(Class type, String name) {
- int indentSize = getIndentSize(name);
+ private static String getTypeDecl(final Class type, final String name) {
+ final int indentSize = getIndentSize(name);
return name.substring(0, indentSize) + type.getSimpleName() + " " + name.substring(indentSize);
}
- private static int getIndentSize(String name) {
+ private static int getIndentSize(final String name) {
for (int i = 0; i < name.length(); i++) {
- if (name.charAt(i) != ' ') {
- return i;
- }
+ if (name.charAt(i) != ' ') {
+ return i;
+ }
}
return 0;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java Thu Jul 17 07:52:58 2014
@@ -53,7 +53,7 @@ public class BoneCPDataSourceCreator ext
try {
config = new BoneCPConfig(prefixedProps(properties));
pool = new BoneCP(config);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalArgumentException(e);
}
return build(BoneCPDataSourceProvidedPool.class, new BoneCPDataSourceProvidedPool(pool), new Properties());
@@ -75,7 +75,7 @@ public class BoneCPDataSourceCreator ext
properties.setProperty("jdbcUrl", newUrl);
}
}
- } catch (SQLException ignored) {
+ } catch (final SQLException ignored) {
// no-op
}
}
@@ -101,7 +101,7 @@ public class BoneCPDataSourceCreator ext
// bonecp expects bonecp prefix in properties
final Properties prefixedProps = new Properties();
- for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+ for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
final String suffix = Strings.lcfirst((String) entry.getKey());
prefixedProps.put("bonecp." + suffix, entry.getValue());
}
@@ -136,11 +136,12 @@ public class BoneCPDataSourceCreator ext
private static final class BoneCPDataSourceProvidedPool extends BoneCPDataSource {
private static final Field POOL_FIELD;
+
static {
try {
POOL_FIELD = BoneCPDataSource.class.getDeclaredField("pool");
POOL_FIELD.setAccessible(true);
- } catch (NoSuchFieldException e) {
+ } catch (final NoSuchFieldException e) {
throw new OpenEJBRuntimeException(e);
}
}
@@ -148,7 +149,7 @@ public class BoneCPDataSourceCreator ext
public BoneCPDataSourceProvidedPool(final BoneCP pool) {
try {
POOL_FIELD.set(this, pool);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new OpenEJBRuntimeException(e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java Thu Jul 17 07:52:58 2014
@@ -84,8 +84,8 @@ public class BoneCPPooledDataSourceFromP
@Module
public EjbJar app() throws Exception {
return new EjbJar()
- .enterpriseBean(new SingletonBean(Persister.class).localBean())
- .enterpriseBean(new SingletonBean(OtherPersister.class).localBean());
+ .enterpriseBean(new SingletonBean(Persister.class).localBean())
+ .enterpriseBean(new SingletonBean(OtherPersister.class).localBean());
}
@LocalBean
@@ -111,9 +111,9 @@ public class BoneCPPooledDataSourceFromP
@LocalBean
@Singleton
@DataSourceDefinition(
- name = "managed",
- url = URL, user = USER, password = PASSWORD,
- className = "org.hsqldb.jdbc.JDBCDataSource")
+ name = "managed",
+ url = URL, user = USER, password = PASSWORD,
+ className = "org.hsqldb.jdbc.JDBCDataSource")
public static class Persister {
@Resource(name = "managed")
private DataSource ds;
@@ -199,12 +199,12 @@ public class BoneCPPooledDataSourceFromP
public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
final Field map = ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX_BY_DS");
map.setAccessible(true);
- final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>> ) map.get(null);
+ final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>>) map.get(null);
assertEquals(1, instance.size());
assertEquals(0, instance.values().iterator().next().size());
}
- private static boolean exists(int id) throws SQLException {
+ private static boolean exists(final int id) throws SQLException {
final Connection connection = DriverManager.getConnection(URL, USER, PASSWORD);
final Statement statement = connection.createStatement();
final ResultSet result = statement.executeQuery("SELECT count(*) AS NB FROM " + TABLE + " WHERE ID = " + id);
@@ -217,7 +217,7 @@ public class BoneCPPooledDataSourceFromP
}
}
- private static void save(final DataSource ds, int id) throws SQLException {
+ private static void save(final DataSource ds, final int id) throws SQLException {
execute(ds, "INSERT INTO " + TABLE + "(ID) VALUES(" + id + ")");
}