This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new 2c89d63 very minor SonarLint (#762) 2c89d63 is described below commit 2c89d63ad40544c7b346d252398f010ba3b50a66 Author: Alan <alan.me...@gmail.com> AuthorDate: Fri Apr 2 09:07:35 2021 +0200 very minor SonarLint (#762) --- .../java/org/apache/cxf/annotations/Policy.java | 2 +- .../apache/cxf/annotations/WSDLDocumentation.java | 2 +- .../cxf/attachment/AttachmentDataSource.java | 2 +- .../cxf/attachment/AttachmentDeserializer.java | 15 ++-- .../cxf/attachment/AttachmentSerializer.java | 2 +- .../org/apache/cxf/attachment/AttachmentUtil.java | 18 ++-- .../apache/cxf/attachment/Base64DecoderStream.java | 6 +- .../apache/cxf/attachment/ContentDisposition.java | 8 +- .../cxf/attachment/LazyAttachmentCollection.java | 5 ++ .../cxf/attachment/MimeBodyPartInputStream.java | 2 + .../java/org/apache/cxf/bus/CXFBusFactory.java | 4 +- .../bus/blueprint/BundleDelegatingClassLoader.java | 4 + .../cxf/bus/blueprint/BusDefinitionParser.java | 4 + .../org/apache/cxf/bus/extension/Extension.java | 15 ++-- .../ServiceContractResolverRegistryImpl.java | 6 +- .../java/org/apache/cxf/bus/osgi/CXFActivator.java | 3 + .../cxf/bus/osgi/CXFExtensionBundleListener.java | 8 +- .../org/apache/cxf/bus/osgi/OSGIBusListener.java | 9 +- .../cxf/bus/resource/ResourceManagerImpl.java | 2 + .../apache/cxf/bus/spring/BusDefinitionParser.java | 12 +++ .../apache/cxf/bus/spring/BusEntityResolver.java | 8 +- .../cxf/bus/spring/BusExtensionPostProcessor.java | 2 + .../cxf/bus/spring/Jsr250BeanPostProcessor.java | 4 + .../apache/cxf/bus/spring/NamespaceHandler.java | 1 + .../java/org/apache/cxf/bus/spring/SpringBus.java | 2 + .../java/org/apache/cxf/common/i18n/Exception.java | 1 + .../apache/cxf/common/i18n/UncheckedException.java | 1 + .../cxf/common/injection/ResourceInjector.java | 5 +- .../common/logging/AbstractDelegatingLogger.java | 39 +++++++++ .../org/apache/cxf/common/logging/LogUtils.java | 5 +- .../cxf/common/spi/ClassGeneratorClassLoader.java | 4 +- .../cxf/common/spi/NamespaceClassGenerator.java | 99 +++++++++++----------- .../org/apache/cxf/common/util/ASMHelperImpl.java | 5 +- .../org/apache/cxf/common/util/CachedClass.java | 8 +- .../org/apache/cxf/common/util/ClassHelper.java | 3 +- .../apache/cxf/common/util/CollectionUtils.java | 6 +- .../common/util/ModCountCopyOnWriteArrayList.java | 2 + .../org/apache/cxf/common/util/PackageUtils.java | 1 - .../apache/cxf/common/util/ProxyClassLoader.java | 2 + .../org/apache/cxf/common/util/ProxyHelper.java | 2 +- .../common/util/ReflectionInvokationHandler.java | 2 + .../org/apache/cxf/common/util/SortedArraySet.java | 3 +- .../cxf/common/util/SpringClasspathScanner.java | 14 +-- .../org/apache/cxf/common/util/StreamPrinter.java | 1 + .../cxf/common/xmlschema/SchemaCollection.java | 60 ++++++------- .../configuration/jsse/TLSClientParameters.java | 1 + .../cxf/configuration/spring/ConfigurerImpl.java | 3 + .../cxf/databinding/source/SourceDataBinding.java | 1 + .../cxf/databinding/stax/StaxDataBinding.java | 2 + .../cxf/endpoint/AbstractConduitSelector.java | 2 +- .../org/apache/cxf/endpoint/ClientCallback.java | 2 +- .../java/org/apache/cxf/endpoint/ClientImpl.java | 6 +- .../org/apache/cxf/feature/FastInfosetFeature.java | 2 +- .../org/apache/cxf/feature/WrappedFeature.java | 4 + .../main/java/org/apache/cxf/headers/Header.java | 2 +- .../main/java/org/apache/cxf/helpers/DOMUtils.java | 6 +- .../interceptor/AbstractLoggingInterceptor.java | 1 + .../cxf/interceptor/AttachmentInInterceptor.java | 1 + .../cxf/interceptor/ClientOutFaultObserver.java | 1 + .../interceptor/InFaultChainInitiatorObserver.java | 1 + .../apache/cxf/interceptor/InterceptorChain.java | 2 +- .../org/apache/cxf/interceptor/LoggingMessage.java | 3 + .../interceptor/OneWayProcessorInterceptor.java | 2 + .../OutFaultChainInitiatorObserver.java | 1 + .../security/DefaultSecurityContext.java | 2 +- .../interceptor/security/JAASLoginInterceptor.java | 4 + .../cxf/internal/CXFAPINamespaceHandler.java | 3 + .../main/java/org/apache/cxf/io/CachedWriter.java | 10 +++ .../java/org/apache/cxf/io/ReaderInputStream.java | 11 +-- .../apache/cxf/io/WriteOnCloseOutputStream.java | 1 + .../java/org/apache/cxf/message/MessageUtils.java | 1 + .../java/org/apache/cxf/phase/PhaseChainCache.java | 5 +- .../apache/cxf/phase/PhaseInterceptorChain.java | 6 +- .../cxf/service/factory/FactoryBeanListener.java | 2 +- .../apache/cxf/service/invoker/FactoryInvoker.java | 1 + .../service/model/AbstractPropertiesHolder.java | 2 +- .../org/apache/cxf/service/model/FaultInfo.java | 2 + .../apache/cxf/service/model/InterfaceInfo.java | 2 +- .../apache/cxf/service/model/OperationInfo.java | 2 +- .../cxf/service/model/UnwrappedOperationInfo.java | 6 ++ .../AbstractBeanValidationInterceptor.java | 2 + .../apache/cxf/ws/addressing/MAPAggregator.java | 2 + 82 files changed, 329 insertions(+), 187 deletions(-) diff --git a/core/src/main/java/org/apache/cxf/annotations/Policy.java b/core/src/main/java/org/apache/cxf/annotations/Policy.java index cc25779..a0d4a75 100644 --- a/core/src/main/java/org/apache/cxf/annotations/Policy.java +++ b/core/src/main/java/org/apache/cxf/annotations/Policy.java @@ -73,7 +73,7 @@ public @interface Policy { SERVICE, SERVICE_PORT, - }; + } final class DEFAULT { } } diff --git a/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java b/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java index 0621bef..9116f1c 100644 --- a/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java +++ b/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java @@ -81,7 +81,7 @@ public @interface WSDLDocumentation { SERVICE, SERVICE_PORT, - }; + } final class DEFAULT { } diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java index 1e2dc09..6e4fa1a 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java @@ -38,7 +38,7 @@ public class AttachmentDataSource implements DataSource { private DelegatingInputStream delegate; private String name; - public AttachmentDataSource(String ctParam, InputStream inParam) throws IOException { + public AttachmentDataSource(String ctParam, InputStream inParam) { this.ct = ctParam; ins = inParam; } 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 0f7f6b8..55a1dcc 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.PushbackInputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -97,8 +98,6 @@ public class AttachmentDeserializer { private byte[] boundary; - private String contentType; - private LazyAttachmentCollection attachments; private Message message; @@ -141,7 +140,7 @@ public class AttachmentDeserializer { } protected void initializeRootMessage() throws IOException { - contentType = (String) message.get(Message.CONTENT_TYPE); + String contentType = (String) message.get(Message.CONTENT_TYPE); if (contentType == null) { throw new IllegalStateException("Content-Type can not be empty!"); @@ -160,7 +159,7 @@ public class AttachmentDeserializer { if (null == boundaryString) { throw new IOException("Couldn't determine the boundary from the message!"); } - boundary = boundaryString.getBytes("utf-8"); + boundary = boundaryString.getBytes(StandardCharsets.UTF_8); stream = new PushbackInputStream(message.getContent(InputStream.class), PUSHBACK_AMOUNT); if (!readTillFirstBoundary(stream, boundary)) { @@ -189,7 +188,7 @@ public class AttachmentDeserializer { } } - private String findBoundaryFromContentType(String ct) throws IOException { + private String findBoundaryFromContentType(String ct) { // Use regex to get the boundary and return null if it's not found Matcher m = CONTENT_TYPE_BOUNDARY_PATTERN.matcher(ct); return m.find() ? "--" + m.group(1) : null; @@ -456,11 +455,7 @@ public class AttachmentDeserializer { } value = line.substring(separator); } - List<String> v = heads.get(name); - if (v == null) { - v = new ArrayList<>(1); - heads.put(name, v); - } + List<String> v = heads.computeIfAbsent(name, k -> new ArrayList<>(1)); v.add(value); } diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java index 9704e33..3e65de3 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java @@ -46,7 +46,7 @@ public class AttachmentSerializer { // http://tools.ietf.org/html/rfc2387 private static final String DEFAULT_MULTIPART_TYPE = "multipart/related"; - private String contentTransferEncoding = "binary"; + private String contentTransferEncoding = AttachmentUtil.BINARY; private Message message; private String bodyBoundary; 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 e8d0a3e..7c72f00 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java @@ -67,6 +67,8 @@ import org.apache.cxf.message.MessageUtils; public final class AttachmentUtil { public static final String BODY_ATTACHMENT_ID = "root.mess...@cxf.apache.org"; + static final String BINARY = "binary"; + private static final Logger LOG = LogUtils.getL7dLogger(AttachmentUtil.class); private static final AtomicInteger COUNTER = new AtomicInteger(); @@ -75,7 +77,8 @@ public final class AttachmentUtil { private static final Random BOUND_RANDOM = new Random(); private static final CommandMap DEFAULT_COMMAND_MAP = CommandMap.getDefaultCommandMap(); private static final MailcapCommandMap COMMAND_MAP = new EnhancedMailcapCommandMap(); - + + static final class EnhancedMailcapCommandMap extends MailcapCommandMap { @Override public synchronized DataContentHandler createDataContentHandler( @@ -277,7 +280,7 @@ public final class AttachmentUtil { dataHandlers = new DHMap(attachments); } } - return dataHandlers == null ? new LinkedHashMap<String, DataHandler>() : dataHandlers; + return dataHandlers == null ? new LinkedHashMap<>() : dataHandlers; } static class DHMap extends AbstractMap<String, DataHandler> { @@ -313,6 +316,7 @@ public final class AttachmentUtil { } }; } + @Override public void remove() { it.remove(); } @@ -325,6 +329,8 @@ public final class AttachmentUtil { } }; } + + @Override public DataHandler put(String key, DataHandler value) { Iterator<Attachment> i = list.iterator(); DataHandler ret = null; @@ -360,7 +366,7 @@ public final class AttachmentUtil { } if (id == null) { //no Content-ID, set cxf default ID - id = "root.mess...@cxf.apache.org"; + id = BODY_ATTACHMENT_ID; } return id; } @@ -400,14 +406,14 @@ public final class AttachmentUtil { String name = e.getKey(); if ("Content-Transfer-Encoding".equalsIgnoreCase(name)) { encoding = getHeader(headers, name); - if ("binary".equalsIgnoreCase(encoding)) { + if (BINARY.equalsIgnoreCase(encoding)) { att.setXOP(true); } } att.setHeader(name, getHeaderValue(e.getValue())); } if (encoding == null) { - encoding = "binary"; + encoding = BINARY; } InputStream ins = decode(stream, encoding); if (ins != stream) { @@ -440,7 +446,7 @@ public final class AttachmentUtil { encoding = encoding.toLowerCase(); // some encodings are just pass-throughs, with no real decoding. - if ("binary".equals(encoding) + if (BINARY.equals(encoding) || "7bit".equals(encoding) || "8bit".equals(encoding)) { return in; diff --git a/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java b/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java index 9367db4..134553f 100644 --- a/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java +++ b/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java @@ -171,21 +171,25 @@ public class Base64DecoderStream extends FilterInputStream { // in order to function as a filter, these streams need to override the different // read() signature. + @Override public int read() throws IOException { return getByte(); } + @Override public int read(byte [] buffer, int offset, int length) throws IOException { return getBytes(buffer, offset, length); } - + + @Override public boolean markSupported() { return false; } + @Override public int available() throws IOException { return ((in.available() / 4) * 3) + decodedCount; } diff --git a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java index 94abed6..f9d4524 100644 --- a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java +++ b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java @@ -37,6 +37,8 @@ public class ContentDisposition { private static final Pattern CD_HEADER_EXT_PARAMS_PATTERN = Pattern.compile(CD_HEADER_EXT_PARAMS_EXPRESSION); private static final Pattern CODEPOINT_ENCODED_VALUE_PATTERN = Pattern.compile("&#[0-9]{4};|\\S"); + + private static final String FILE_NAME = "filename"; private String value; private String type; @@ -97,7 +99,7 @@ public class ContentDisposition { } catch (UnsupportedEncodingException e) { // would be odd not to support UTF-8 or 8859-1 } - } else if ("filename".equalsIgnoreCase(paramName) && paramValue.contains("&#")) { + } else if (FILE_NAME.equalsIgnoreCase(paramName) && paramValue.contains("&#")) { Matcher matcher = CODEPOINT_ENCODED_VALUE_PATTERN.matcher(paramValue); StringBuilder sb = new StringBuilder(); while (matcher.find()) { @@ -116,7 +118,7 @@ public class ContentDisposition { params.put(paramName.toLowerCase(), paramValue); } if (extendedFilename != null) { - params.put("filename", extendedFilename); + params.put(FILE_NAME, extendedFilename); } } @@ -125,7 +127,7 @@ public class ContentDisposition { } public String getFilename() { - return params.get("filename"); + return params.get(FILE_NAME); } public String getParameter(String name) { diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java index d866029..8dd4ace 100644 --- a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java +++ b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java @@ -110,6 +110,7 @@ public class LazyAttachmentCollection } } + @Override public Attachment next() { Attachment a = attachments.get(current); current++; @@ -117,6 +118,7 @@ public class LazyAttachmentCollection return a; } + @Override public void remove() { if (removed) { throw new IllegalStateException(); @@ -291,6 +293,7 @@ public class LazyAttachmentCollection } }; } + @Override public void remove() { it.remove(); } @@ -315,6 +318,7 @@ public class LazyAttachmentCollection return it.next().getId(); } + @Override public void remove() { it.remove(); } @@ -339,6 +343,7 @@ public class LazyAttachmentCollection public DataHandler next() { return it.next().getDataHandler(); } + @Override public void remove() { it.remove(); } diff --git a/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java b/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java index 7d71b45..ab80b89 100644 --- a/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java +++ b/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java @@ -43,6 +43,7 @@ public class MimeBodyPartInputStream extends InputStream { this.pbAmount = pbsize; } + @Override public int read(byte[] buf, int origOff, int origLen) throws IOException { byte[] b = buf; int off = origOff; @@ -267,6 +268,7 @@ public class MimeBodyPartInputStream extends InputStream { return value; } + @Override public void close() throws IOException { this.closed = true; } diff --git a/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java b/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java index b576621..fb3a833 100644 --- a/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java +++ b/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java @@ -29,11 +29,11 @@ import org.apache.cxf.bus.extension.ExtensionManagerBus; public class CXFBusFactory extends BusFactory { public Bus createBus() { - return createBus(new HashMap<Class<?>, Object>()); + return createBus(new HashMap<>()); } public Bus createBus(Map<Class<?>, Object> e) { - return createBus(e, new HashMap<String, Object>()); + return createBus(e, new HashMap<>()); } public Bus createBus(Map<Class<?>, Object> e, Map<String, Object> properties) { diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java index 7743a59..ff957c2 100644 --- a/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java +++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java @@ -47,6 +47,7 @@ public class BundleDelegatingClassLoader extends ClassLoader { this.classLoader = classLoader; } + @Override protected Class<?> findClass(final String name) throws ClassNotFoundException { try { return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() { @@ -64,6 +65,7 @@ public class BundleDelegatingClassLoader extends ClassLoader { } } + @Override protected URL findResource(final String name) { URL resource = AccessController.doPrivileged(new PrivilegedAction<URL>() { public URL run() { @@ -76,6 +78,7 @@ public class BundleDelegatingClassLoader extends ClassLoader { return resource; } + @Override protected Enumeration<URL> findResources(final String name) throws IOException { Enumeration<URL> urls; try { @@ -101,6 +104,7 @@ public class BundleDelegatingClassLoader extends ClassLoader { return urls; } + @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { Class<?> clazz; try { diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java index 57ae5f3..baf83b7 100644 --- a/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java +++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java @@ -46,10 +46,14 @@ public class BusDefinitionParser } return cxfBean; } + + @Override protected void processBusAttribute(Element element, ParserContext ctx, MutableBeanMetadata bean, String val) { //nothing } + + @Override protected boolean hasBusProperty() { return false; } diff --git a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java index 6081dd6..03f0dc6 100644 --- a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java +++ b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java @@ -34,6 +34,8 @@ import org.apache.cxf.common.util.StringUtils; public class Extension { protected static final Logger LOG = LogUtils.getL7dLogger(Extension.class); + + private static final String PROBLEM_CREATING_EXTENSION_CLASS = "PROBLEM_CREATING_EXTENSION_CLASS"; protected String className; protected ClassLoader classloader; @@ -46,6 +48,7 @@ public class Extension { protected volatile Object obj; protected boolean optional; protected boolean notFound; + public Extension() { } @@ -227,12 +230,10 @@ public class Extension { return obj; } } catch (InvocationTargetException ex) { - throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), + throw new ExtensionException(new Message(PROBLEM_CREATING_EXTENSION_CLASS, LOG, cls.getName()), ex.getCause()); - } catch (InstantiationException ex) { - throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), ex); - } catch (SecurityException ex) { - throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), ex); + } catch (InstantiationException | SecurityException ex) { + throw new ExtensionException(new Message(PROBLEM_CREATING_EXTENSION_CLASS, LOG, cls.getName()), ex); } catch (NoSuchMethodException e) { //ignore } @@ -246,7 +247,7 @@ public class Extension { } catch (InvocationTargetException ex) { notFound = true; if (!optional) { - throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), + throw new ExtensionException(new Message(PROBLEM_CREATING_EXTENSION_CLASS, LOG, cls.getName()), ex.getCause()); } LOG.log(Level.FINE, "Could not load optional extension " + getName(), ex); @@ -267,7 +268,7 @@ public class Extension { } catch (Throwable e) { notFound = true; if (!optional) { - throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), e); + throw new ExtensionException(new Message(PROBLEM_CREATING_EXTENSION_CLASS, LOG, cls.getName()), e); } LOG.log(Level.FINE, "Could not load optional extension " + getName(), e); } diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java index c0feb42..a0f7af0 100644 --- a/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java +++ b/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java @@ -37,7 +37,6 @@ import org.apache.cxf.endpoint.ServiceContractResolverRegistry; @NoJSR250Annotations(unlessNull = "bus") public class ServiceContractResolverRegistryImpl implements ServiceContractResolverRegistry { - private Bus bus; private List<ServiceContractResolver> resolvers = new CopyOnWriteArrayList<>(); @@ -52,10 +51,9 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol /** * Sets the bus with which the registry is associated. * - * @param b + * @param bus */ - public final void setBus(Bus b) { - this.bus = b; + public final void setBus(Bus bus) { if (bus != null) { bus.setExtension(this, ServiceContractResolverRegistry.class); } diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java index 375efc0..6504276 100644 --- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java +++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java @@ -108,10 +108,13 @@ public class CXFActivator implements BundleActivator { private static Extension createManagedWorkQueueListExtension(final ManagedWorkQueueList workQueues) { return new Extension(ManagedWorkQueueList.class) { + + @Override public Object getLoadedObject() { return workQueues; } + @Override public Extension cloneNoObject() { return this; } diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java index 6c5f989..ee9bb15 100644 --- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java +++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java @@ -18,7 +18,6 @@ */ package org.apache.cxf.bus.osgi; -import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; @@ -51,7 +50,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener { this.id = bundleId; } - public void registerExistingBundles(BundleContext context) throws IOException { + public void registerExistingBundles(BundleContext context) { for (Bundle bundle : context.getBundles()) { if ((bundle.getState() == Bundle.RESOLVED || bundle.getState() == Bundle.STARTING @@ -132,6 +131,8 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener { serviceObject = o; obj = o; } + + @Override public Object load(ClassLoader cl, Bus b) { if (interfaceName == null && bundle.getBundleContext() != null) { ServiceReference<?> ref = bundle.getBundleContext().getServiceReference(className); @@ -144,6 +145,8 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener { } return super.load(cl, b); } + + @Override protected Class<?> tryClass(String name, ClassLoader cl) { Class<?> c = null; Throwable origExc = null; @@ -167,6 +170,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener { return c; } + @Override public Extension cloneNoObject() { OSGiExtension ext = new OSGiExtension(this, bundle); ext.obj = serviceObject; diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java index 2573083..aad270d 100644 --- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java +++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java @@ -169,10 +169,13 @@ public class OSGIBusListener implements BusLifeCycleListener { private boolean isPrivate(ServiceReference<?> ref) { Object o = ref.getProperty(SERVICE_PROPERTY_PRIVATE); - Boolean pvt = Boolean.FALSE; + if (o == null) { - pvt = Boolean.FALSE; - } else if (o instanceof String) { + return false; + } + + Boolean pvt = Boolean.FALSE; + if (o instanceof String) { pvt = Boolean.parseBoolean((String)o); } else if (o instanceof Boolean) { pvt = (Boolean)o; diff --git a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java index 4edcfc1..99c6ee9 100644 --- a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java +++ b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java @@ -44,6 +44,8 @@ public class ResourceManagerImpl extends DefaultResourceManager implements BusEx super(); setBus(b); } + + @Override protected void onFirstResolve() { super.onFirstResolve(); if (bus != null) { diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java index 0bb1646..9d508b6 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java @@ -52,6 +52,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { setBeanClass(BusConfig.class); } + @Override protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) { String bus = element.getAttribute("bus"); if (StringUtils.isEmpty(bus)) { @@ -91,11 +92,14 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { bean.addConstructorArgValue(bus); } } + + @Override protected boolean processBusAttribute(Element element, ParserContext ctx, BeanDefinitionBuilder bean, String val) { return false; } + private void copyProps(BeanDefinitionBuilder src, BeanDefinition def) { for (PropertyValue v : src.getBeanDefinition().getPropertyValues().getPropertyValues()) { if (!"bus".equals(v.getName())) { @@ -199,6 +203,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { } } + @Override public List<Interceptor<? extends Message>> getOutFaultInterceptors() { if (bus != null) { return bus.getOutFaultInterceptors(); @@ -206,6 +211,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { return super.getOutFaultInterceptors(); } + @Override public List<Interceptor<? extends Message>> getInFaultInterceptors() { if (bus != null) { return bus.getInFaultInterceptors(); @@ -213,6 +219,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { return super.getInFaultInterceptors(); } + @Override public List<Interceptor<? extends Message>> getInInterceptors() { if (bus != null) { return bus.getInInterceptors(); @@ -220,6 +227,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { return super.getInInterceptors(); } + @Override public List<Interceptor<? extends Message>> getOutInterceptors() { if (bus != null) { return bus.getOutInterceptors(); @@ -227,6 +235,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { return super.getOutInterceptors(); } + @Override public void setInInterceptors(List<Interceptor<? extends Message>> interceptors) { if (bus != null) { bus.getInInterceptors().addAll(interceptors); @@ -235,6 +244,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { } } + @Override public void setInFaultInterceptors(List<Interceptor<? extends Message>> interceptors) { if (bus != null) { bus.getInFaultInterceptors().addAll(interceptors); @@ -243,6 +253,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { } } + @Override public void setOutInterceptors(List<Interceptor<? extends Message>> interceptors) { if (bus != null) { bus.getOutInterceptors().addAll(interceptors); @@ -251,6 +262,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser { } } + @Override public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) { if (bus != null) { bus.getOutFaultInterceptors().addAll(interceptors); diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java index 725f51b..1e95e28 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java @@ -75,10 +75,12 @@ public class BusEntityResolver extends DelegatingEntityResolver { if (null == source) { source = dtdResolver.resolveEntity(publicId, systemId); } - if (null == source) { - return null; - } } + + if (null == source) { + return null; + } + String resourceLocation = schemaMappings.get(systemId); if (resourceLocation != null && publicId == null) { Resource resource = new ClassPathResource(resourceLocation, classLoader); diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java index cc0dc69..9389be6 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java @@ -42,10 +42,12 @@ public class BusExtensionPostProcessor implements BeanPostProcessor, Application } + @Override public Object postProcessAfterInitialization(Object bean, String beanId) { return bean; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanId) { if (bean instanceof BusExtension && null != getBus()) { Class<? extends Object> cls = ((BusExtension)bean).getRegistrationType(); diff --git a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java index 9aca9b7..1fb0746 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java @@ -102,6 +102,8 @@ public class Jsr250BeanPostProcessor } return resourceManager; } + + @Override public Object postProcessAfterInitialization(Object bean, String beanId) { if (!isProcessing) { if (resourceManager == null && bean instanceof ResourceManager) { @@ -117,6 +119,7 @@ public class Jsr250BeanPostProcessor return bean; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanId) { if (!isProcessing) { return bean; @@ -153,6 +156,7 @@ public class Jsr250BeanPostProcessor } } + @Override public boolean requiresDestruction(Object bean) { return isProcessing; } diff --git a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java index 4a6051c..9211ea8 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java @@ -40,6 +40,7 @@ public class NamespaceHandler extends NamespaceHandlerSupport { registerBeanDefinitionParser("workqueue", new SimpleBeanDefinitionParser(AutomaticWorkQueueImpl.class) { + @Override protected void processNameAttribute(Element element, ParserContext ctx, BeanDefinitionBuilder bean, 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 c30b2b3..6616c8e 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 @@ -110,6 +110,7 @@ public class SpringBus extends ExtensionManagerBus } } + @Override public void destroyBeans() { if (closeContext) { ctx.close(); @@ -117,6 +118,7 @@ public class SpringBus extends ExtensionManagerBus super.destroyBeans(); } + @Override public String getId() { if (id == null) { try { diff --git a/core/src/main/java/org/apache/cxf/common/i18n/Exception.java b/core/src/main/java/org/apache/cxf/common/i18n/Exception.java index 874142c..fcb38ad 100644 --- a/core/src/main/java/org/apache/cxf/common/i18n/Exception.java +++ b/core/src/main/java/org/apache/cxf/common/i18n/Exception.java @@ -48,6 +48,7 @@ public class Exception extends java.lang.Exception { return null; } + @Override public String getMessage() { if (null != message) { return message.toString(); diff --git a/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java b/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java index 46b5264..ea15fd7 100644 --- a/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java +++ b/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java @@ -74,6 +74,7 @@ public class UncheckedException extends java.lang.RuntimeException { return null; } + @Override public String getMessage() { if (null != message) { return message.toString(); 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 a4380c1..9c420ce 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 @@ -148,6 +148,7 @@ public class ResourceInjector extends AbstractAnnotationVisitor { // Implementation of org.apache.cxf.common.annotation.AnnotationVisitor + @Override public final void visitClass(final Class<?> clz, final Annotation annotation) { //NOPMD assert annotation instanceof Resource || annotation instanceof Resources : annotation; @@ -294,9 +295,7 @@ public class ResourceInjector extends AbstractAnnotationVisitor { } } catch (IllegalAccessException e) { LOG.log(Level.SEVERE, "INJECTION_SETTER_NOT_VISIBLE", method); - } catch (InvocationTargetException e) { - LogUtils.log(LOG, Level.SEVERE, "INJECTION_SETTER_RAISED_EXCEPTION", e, method); - } catch (SecurityException e) { + } catch (InvocationTargetException | SecurityException e) { LogUtils.log(LOG, Level.SEVERE, "INJECTION_SETTER_RAISED_EXCEPTION", e, method); } catch (NoSuchMethodException e) { LOG.log(Level.SEVERE, "INJECTION_SETTER_METHOD_NOT_FOUND", new Object[] {method.getName()}); diff --git a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java index aa114c7..dd3cbd5 100644 --- a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java +++ b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java @@ -41,12 +41,14 @@ public abstract class AbstractDelegatingLogger extends Logger { super(name, resourceBundleName); } + @Override public void log(LogRecord record) { if (isLoggable(record.getLevel())) { doLog(record); } } + @Override public void log(Level level, String msg) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -54,6 +56,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void log(Level level, String msg, Object param1) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -63,6 +66,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void log(Level level, String msg, Object[] params) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -71,6 +75,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void log(Level level, String msg, Throwable thrown) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -79,6 +84,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void logp(Level level, String sourceClass, String sourceMethod, String msg) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -88,6 +94,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object param1) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -99,6 +106,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object[] params) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -109,6 +117,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void logp(Level level, String sourceClass, String sourceMethod, String msg, Throwable thrown) { if (isLoggable(level)) { LogRecord lr = new LogRecord(level, msg); @@ -119,6 +128,8 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + + @Override @Deprecated public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg) { if (isLoggable(level)) { @@ -129,6 +140,8 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + + @Override @Deprecated public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg, Object param1) { @@ -142,6 +155,8 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + + @Override @Deprecated public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg, Object[] params) { @@ -154,6 +169,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override @Deprecated public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg, Throwable thrown) { @@ -166,12 +182,14 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void entering(String sourceClass, String sourceMethod) { if (isLoggable(Level.FINER)) { logp(Level.FINER, sourceClass, sourceMethod, "ENTRY"); } } + @Override public void entering(String sourceClass, String sourceMethod, Object param1) { if (isLoggable(Level.FINER)) { Object[] params = {param1 }; @@ -179,6 +197,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void entering(String sourceClass, String sourceMethod, Object[] params) { if (isLoggable(Level.FINER)) { String msg = "ENTRY"; @@ -196,12 +215,14 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void exiting(String sourceClass, String sourceMethod) { if (isLoggable(Level.FINER)) { logp(Level.FINER, sourceClass, sourceMethod, "RETURN"); } } + @Override public void exiting(String sourceClass, String sourceMethod, Object result) { if (isLoggable(Level.FINER)) { Object[] params = {result }; @@ -209,6 +230,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void throwing(String sourceClass, String sourceMethod, Throwable thrown) { if (isLoggable(Level.FINER)) { LogRecord lr = new LogRecord(Level.FINER, "THROW"); @@ -219,6 +241,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void severe(String msg) { if (isLoggable(Level.SEVERE)) { LogRecord lr = new LogRecord(Level.SEVERE, msg); @@ -226,6 +249,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void warning(String msg) { if (isLoggable(Level.WARNING)) { LogRecord lr = new LogRecord(Level.WARNING, msg); @@ -233,6 +257,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void info(String msg) { if (isLoggable(Level.INFO)) { LogRecord lr = new LogRecord(Level.INFO, msg); @@ -240,6 +265,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void config(String msg) { if (isLoggable(Level.CONFIG)) { LogRecord lr = new LogRecord(Level.CONFIG, msg); @@ -247,6 +273,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void fine(String msg) { if (isLoggable(Level.FINE)) { LogRecord lr = new LogRecord(Level.FINE, msg); @@ -254,6 +281,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void finer(String msg) { if (isLoggable(Level.FINER)) { LogRecord lr = new LogRecord(Level.FINER, msg); @@ -261,6 +289,7 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void finest(String msg) { if (isLoggable(Level.FINEST)) { LogRecord lr = new LogRecord(Level.FINEST, msg); @@ -268,12 +297,15 @@ public abstract class AbstractDelegatingLogger extends Logger { } } + @Override public void setLevel(Level newLevel) { throw new UnsupportedOperationException(); } + @Override public abstract Level getLevel(); + @Override public boolean isLoggable(Level level) { Level l = getLevel(); return level.intValue() >= l.intValue() && l != Level.OFF; @@ -283,6 +315,7 @@ public abstract class AbstractDelegatingLogger extends Logger { return false; } + @Override public synchronized void addHandler(Handler handler) { if (supportsHandlers()) { super.addHandler(handler); @@ -291,6 +324,7 @@ public abstract class AbstractDelegatingLogger extends Logger { throw new UnsupportedOperationException(); } + @Override public synchronized void removeHandler(Handler handler) { if (supportsHandlers()) { super.removeHandler(handler); @@ -299,6 +333,7 @@ public abstract class AbstractDelegatingLogger extends Logger { throw new UnsupportedOperationException(); } + @Override public synchronized Handler[] getHandlers() { if (supportsHandlers()) { return super.getHandlers(); @@ -306,6 +341,7 @@ public abstract class AbstractDelegatingLogger extends Logger { throw new UnsupportedOperationException(); } + @Override public synchronized void setUseParentHandlers(boolean useParentHandlers) { if (supportsHandlers()) { super.setUseParentHandlers(useParentHandlers); @@ -314,6 +350,7 @@ public abstract class AbstractDelegatingLogger extends Logger { throw new UnsupportedOperationException(); } + @Override public synchronized boolean getUseParentHandlers() { if (supportsHandlers()) { return super.getUseParentHandlers(); @@ -321,10 +358,12 @@ public abstract class AbstractDelegatingLogger extends Logger { throw new UnsupportedOperationException(); } + @Override public Logger getParent() { return null; } + @Override public void setParent(Logger parent) { throw new UnsupportedOperationException(); } diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java index 599113b..09727e6 100644 --- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java +++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java @@ -280,12 +280,11 @@ public final class LogUtils { Logger logger; try { logger = Logger.getLogger(loggerName, bundleName); //NOPMD - } catch (IllegalArgumentException iae) { + } catch (IllegalArgumentException | MissingResourceException ex) { //likely a mismatch on the bundle name, just return the default logger = Logger.getLogger(loggerName); //NOPMD - } catch (MissingResourceException rex) { - logger = Logger.getLogger(loggerName); //NOPMD } + return logger; } finally { if (n != orig) { diff --git a/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java b/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java index 8cee8ff..5906c7a 100644 --- a/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java +++ b/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java @@ -86,7 +86,7 @@ public class ClassGeneratorClassLoader { TypeHelperClassLoader ret; if (ref == null || ref.get() == null) { ret = new TypeHelperClassLoader(cls.getClassLoader()); - CLASS_MAP.put(cls, new WeakReference<TypeHelperClassLoader>(ret)); + CLASS_MAP.put(cls, new WeakReference<>(ret)); } else { ret = ref.get(); } @@ -98,7 +98,7 @@ public class ClassGeneratorClassLoader { TypeHelperClassLoader ret; if (ref == null || ref.get() == null) { ret = new TypeHelperClassLoader(l); - LOADER_MAP.put(l, new WeakReference<TypeHelperClassLoader>(ret)); + LOADER_MAP.put(l, new WeakReference<>(ret)); } else { ret = ref.get(); } diff --git a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java index fbdc524..48c755b 100644 --- a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java +++ b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java @@ -44,7 +44,7 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement String postFix = ""; if (mcls.getName().contains("eclipse")) { - return createEclipseNamespaceMapper(mcls, map); + return createEclipseNamespaceMapper(); } else if (mcls.getName().contains(".internal")) { postFix = "Internal"; } else if (mcls.getName().contains("com.sun")) { @@ -79,13 +79,13 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement return cls; } - private Class<?> createEclipseNamespaceMapper(Class<?> mcls, Map<String, String> map) { + private Class<?> createEclipseNamespaceMapper() { String className = "org.apache.cxf.jaxb.EclipseNamespaceMapper"; Class<?> cls = findClass(className, NamespaceClassCreator.class); if (cls != null) { return cls; } - byte[] bts = createEclipseNamespaceMapper(); + byte[] bts = doCreateEclipseNamespaceMapper(); //previous code use mcls instead of NamespaceClassGenerator.class return loadClass(className, NamespaceClassCreator.class, bts); } @@ -121,7 +121,7 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement */ //CHECKSTYLE:OFF //bunch of really long ASM based methods that cannot be shortened easily - private byte[] createEclipseNamespaceMapper() { + private byte[] doCreateEclipseNamespaceMapper() { OpcodesProxy Opcodes = helper.getOpCodes(); String slashedName = "org/apache/cxf/jaxb/EclipseNamespaceMapper"; ASMHelper.ClassWriter cw = helper.createClassWriter(); @@ -286,8 +286,7 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement cw.visitEnd(); - byte[] bts = cw.toByteArray(); - return bts; + return cw.toByteArray(); } private byte[] createNamespaceWrapperInternal(String postFix) { @@ -302,63 +301,63 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement } ASMHelper.FieldVisitor fv; ASMHelper.MethodVisitor mv; - OpcodesProxy Opcodes= helper.getOpCodes(); - cw.visit(Opcodes.V1_6, - Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER, + OpcodesProxy opcodes= helper.getOpCodes(); + cw.visit(opcodes.V1_6, + opcodes.ACC_PUBLIC + opcodes.ACC_FINAL + opcodes.ACC_SUPER, postFixedName, null, superName, null); cw.visitSource("NamespaceMapper.java", null); - fv = cw.visitField(Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL, + fv = cw.visitField(opcodes.ACC_PRIVATE + opcodes.ACC_FINAL, "nspref", "Ljava/util/Map;", "Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;", null); fv.visitEnd(); - fv = cw.visitField(Opcodes.ACC_PRIVATE, "nsctxt", "[Ljava/lang/String;", null, null); + fv = cw.visitField(opcodes.ACC_PRIVATE, "nsctxt", "[Ljava/lang/String;", null, null); fv.visitEnd(); - fv = cw.visitField(Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL + Opcodes.ACC_STATIC, + fv = cw.visitField(opcodes.ACC_PRIVATE + opcodes.ACC_FINAL + opcodes.ACC_STATIC, "EMPTY_STRING", "[Ljava/lang/String;", null, null); fv.visitEnd(); - mv = cw.visitMethod(Opcodes.ACC_STATIC, "<clinit>", "()V", null, null); + mv = cw.visitMethod(opcodes.ACC_STATIC, "<clinit>", "()V", null, null); mv.visitCode(); ASMHelper.Label l0 = helper.createLabel(); mv.visitLabel(l0); mv.visitLineNumber(30, l0); - mv.visitInsn(Opcodes.ICONST_0); - mv.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String"); - mv.visitFieldInsn(Opcodes.PUTSTATIC, postFixedName, "EMPTY_STRING", "[Ljava/lang/String;"); - mv.visitInsn(Opcodes.RETURN); + mv.visitInsn(opcodes.ICONST_0); + mv.visitTypeInsn(opcodes.ANEWARRAY, "java/lang/String"); + mv.visitFieldInsn(opcodes.PUTSTATIC, postFixedName, "EMPTY_STRING", "[Ljava/lang/String;"); + mv.visitInsn(opcodes.RETURN); mv.visitMaxs(0, 0); mv.visitEnd(); - mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", + mv = cw.visitMethod(opcodes.ACC_PUBLIC, "<init>", "(Ljava/util/Map;)V", "(Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V", null); mv.visitCode(); l0 = helper.createLabel(); mv.visitLabel(l0); mv.visitLineNumber(32, l0); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitMethodInsn(Opcodes.INVOKESPECIAL, superName, "<init>", "()V", false); + mv.visitVarInsn(opcodes.ALOAD, 0); + mv.visitMethodInsn(opcodes.INVOKESPECIAL, superName, "<init>", "()V", false); ASMHelper.Label l1 = helper.createLabel(); mv.visitLabel(l1); mv.visitLineNumber(29, l1); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitFieldInsn(Opcodes.GETSTATIC, postFixedName, "EMPTY_STRING", "[Ljava/lang/String;"); - mv.visitFieldInsn(Opcodes.PUTFIELD, postFixedName, "nsctxt", "[Ljava/lang/String;"); + mv.visitVarInsn(opcodes.ALOAD, 0); + mv.visitFieldInsn(opcodes.GETSTATIC, postFixedName, "EMPTY_STRING", "[Ljava/lang/String;"); + mv.visitFieldInsn(opcodes.PUTFIELD, postFixedName, "nsctxt", "[Ljava/lang/String;"); ASMHelper.Label l2 = helper.createLabel(); mv.visitLabel(l2); mv.visitLineNumber(33, l2); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitVarInsn(Opcodes.ALOAD, 1); - mv.visitFieldInsn(Opcodes.PUTFIELD, postFixedName, "nspref", "Ljava/util/Map;"); + mv.visitVarInsn(opcodes.ALOAD, 0); + mv.visitVarInsn(opcodes.ALOAD, 1); + mv.visitFieldInsn(opcodes.PUTFIELD, postFixedName, "nspref", "Ljava/util/Map;"); ASMHelper.Label l3 = helper.createLabel(); mv.visitLabel(l3); mv.visitLineNumber(34, l3); - mv.visitInsn(Opcodes.RETURN); + mv.visitInsn(opcodes.RETURN); ASMHelper.Label l4 = helper.createLabel(); mv.visitLabel(l4); mv.visitLocalVariable("this", "L" + postFixedName + ";", null, l0, l4, 0); @@ -368,36 +367,36 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement mv.visitMaxs(0, 0); mv.visitEnd(); - mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "getPreferredPrefix", + mv = cw.visitMethod(opcodes.ACC_PUBLIC, "getPreferredPrefix", "(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;", null, null); mv.visitCode(); l0 = helper.createLabel(); mv.visitLabel(l0); mv.visitLineNumber(39, l0); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitFieldInsn(Opcodes.GETFIELD, postFixedName, "nspref", "Ljava/util/Map;"); - mv.visitVarInsn(Opcodes.ALOAD, 1); - mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map", + mv.visitVarInsn(opcodes.ALOAD, 0); + mv.visitFieldInsn(opcodes.GETFIELD, postFixedName, "nspref", "Ljava/util/Map;"); + mv.visitVarInsn(opcodes.ALOAD, 1); + mv.visitMethodInsn(opcodes.INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/String"); - mv.visitVarInsn(Opcodes.ASTORE, 4); + mv.visitTypeInsn(opcodes.CHECKCAST, "java/lang/String"); + mv.visitVarInsn(opcodes.ASTORE, 4); l1 = helper.createLabel(); mv.visitLabel(l1); mv.visitLineNumber(40, l1); - mv.visitVarInsn(Opcodes.ALOAD, 4); + mv.visitVarInsn(opcodes.ALOAD, 4); l2 = helper.createLabel(); - mv.visitJumpInsn(Opcodes.IFNULL, l2); + mv.visitJumpInsn(opcodes.IFNULL, l2); l3 = helper.createLabel(); mv.visitLabel(l3); mv.visitLineNumber(41, l3); - mv.visitVarInsn(Opcodes.ALOAD, 4); - mv.visitInsn(Opcodes.ARETURN); + mv.visitVarInsn(opcodes.ALOAD, 4); + mv.visitInsn(opcodes.ARETURN); mv.visitLabel(l2); mv.visitLineNumber(43, l2); - mv.visitFrame(Opcodes.F_APPEND, 1, new Object[] {"java/lang/String"}, 0, null); - mv.visitVarInsn(Opcodes.ALOAD, 2); - mv.visitInsn(Opcodes.ARETURN); + mv.visitFrame(opcodes.F_APPEND, 1, new Object[] {"java/lang/String"}, 0, null); + mv.visitVarInsn(opcodes.ALOAD, 2); + mv.visitInsn(opcodes.ARETURN); l4 = helper.createLabel(); mv.visitLabel(l4); mv.visitLocalVariable("this", "L" + postFixedName + ";", null, l0, l4, 0); @@ -408,18 +407,18 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement mv.visitMaxs(0, 0); mv.visitEnd(); - mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "setContextualNamespaceDecls", "([Ljava/lang/String;)V", null, null); + mv = cw.visitMethod(opcodes.ACC_PUBLIC, "setContextualNamespaceDecls", "([Ljava/lang/String;)V", null, null); mv.visitCode(); l0 = helper.createLabel(); mv.visitLabel(l0); mv.visitLineNumber(47, l0); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitVarInsn(Opcodes.ALOAD, 1); - mv.visitFieldInsn(Opcodes.PUTFIELD, postFixedName, "nsctxt", "[Ljava/lang/String;"); + mv.visitVarInsn(opcodes.ALOAD, 0); + mv.visitVarInsn(opcodes.ALOAD, 1); + mv.visitFieldInsn(opcodes.PUTFIELD, postFixedName, "nsctxt", "[Ljava/lang/String;"); l1 = helper.createLabel(); mv.visitLabel(l1); mv.visitLineNumber(48, l1); - mv.visitInsn(Opcodes.RETURN); + mv.visitInsn(opcodes.RETURN); l2 = helper.createLabel(); mv.visitLabel(l2); mv.visitLocalVariable("this", "L" + postFixedName + ";", null, l0, l2, 0); @@ -427,14 +426,14 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement mv.visitMaxs(0, 0); mv.visitEnd(); - mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "getContextualNamespaceDecls", "()[Ljava/lang/String;", null, null); + mv = cw.visitMethod(opcodes.ACC_PUBLIC, "getContextualNamespaceDecls", "()[Ljava/lang/String;", null, null); mv.visitCode(); l0 = helper.createLabel(); mv.visitLabel(l0); mv.visitLineNumber(51, l0); - mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitFieldInsn(Opcodes.GETFIELD, postFixedName, "nsctxt", "[Ljava/lang/String;"); - mv.visitInsn(Opcodes.ARETURN); + mv.visitVarInsn(opcodes.ALOAD, 0); + mv.visitFieldInsn(opcodes.GETFIELD, postFixedName, "nsctxt", "[Ljava/lang/String;"); + mv.visitInsn(opcodes.ARETURN); l1 = helper.createLabel(); mv.visitLabel(l1); diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelperImpl.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelperImpl.java index f67a06d..cc01f14 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ASMHelperImpl.java +++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelperImpl.java @@ -209,11 +209,10 @@ public class ASMHelperImpl implements ASMHelper { } // ASM >= 3.x (since cxf is java 8 min we don't care of asm 1/2) try { - Constructor<?> cons - = cwClass.getConstructor(new Class<?>[] {Integer.TYPE}); + Constructor<?> cons = cwClass.getConstructor(Integer.TYPE); int i = cwClass.getField("COMPUTE_MAXS").getInt(null); i |= cwClass.getField("COMPUTE_FRAMES").getInt(null); - newCw = cons.newInstance(new Object[] {Integer.valueOf(i)}); + newCw = cons.newInstance(Integer.valueOf(i)); } catch (Throwable e1) { // ignore } diff --git a/core/src/main/java/org/apache/cxf/common/util/CachedClass.java b/core/src/main/java/org/apache/cxf/common/util/CachedClass.java index 3457879..fe2df06 100644 --- a/core/src/main/java/org/apache/cxf/common/util/CachedClass.java +++ b/core/src/main/java/org/apache/cxf/common/util/CachedClass.java @@ -21,17 +21,17 @@ package org.apache.cxf.common.util; import java.lang.ref.WeakReference; public class CachedClass { - private WeakReference<Class<?>> cachedClass; + private WeakReference<Class<?>> cachedClazz; public CachedClass(Class<?> cachedClass) { - this.cachedClass = new WeakReference<>(cachedClass); + this.cachedClazz = new WeakReference<>(cachedClass); } public Class<?> getCachedClass() { - return cachedClass == null ? null : cachedClass.get(); + return cachedClazz == null ? null : cachedClazz.get(); } public void setCachedClass(Class<?> cachedClass) { - this.cachedClass = new WeakReference<>(cachedClass); + this.cachedClazz = new WeakReference<>(cachedClass); } } diff --git a/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java b/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java index 6deeb1f..adec469 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java +++ b/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java @@ -123,8 +123,7 @@ public class ClassHelper { private static ClassUnwrapper getContextClassUnwrapper(Bus bus) { if (bus != null && bus.getProperty(ClassUnwrapper.class.getName()) != null) { - ClassUnwrapper unwrapper = (ClassUnwrapper) bus.getProperty(ClassUnwrapper.class.getName()); - return unwrapper; + return (ClassUnwrapper) bus.getProperty(ClassUnwrapper.class.getName()); } return (DEFAULT_UNWRAPPER == UNWRAPPER || checkUseDefaultClassHelper(bus)) ? DEFAULT_UNWRAPPER : UNWRAPPER; diff --git a/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java b/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java index ebd91e1..4e888c3 100644 --- a/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java @@ -65,7 +65,7 @@ public final class CollectionUtils { } public static <S, T> Dictionary<S, T> toDictionary(Map<S, T> map) { - return new MapToDictionary<S, T>(map); + return new MapToDictionary<>(map); } static class MapToDictionary<S, T> extends Dictionary<S, T> { @@ -80,7 +80,7 @@ public final class CollectionUtils { public Enumeration<T> elements() { - return map != null ? new IteratorToEnumeration<T>(map.values().iterator()) : null; + return map != null ? new IteratorToEnumeration<>(map.values().iterator()) : null; } public T get(Object key) { @@ -92,7 +92,7 @@ public final class CollectionUtils { } public Enumeration<S> keys() { - return map != null ? new IteratorToEnumeration<S>(map.keySet().iterator()) : null; + return map != null ? new IteratorToEnumeration<>(map.keySet().iterator()) : null; } public T put(S key, T value) { diff --git a/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java b/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java index 9fc055e..daa6407 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java +++ b/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java @@ -138,10 +138,12 @@ public final class ModCountCopyOnWriteArrayList<T> extends CopyOnWriteArrayList< return false; } + @Override public int hashCode() { return super.hashCode() + modCount.get(); } + @Override public boolean equals(Object o) { if (o instanceof ModCountCopyOnWriteArrayList) { return super.equals(o) && modCount.get() diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java index b07874b..9d014c8 100644 --- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java @@ -103,7 +103,6 @@ public final class PackageUtils { String lastToken = tokens.get(tokens.size() - 1); idx = lastToken.lastIndexOf('.'); if (idx > 0) { - //lastToken = lastToken.substring(0, idx); lastToken = lastToken.replace('.', '_'); tokens.set(tokens.size() - 1, lastToken); } diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java index dfdd12b..073ca46 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java +++ b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java @@ -50,6 +50,7 @@ public class ProxyClassLoader extends ClassLoader { } } + @Override public Class<?> findClass(String name) throws ClassNotFoundException { if (classes != null) { for (Class<?> c : classes) { @@ -75,6 +76,7 @@ public class ProxyClassLoader extends ClassLoader { throw new ClassNotFoundException(name); } + @Override public URL findResource(String name) { for (ClassLoader loader : loaders) { URL url = loader.getResource(name); diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java index ddb5941..380e2bb 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java +++ b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java @@ -96,7 +96,7 @@ public class ProxyHelper { } private String getSortedNameFromInterfaceArray(Class<?>[] interfaces) { - SortedArraySet<String> arraySet = new SortedArraySet<String>(); + SortedArraySet<String> arraySet = new SortedArraySet<>(); for (Class<?> currentInterface : interfaces) { arraySet.add(currentInterface.getName() + ClassLoaderUtils.getClassLoaderName(currentInterface)); } diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java index 57c0eb5..1b4d904 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java +++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java @@ -190,6 +190,8 @@ public class ReflectionInvokationHandler implements InvocationHandler { Object obj = internal.next(); return createProxyWrapper(obj, cls); } + + @Override public void remove() { internal.remove(); } diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java index ef24f4c..9c2b139 100644 --- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java +++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java @@ -57,7 +57,7 @@ public final class SortedArraySet<T> implements SortedSet<T> { } public Iterator<T> iterator() { - return new SASIterator<T>(data.get()); + return new SASIterator<>(data.get()); } public int size() { @@ -222,6 +222,7 @@ public final class SortedArraySet<T> implements SortedSet<T> { return data[idx++]; } + @Override public void remove() { if (idx > 0) { SortedArraySet.this.remove((Object)data[idx - 1]); diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java index fa7e0f7..9113d77 100644 --- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java +++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java @@ -40,10 +40,9 @@ import org.springframework.util.ClassUtils; class SpringClasspathScanner extends ClasspathScanner { - private static final Boolean IN_OSGI; - static { - IN_OSGI = isSpringInOsgi(); - } + private static final boolean IN_OSGI = isSpringInOsgi(); + + SpringClasspathScanner() throws Exception { Class.forName("org.springframework.core.io.support.PathMatchingResourcePatternResolver"); Class.forName("org.springframework.core.type.classreading.CachingMetadataReaderFactory"); @@ -58,6 +57,7 @@ class SpringClasspathScanner extends ClasspathScanner { } } + @Override protected Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClassesInternal( Collection< String > basePackages, List<Class< ? extends Annotation > > annotations, @@ -74,8 +74,8 @@ class SpringClasspathScanner extends ClasspathScanner { final Map<String, String[]> nonMatchingClasses = new HashMap<>(); for (Class< ? extends Annotation > annotation: annotations) { - classes.put(annotation, new HashSet< Class < ? > >()); - matchingInterfaces.put(annotation, new HashSet< String >()); + classes.put(annotation, new HashSet<>()); + matchingInterfaces.put(annotation, new HashSet<>()); } if (basePackages == null || basePackages.isEmpty()) { @@ -137,6 +137,7 @@ class SpringClasspathScanner extends ClasspathScanner { return classes; } + @Override protected List<URL> findResourcesInternal(Collection<String> basePackages, String extension, ClassLoader loader) @@ -170,6 +171,7 @@ class SpringClasspathScanner extends ClasspathScanner { private ResourcePatternResolver getResolver(ClassLoader loader) { ResourcePatternResolver resolver = null; + if (IN_OSGI) { resolver = SpringOsgiUtil.getResolver(loader); } diff --git a/core/src/main/java/org/apache/cxf/common/util/StreamPrinter.java b/core/src/main/java/org/apache/cxf/common/util/StreamPrinter.java index 1f678b3..fa88287 100644 --- a/core/src/main/java/org/apache/cxf/common/util/StreamPrinter.java +++ b/core/src/main/java/org/apache/cxf/common/util/StreamPrinter.java @@ -37,6 +37,7 @@ class StreamPrinter extends Thread { os = redirect; } + @Override public void run() { try { PrintWriter pw = null; diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java index 49ad68c..034c8e2 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java @@ -60,7 +60,7 @@ import org.apache.ws.commons.schema.utils.XmlSchemaObjectBase; */ public class SchemaCollection { - private XmlSchemaCollection schemaCollection; + private XmlSchemaCollection xmlSchemaCollection; private Map<XmlSchema, Set<XmlSchemaType>> xmlTypesCheckedForCrossImportsPerSchema = new HashMap<>(); @@ -69,88 +69,88 @@ public class SchemaCollection { } public SchemaCollection(XmlSchemaCollection col) { - schemaCollection = col; - if (schemaCollection.getNamespaceContext() == null) { + xmlSchemaCollection = col; + if (xmlSchemaCollection.getNamespaceContext() == null) { // an empty prefix map avoids extra checks for null. - schemaCollection.setNamespaceContext(new NamespaceMap()); + xmlSchemaCollection.setNamespaceContext(new NamespaceMap()); } } public XmlSchemaCollection getXmlSchemaCollection() { - return schemaCollection; + return xmlSchemaCollection; } public boolean equals(Object obj) { if (obj instanceof SchemaCollection) { - return schemaCollection.equals(((SchemaCollection)obj).schemaCollection); + return xmlSchemaCollection.equals(((SchemaCollection)obj).xmlSchemaCollection); } else if (obj instanceof XmlSchemaCollection) { - return schemaCollection.equals(obj); + return xmlSchemaCollection.equals(obj); } return false; } public XmlSchemaElement getElementByQName(QName qname) { - return schemaCollection.getElementByQName(qname); + return xmlSchemaCollection.getElementByQName(qname); } public XmlSchemaAttribute getAttributeByQName(QName qname) { - return schemaCollection.getAttributeByQName(qname); + return xmlSchemaCollection.getAttributeByQName(qname); } public ExtensionRegistry getExtReg() { - return schemaCollection.getExtReg(); + return xmlSchemaCollection.getExtReg(); } public NamespacePrefixList getNamespaceContext() { - return schemaCollection.getNamespaceContext(); + return xmlSchemaCollection.getNamespaceContext(); } public XmlSchemaType getTypeByQName(QName schemaTypeName) { - return schemaCollection.getTypeByQName(schemaTypeName); + return xmlSchemaCollection.getTypeByQName(schemaTypeName); } public XmlSchema[] getXmlSchema(String systemId) { - return schemaCollection.getXmlSchema(systemId); + return xmlSchemaCollection.getXmlSchema(systemId); } public XmlSchema[] getXmlSchemas() { - return schemaCollection.getXmlSchemas(); + return xmlSchemaCollection.getXmlSchemas(); } public int hashCode() { - return schemaCollection.hashCode(); + return xmlSchemaCollection.hashCode(); } public void init() { - schemaCollection.init(); + xmlSchemaCollection.init(); } public XmlSchema read(Element elem, String uri) { - return schemaCollection.read(elem, uri); + return xmlSchemaCollection.read(elem, uri); } public XmlSchema read(Document d, String uri) { - return schemaCollection.read(d, uri); + return xmlSchemaCollection.read(d, uri); } public XmlSchema read(Element elem) { - return schemaCollection.read(elem); + return xmlSchemaCollection.read(elem); } public void setBaseUri(String baseUri) { - schemaCollection.setBaseUri(baseUri); + xmlSchemaCollection.setBaseUri(baseUri); } public void setExtReg(ExtensionRegistry extReg) { - schemaCollection.setExtReg(extReg); + xmlSchemaCollection.setExtReg(extReg); } public void setNamespaceContext(NamespacePrefixList namespaceContext) { - schemaCollection.setNamespaceContext(namespaceContext); + xmlSchemaCollection.setNamespaceContext(namespaceContext); } public void setSchemaResolver(URIResolver schemaResolver) { - schemaCollection.setSchemaResolver(schemaResolver); + xmlSchemaCollection.setSchemaResolver(schemaResolver); } /** @@ -160,7 +160,7 @@ public class SchemaCollection { * @return schema, or null. */ public XmlSchema getSchemaByTargetNamespace(String namespaceURI) { - for (XmlSchema schema : schemaCollection.getXmlSchemas()) { + for (XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) { if (namespaceURI != null && namespaceURI.equals(schema.getTargetNamespace()) || namespaceURI == null && schema.getTargetNamespace() == null) { return schema; @@ -170,7 +170,7 @@ public class SchemaCollection { } public XmlSchema getSchemaForElement(QName name) { - for (XmlSchema schema : schemaCollection.getXmlSchemas()) { + for (XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) { if (name.getNamespaceURI().equals(schema.getTargetNamespace())) { if (schema.getElementByName(name.getLocalPart()) != null) { @@ -192,7 +192,7 @@ public class SchemaCollection { */ public XmlSchema newXmlSchemaInCollection(String namespaceURI) { - return new XmlSchema(namespaceURI, schemaCollection); + return new XmlSchema(namespaceURI, xmlSchemaCollection); } /** @@ -205,7 +205,7 @@ public class SchemaCollection { if ("".equals(qname.getNamespaceURI())) { return; // references to the 'unqualified' namespace are OK even if there is no schema for it. } - for (XmlSchema schema : schemaCollection.getXmlSchemas()) { + for (XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) { if (schema.getTargetNamespace().equals(qname.getNamespaceURI())) { return; } @@ -214,7 +214,7 @@ public class SchemaCollection { } public void validateElementName(QName referrer, QName elementQName) { - XmlSchemaElement element = schemaCollection.getElementByQName(elementQName); + XmlSchemaElement element = xmlSchemaCollection.getElementByQName(elementQName); if (element == null) { throw new InvalidXmlSchemaReferenceException(referrer + " references non-existent element " + elementQName); @@ -222,7 +222,7 @@ public class SchemaCollection { } public void validateTypeName(QName referrer, QName typeQName) { - XmlSchemaType type = schemaCollection.getTypeByQName(typeQName); + XmlSchemaType type = xmlSchemaCollection.getTypeByQName(typeQName); if (type == null) { throw new InvalidXmlSchemaReferenceException(referrer + " references non-existent type " + typeQName); @@ -233,7 +233,7 @@ public class SchemaCollection { /* * We need to inventory all the cross-imports to see if any are missing. */ - for (XmlSchema schema : schemaCollection.getXmlSchemas()) { + for (XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) { addOneSchemaCrossImports(schema); } } diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java index d70e83b..3e0099a 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java @@ -191,6 +191,7 @@ public class TLSClientParameters extends TLSParameterBase { return i; } + @Override public boolean equals(Object o) { if (o == this) { return true; diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java index c769f97..d920936 100644 --- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java +++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java @@ -68,6 +68,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport wildCardId = orig; this.matcher = matcher; } + @Override public int compareTo(MatcherHolder mh) { int literalCharsLen1 = this.wildCardId.replace("*", "").length(); @@ -85,6 +86,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport setApplicationContext(ac); } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; super.setBeanFactory(beanFactory); @@ -269,6 +271,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport } } + @Override public void destroy() { super.destroy(); appContexts.clear(); diff --git a/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java index efa1375..5321779 100644 --- a/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java +++ b/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java @@ -60,6 +60,7 @@ public class SourceDataBinding extends org.apache.cxf.databinding.AbstractDataBi continue; } new ServiceModelVisitor(serviceInfo) { + @Override public void begin(MessagePartInfo part) { if (part.getTypeQName() != null || part.getElementQName() != null) { return; diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java index 40b8b7b..3cb836b 100644 --- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java +++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java @@ -90,6 +90,8 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding { continue; } new ServiceModelVisitor(serviceInfo) { + + @Override public void begin(MessagePartInfo part) { if (part.getTypeQName() != null || part.getElementQName() != null) { return; diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java index 20f1a28..250e523 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java +++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java @@ -54,7 +54,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea //collection of conduits that were created so we can close them all at the end protected List<Conduit> conduits = new CopyOnWriteArrayList<>(); - //protected Conduit selectedConduit; + protected Endpoint endpoint; diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java b/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java index b9563c7..467b5a8 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java +++ b/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java @@ -42,7 +42,7 @@ import org.apache.cxf.message.Message; * </ol> */ public class ClientCallback implements Future<Object[]> { - protected final CompletableFuture<Object[]> delegate = new CompletableFuture<Object[]>(); + protected final CompletableFuture<Object[]> delegate = new CompletableFuture<>(); protected Map<String, Object> context; protected boolean started; diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java index 8a07112..53d3a43 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java +++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java @@ -246,6 +246,7 @@ public class ClientImpl responseContext.remove(t); } + @Override public Contexts getContexts() { return new Contexts() { @Override @@ -266,10 +267,7 @@ public class ClientImpl public Map<String, Object> getRequestContext() { if (isThreadLocalRequestContext()) { final Thread t = Thread.currentThread(); - if (!requestContext.containsKey(t)) { - EchoContext freshRequestContext = new EchoContext(currentRequestContext); - requestContext.put(t, freshRequestContext); - } + requestContext.computeIfAbsent(t, k -> new EchoContext(currentRequestContext)); latestContextThread = t; return requestContext.get(t); } diff --git a/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java b/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java index d6af015..daa4bd3 100644 --- a/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java +++ b/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java @@ -23,7 +23,7 @@ import org.apache.cxf.common.injection.NoJSR250Annotations; import org.apache.cxf.interceptor.FIStaxInInterceptor; import org.apache.cxf.interceptor.FIStaxOutInterceptor; import org.apache.cxf.interceptor.InterceptorProvider; -//import org.apache.cxf.interceptor.FIStaxInInterceptor; + /** * <pre> diff --git a/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java b/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java index 18ec628..2236a38 100644 --- a/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java +++ b/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java @@ -38,18 +38,22 @@ public class WrappedFeature extends AbstractFeature { wrapped = f; } + @Override public void initialize(Server server, Bus bus) { wrapped.initialize(server, bus); } + @Override public void initialize(Client client, Bus bus) { wrapped.initialize(client, bus); } + @Override public void initialize(InterceptorProvider interceptorProvider, Bus bus) { wrapped.initialize(interceptorProvider, bus); } + @Override public void initialize(Bus bus) { wrapped.initialize(bus); } diff --git a/core/src/main/java/org/apache/cxf/headers/Header.java b/core/src/main/java/org/apache/cxf/headers/Header.java index 00763ed..f933c14 100644 --- a/core/src/main/java/org/apache/cxf/headers/Header.java +++ b/core/src/main/java/org/apache/cxf/headers/Header.java @@ -27,7 +27,7 @@ public class Header { DIRECTION_IN, DIRECTION_OUT, DIRECTION_INOUT - }; + } public static final String HEADER_LIST = Header.class.getName() + ".list"; diff --git a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java index 6149abe..37bde67 100644 --- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java +++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java @@ -316,8 +316,7 @@ public final class DOMUtils { } for (Node node = first; node != null; node = node.getNextSibling()) { - // System.out.println("getNode: " + name + " " + - // node.getNodeName()); + if (node.getNodeType() != Node.ELEMENT_NODE) { continue; } @@ -424,8 +423,7 @@ public final class DOMUtils { return null; } for (Node node = first; node != null; node = node.getNextSibling()) { - // System.out.println("getNode: " + name + " " + - // node.getNodeName()); + if (name.equals(node.getNodeName())) { return getRawContent(node); } diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java index d36e11c..5178453 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java @@ -51,6 +51,7 @@ import org.apache.cxf.staxutils.StaxUtils; /** * A simple logging handler which outputs the bytes of the message to the * Logger. + * @deprecated */ @Deprecated public abstract class AbstractLoggingInterceptor extends AbstractPhaseInterceptor<Message> { diff --git a/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java index 6d578f9..0a56be1 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java @@ -62,6 +62,7 @@ public class AttachmentInInterceptor extends AbstractPhaseInterceptor<Message> { } } + @Override public void handleFault(Message messageParam) { } diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java b/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java index f139da9..341b3b0 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java +++ b/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java @@ -44,6 +44,7 @@ public class ClientOutFaultObserver extends AbstractFaultChainInitiatorObserver /** * override the super class method */ + @Override public void onMessage(Message m) { if (m.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) { //it's outbound fault observer so only take care of outbound fault diff --git a/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java index ed6ca7b..fd35182 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java +++ b/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java @@ -37,6 +37,7 @@ public class InFaultChainInitiatorObserver extends AbstractFaultChainInitiatorOb super(bus); } + @Override protected void initializeInterceptors(Exchange ex, PhaseInterceptorChain chain) { Endpoint e = ex.getEndpoint(); Client c = ex.get(Client.class); diff --git a/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java b/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java index 9ed7b10..da5deba 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java +++ b/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java @@ -41,7 +41,7 @@ public interface InterceptorChain extends Iterable<Interceptor<? extends Message EXECUTING, COMPLETE, ABORTED, - }; + } String STARTING_AFTER_INTERCEPTOR_ID = "starting_after_interceptor_id"; String STARTING_AT_INTERCEPTOR_ID = "starting_at_interceptor_id"; diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java index f40320d..661e3db 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java +++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java @@ -20,6 +20,9 @@ package org.apache.cxf.interceptor; import java.util.concurrent.atomic.AtomicInteger; +/** + * @deprecated use the logging module rt/features/logging instead + */ @Deprecated public final class LoggingMessage { public static final String ID_KEY = LoggingMessage.class.getName() + ".ID"; diff --git a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java index 14e2aa5..b140601 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java @@ -52,6 +52,8 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message public OneWayProcessorInterceptor(String phase) { super(phase); } + + @Override public void handleFault(Message message) { if (message.getExchange().isOneWay() && !isRequestor(message)) { diff --git a/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java index 022a356..a00e403 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java +++ b/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java @@ -37,6 +37,7 @@ public class OutFaultChainInitiatorObserver extends AbstractFaultChainInitiatorO super(bus); } + @Override protected void initializeInterceptors(Exchange ex, PhaseInterceptorChain chain) { Endpoint e = ex.getEndpoint(); Client c = ex.get(Client.class); diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java index aa1a6da..9b712f3 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java @@ -110,7 +110,7 @@ public class DefaultSecurityContext implements LoginSecurityContext { if (subject != null) { for (Principal principal : subject.getPrincipals()) { if (isGroupPrincipal(principal) - && checkGroup((Principal)principal, role)) { + && checkGroup(principal, role)) { return true; } else if (p != principal && role.equals(principal.getName())) { diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java index c51e662..3363c20 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java @@ -77,6 +77,10 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> { return contextName; } + /** + * @deprecated replaced by {@link #setRoleClassifier(String)} + * @param name + */ @Deprecated public void setRolePrefix(String name) { setRoleClassifier(name); diff --git a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java index 870894a..e3d432d 100644 --- a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java +++ b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java @@ -94,6 +94,8 @@ public class CXFAPINamespaceHandler implements NamespaceHandler { return new SimpleBPBeanDefinitionParser(FastInfosetFeature.class).parse(element, context); } else if ("workqueue".equals(s)) { return new SimpleBPBeanDefinitionParser(AutomaticWorkQueueImpl.class) { + + @Override public String getId(Element element, ParserContext context) { String id = element.hasAttribute("id") ? element.getAttribute("id") : null; if (id == null) { @@ -103,6 +105,7 @@ public class CXFAPINamespaceHandler implements NamespaceHandler { return id; } + @Override protected void processNameAttribute(Element element, ParserContext ctx, MutableBeanMetadata bean, String val) { bean.addProperty("name", createValue(ctx, val)); diff --git a/core/src/main/java/org/apache/cxf/io/CachedWriter.java b/core/src/main/java/org/apache/cxf/io/CachedWriter.java index 07ad64d..0178563 100644 --- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java +++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java @@ -507,6 +507,8 @@ public class CachedWriter extends Writer { try { InputStream fileInputStream = new FileInputStream(tempFile) { boolean closed; + + @Override public void close() throws IOException { if (!closed) { super.close(); @@ -519,6 +521,8 @@ public class CachedWriter extends Writer { if (cipherTransformation != null) { fileInputStream = new CipherInputStream(fileInputStream, ciphers.getDecryptor()) { boolean closed; + + @Override public void close() throws IOException { if (!closed) { super.close(); @@ -618,6 +622,8 @@ public class CachedWriter extends Writer { throw new IOException(e.getMessage(), e); } out = new CipherOutputStream(out, ciphers.getEncryptor()) { + + @Override public void close() throws IOException { if (!cosClosed) { super.close(); @@ -627,6 +633,8 @@ public class CachedWriter extends Writer { }; } return new OutputStreamWriter(out, UTF_8) { + + @Override public void close() throws IOException { if (!cosClosed) { super.close(); @@ -641,6 +649,8 @@ public class CachedWriter extends Writer { if (cipherTransformation != null) { in = new CipherInputStream(in, ciphers.getDecryptor()) { boolean closed; + + @Override public void close() throws IOException { if (!closed) { super.close(); diff --git a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java index 30e7c24..5bfed10 100644 --- a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java +++ b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java @@ -21,7 +21,6 @@ package org.apache.cxf.io; import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; @@ -120,9 +119,7 @@ public class ReaderInputStream extends InputStream { this.reader = reader; this.encoder = encoder; this.encoderIn = CharBuffer.allocate(bufferSize); - ((Buffer)this.encoderIn).flip(); this.encoderOut = ByteBuffer.allocate(128); - ((Buffer)this.encoderOut).flip(); } /** @@ -192,7 +189,7 @@ public class ReaderInputStream extends InputStream { private void fillBuffer() throws IOException { if (!endOfInput && (lastCoderResult == null || lastCoderResult.isUnderflow())) { encoderIn.compact(); - int position = ((Buffer)encoderIn).position(); + int position = encoderIn.position(); // We don't use Reader#read(CharBuffer) here because it is more efficient // to write directly to the underlying char array (the default implementation // copies data to a temporary char array). @@ -200,13 +197,13 @@ public class ReaderInputStream extends InputStream { if (c == -1) { endOfInput = true; } else { - ((Buffer)encoderIn).position(position + c); + encoderIn.position(position + c); } - ((Buffer)encoderIn).flip(); + encoderIn.flip(); } encoderOut.compact(); lastCoderResult = encoder.encode(encoderIn, encoderOut, endOfInput); - ((Buffer)encoderOut).flip(); + encoderOut.flip(); } /** diff --git a/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java b/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java index 2d5d168..17f4579 100644 --- a/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java +++ b/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java @@ -37,6 +37,7 @@ public class WriteOnCloseOutputStream extends CachedOutputStream { } + @Override protected void doClose() throws IOException { resetOut(flowThroughStream, true); flowThroughStream.flush(); diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java index b103bdd..e7f7523 100644 --- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java +++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java @@ -133,6 +133,7 @@ public final class MessageUtils { * Returns true if a value is either the String "true" (regardless of case) or Boolean.TRUE. * @param value * @return true if value is either the String "true" or Boolean.TRUE + * @deprecated replaced by {@link #PropertyUtils#isTrue(Object)} */ @Deprecated public static boolean isTrue(Object value) { diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java b/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java index 7e817dc..ccd12d2 100644 --- a/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java +++ b/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java @@ -82,10 +82,9 @@ public final class PhaseChainCache { PhaseInterceptorChain chain = new PhaseInterceptorChain(phaseList); List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> copy - = new ArrayList<ModCountCopyOnWriteArrayList< - Interceptor<? extends Message>>>(providers.length); + = new ArrayList<>(providers.length); for (List<Interceptor<? extends Message>> p : providers) { - copy.add(new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(p)); + copy.add(new ModCountCopyOnWriteArrayList<>(p)); chain.add(p); } last = new ChainHolder(chain, copy); diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java index 8f7580a..c8a52a8 100644 --- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java +++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java @@ -206,7 +206,6 @@ public class PhaseInterceptorChain implements InterceptorChain { if (iterator == null) { iterator = new PhaseInterceptorIterator(heads); outputChainToLog(false); - //System.out.println(toString()); } } @@ -637,8 +636,7 @@ public class PhaseInterceptorChain implements InterceptorChain { if (lastAfter == null && beforeList.contains("*")) { firstBefore = heads[phase]; } - //System.out.print("Didn't skip: " + phase.toString()); - //System.out.println(" " + interc.getId()); + } else if (!force) { // skip interceptor if already in chain InterceptorHolder ih2 = heads[phase]; @@ -649,8 +647,6 @@ public class PhaseInterceptorChain implements InterceptorChain { ih2 = ih2.next; } - //System.out.print("Skipped: " + phase.toString()); - //System.out.println(" " + interc.getId()); } hasAfters[phase] |= !afterList.isEmpty(); diff --git a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java index b16d21c..687f211 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java +++ b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java @@ -138,7 +138,7 @@ public interface FactoryBeanListener { * Class[], InvokationHandler, Proxy */ PROXY_CREATED, - }; + } void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object ... args); diff --git a/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java b/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java index 8c819c4..465046b 100644 --- a/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java +++ b/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java @@ -59,6 +59,7 @@ public class FactoryInvoker extends AbstractInvoker { } } + @Override public void releaseServiceObject(final Exchange ex, Object obj) { factory.release(ex, obj); } diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java index 2357243..d80e02d 100644 --- a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java +++ b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java @@ -125,7 +125,7 @@ public abstract class AbstractPropertiesHolder implements Extensible { return; } if (null == propertyMap.get()) { - propertyMap.compareAndSet(null, new ConcurrentHashMap<String, Object>(4, 0.75f, 2)); + propertyMap.compareAndSet(null, new ConcurrentHashMap<>(4, 0.75f, 2)); } if (v == null) { propertyMap.get().remove(name); diff --git a/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java b/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java index 49a7daa..f2f240f 100644 --- a/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java @@ -38,10 +38,12 @@ public class FaultInfo extends AbstractMessageContainer { + @Override public int hashCode() { return faultName == null ? -1 : faultName.hashCode(); } + @Override public boolean equals(Object o) { if (o == this) { return true; diff --git a/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java b/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java index d3a7178..a5c3f26 100644 --- a/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java @@ -75,7 +75,7 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt } if (operations.containsKey(oname)) { throw new IllegalArgumentException( - new Message("DUPLICATED.OPERATION.NAME", LOG, new Object[]{oname}).toString()); + new Message("DUPLICATED.OPERATION.NAME", LOG, oname).toString()); } OperationInfo operation = new OperationInfo(this, oname); diff --git a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java index c02158d..d5fe4d3 100644 --- a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java @@ -145,7 +145,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem } if (faults != null && faults.containsKey(name)) { throw new IllegalArgumentException( - new Message("DUPLICATED.FAULT.NAME", LOG, new Object[] {name}).toString()); + new Message("DUPLICATED.FAULT.NAME", LOG, name).toString()); } FaultInfo fault = new FaultInfo(name, message, this); addFault(fault); diff --git a/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java index 0f636a6..31ed72c 100644 --- a/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java @@ -36,28 +36,34 @@ public class UnwrappedOperationInfo extends OperationInfo { return wrappedOp; } + @Override public boolean isUnwrapped() { return true; } + @Override public FaultInfo addFault(QName name, QName message) { return wrappedOp.addFault(name, message); } + @Override public FaultInfo getFault(QName name) { return wrappedOp.getFault(name); } + @Override public Collection<FaultInfo> getFaults() { return wrappedOp.getFaults(); } + @Override public void setOutput(String nm, MessageInfo out) { super.setOutput(nm, out); out.setDelegate(wrappedOp.getOutput(), false); } + @Override public void setInput(String nm, MessageInfo in) { super.setInput(nm, in); in.setDelegate(wrappedOp.getInput(), false); diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java index aab3182..3fecf1a 100644 --- a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java +++ b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java @@ -30,10 +30,12 @@ public abstract class AbstractBeanValidationInterceptor extends AbstractValidati super(phase); } + @Override protected Object getServiceObject(Message message) { return checkNotNull(super.getServiceObject(message), "SERVICE_OBJECT_NULL"); } + @Override protected Method getServiceMethod(Message message) { return (Method)checkNotNull(super.getServiceMethod(message), "SERVICE_METHOD_NULL"); } diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java b/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java index 425e972..206494d 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java @@ -204,6 +204,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> { impl.handleMessage(message); } + @Override public void handleFault(Message message) { if (impl != null) { impl.handleFault(message); @@ -211,6 +212,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> { } + @Override public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() { if (impl != null) { return impl.getAdditionalInterceptors();