Repository: cxf Updated Branches: refs/heads/master 4a418df6e -> 864dafbc5
http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorStaticStrategy.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorStaticStrategy.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorStaticStrategy.java index b5b0518..2832491 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorStaticStrategy.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorStaticStrategy.java @@ -37,9 +37,7 @@ public class LoadDistributorStaticStrategy extends SequentialStrategy { // Get the list of endpoints, including the current one. // This part is required for most FailoverStrategys that provide alternate // target endpoints for the LoadDistributorTargetSelector. - List<Endpoint> alternateEndpoints = getEndpoints(exchange, true); - - return alternateEndpoints; + return getEndpoints(exchange, true); } @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java index 94adcff..b57fa5a 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java @@ -519,7 +519,7 @@ public class MessageFlow extends Assert { return !(null != bodyElement && bodyElement.hasChildNodes()); } - private String dump(List<byte[]> streams) { + String dump(List<byte[]> streams) { StringBuilder buf = new StringBuilder(); try { buf.append(System.getProperty("line.separator")); http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java index 6ff0d20..d0df548 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java @@ -99,15 +99,13 @@ public class WSSecurity10UsernameAuthorizationLegacyTest extends AbstractBusClie BusFactory.setDefaultBus(bus); BusFactory.setThreadDefaultBus(bus); PingService svc = new PingService(getWsdlLocation("UserNameOverTransport")); - final IPingService port = - svc.getPort( + return svc.getPort( new QName( "http://WSSec/wssec10";, "UserNameOverTransport" + "_IPingService" ), IPingService.class ); - return port; } http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java index 7f5ef85..e8e5767 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java @@ -135,15 +135,13 @@ public class WSSecurity10UsernameAuthorizationTest extends AbstractBusClientServ BusFactory.setDefaultBus(bus); BusFactory.setThreadDefaultBus(bus); PingService svc = new PingService(getWsdlLocation("UserNameOverTransport")); - final IPingService port = - svc.getPort( + return svc.getPort( new QName( "http://WSSec/wssec10";, "UserNameOverTransport" + "_IPingService" ), IPingService.class ); - return port; } private static IPingService getUTOnlyPort(Bus bus, boolean hashed) { @@ -151,15 +149,13 @@ public class WSSecurity10UsernameAuthorizationTest extends AbstractBusClientServ BusFactory.setDefaultBus(bus); BusFactory.setThreadDefaultBus(bus); PingService svc = new PingService(getWsdlLocation(hashed)); - final IPingService port = - svc.getPort( + return svc.getPort( new QName( "http://WSSec/wssec10";, hashed ? "UserName_IPingService_hashed" : "UserName_IPingService" ), IPingService.class ); - return port; } private static URL getWsdlLocation(boolean hashed) { http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java index 2e65986..97e017b 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java @@ -133,9 +133,7 @@ public class WSAFaultToClientServerTest extends AbstractWSATestBase { QName serviceName = new QName("http://apache.org/cxf/systest/ws/addr_feature/";, "AddNumbersService"); AddNumbersService service = new AddNumbersService(wsdl, serviceName); assertNotNull("Service is null ", service); - AddNumbersPortType port = service.getAddNumbersPort(new AddressingFeature()); - //updateAddressPort(port, PORT); - return port; + return service.getAddNumbersPort(new AddressingFeature()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java index 94adcff..b57fa5a 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/MessageFlow.java @@ -519,7 +519,7 @@ public class MessageFlow extends Assert { return !(null != bodyElement && bodyElement.hasChildNodes()); } - private String dump(List<byte[]> streams) { + String dump(List<byte[]> streams) { StringBuilder buf = new StringBuilder(); try { buf.append(System.getProperty("line.separator")); http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java ---------------------------------------------------------------------- diff --git a/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java b/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java index 384ae7b..24fabcd 100644 --- a/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java +++ b/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java @@ -226,10 +226,9 @@ public class TestUtilities { is.close(); os.close(); - byte[] bs = obs.getResponseStream().toByteArray(); - - return bs; + return obs.getResponseStream().toByteArray(); } + public byte[] invokeBytes(String address, String transport, byte[] message) throws Exception { EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http";); ei.setAddress(address); http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ConstrTypeSpecVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ConstrTypeSpecVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ConstrTypeSpecVisitor.java index 849400b..2676e63 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ConstrTypeSpecVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ConstrTypeSpecVisitor.java @@ -37,11 +37,9 @@ public class ConstrTypeSpecVisitor extends VisitorBase { } public static boolean accept(AST node) { - boolean result = - StructVisitor.accept(node) + return StructVisitor.accept(node) || UnionVisitor.accept(node) || EnumVisitor.accept(node); - return result; } public void visit(AST node) { http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java index 3b21a15..5c87adb 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java @@ -37,10 +37,8 @@ public class SimpleTypeSpecVisitor extends VisitorBase { } public static boolean accept(AST node) { - boolean result = - PrimitiveTypesVisitor.accept(node) + return PrimitiveTypesVisitor.accept(node) || TemplateTypeSpecVisitor.accept(node); - return result; } public void visit(AST node) { http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java index 9adcc86..621804c 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java @@ -37,11 +37,9 @@ public class TemplateTypeSpecVisitor extends VisitorBase { } public static boolean accept(AST node) { - boolean result = - SequenceVisitor.accept(node) + return SequenceVisitor.accept(node) || StringVisitor.accept(node) || FixedVisitor.accept(node); - return result; } public void visit(AST node) { http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java index 9037921..089f799 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypeDclVisitor.java @@ -35,12 +35,10 @@ public class TypeDclVisitor extends VisitorBase { } public static boolean accept(AST node) { - boolean result = - TypedefVisitor.accept(node) + return TypedefVisitor.accept(node) || StructVisitor.accept(node) || UnionVisitor.accept(node) || EnumVisitor.accept(node); - return result; } public void visit(AST node) { http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java index b80131c..bdc8140 100644 --- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java +++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java @@ -116,11 +116,7 @@ public class IdlPreprocessorReaderTest extends TestCase { final URL orig = findTestResource(location); final ClassPathIncludeResolver includeResolver = new ClassPathIncludeResolver(); final DefineState defineState = new DefineState(new HashMap<String, String>()); - final IdlPreprocessorReader preprocessor = new IdlPreprocessorReader(orig, - location, - includeResolver, - defineState); - return preprocessor; + return new IdlPreprocessorReader(orig, location, includeResolver, defineState); } private void assertExpectedPreprocessingResult(final String expectedResultLocation, http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java index 03008ad..8ed2af4 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java @@ -70,17 +70,13 @@ public final class CustomNodeSelector { public Node queryNode(final Node target, final String expression) { XPathUtils xpath = new XPathUtils(context); - Node node = (Node) xpath.getValue(expression, target, XPathConstants.NODE); - - return node; + return (Node) xpath.getValue(expression, target, XPathConstants.NODE); } public NodeList queryNodes(final Node target, final String expression) { XPathUtils xpath = new XPathUtils(context); - NodeList nodeList = (NodeList) xpath.getValue(expression, target, XPathConstants.NODESET); - - return nodeList; + return (NodeList) xpath.getValue(expression, target, XPathConstants.NODESET); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java index cf835d0..7e6269b 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java @@ -59,9 +59,8 @@ public class FaultProcessor extends AbstractProcessor { if (context.optionSet(ToolConstants.CFG_GEN_OVERWRITE)) { return false; } - boolean collision = collector.containTypesClass(packageName, className) + return collector.containTypesClass(packageName, className) || collector.containSeiClass(packageName, className); - return collision; } private void processFault(JavaMethod method, FaultInfo faultMessage) throws ToolException { http://git-wip-us.apache.org/repos/asf/cxf/blob/d49f3f24/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java index ab41d89..aed6a1b 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java @@ -191,7 +191,7 @@ public final class ProcessorUtil { if (location.startsWith("http://";)) { return location; } else { - return resolvePath(new File(location).getAbsolutePath()); + return new File(location).getAbsolutePath().replace('\\', '/'); } } @@ -204,10 +204,6 @@ public final class ProcessorUtil { } } - private static String resolvePath(String path) { - return path.replace('\\', '/'); - } - public static String classNameToFilePath(String className) { String str; if (className.indexOf(".") < 0) { @@ -282,7 +278,7 @@ public final class ProcessorUtil { } } - private static String escapeSpace(String url) { + static String escapeSpace(String url) { StringBuilder buf = new StringBuilder(); for (int i = 0; i < url.length(); i++) { if (url.charAt(i) == ' ') {
