Repository: cxf Updated Branches: refs/heads/master cf34dcfc9 -> f0c825245
Some PMD updates Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f0c82524 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f0c82524 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f0c82524 Branch: refs/heads/master Commit: f0c825245164f3368d8fbef360c491fd77bb7181 Parents: cf34dcf Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Dec 23 11:18:49 2015 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Dec 23 11:18:49 2015 +0000 ---------------------------------------------------------------------- .../cxf/attachment/AttachmentDeserializer.java | 6 +-- .../apache/cxf/attachment/AttachmentUtil.java | 4 +- .../apache/cxf/bus/blueprint/BlueprintBus.java | 4 -- .../org/apache/cxf/bus/spring/SpringBus.java | 4 -- .../cxf/common/injection/ResourceInjector.java | 8 ++-- .../org/apache/cxf/common/util/CacheMap.java | 2 +- .../configuration/ConfiguredBeanLocator.java | 2 +- .../jsse/TLSParameterJaxBUtils.java | 12 ++--- .../org/apache/cxf/endpoint/EndpointImpl.java | 14 +++++- .../org/apache/cxf/helpers/ServiceUtils.java | 6 +-- .../AbstractAttributedInterceptorProvider.java | 2 +- .../AbstractOutDatabindingInterceptor.java | 3 +- .../cxf/interceptor/AnnotationInterceptors.java | 2 +- .../cxf/interceptor/FIStaxOutInterceptor.java | 4 +- .../cxf/interceptor/StaxOutInterceptor.java | 7 +-- .../apache/cxf/service/ServiceModelVisitor.java | 4 +- .../factory/AnnotationsFactoryBeanListener.java | 4 +- .../invoker/spring/SpringBeanFactory.java | 2 +- .../cxf/staxutils/W3CDOMStreamReader.java | 5 -- .../staxutils/transform/InTransformReader.java | 4 +- .../apache/cxf/ws/addressing/ContextUtils.java | 8 +--- .../ws/addressing/EndpointReferenceUtils.java | 2 +- .../cxf/ws/addressing/VersionTransformer.java | 2 +- .../cxf/bus/extension/ExtensionManagerTest.java | 2 +- .../cxf/bus/osgi/OSGiBusListenerTest.java | 8 ++-- .../common/injection/ResourceInjectorTest.java | 2 - .../spring/ConfigurerImplTest.java | 48 ++++++++++---------- .../common/gzip/GZIPAcceptEncodingTest.java | 14 +++--- .../cxf/tools/common/VelocityGenerator.java | 4 +- .../common/dom/ExtendedDocumentBuilder.java | 4 +- .../cxf/tools/common/model/JavaMethod.java | 2 +- .../common/toolspec/DummyToolContainer.java | 6 +-- 32 files changed, 94 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java index 5bf78d1..8d54660 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java @@ -184,7 +184,7 @@ public class AttachmentDeserializer { if (body instanceof DelegatingInputStream && !((DelegatingInputStream) body).isClosed()) { - cache((DelegatingInputStream) body, true); + cache((DelegatingInputStream) body); } List<Attachment> atts = new ArrayList<Attachment>(attachments.getLoadedAttachments()); @@ -196,14 +196,14 @@ public class AttachmentDeserializer { ads.cache(message); } } else if (s.getInputStream() instanceof DelegatingInputStream) { - cache((DelegatingInputStream) s.getInputStream(), false); + cache((DelegatingInputStream) s.getInputStream()); } else { //assume a normal stream that is already cached } } } - private void cache(DelegatingInputStream input, boolean deleteOnClose) throws IOException { + private void cache(DelegatingInputStream input) throws IOException { if (loaded.contains(input)) { return; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java index ec3407a..5950d6c 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java @@ -156,7 +156,7 @@ public final class AttachmentUtil { } public static boolean isMtomEnabled(Message message) { - Object prop = message.getContextualProperty(org.apache.cxf.message.Message.MTOM_ENABLED); + Object prop = message.getContextualProperty(Message.MTOM_ENABLED); return MessageUtils.isTrue(prop); } @@ -278,7 +278,7 @@ public final class AttachmentUtil { public boolean hasNext() { return it.hasNext(); } - public java.util.Map.Entry<String, DataHandler> next() { + public Map.Entry<String, DataHandler> next() { final Attachment a = it.next(); return new Map.Entry<String, DataHandler>() { @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java index b6b68dc..e1aeb7f 100644 --- a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java +++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java @@ -42,10 +42,6 @@ public class BlueprintBus extends ExtensionManagerBus { super(null, null, BlueprintBus.class.getClassLoader()); } - public void loadAdditionalFeatures() { - super.loadAdditionalFeatures(); - } - public void setBundleContext(final BundleContext c) { context = c; ClassLoader bundleClassLoader = http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java index 648431d..6272f3b 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java @@ -49,10 +49,6 @@ public class SpringBus extends ExtensionManagerBus bc.setBus(this); } - public void loadAdditionalFeatures() { - super.loadAdditionalFeatures(); - } - /** {@inheritDoc}*/ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { ctx = (AbstractApplicationContext)applicationContext; http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java index 6690d3b..2e6eb3b 100644 --- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java +++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java @@ -143,22 +143,22 @@ public class ResourceInjector extends AbstractAnnotationVisitor { // Implementation of org.apache.cxf.common.annotation.AnnotationVisitor - public final void visitClass(final Class<?> clz, final Annotation annotation) { + public final void visitClass(final Class<?> clz, final Annotation annotation) { //NOPMD assert annotation instanceof Resource || annotation instanceof Resources : annotation; if (annotation instanceof Resource) { - injectResourceClassLevel(clz, (Resource)annotation); + injectResourceClassLevel((Resource)annotation); } else if (annotation instanceof Resources) { Resources resources = (Resources)annotation; for (Resource resource : resources.value()) { - injectResourceClassLevel(clz, resource); + injectResourceClassLevel(resource); } } } - private void injectResourceClassLevel(Class<?> clz, Resource res) { + private void injectResourceClassLevel(Resource res) { if (res.name() == null || "".equals(res.name())) { LOG.log(Level.INFO, "RESOURCE_NAME_NOT_SPECIFIED", target.getClass().getName()); return; http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/common/util/CacheMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java index fca3b3e..4f0a98c 100644 --- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java +++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java @@ -78,7 +78,7 @@ public class CacheMap<K, V> implements Map<K, V> { || extraKeyMap.containsValue(value); } - public Set<java.util.Map.Entry<K, V>> entrySet() { + public Set<Map.Entry<K, V>> entrySet() { updateMainDataMap(); return mainDataMap.entrySet(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java b/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java index 3de9472..22bb23f 100644 --- a/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java +++ b/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java @@ -73,7 +73,7 @@ public interface ConfiguredBeanLocator { */ boolean hasConfiguredPropertyValue(String beanName, String propertyName, String value); - public interface BeanLoaderListener<T> { + interface BeanLoaderListener<T> { /** * Return true to have the loader go ahead and load the bean. If false, * the loader will just skip to the next bean http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java index 088a710..ef611a1 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java @@ -129,12 +129,12 @@ public final class TLSParameterJaxBUtils { keyStore.load(kstInputStream, password); } } else if (kst.isSetResource()) { - final java.io.InputStream is = getResourceAsStream(kst.getResource()); + final InputStream is = getResourceAsStream(kst.getResource()); if (is == null) { final String msg = "Could not load keystore resource " + kst.getResource(); LOG.severe(msg); - throw new java.io.IOException(msg); + throw new IOException(msg); } keyStore.load(is, password); } else if (kst.isSetUrl()) { @@ -164,12 +164,12 @@ public final class TLSParameterJaxBUtils { return createTrustStore(new FileInputStream(pst.getFile())); } if (pst.isSetResource()) { - final java.io.InputStream is = getResourceAsStream(pst.getResource()); + final InputStream is = getResourceAsStream(pst.getResource()); if (is == null) { final String msg = "Could not load truststore resource " + pst.getResource(); LOG.severe(msg); - throw new java.io.IOException(msg); + throw new IOException(msg); } return createTrustStore(is); } @@ -196,7 +196,7 @@ public final class TLSParameterJaxBUtils { * Create a KeyStore containing the trusted CA certificates contained * in the supplied input stream. */ - private static KeyStore createTrustStore(final java.io.InputStream is) + private static KeyStore createTrustStore(final InputStream is) throws IOException, CertificateException, KeyStoreException, NoSuchAlgorithmException { final Collection<? extends Certificate> certs = loadCertificates(is); @@ -216,7 +216,7 @@ public final class TLSParameterJaxBUtils { /** * load the certificates as X.509 certificates */ - private static Collection<? extends Certificate> loadCertificates(final java.io.InputStream is) + private static Collection<? extends Certificate> loadCertificates(final InputStream is) throws IOException, CertificateException { final CertificateFactory factory = CertificateFactory.getInstance("X.509"); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java index 432fdf6..9aec397 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java +++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java @@ -185,8 +185,20 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen activeFeatures = CastUtils.cast(features); } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof EndpointImpl)) { + return false; + } + + return super.equals(obj); + } + /** - * Returns the hashCode bsed on the EndpointInfo so that this object + * Returns the hashCode based on the EndpointInfo so that this object * can be used as a map key. */ @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java index 208c1c8..22b9a53 100644 --- a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java +++ b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java @@ -112,10 +112,10 @@ public final class ServiceUtils { EndpointInfo ep = endpoint.getEndpointInfo(); if (validationType == null && opInfo != null) { - validationType = getSchemaValidationTypeFromModel(message, opInfo); + validationType = getSchemaValidationTypeFromModel(opInfo); if (validationType == null && ep != null) { - validationType = getSchemaValidationTypeFromModel(message, ep); + validationType = getSchemaValidationTypeFromModel(ep); } } @@ -128,7 +128,7 @@ public final class ServiceUtils { } private static SchemaValidationType getSchemaValidationTypeFromModel( - Message message, AbstractPropertiesHolder properties) { + AbstractPropertiesHolder properties) { Object obj = properties.getProperty(Message.SCHEMA_VALIDATION_TYPE); if (obj != null) { return getSchemaValidationType(obj); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java index 187eb57..24244db 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java @@ -84,7 +84,7 @@ public abstract class AbstractAttributedInterceptorProvider extends ConcurrentHa } @Override - public int hashCode() { + public int hashCode() { //NOPMD return super.hashCode(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java index 0e3183b..9d3bd45 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java @@ -186,8 +186,7 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt DataWriter<T> writer = service.getDataBinding().createWriter(output); Collection<Attachment> atts = message.getAttachments(); - if (MessageUtils.isTrue(message.getContextualProperty( - org.apache.cxf.message.Message.MTOM_ENABLED)) + if (MessageUtils.isTrue(message.getContextualProperty(Message.MTOM_ENABLED)) && atts == null) { atts = new ArrayList<Attachment>(); message.setAttachments(atts); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java index 2de8aaf..a8c5a85 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java @@ -64,7 +64,7 @@ public class AnnotationInterceptors { } @SuppressWarnings("unchecked") - private <T> Class<? extends T>[] getAnnotationObjectClasses(Annotation ann, Class<T> type) { + private <T> Class<? extends T>[] getAnnotationObjectClasses(Annotation ann, Class<T> type) { //NOPMD if (ann instanceof InFaultInterceptors) { return (Class<? extends T>[])((InFaultInterceptors)ann).classes(); } else if (ann instanceof InInterceptors) { http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java index 89d42b1..c5d0b6e 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java @@ -113,7 +113,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> { if (force || MessageUtils.isTrue(o)) { - StAXDocumentSerializer serializer = getOutput(message, out); + StAXDocumentSerializer serializer = getOutput(out); message.setContent(XMLStreamWriter.class, serializer); message.removeContent(OutputStream.class); @@ -138,7 +138,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> { } } - private StAXDocumentSerializer getOutput(Message m, OutputStream out) { + private StAXDocumentSerializer getOutput(OutputStream out) { /* StAXDocumentSerializer serializer = (StAXDocumentSerializer)m.getExchange().getEndpoint() .remove(StAXDocumentSerializer.class.getName()); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java index 8509036..e90f2b52 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java @@ -78,7 +78,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> { XMLOutputFactory factory = getXMLOutputFactory(message); if (factory == null) { if (writer == null) { - os = setupOutputStream(message, os); + os = setupOutputStream(os); xwriter = StaxUtils.createXMLStreamWriter(os, encoding); } else { xwriter = StaxUtils.createXMLStreamWriter(writer); @@ -86,7 +86,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> { } else { synchronized (factory) { if (writer == null) { - os = setupOutputStream(message, os); + os = setupOutputStream(os); xwriter = factory.createXMLStreamWriter(os, encoding); } else { xwriter = factory.createXMLStreamWriter(writer); @@ -108,7 +108,8 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> { // Add a final interceptor to write end elements message.getInterceptorChain().add(ENDING); } - private OutputStream setupOutputStream(Message message, OutputStream os) { + + private OutputStream setupOutputStream(OutputStream os) { if (!(os instanceof AbstractWrappedOutputStream)) { os = new AbstractWrappedOutputStream(os) { }; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java b/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java index 9b3bc60..17dd12e 100644 --- a/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java +++ b/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java @@ -164,8 +164,8 @@ public class ServiceModelVisitor { } public void end(EndpointInfo endpointInfo) { } - private void begin(BindingInfo bindingInfo) { + public void begin(BindingInfo bindingInfo) { } - private void end(BindingInfo bindingInfo) { + public void end(BindingInfo bindingInfo) { } } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java index 09b75d3..0fcb914 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java +++ b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java @@ -142,7 +142,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener { if (props != null) { addEndpointProperties(server.getEndpoint(), bus, props.value()); } - setScope(factory, server, cls); + setScope(server, cls); break; } case INTERFACE_OPERATION_BOUND: { @@ -168,7 +168,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener { } } - private void setScope(AbstractServiceFactoryBean factory, Server server, Class<?> cls) { + private void setScope(Server server, Class<?> cls) { FactoryType scope = cls.getAnnotation(FactoryType.class); if (scope != null) { Invoker i = server.getEndpoint().getService().getInvoker(); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java index ef16680..d5911b3 100644 --- a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java +++ b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java @@ -41,7 +41,7 @@ public class SpringBeanFactory implements Factory, ApplicationContextAware { public SpringBeanFactory(String name) { beanName = name; } - public SpringBeanFactory(Class<?> c, String[] args) { + public SpringBeanFactory(Class<?> c, String[] args) { //NOPMD beanName = args[0]; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java index 7a91ac6..eb8442b 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java @@ -146,11 +146,6 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> { } } - @Override - protected void endElement() { - super.endElement(); - } - public final Node getCurrentNode() { return getCurrentFrame().element; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java index ec1601c..aba6166 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java @@ -139,7 +139,7 @@ public class InTransformReader extends DepthXMLStreamReader { if (null != appendProp && !replaceContent) { // handle one of the four append modes - handleAppendMode(theName, expected, appendProp); + handleAppendMode(expected, appendProp); } else if (replaceContent) { replaceText = appendProp.getText(); if (doDebug) { @@ -201,7 +201,7 @@ public class InTransformReader extends DepthXMLStreamReader { } - private void handleAppendMode(QName name, QName expected, ElementProperty appendProp) { + private void handleAppendMode(QName expected, ElementProperty appendProp) { final boolean doDebug = LOG.isLoggable(Level.FINE); if (appendProp.isChild()) { // ap-post-* http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java index 361530b..8c171b7 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java @@ -46,14 +46,10 @@ import org.apache.cxf.transport.ConduitInitiatorManager; import org.apache.cxf.transport.Destination; import org.apache.cxf.transport.MessageObserver; -import static org.apache.cxf.message.Message.ASYNC_POST_RESPONSE_DISPATCH; -import static org.apache.cxf.message.Message.REQUESTOR_ROLE; - import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND; import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_OUTBOUND; import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES; - /** * Holder for utility methods relating to contexts. */ @@ -132,7 +128,7 @@ public final class ContextUtils { * @return true if the current messaging role is that of requestor */ public static boolean isRequestor(Message message) { - Boolean requestor = (Boolean)message.get(REQUESTOR_ROLE); + Boolean requestor = (Boolean)message.get(Message.REQUESTOR_ROLE); return requestor != null && requestor.booleanValue(); } @@ -507,7 +503,7 @@ public final class ContextUtils { * invocation is required. */ public static boolean retrieveAsyncPostResponseDispatch(Message message) { - Boolean ret = (Boolean)message.get(ASYNC_POST_RESPONSE_DISPATCH); + Boolean ret = (Boolean)message.get(Message.ASYNC_POST_RESPONSE_DISPATCH); return ret != null && ret.booleanValue(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java index 6155c50..57a65af 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java @@ -906,7 +906,7 @@ public final class EndpointReferenceUtils { } public static Source convertToXML(EndpointReferenceType epr) { try { - javax.xml.bind.Marshaller jm = getJAXBContextForEPR().createMarshaller(); + Marshaller jm = getJAXBContextForEPR().createMarshaller(); jm.setProperty(Marshaller.JAXB_FRAGMENT, true); QName qname = new QName("http://www.w3.org/2005/08/addressing", "EndpointReference"); JAXBElement<EndpointReferenceType> jaxEle http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java index d113d3b..345fcac 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java @@ -545,7 +545,7 @@ public class VersionTransformer { public static JAXBContext getJAXBContext() throws JAXBException { synchronized (Names200408.class) { if (jaxbContext == null) { - jaxbContext = JAXBContext.newInstance(org.apache.cxf.ws.addressing.v200408.ObjectFactory.class); + jaxbContext = JAXBContext.newInstance(ObjectFactory.class); } } return jaxbContext; http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java index 2baeffa..057200d 100644 --- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java +++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java @@ -42,7 +42,7 @@ public class ExtensionManagerTest extends Assert { ResourceManager rm = new DefaultResourceManager(resolver); extensions = new HashMap<Class<?>, Object>(); - extensions.put(Integer.class, new Integer(0)); + extensions.put(Integer.class, Integer.valueOf(0)); manager = new ExtensionManagerImpl("test-extension.xml", Thread.currentThread().getContextClassLoader(), extensions, rm, null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java index 601a34c..9f901d6 100644 --- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java +++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java @@ -86,7 +86,7 @@ public class OSGiBusListenerTest extends Assert { setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null); setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null); Collection<Feature> lst = new ArrayList<Feature>(); - setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null, lst); + setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst); control.replay(); new OSGIBusListener(bus, new Object[]{bundleContext}); @@ -101,7 +101,7 @@ public class OSGiBusListenerTest extends Assert { setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES); setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES); Collection<Feature> lst = new ArrayList<Feature>(); - setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES, lst); + setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst); EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES); control.replay(); new OSGIBusListener(bus, new Object[]{bundleContext}); @@ -116,7 +116,7 @@ public class OSGiBusListenerTest extends Assert { setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES); setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES); Collection<Feature> lst = new ArrayList<Feature>(); - setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES, lst); + setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, lst); EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES); control.replay(); new OSGIBusListener(bus, new Object[]{bundleContext}); @@ -158,7 +158,7 @@ public class OSGiBusListenerTest extends Assert { } } - private void setFeatures(String[] names, String[] restricted, String excludes, + private void setFeatures(String[] names, String[] restricted, Collection<Feature> lst) throws Exception { ServiceReference[] svcrefs = createTestServiceReferences(names, restricted); EasyMock.expect(bundleContext.getServiceReferences(Feature.class.getName(), null)) http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java index 9d78430..d03ba5f 100644 --- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java +++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java @@ -256,8 +256,6 @@ class ProxyClass implements InvocationHandler { // Do nothing here } catch (Exception eBj) { eBj.printStackTrace(); - } finally { - // Do something after the method is called ... } return result; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java index 0aa777f..6abcbf4 100644 --- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java +++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java @@ -75,19 +75,19 @@ public class ConfigurerImplTest extends Assert { assertEquals("Unexpected value for attribute integerAttr", BigInteger.ONE, sb.getIntegerAttr()); assertEquals("Unexpected value for attribute intAttr", - new Integer(2), sb.getIntAttr()); + Integer.valueOf(2), sb.getIntAttr()); assertEquals("Unexpected value for attribute longAttr", - new Long(3L), sb.getLongAttr()); + Long.valueOf(3L), sb.getLongAttr()); assertEquals("Unexpected value for attribute shortAttr", - new Short((short)4), sb.getShortAttr()); + Short.valueOf((short)4), sb.getShortAttr()); assertEquals("Unexpected value for attribute decimalAttr", new BigDecimal("5"), sb.getDecimalAttr()); assertEquals("Unexpected value for attribute floatAttr", new Float(6F), sb.getFloatAttr()); assertEquals("Unexpected value for attribute doubleAttr", - new Double(7D), sb.getDoubleAttr()); + Double.valueOf(7.0D), sb.getDoubleAttr()); assertEquals("Unexpected value for attribute byteAttr", - new Byte((byte)8), sb.getByteAttr()); + Byte.valueOf((byte)8), sb.getByteAttr()); QName qn = sb.getQnameAttr(); assertEquals("Unexpected value for attribute qnameAttrNoDefault", @@ -108,11 +108,11 @@ public class ConfigurerImplTest extends Assert { } assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault", - new Long(9L), sb.getUnsignedIntAttr()); + Long.valueOf(9L), sb.getUnsignedIntAttr()); assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault", - new Integer(10), sb.getUnsignedShortAttr()); + Integer.valueOf(10), sb.getUnsignedShortAttr()); assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault", - new Short((short)11), sb.getUnsignedByteAttr()); + Short.valueOf((short)11), sb.getUnsignedByteAttr()); } @Test @@ -142,26 +142,26 @@ public class ConfigurerImplTest extends Assert { assertEquals("Unexpected value for attribute integerAttr", BigInteger.TEN, sb.getIntegerAttr()); assertEquals("Unexpected value for attribute intAttr", - new Integer(12), sb.getIntAttr()); + Integer.valueOf(12), sb.getIntAttr()); assertEquals("Unexpected value for attribute longAttr", - new Long(13L), sb.getLongAttr()); + Long.valueOf(13L), sb.getLongAttr()); assertEquals("Unexpected value for attribute shortAttr", - new Short((short)14), sb.getShortAttr()); + Short.valueOf((short)14), sb.getShortAttr()); assertEquals("Unexpected value for attribute decimalAttr", new BigDecimal("15"), sb.getDecimalAttr()); assertEquals("Unexpected value for attribute floatAttr", new Float(16F), sb.getFloatAttr()); assertEquals("Unexpected value for attribute doubleAttr", - new Double(17D), sb.getDoubleAttr()); + Double.valueOf(17D), sb.getDoubleAttr()); assertEquals("Unexpected value for attribute byteAttr", - new Byte((byte)18), sb.getByteAttr()); + Byte.valueOf((byte)18), sb.getByteAttr()); assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault", - new Long(19L), sb.getUnsignedIntAttr()); + Long.valueOf(19L), sb.getUnsignedIntAttr()); assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault", - new Integer(20), sb.getUnsignedShortAttr()); + Integer.valueOf(20), sb.getUnsignedShortAttr()); assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault", - new Short((short)21), sb.getUnsignedByteAttr()); + Short.valueOf((short)21), sb.getUnsignedByteAttr()); } @Test @@ -246,19 +246,19 @@ public class ConfigurerImplTest extends Assert { private String stringAttr = "hello"; private Boolean booleanAttr = Boolean.TRUE; private BigInteger integerAttr = BigInteger.ONE; - private Integer intAttr = new Integer(2); - private Long longAttr = new Long(3); - private Short shortAttr = new Short((short)4); + private Integer intAttr = Integer.valueOf(2); + private Long longAttr = Long.valueOf(3); + private Short shortAttr = Short.valueOf((short)4); private BigDecimal decimalAttr = new BigDecimal("5"); private Float floatAttr = new Float(6F); - private Double doubleAttr = new Double(7D); - private Byte byteAttr = new Byte((byte)8); + private Double doubleAttr = Double.valueOf(7D); + private Byte byteAttr = Byte.valueOf((byte)8); private QName qnameAttr = new QName("http://www.w3.org/2001/XMLSchema", "schema", "xs"); private byte[] base64BinaryAttr = DatatypeConverter.parseBase64Binary("abcd"); private byte[] hexBinaryAttr = new HexBinaryAdapter().unmarshal("aaaa"); - private Long unsignedIntAttr = new Long(9); - private Integer unsignedShortAttr = new Integer(10); - private Short unsignedByteAttr = new Short((short)11); + private Long unsignedIntAttr = Long.valueOf(9); + private Integer unsignedShortAttr = Integer.valueOf(10); + private Short unsignedByteAttr = Short.valueOf((short)11); SimpleBean(String bn) { http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java index 37d796a..cd86280 100644 --- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java +++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java @@ -81,32 +81,32 @@ public class GZIPAcceptEncodingTest extends Assert { @Test public void testAcceptGzip() throws Exception { - singleTest("gzip", true, YES, "gzip"); + singleTest("gzip", YES, "gzip"); } @Test public void testAcceptXGzip() throws Exception { - singleTest("x-gzip, x-compress", true, YES, "x-gzip"); + singleTest("x-gzip, x-compress", YES, "x-gzip"); } @Test public void testAcceptStar() throws Exception { - singleTest("*", true, YES, "gzip"); + singleTest("*", YES, "gzip"); } @Test public void testAcceptOnlyGzip() throws Exception { - singleTest("gzip, identity; q=0", true, FORCE, "gzip"); + singleTest("gzip, identity; q=0", FORCE, "gzip"); } @Test public void testOnlyIdentitySupported() throws Exception { - singleTest("deflate", false, null, null); + singleTest("deflate", null, null); } @Test public void testGzipExplicitlyDisabled() throws Exception { - singleTest("gzip; q=0.00", false, null, null); + singleTest("gzip; q=0.00", null, null); } @Test(expected = Fault.class) @@ -116,7 +116,7 @@ public class GZIPAcceptEncodingTest extends Assert { interceptor.handleMessage(outMessage); } - private void singleTest(String encoding, boolean expectEndingInterceptor, + private void singleTest(String encoding, GZIPOutInterceptor.UseGzip expectedUseGzip, String expectedGzipEncoding) throws Exception { http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java index 5d89942..180aa92 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java @@ -78,9 +78,7 @@ public final class VelocityGenerator { } Velocity.init(props); } catch (Exception e) { - org.apache.cxf.common.i18n.Message msg = - new org.apache.cxf.common.i18n.Message("FAIL_TO_INITIALIZE_VELOCITY_ENGINE", - LOG); + Message msg = new Message("FAIL_TO_INITIALIZE_VELOCITY_ENGINE", LOG); LOG.log(Level.SEVERE, msg.toString()); throw new ToolException(msg, e); } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/tools/common/src/main/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilder.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilder.java b/tools/common/src/main/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilder.java index 8551225..702b407 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilder.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/dom/ExtendedDocumentBuilder.java @@ -67,7 +67,7 @@ public class ExtendedDocumentBuilder { this.schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); try { this.schema = schemaFactory.newSchema(new StreamSource(getSchemaLocation())); - } catch (org.xml.sax.SAXException e) { + } catch (SAXException e) { LOG.log(Level.SEVERE, "SCHEMA_FACTORY_EXCEPTION_MSG"); } try { @@ -93,7 +93,7 @@ public class ExtendedDocumentBuilder { //validating, so need to use the validating parser factory try { return parserFactory.newDocumentBuilder().parse(in); - } catch (javax.xml.parsers.ParserConfigurationException e) { + } catch (ParserConfigurationException e) { LOG.log(Level.SEVERE, "NEW_DOCUMENT_BUILDER_EXCEPTION_MSG"); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java index 136ff0e..be16dba 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java @@ -161,7 +161,7 @@ public class JavaMethod implements JavaAnnotatable { //primitive in is being changed to an in/out //which would no longer be primitive String s = PRIMITIVE_MAP.get(c2); - if (s != null && c1.equals(s)) { + if (s != null && s.equals(c1)) { return true; } return c1.equals(c2); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0c82524/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/DummyToolContainer.java ---------------------------------------------------------------------- diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/DummyToolContainer.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/DummyToolContainer.java index e04a9ac..787cbc0 100644 --- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/DummyToolContainer.java +++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/DummyToolContainer.java @@ -19,16 +19,12 @@ package org.apache.cxf.tools.common.toolspec; -import org.apache.cxf.tools.common.ToolException; import org.apache.cxf.tools.common.toolspec.parser.BadUsageException; + public class DummyToolContainer extends AbstractToolContainer { public DummyToolContainer(ToolSpec ts) throws BadUsageException { super(ts); } - public void execute(boolean exitOnFinish) throws ToolException { - super.execute(exitOnFinish); - } - }