Repository: cxf Updated Branches: refs/heads/master a6a9e6937 -> 885b65d32
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 8474dee..03008ad 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 @@ -31,7 +31,7 @@ import org.apache.cxf.helpers.XPathUtils; import org.apache.cxf.tools.common.ToolConstants; public final class CustomNodeSelector { - private static final Map<String, String> BINDING_NS_MAP = new HashMap<String, String>(); + private static final Map<String, String> BINDING_NS_MAP = new HashMap<>(); private MapNamespaceContext context = new MapNamespaceContext(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java index 5dbf132..51edf88 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java @@ -65,9 +65,9 @@ public final class CustomizationParser { private ToolContext env; // map for jaxws binding and wsdl element - private final Map<Element, Element> jaxwsBindingsMap = new HashMap<Element, Element>(); + private final Map<Element, Element> jaxwsBindingsMap = new HashMap<>(); private final List<InputSource> jaxbBindings = new ArrayList<>(); - private final Map<String, Element> customizedElements = new HashMap<String, Element>(); + private final Map<String, Element> customizedElements = new HashMap<>(); private Element handlerChains; private Element wsdlNode; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java index a42768e..dff77a1 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java @@ -70,8 +70,8 @@ public class AntGenerator extends AbstractJAXWSGenerator { return; } - Map<String, String> clientClassNamesMap = new HashMap<String, String>(); - Map<String, String> serverClassNamesMap = new HashMap<String, String>(); + Map<String, String> clientClassNamesMap = new HashMap<>(); + Map<String, String> serverClassNamesMap = new HashMap<>(); Map<String, JavaInterface> interfaces = javaModel.getInterfaces(); int index = 1; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java index 73943bb..fe6a36b 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java @@ -106,7 +106,7 @@ public class ImplGenerator extends AbstractJAXWSGenerator { private String getImplName(String port, String service, JavaInterface intf, ToolContext penv) { Map<String, String> nm = CastUtils.cast((Map<?, ?>)penv.get(ToolConstants.CFG_IMPL_CLASS)); if (nm == null) { - nm = new HashMap<String, String>(); + nm = new HashMap<>(); penv.put(ToolConstants.CFG_IMPL_CLASS, nm); } String name = nm.get(service + "/" + port); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java index 1e888f2..63a4a57 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java @@ -105,7 +105,7 @@ public class ServerGenerator extends AbstractJAXWSGenerator { private String getImplName(String port, String service, JavaInterface intf, ToolContext penv) { Map<String, String> nm = CastUtils.cast((Map<?, ?>)penv.get(ToolConstants.CFG_IMPL_CLASS)); if (nm == null) { - nm = new HashMap<String, String>(); + nm = new HashMap<>(); penv.put(ToolConstants.CFG_IMPL_CLASS, nm); } String name = nm.get(service + "/" + port); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java index 06f26cf..033ae25 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java @@ -636,7 +636,7 @@ public class ServiceProcessor extends AbstractProcessor { } private Map<String, Object> getSoapOperationProp(BindingOperationInfo bop) { - Map<String, Object> soapOPProp = new HashMap<String, Object>(); + Map<String, Object> soapOPProp = new HashMap<>(); if (bop.getExtensor(ExtensibilityElement.class) != null) { for (ExtensibilityElement ext : bop.getExtensors(ExtensibilityElement.class)) { if (SOAPBindingUtil.isSOAPOperation(ext)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java index db434f3..6ac0035 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java @@ -68,8 +68,8 @@ public class UniqueBodyValidator extends ServiceValidator { private boolean isValidEndpoint(EndpointInfo endpoint) { BindingInfo binding = endpoint.getBinding(); - Map<QName, QName> uniqueNames = new HashMap<QName, QName>(); - Map<QName, Set<String>> actions = new HashMap<QName, Set<String>>(); + Map<QName, QName> uniqueNames = new HashMap<>(); + Map<QName, Set<String>> actions = new HashMap<>(); Collection<BindingOperationInfo> bos = binding.getOperations(); for (BindingOperationInfo bo : bos) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java index 781d673..40e4fe0 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java @@ -141,7 +141,7 @@ public class WrapperStyleNameCollisionValidator extends ServiceValidator { output = operation.getOutput().getFirstMessagePart(); } if (!c) { - Map<String, QName> names = new HashMap<String, QName>(); + Map<String, QName> names = new HashMap<>(); if (input != null) { for (WrapperElement element : ProcessorUtil.getWrappedElement(context, input.getElementQName())) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java index 73c725d..7a13a5d 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java @@ -44,7 +44,7 @@ public class CustomizedWSDLLocator implements javax.wsdl.xml.WSDLLocator { private Map<String, Element> elementMap; private String latestImportURI; - private Map<String, String> resolvedMap = new HashMap<String, String>(); + private Map<String, String> resolvedMap = new HashMap<>(); private boolean resolveFromMap; public CustomizedWSDLLocator(String wsdlUrl, Map<String, Element> map) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java index 585aa9d..04089f8 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java @@ -59,7 +59,7 @@ public class AbstractWSDLToProcessor implements Processor { protected ClassCollector classColletor; private Map<String, WSDLExtensibilityPlugin> wsdlPlugins - = new HashMap<String, WSDLExtensibilityPlugin>(); + = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java index 102ab2f..47a3dc3 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java @@ -222,7 +222,7 @@ public class WSDLToXMLProcessor extends AbstractWSDLToProcessor { if (extReg == null) { extReg = wsdlFactory.newPopulatedExtensionRegistry(); } - Map<String, Object> args = new HashMap<String, Object>(); + Map<String, Object> args = new HashMap<>(); args.put(QName.class.getName(), new QName(wsdlDefinition.getTargetNamespace(), operationName)); args.put(Class.class.getName(), clz); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java index 21762c4..cab2816 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/AddressFactory.java @@ -34,7 +34,7 @@ public final class AddressFactory { private static final String PREFIX = "org.apache.cxf.tools.misc.processor.address"; private static final AddressFactory INSTANCE = new AddressFactory(); - private final Map<String, Address> addresses = new HashMap<String, Address>(); + private final Map<String, Address> addresses = new HashMap<>(); private AddressFactory() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/JmsAddress.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/JmsAddress.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/JmsAddress.java index f8a1a8a..7a28ecb 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/JmsAddress.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/JmsAddress.java @@ -27,13 +27,13 @@ import org.apache.cxf.tools.common.ToolContext; public class JmsAddress implements Address { public Map<String, String> getNamespaces(final ToolContext context) { - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("jms", ToolConstants.NS_JMS_ADDRESS); return ns; } public Map<String, Object> buildAddressArguments(final ToolContext context) { - Map<String, Object> args = new HashMap<String, Object>(); + Map<String, Object> args = new HashMap<>(); if (context.optionSet(ToolConstants.JMS_ADDR_DEST_STYLE)) { args.put(ToolConstants.JMS_ADDR_DEST_STYLE, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java index ace730e..26f85d0 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java @@ -28,7 +28,7 @@ import org.apache.cxf.wsdl.WSDLConstants; public class SoapAddress extends XmlAddress { public Map<String, String> getNamespaces(final ToolContext context) { - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); if (context.optionSet(ToolConstants.CFG_SOAP12)) { ns.put(ToolConstants.CFG_SOAP12, WSDLConstants.NS_SOAP12); } else { @@ -38,7 +38,7 @@ public class SoapAddress extends XmlAddress { } public Map<String, Object> buildAddressArguments(final ToolContext context) { - Map<String, Object> args = new HashMap<String, Object>(); + Map<String, Object> args = new HashMap<>(); args.putAll(super.buildAddressArguments(context)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/XmlAddress.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/XmlAddress.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/XmlAddress.java index 2a6be92..5e6652d 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/XmlAddress.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/XmlAddress.java @@ -28,13 +28,13 @@ import org.apache.cxf.tools.common.ToolContext; public class XmlAddress implements Address { public Map<String, String> getNamespaces(final ToolContext context) { - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("http", ToolConstants.NS_XML_HTTP); return ns; } public Map<String, Object> buildAddressArguments(final ToolContext context) { - Map<String, Object> args = new HashMap<String, Object>(); + Map<String, Object> args = new HashMap<>(); if (context.optionSet(ToolConstants.CFG_ADDRESS)) { args.put(ToolConstants.CFG_ADDRESS,
