Repository: cxf Updated Branches: refs/heads/master d28828e47 -> c26e8b990
http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java index 5c79fc0..45a4dc7 100644 --- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java +++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java @@ -289,14 +289,12 @@ public class CachedOutputStream extends OutputStream { if (inmem) { if (currentStream instanceof ByteArrayOutputStream) { return ((ByteArrayOutputStream)currentStream).toByteArray(); - } else { - throw new IOException("Unknown format of currentStream"); - } - } else { - // read the file - try (InputStream fin = createInputStream(tempFile)) { - return IOUtils.readBytesFromStream(fin); } + throw new IOException("Unknown format of currentStream"); + } + // read the file + try (InputStream fin = createInputStream(tempFile)) { + return IOUtils.readBytesFromStream(fin); } } @@ -498,26 +496,25 @@ public class CachedOutputStream extends OutputStream { } else { return null; } - } else { - try { - InputStream fileInputStream = new TransferableFileInputStream(tempFile); - streamList.add(fileInputStream); - if (cipherTransformation != null) { - fileInputStream = new CipherInputStream(fileInputStream, ciphers.getDecryptor()) { - boolean closed; - public void close() throws IOException { - if (!closed) { - super.close(); - closed = true; - } + } + try { + InputStream fileInputStream = new TransferableFileInputStream(tempFile); + streamList.add(fileInputStream); + if (cipherTransformation != null) { + fileInputStream = new CipherInputStream(fileInputStream, ciphers.getDecryptor()) { + boolean closed; + public void close() throws IOException { + if (!closed) { + super.close(); + closed = true; } - }; - } - - return fileInputStream; - } catch (FileNotFoundException e) { - throw new IOException("Cached file was deleted, " + e.toString()); + } + }; } + + return fileInputStream; + } catch (FileNotFoundException e) { + throw new IOException("Cached file was deleted, " + e.toString()); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/io/CachedWriter.java ---------------------------------------------------------------------- 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 64be62e..9fd4b66 100644 --- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java +++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java @@ -307,21 +307,19 @@ public class CachedWriter extends Writer { if (inmem) { if (currentStream instanceof LoadingCharArrayWriter) { return ((LoadingCharArrayWriter)currentStream).toCharArray(); - } else { - throw new IOException("Unknown format of currentStream"); } - } else { - // read the file - try (Reader fin = createInputStreamReader(tempFile)) { - CharArrayWriter out = new CharArrayWriter((int)tempFile.length()); - char bytes[] = new char[1024]; - int x = fin.read(bytes); - while (x != -1) { - out.write(bytes, 0, x); - x = fin.read(bytes); - } - return out.toCharArray(); + throw new IOException("Unknown format of currentStream"); + } + // read the file + try (Reader fin = createInputStreamReader(tempFile)) { + CharArrayWriter out = new CharArrayWriter((int)tempFile.length()); + char bytes[] = new char[1024]; + int x = fin.read(bytes); + while (x != -1) { + out.write(bytes, 0, x); + x = fin.read(bytes); } + return out.toCharArray(); } } @@ -491,37 +489,35 @@ public class CachedWriter extends Writer { if (currentStream instanceof LoadingCharArrayWriter) { LoadingCharArrayWriter lcaw = (LoadingCharArrayWriter)currentStream; return new CharArrayReader(lcaw.rawCharArray(), 0, lcaw.size()); - } else { - return null; } - } else { - try { - InputStream fileInputStream = new FileInputStream(tempFile) { + return null; + } + try { + InputStream fileInputStream = new FileInputStream(tempFile) { + boolean closed; + public void close() throws IOException { + if (!closed) { + super.close(); + maybeDeleteTempFile(this); + } + closed = true; + } + }; + streamList.add(fileInputStream); + if (cipherTransformation != null) { + fileInputStream = new CipherInputStream(fileInputStream, ciphers.getDecryptor()) { boolean closed; public void close() throws IOException { if (!closed) { super.close(); - maybeDeleteTempFile(this); + closed = true; } - closed = true; } }; - streamList.add(fileInputStream); - if (cipherTransformation != null) { - fileInputStream = new CipherInputStream(fileInputStream, ciphers.getDecryptor()) { - boolean closed; - public void close() throws IOException { - if (!closed) { - super.close(); - closed = true; - } - } - }; - } - return new InputStreamReader(fileInputStream, StandardCharsets.UTF_8); - } catch (FileNotFoundException e) { - throw new IOException("Cached file was deleted, " + e.toString()); } + return new InputStreamReader(fileInputStream, StandardCharsets.UTF_8); + } catch (FileNotFoundException e) { + throw new IOException("Cached file was deleted, " + e.toString()); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/message/MessageUtils.java ---------------------------------------------------------------------- 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 1e89239..4939905 100644 --- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java +++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java @@ -78,9 +78,8 @@ public final class MessageUtils { FaultMode mode = message.get(FaultMode.class); if (null != mode) { return mode; - } else { - return FaultMode.RUNTIME_FAULT; } + return FaultMode.RUNTIME_FAULT; } return null; } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java ---------------------------------------------------------------------- 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 32da08b..0187e8a 100644 --- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java +++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java @@ -169,11 +169,10 @@ public class PhaseInterceptorChain implements InterceptorChain { if (chain.iterator.next() instanceof ServiceInvokerInterceptor) { CURRENT_MESSAGE.set(m); return true; - } else { - String error = "Only ServiceInvokerInterceptor can update the current chain message"; - LOG.warning(error); - throw new IllegalStateException(error); } + String error = "Only ServiceInvokerInterceptor can update the current chain message"; + LOG.warning(error); + throw new IllegalStateException(error); } return false; http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java b/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java index ae1b0d8..1eb470a 100644 --- a/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java +++ b/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java @@ -88,9 +88,8 @@ public class ExtendedURIResolver { public String getURI() { if (currentResolver.getURI() != null) { return currentResolver.getURI().toString(); - } else { - return lastestImportUri; } + return lastestImportUri; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/resource/SecurityActions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/resource/SecurityActions.java b/core/src/main/java/org/apache/cxf/resource/SecurityActions.java index 2f80835..c2a1e5b 100644 --- a/core/src/main/java/org/apache/cxf/resource/SecurityActions.java +++ b/core/src/main/java/org/apache/cxf/resource/SecurityActions.java @@ -32,13 +32,12 @@ final class SecurityActions { SecurityManager sm = System.getSecurityManager(); if (sm == null) { return file.exists(); - } else { - sm.checkPermission(permission); - return AccessController.doPrivileged(new PrivilegedAction<Boolean>() { - public Boolean run() { - return file.exists(); - } - }); } + sm.checkPermission(permission); + return AccessController.doPrivileged(new PrivilegedAction<Boolean>() { + public Boolean run() { + return file.exists(); + } + }); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java index 90dca4f..5e757f5 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java +++ b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java @@ -205,7 +205,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener { } } else { try { - f = (Factory)scope.factoryClass().getConstructor(Class.class, String[].class) + f = scope.factoryClass().getConstructor(Class.class, String[].class) .newInstance(cls, scope.args()); } catch (Throwable t) { throw new ServiceConstructionException(t); http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java b/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java index 2f2bd60..a94357f 100644 --- a/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java +++ b/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java @@ -160,13 +160,12 @@ public abstract class AbstractInvoker implements Invoker { if (checked) { return new Fault(ex); - } else { - String message = (ex == null) ? "" : ex.getMessage(); - String method = (m == null) ? "<null>" : m.toString(); - return new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG, - message, method, params), - ex); } + String message = (ex == null) ? "" : ex.getMessage(); + String method = (m == null) ? "<null>" : m.toString(); + return new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG, + message, method, params), + ex); } protected Object performInvocation(Exchange exchange, final Object serviceObject, Method m, http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java index 5d3f612..3128cc5 100644 --- a/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java @@ -76,12 +76,11 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem if (a == null) { // in case of input/output itself is empty return true; - } else { - if (b == null) { - b = def; - } - return "".equals(a) ? "".equals(b) : a.equals(b); } + if (b == null) { + b = def; + } + return "".equals(a) ? "".equals(b) : a.equals(b); } public BindingOperationInfo buildOperation(QName opName, String inName, String outName) { for (OperationInfo op : getInterface().getOperations()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java index 7b011a4..55664f6 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java @@ -70,9 +70,8 @@ public class DepthRestrictingStreamReader extends DepthXMLStreamReader { int currentCount = stack.pop(); if (++currentCount >= props.getInnerElementCountThreshold()) { throw new DepthExceededStaxException(); - } else { - stack.push(currentCount); } + stack.push(currentCount); } stack.push(0); } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java index a06944e..9b8dce2 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java +++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java @@ -181,9 +181,8 @@ public class StaxSource extends SAXSource implements XMLReader { String prefix = streamReader.getPrefix(); if (prefix != null && prefix.length() > 0) { return prefix + ":" + streamReader.getLocalName(); - } else { - return streamReader.getLocalName(); } + return streamReader.getLocalName(); } protected Attributes getAttributes() { http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java index 728b391..53cc1ab 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java @@ -269,9 +269,8 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> { if (prefix == null) { return new QName(ns, ln); - } else { - return new QName(ns, ln, prefix); } + return new QName(ns, ln, prefix); } public String getAttributeNamespace(int i) { http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java b/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java index 634f409..13ad279 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java +++ b/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java @@ -106,9 +106,8 @@ public class W3CNamespaceContext implements NamespaceContext { String name = a.getLocalName(); if ("xmlns".equals(name)) { return ""; - } else { - return name; } + return name; } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java index 3ce1a15..efd74b3 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java @@ -102,10 +102,9 @@ public class InTransformReader extends DepthXMLStreamReader { LOG.fine("pushed event available: " + currentEvent); } return currentEvent.getEvent(); - } else { - if (doDebug) { - LOG.fine("no pushed event"); - } + } + if (doDebug) { + LOG.fine("no pushed event"); } int event = super.next(); @@ -279,9 +278,8 @@ public class InTransformReader extends DepthXMLStreamReader { public String getLocalName() { if (currentEvent != null) { return currentEvent.getName().getLocalPart(); - } else { - return super.getLocalName(); } + return super.getLocalName(); } @@ -319,9 +317,8 @@ public class InTransformReader extends DepthXMLStreamReader { if (actualNs != null) { if (actualNs.length() > 0) { return super.getNamespacePrefix(index); - } else { - return ""; } + return ""; } else if (ns.equals(reader.getNamespaceURI())) { return getPrefix(); } else { @@ -335,17 +332,15 @@ public class InTransformReader extends DepthXMLStreamReader { String actualNs = nsMap.get(ns); if (actualNs != null) { return actualNs; - } else { - return ns != null ? ns : namespaceContext.getNamespaceURI(prefix); } + return ns != null ? ns : namespaceContext.getNamespaceURI(prefix); } public String getNamespaceURI() { if (currentEvent != null) { return currentEvent.getName().getNamespaceURI(); - } else { - return super.getNamespaceURI(); } + return super.getNamespaceURI(); } private QName readCurrentElement() { @@ -408,14 +403,12 @@ public class InTransformReader extends DepthXMLStreamReader { QName aname = getAttributeName(arg0); if (XMLConstants.NULL_NS_URI.equals(aname.getNamespaceURI())) { return ""; - } else { - String actualNs = nsMap.get(aname.getNamespaceURI()); - if (actualNs != null) { - return namespaceContext.findUniquePrefix(actualNs); - } else { - return namespaceContext.getPrefix(aname.getNamespaceURI()); - } } + String actualNs = nsMap.get(aname.getNamespaceURI()); + if (actualNs != null) { + return namespaceContext.findUniquePrefix(actualNs); + } + return namespaceContext.getPrefix(aname.getNamespaceURI()); } public String getAttributeType(int arg0) { http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java b/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java index c4a01a7..aeb61a2 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java +++ b/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java @@ -81,8 +81,7 @@ public class ResolvingGrammarReaderController implements GrammarReaderController if (embeddedSchema != null) { return new DOMLSInputImpl(this.baseURI, embeddedSchema.getSystemId(), embeddedSchema .getSchemaElement()); - } else { - return null; } + return null; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/main/java/org/apache/cxf/transport/TransportFinder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/transport/TransportFinder.java b/core/src/main/java/org/apache/cxf/transport/TransportFinder.java index a6ff31f..077c640 100644 --- a/core/src/main/java/org/apache/cxf/transport/TransportFinder.java +++ b/core/src/main/java/org/apache/cxf/transport/TransportFinder.java @@ -150,7 +150,7 @@ public class TransportFinder<T> { } } else { try { - Method m = bean.getClass().getMethod("getActivationNamespaces", new Class[0]); + Method m = bean.getClass().getMethod("getActivationNamespaces"); Collection<String> c = CastUtils.cast((Collection<?>)m.invoke(bean)); for (String s : c) { if (!map.containsKey(s)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java index 15ee62b..77ab26b 100644 --- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java +++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java @@ -57,10 +57,9 @@ public class AnnotatedGreeterImpl { public int getInvocationCount(String method) { if (invocationCount.containsKey(method)) { return invocationCount.get(method).intValue(); - } else { - System.out.println("No invocation count for method: " + method); - return 0; } + System.out.println("No invocation count for method: " + method); + return 0; } /** http://git-wip-us.apache.org/repos/asf/cxf/blob/c26e8b99/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java index 21c9427..4ef6338 100644 --- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java +++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java @@ -45,22 +45,17 @@ public class URIResolverTest extends Assert { URL jarURL = new URL(uriStr); InputStream is = jarURL.openStream(); assertNotNull(is); - if (is != null) { - barray = new byte[is.available()]; - is.read(barray); - is.close(); - } + barray = new byte[is.available()]; + is.read(barray); + is.close(); uriResolver.resolve("baseUriStr", uriStr, null); InputStream is2 = uriResolver.getInputStream(); assertNotNull(is2); - if (is2 != null) { - barray2 = new byte[is2.available()]; - is2.read(barray2); - is2.close(); - - } + barray2 = new byte[is2.available()]; + is2.read(barray2); + is2.close(); assertEquals(IOUtils.newStringFromBytes(barray), IOUtils.newStringFromBytes(barray2)); }
