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 2012/10/25 12:51:13 UTC
svn commit: r1402093 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/configuration/jsse/
api/src/main/java/org/apache/cxf/configuration/spring/
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/
rt/core/src/main/java/org/apache/cxf/bus/...
Author: coheigea
Date: Thu Oct 25 10:51:12 2012
New Revision: 1402093
URL: http://svn.apache.org/viewvc?rev=1402093&view=rev
Log:
More cleanup
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java Thu Oct 25 10:51:12 2012
@@ -170,12 +170,10 @@ public final class SSLUtils {
throws Exception {
// ********************** Load Trusted CA file **********************
- TrustManager[] trustStoreManagers = null;
KeyStore trustedCertStore = KeyStore.getInstance(trustStoreType);
if (pkcs12) {
//TODO could support multiple trust cas
- trustStoreManagers = new TrustManager[1];
trustedCertStore.load(null, "".toCharArray());
CertificateFactory cf = CertificateFactory.getInstance(CERTIFICATE_FACTORY_TYPE);
@@ -207,9 +205,7 @@ public final class SSLUtils {
TrustManagerFactory.getInstance(trustStoreMgrFactoryAlgorithm);
tmf.init(trustedCertStore);
LogUtils.log(log, Level.FINE, "LOADED_TRUST_STORE", trustStoreLocation);
- trustStoreManagers = tmf.getTrustManagers();
-
- return trustStoreManagers;
+ return tmf.getTrustManagers();
}
protected static byte[] loadClientCredential(String fileName) throws IOException {
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java Thu Oct 25 10:51:12 2012
@@ -230,7 +230,7 @@ abstract class AbstractSpringBeanMap<X,
}
}
- private class SpringBeanMapWrapper extends ConcurrentHashMap<X, V> implements Map<X, V> {
+ private class SpringBeanMapWrapper extends ConcurrentHashMap<X, V> {
private static final long serialVersionUID = -8693455914470226111L;
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java Thu Oct 25 10:51:12 2012
@@ -76,7 +76,7 @@ public final class SAAJStreamWriter exte
if (f == null) {
Element el = part.createElementNS(namespace,
StringUtils.isEmpty(prefix) ? local : prefix + ":" + local);
- el = (Element)part.getEnvelope().getBody().appendChild(el);
+ part.getEnvelope().getBody().appendChild(el);
f = part.getEnvelope().getBody().getFault();
if (f == null) {
f = part.getEnvelope().getBody().addFault();
@@ -109,4 +109,4 @@ public final class SAAJStreamWriter exte
}
super.createAndAddElement(prefix, local, namespace);
}
-}
\ No newline at end of file
+}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java Thu Oct 25 10:51:12 2012
@@ -174,7 +174,6 @@ public class BusWiringBeanFactoryPostPro
Configurer conf = bus.getExtension(Configurer.class);
if (conf instanceof NullConfigurer) {
bus.setExtension(new ConfigurerImpl(ctx), Configurer.class);
- conf = bus.getExtension(Configurer.class);
} else if (conf instanceof ConfigurerImpl) {
((ConfigurerImpl)conf).addApplicationContext(ctx);
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Oct 25 10:51:12 2012
@@ -1081,8 +1081,7 @@ public class ReflectionServiceFactoryBea
protected void checkForElement(ServiceInfo serviceInfo, MessagePartInfo mpi) {
SchemaInfo si = getOrCreateSchema(serviceInfo, mpi.getElementQName().getNamespaceURI(),
getQualifyWrapperSchema());
- XmlSchemaElement e = si.getElementByQName(mpi.getElementQName());
- e = si.getSchema().getElementByName(mpi.getElementQName().getLocalPart());
+ XmlSchemaElement e = si.getSchema().getElementByName(mpi.getElementQName().getLocalPart());
if (e != null) {
mpi.setXmlSchema(e);
return;
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Thu Oct 25 10:51:12 2012
@@ -326,10 +326,7 @@ class JAXBSchemaInitializer extends Serv
SchemaInfo schemaInfo = serviceInfo.getSchema(qn.getNamespaceURI());
if (schemaInfo != null) {
el = schemaInfo.getElementByQName(qn);
- if (el == null) {
- el = createXsElement(schemaInfo.getSchema(), part, typeName, schemaInfo);
-
- } else if (!typeName.equals(el.getSchemaTypeName())) {
+ if (el != null && !typeName.equals(el.getSchemaTypeName())) {
throw new Fault(new Message("CANNOT_CREATE_ELEMENT", LOG,
qn, typeName, el.getSchemaTypeName()));
}
Modified: cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/JibxDataBinding.java Thu Oct 25 10:51:12 2012
@@ -116,8 +116,6 @@ public class JibxDataBinding extends Abs
List<Method> setMethods = new ArrayList<Method>(partNames.size());
List<Field> fields = new ArrayList<Field>(partNames.size());
- Method allMethods[] = wrapperType.getMethods();
-
for (int x = 0; x < partNames.size(); x++) {
String partName = partNames.get(x);
if (partName == null) {
@@ -132,7 +130,7 @@ public class JibxDataBinding extends Abs
Method getMethod = null;
Method setMethod = null;
- allMethods = wrapperType.getMethods();
+ Method[] allMethods = wrapperType.getMethods();
try {
getMethod = wrapperType.getMethod(getAccessor, AbstractWrapperHelper.NO_CLASSES);
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java Thu Oct 25 10:51:12 2012
@@ -164,9 +164,8 @@ public class DataWriterImpl implements D
es.printStackTrace();
}
}
- int i = reader.getEventType();
- if (i == XMLStreamReader.START_DOCUMENT) {
- i = reader.next();
+ if (reader.getEventType() == XMLStreamReader.START_DOCUMENT) {
+ reader.next();
}
if (st != null && !st.isDocumentType()
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansDataBinding.java Thu Oct 25 10:51:12 2012
@@ -124,8 +124,6 @@ public class XmlBeansDataBinding extends
List<Method> setMethods = new ArrayList<Method>(partNames.size());
List<Field> fields = new ArrayList<Field>(partNames.size());
- Method allMethods[] = wrapperType.getMethods();
-
for (int x = 0; x < partNames.size(); x++) {
String partName = partNames.get(x);
if (partName == null) {
@@ -140,7 +138,7 @@ public class XmlBeansDataBinding extends
Method getMethod = null;
Method setMethod = null;
Class<?> valueClass = XmlBeansWrapperHelper.getXMLBeansValueType(wrapperType);
- allMethods = valueClass.getMethods();
+ Method[] allMethods = valueClass.getMethods();
try {
getMethod = valueClass.getMethod(getAccessor, AbstractWrapperHelper.NO_CLASSES);
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java Thu Oct 25 10:51:12 2012
@@ -217,7 +217,7 @@ public class AbstractJAXRSFactoryBean ex
}
EndpointInfo ei = createEndpointInfo();
- Endpoint ep = new EndpointImpl(getBus(), getServiceFactory().getService(), ei);
+ Endpoint ep = new EndpointImpl(getBus(), service, ei);
if (properties != null) {
ep.putAll(properties);
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java Thu Oct 25 10:51:12 2012
@@ -84,7 +84,6 @@ public class LogicalHandlerOutIntercepto
} else {
document = XMLUtils.newDocument();
message.setContent(Node.class, document);
- nd = document;
}
W3CDOMStreamWriter writer = new W3CDOMStreamWriter(document.createDocumentFragment());
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java Thu Oct 25 10:51:12 2012
@@ -432,7 +432,6 @@ public class PolicyAnnotationListener im
Document doc = StaxUtils.read(reader);
uri = getPolicyId(doc.getDocumentElement());
if (StringUtils.isEmpty(uri)) {
- uri = defName;
Attr att = doc.createAttributeNS(PolicyConstants.WSU_NAMESPACE_URI,
"wsu:" + PolicyConstants.WSU_ID_ATTR_NAME);
att.setNodeValue(defName);
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java Thu Oct 25 10:51:12 2012
@@ -358,7 +358,7 @@ public class AttributeVisitor extends Vi
* @return the generated corba:operation.
*/
private OperationType generateCorbaOperation(Operation op, ParamType param, ArgType arg) {
- OperationType operation = new OperationType();
+ OperationType operation = null;
try {
operation = (OperationType)extReg.createExtension(BindingOperation.class,
CorbaConstants.NE_CORBA_OPERATION);
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java Thu Oct 25 10:51:12 2012
@@ -372,10 +372,9 @@ public class IDLToWSDLProcessor extends
private Writer createOutputWriter(String name) throws Exception {
String outDir = outputDir;
- String filename = name;
int index = name.lastIndexOf(System.getProperty("file.separator"));
outDir = name.substring(0, index);
- filename = name.substring(index + 1, name.length());
+ String filename = name.substring(index + 1, name.length());
return getOutputWriter(filename, outDir);
}
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java Thu Oct 25 10:51:12 2012
@@ -297,7 +297,6 @@ public class WSDLToCorbaHelper {
private CorbaTypeImpl processLocalElement(XmlSchemaElement element, String uri) throws Exception {
CorbaTypeImpl membertype = new CorbaTypeImpl();
- CorbaTypeImpl memtype = new CorbaTypeImpl();
XmlSchemaType schemaType = element.getSchemaType();
QName schemaName = element.getQName();
@@ -327,7 +326,7 @@ public class WSDLToCorbaHelper {
if (elName == null) {
elName = createQNameTargetNamespace(elemName.getLocalPart());
}
- memtype = createNillableUnion(elName,
+ CorbaTypeImpl memtype = createNillableUnion(elName,
name,
elemtype.getQName(),
elementQualified);
Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Thu Oct 25 10:51:12 2012
@@ -56,18 +56,16 @@ public class WSIBPValidator extends Abst
public boolean isValid() {
for (Method m : getClass().getMethods()) {
- Boolean res = Boolean.TRUE;
-
if (m.getName().startsWith("check") || m.getModifiers() == Member.PUBLIC) {
try {
- res = (Boolean)m.invoke(this, new Object[] {});
+ Boolean res = (Boolean)m.invoke(this, new Object[] {});
+ if (!res.booleanValue()) {
+ return false;
+ }
} catch (Exception e) {
e.printStackTrace();
throw new ToolException(e);
}
- if (!res.booleanValue()) {
- return false;
- }
}
}
return true;
Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1402093&r1=1402092&r2=1402093&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Thu Oct 25 10:51:12 2012
@@ -362,13 +362,12 @@ public class WSDLToJavaContainer extends
for (int j = 0; j < pns.length; j++) {
int pos = pns[j].indexOf("=");
- String excludePackagename = pns[j];
if (pos != -1) {
String ns = pns[j].substring(0, pos);
if (ns.equals(ToolConstants.WSA_NAMESPACE_URI)) {
env.put(ToolConstants.CFG_NO_ADDRESS_BINDING, ToolConstants.CFG_NO_ADDRESS_BINDING);
}
- excludePackagename = pns[j].substring(pos + 1);
+ String excludePackagename = pns[j].substring(pos + 1);
env.addExcludeNamespacePackageMap(ns, excludePackagename);
env.addNamespacePackageMap(ns, excludePackagename);
} else {