Repository: cxf Updated Branches: refs/heads/master ce6cdcff2 -> 00503840e
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java index d8d09cc..26e0e5b 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java @@ -131,7 +131,7 @@ public class SchemaValidator extends AbstractDefinitionValidator { sf.setResourceResolver(resourceResolver); - List<Source> sources = new ArrayList<Source>(); + List<Source> sources = new ArrayList<>(); for (InputSource is : xsdsInJar) { Message msg = new Message("CREATE_SCHEMA_LOADED_FROM_JAR", LOG, is.getSystemId()); @@ -252,7 +252,7 @@ public class SchemaValidator extends AbstractDefinitionValidator { File[] files = f.listFiles(filter); if (files != null) { - List<String> xsdUrls = new ArrayList<String>(files.length); + List<String> xsdUrls = new ArrayList<>(files.length); for (File file : files) { try { String s = file.toURI().toURL().toString(); @@ -284,7 +284,7 @@ class NewStackTraceErrorHandler implements ErrorHandler { valid = true; numErrors = 0; buffer = new StringBuilder(); - errors = new ArrayList<SAXParseException>(); + errors = new ArrayList<>(); } public void error(SAXParseException ex) throws SAXParseException { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java index d060848..c64752e 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java @@ -56,7 +56,7 @@ public class UniqueBodyPartsValidator extends AbstractDefinitionValidator { if (operation != null && operation.getInput() != null) { Message inMessage = operation.getInput().getMessage(); BindingInput bin = op.getBindingInput(); - Set<String> headers = new HashSet<String>(); + Set<String> headers = new HashSet<>(); if (bin != null) { List<ExtensibilityElement> lst = CastUtils.cast(bin.getExtensibilityElements()); for (ExtensibilityElement ext : lst) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java index bab3289..0705fb8 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java @@ -82,7 +82,7 @@ public final class ValidatorUtil { */ public static List<SchemaCollection> getSchemaList(Document document, String baseURI) throws IOException, SAXException { - List<SchemaCollection> schemaList = new ArrayList<SchemaCollection>(); + List<SchemaCollection> schemaList = new ArrayList<>(); if (document == null) { return schemaList; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java index 406ab83..45591cf 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java @@ -61,7 +61,7 @@ import org.apache.cxf.wsdl.WSDLManager; public class WSDL11Validator extends AbstractDefinitionValidator { protected static final Logger LOG = LogUtils.getL7dLogger(SchemaValidator.class); - private final List<AbstractValidator> validators = new ArrayList<AbstractValidator>(); + private final List<AbstractValidator> validators = new ArrayList<>(); public WSDL11Validator(final Definition definition) { this(definition, null); @@ -175,7 +175,7 @@ public class WSDL11Validator extends AbstractDefinitionValidator { protected List<InputSource> getDefaultSchemas() throws IOException { - List<InputSource> xsdList = new ArrayList<InputSource>(); + List<InputSource> xsdList = new ArrayList<>(); URL url = ClassLoaderUtils.getResource("/schemas/configuration/parameterized-types.xsd", this.getClass()); if (url != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java index 7b0976c..2ab9ce9 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java @@ -80,10 +80,10 @@ import org.apache.ws.commons.schema.XmlSchemaType; public class WSDLRefValidator extends AbstractDefinitionValidator { protected static final Logger LOG = LogUtils.getL7dLogger(WSDLRefValidator.class); - protected List<XNode> vNodes = new ArrayList<XNode>(); + protected List<XNode> vNodes = new ArrayList<>(); - private Set<QName> portTypeRefNames = new HashSet<QName>(); - private Set<QName> messageRefNames = new HashSet<QName>(); + private Set<QName> portTypeRefNames = new HashSet<>(); + private Set<QName> messageRefNames = new HashSet<>(); private Map<QName, Service> services = new HashMap<QName, Service>(); private ValidationResult vResults = new ValidationResult(); @@ -103,14 +103,14 @@ public class WSDLRefValidator extends AbstractDefinitionValidator { public WSDLRefValidator(Definition wsdl, Document doc, Bus bus) { this.definition = wsdl; baseDoc = doc; - importedDefinitions = new ArrayList<Definition>(); + importedDefinitions = new ArrayList<>(); parseImports(wsdl); processSchemas(bus); } private void getSchemas(Bus bus) { Map<String, Element> schemaList = new HashMap<String, Element>(); SchemaUtil schemaUtil = new SchemaUtil(bus, schemaList); - List<SchemaInfo> si = new ArrayList<SchemaInfo>(); + List<SchemaInfo> si = new ArrayList<>(); schemaUtil.getSchemas(definition, schemaCollection, si); ServiceSchemaInfo ssi = new ServiceSchemaInfo(); ssi.setSchemaCollection(schemaCollection); @@ -133,7 +133,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator { } } private Collection<Import> getImports(final Definition wsdlDef) { - Collection<Import> importList = new ArrayList<Import>(); + Collection<Import> importList = new ArrayList<>(); Map<?, ?> imports = wsdlDef.getImports(); for (Map.Entry<?, ?> entry : imports.entrySet()) { List<Import> lst = CastUtils.cast((List<?>)entry.getValue()); @@ -176,7 +176,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator { } private List<Document> getWSDLDocuments() { - List<Document> docs = new ArrayList<Document>(); + List<Document> docs = new ArrayList<>(); try { docs.add(getWSDLDocument()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java index 2f3b612..44ac269 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java @@ -53,7 +53,7 @@ import org.apache.cxf.tools.common.ToolException; import org.apache.cxf.wsdl.WSDLHelper; public class WSIBPValidator extends AbstractDefinitionValidator { - private List<String> operationMap = new ArrayList<String>(); + private List<String> operationMap = new ArrayList<>(); private WSDLHelper wsdlHelper = new WSDLHelper(); public WSIBPValidator(Definition def) { @@ -391,7 +391,7 @@ public class WSIBPValidator extends AbstractDefinitionValidator { && ext.getExtensibilityElements().get(0) instanceof MIMEMultipartRelated) { MIMEMultipartRelated mpr = (MIMEMultipartRelated)ext.getExtensibilityElements().get(0); List<MIMEPart> mps = CastUtils.cast(mpr.getMIMEParts()); - parts = new HashSet<String>(mps.size()); + parts = new HashSet<>(mps.size()); for (Iterator<MIMEPart> it = mps.iterator(); it.hasNext();) { MIMEPart mp = it.next(); if (mp.getExtensibilityElements() != null && mp.getExtensibilityElements().size() > 0 http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java index 06a6be8..b75b366 100644 --- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java +++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java @@ -58,7 +58,7 @@ public class WSDLRefValidatorTest extends Assert { assertEquals(2, results.getErrors().size()); String t = results.getErrors().pop(); String text = "{http://apache.org/hello_world/messages}[portType:GreeterA][operation:sayHi]";; - Set<String> possibles = new HashSet<String>(); + Set<String> possibles = new HashSet<>(); //woodstox possibles.add(new Message("FAILED_AT_POINT", WSDLRefValidator.LOG, @@ -92,7 +92,7 @@ public class WSDLRefValidatorTest extends Assert { String expected = "/wsdl:definitions[@targetNamespace='http://schemas.apache.org/yoko/idl/OptionsPT']" + "/wsdl:portType[@name='foo.bar']"; - Set<String> xpath = new HashSet<String>(); + Set<String> xpath = new HashSet<>(); for (XNode node : validator.vNodes) { xpath.add(node.toString()); @@ -144,7 +144,7 @@ public class WSDLRefValidatorTest extends Assert { assertEquals(1, results.getErrors().size()); String text = "{http://schemas.apache.org/yoko/idl/OptionsPT}[message:getEmployee]";; - Set<String> possibles = new HashSet<String>(); + Set<String> possibles = new HashSet<>(); //woodstox possibles.add(new Message("FAILED_AT_POINT", WSDLRefValidator.LOG, http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java ---------------------------------------------------------------------- diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java index 80ef483..e0b1caa 100644 --- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java +++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java @@ -51,9 +51,9 @@ import org.apache.cxf.tools.wadlto.WadlToolConstants; public final class CustomizationParser { private static final Logger LOG = LogUtils.getL7dLogger(CustomizationParser.class); - private final List<InputSource> jaxbBindings = new ArrayList<InputSource>(); - private final List<InputSource> packageFiles = new ArrayList<InputSource>(); - private final List<String> compilerArgs = new ArrayList<String>(); + private final List<InputSource> jaxbBindings = new ArrayList<>(); + private final List<InputSource> packageFiles = new ArrayList<>(); + private final List<String> compilerArgs = new ArrayList<>(); private Bus bus; private String wadlPath; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java ---------------------------------------------------------------------- diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java index 8780898..3e73e5c 100644 --- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java +++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java @@ -101,7 +101,7 @@ public class JAXRSContainer extends AbstractCXFToolContainer { } public Set<String> getArrayKeys() { - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); set.add(WadlToolConstants.CFG_BINDING); set.add(WadlToolConstants.CFG_SCHEMA_PACKAGENAME); set.add(WadlToolConstants.CFG_SCHEMA_TYPE_MAP); @@ -232,7 +232,7 @@ public class JAXRSContainer extends AbstractCXFToolContainer { private Set<String> parseMethodList(String paramName) { Object value = context.get(paramName); if (value != null) { - Set<String> methods = new HashSet<String>(); + Set<String> methods = new HashSet<>(); String[] values = value.toString().split(","); for (String s : values) { String actual = s.trim(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java index 1137f00..5942ef2 100644 --- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java +++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java @@ -155,7 +155,7 @@ public class SourceGenerator { PARAM_ANNOTATIONS.put("query", QueryParam.class); PARAM_ANNOTATIONS.put("matrix", MatrixParam.class); - RESOURCE_LEVEL_PARAMS = new HashSet<String>(); + RESOURCE_LEVEL_PARAMS = new HashSet<>(); RESOURCE_LEVEL_PARAMS.add("template"); RESOURCE_LEVEL_PARAMS.add("matrix"); @@ -208,11 +208,11 @@ public class SourceGenerator { private Map<String, String> properties; - private List<String> generatedServiceClasses = new ArrayList<String>(); - private List<String> generatedTypeClasses = new ArrayList<String>(); + private List<String> generatedServiceClasses = new ArrayList<>(); + private List<String> generatedTypeClasses = new ArrayList<>(); private List<InputSource> bindingFiles = Collections.emptyList(); private List<InputSource> schemaPackageFiles = Collections.emptyList(); - private List<String> compilerArgs = new ArrayList<String>(); + private List<String> compilerArgs = new ArrayList<>(); private Set<String> suspendedAsyncMethods = Collections.emptySet(); private Set<String> responseMethods = Collections.emptySet(); private Map<String, String> schemaPackageMap = Collections.emptyMap(); @@ -293,7 +293,7 @@ public class SourceGenerator { public void generateSource(String wadl, File srcDir, String codeType) { Application app = readWadl(wadl, wadlPath); - Set<String> typeClassNames = new HashSet<String>(); + Set<String> typeClassNames = new HashSet<>(); GrammarInfo gInfo = generateSchemaCodeAndInfo(app, typeClassNames, srcDir); if (!CODE_TYPE_GRAMMAR.equals(codeType)) { generateResourceClasses(app, gInfo, typeClassNames, srcDir); @@ -1006,7 +1006,7 @@ public class SourceGenerator { List<Element> requestRepsWithElements, GrammarInfo gInfo) { int duplicatesCount = 0; - Set<String> elementRefs = new HashSet<String>(); + Set<String> elementRefs = new HashSet<>(); for (Element el : repElements) { String value = el.getAttribute("element"); if (value.length() > 0 @@ -1783,7 +1783,7 @@ public class SourceGenerator { return null; } - List<SchemaInfo> schemas = new ArrayList<SchemaInfo>(); + List<SchemaInfo> schemas = new ArrayList<>(); List<Element> schemasEls = DOMUtils.getChildrenWithName(grammarEls.get(0), Constants.URI_2001_SCHEMA_XSD, "schema"); for (int i = 0; i < schemasEls.size(); i++) { @@ -2119,7 +2119,7 @@ public class SourceGenerator { private boolean interfaceIsGenerated; private Set<String> typeClassNames; private GrammarInfo gInfo; - private Set<String> resourceClassNames = new HashSet<String>(); + private Set<String> resourceClassNames = new HashSet<>(); private Application rootApp; private File srcDir; private List<Element> inheritedParams = new LinkedList<Element>(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java index 01f073b..d953d58 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java @@ -107,7 +107,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer { } public Set<String> getArrayKeys() { - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); set.add(ToolConstants.CFG_PACKAGENAME); set.add(ToolConstants.CFG_NEXCLUDE); set.add(ToolConstants.CFG_XJC_ARGS); @@ -187,7 +187,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer { @SuppressWarnings("unchecked") List<ServiceInfo> serviceList = (List<ServiceInfo>)context.get(ToolConstants.SERVICE_LIST); if (serviceList == null) { - serviceList = new ArrayList<ServiceInfo>(); + serviceList = new ArrayList<>(); // Build the ServiceModel from the WSDLModel if (version == WSDLConstants.WSDLVersion.WSDL11) { @@ -429,7 +429,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer { @SuppressWarnings("unchecked") public QName getServiceQName(Definition def) { - List<Definition> defs = new ArrayList<Definition>(); + List<Definition> defs = new ArrayList<>(); defs.add(def); Iterator<?> ite1 = def.getImports().values().iterator(); while (ite1.hasNext()) { @@ -742,7 +742,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer { } public List<ServiceValidator> getServiceValidators() { - List<ServiceValidator> validators = new ArrayList<ServiceValidator>(); + List<ServiceValidator> validators = new ArrayList<>(); Properties initialExtensions = null; try { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java index aeaa1d0..294b855 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java @@ -26,7 +26,7 @@ import org.apache.cxf.tools.common.Processor; import org.apache.cxf.tools.common.toolspec.ToolContainer; public class FrontEndProfile { - List<FrontEndGenerator> generators = new ArrayList<FrontEndGenerator>(); + List<FrontEndGenerator> generators = new ArrayList<>(); Processor processor; Class<? extends ToolContainer> containerClz; String toolspec; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java index 3a90451..b14dbc7 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java @@ -268,7 +268,7 @@ public final class PluginLoader { } private List<FrontEndGenerator> getFrontEndGenerators(FrontEnd frontend) { - List<FrontEndGenerator> generators = new ArrayList<FrontEndGenerator>(); + List<FrontEndGenerator> generators = new ArrayList<>(); String fullClzName = null; try { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java index 409e29f..6b19606 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java @@ -52,7 +52,7 @@ public class WSDLDefinitionBuilder implements WSDLBuilder<Definition> { private static final String WSDL_PLUGIN_RESOURCE = "META-INF/wsdl.plugin.xml"; protected Definition wsdlDefinition; - private List<Definition> importedDefinitions = new ArrayList<Definition>(); + private List<Definition> importedDefinitions = new ArrayList<>(); private final Map<String, WSDLExtensibilityPlugin> wsdlPlugins @@ -101,7 +101,7 @@ public class WSDLDefinitionBuilder implements WSDLBuilder<Definition> { } public static Collection<Import> getImports(final Definition wsdlDef) { - Collection<Import> importList = new ArrayList<Import>(); + Collection<Import> importList = new ArrayList<>(); Map<?, ?> imports = wsdlDef.getImports(); for (Map.Entry<?, ?> entry : imports.entrySet()) { List<Import> lst = CastUtils.cast((List<?>)entry.getValue()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java index d85ee7d..191365c 100644 --- a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java +++ b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java @@ -291,7 +291,7 @@ public class JAXBDataBinding implements DataBindingProfile { private static final Logger LOG = LogUtils.getL7dLogger(JAXBDataBinding.class); - private static final Set<String> DEFAULT_TYPE_MAP = new HashSet<String>(); + private static final Set<String> DEFAULT_TYPE_MAP = new HashSet<>(); private static final Map<String, String> JLDEFAULT_TYPE_MAP = new HashMap<String, String>(); private S2JJAXBModel rawJaxbModelGenCode; @@ -371,7 +371,7 @@ public class JAXBDataBinding implements DataBindingProfile { SchemaCollection schemas = (SchemaCollection) context.get(ToolConstants.XML_SCHEMA_COLLECTION); - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); if (context.get(ToolConstants.CFG_NO_ADDRESS_BINDING) == null) { //hard code to enable jaxb extensions @@ -609,7 +609,7 @@ public class JAXBDataBinding implements DataBindingProfile { SchemaCompiler schemaCompiler, SchemaCollection schemaCollection) { - Set<String> ids = new HashSet<String>(); + Set<String> ids = new HashSet<>(); List<ServiceInfo> serviceList = (List<ServiceInfo>)context.get(ToolConstants.SERVICE_LIST); for (ServiceInfo si : serviceList) { for (SchemaInfo sci : si.getSchemas()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/TypesCodeWriter.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/TypesCodeWriter.java b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/TypesCodeWriter.java index 6ef4c0f..1c2b1d4 100644 --- a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/TypesCodeWriter.java +++ b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/TypesCodeWriter.java @@ -38,10 +38,10 @@ public class TypesCodeWriter extends CodeWriter { private File target; private OutputStreamCreator osc; - private List<String> excludeFileList = new ArrayList<String>(); + private List<String> excludeFileList = new ArrayList<>(); private List<String> excludePkgList; - private List<File> generatedFiles = new ArrayList<File>(); + private List<File> generatedFiles = new ArrayList<>(); public TypesCodeWriter(File ftarget, List<String> excludePkgs, String e, OutputStreamCreator outputStreamCreator) http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java index 0501c99..c9ab8ef 100644 --- a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java +++ b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java @@ -67,7 +67,7 @@ public class JavaScriptContainer extends WSDLToJavaContainer { } public Set<String> getArrayKeys() { - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); set.add(ToolConstants.CFG_JSPACKAGEPREFIX); set.add(ToolConstants.CFG_BEAN_CONFIG); return set; @@ -91,7 +91,7 @@ public class JavaScriptContainer extends WSDLToJavaContainer { String wsdlURL = (String)context.get(ToolConstants.CFG_WSDLURL); List<ServiceInfo> serviceList = (List<ServiceInfo>)context.get(ToolConstants.SERVICE_LIST); if (serviceList == null) { - serviceList = new ArrayList<ServiceInfo>(); + serviceList = new ArrayList<>(); PluginLoader pluginLoader = PluginLoader.newInstance(); // for JavaScript generation, we always use JAX-WS. @@ -284,7 +284,7 @@ public class JavaScriptContainer extends WSDLToJavaContainer { } public List<ServiceValidator> getServiceValidators() { - List<ServiceValidator> validators = new ArrayList<ServiceValidator>(); + List<ServiceValidator> validators = new ArrayList<>(); Properties initialExtensions = null; try { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java index 3378259..2c96c03 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java @@ -92,7 +92,7 @@ public class JAXWSContainer extends WSDLToJavaContainer { private void cleanArrays(ToolContext env, String key) { String s[] = env.getArray(key); if (s != null) { - List<String> n = new ArrayList<String>(); + List<String> n = new ArrayList<>(); for (String s2 : s) { StringTokenizer tokenizer = new StringTokenizer(s2, ",=", false); while (tokenizer.hasMoreTokens()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 b7f77b9..9d39bef 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 @@ -66,7 +66,7 @@ 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 List<InputSource> jaxbBindings = new ArrayList<InputSource>(); + private final List<InputSource> jaxbBindings = new ArrayList<>(); private final Map<String, Element> customizedElements = new HashMap<String, Element>(); private Element handlerChains; @@ -469,7 +469,7 @@ public final class CustomizationParser { } private Element[] getChildElements(Element parent, String nsUri) { - List<Element> a = new ArrayList<Element>(); + List<Element> a = new ArrayList<>(); for (Node item = parent.getFirstChild(); item != null; item = item.getNextSibling()) { if (!(item instanceof Element)) { continue; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java index 0445751..bc7a1b6 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java @@ -128,13 +128,13 @@ public class JAXWSBinding implements ExtensibilityElement, Serializable { public void addJaxwsPara(JAXWSParameter para) { if (jaxwsPara == null) { - jaxwsPara = new ArrayList<JAXWSParameter>(); + jaxwsPara = new ArrayList<>(); } jaxwsPara.add(para); } public void setJaxwsParas(List<JAXWSParameter> p) { - jaxwsPara = new ArrayList<JAXWSParameter>(p); + jaxwsPara = new ArrayList<>(p); } public List<JAXWSParameter> getJaxwsParas() { return jaxwsPara; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java index 89e82d1..328d9b8 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java @@ -75,7 +75,7 @@ public class WSDLToJavaProcessor extends WSDLToProcessor implements ClassNamePro } context.put(JavaModel.class, javaModel); - List<JavaInterface> interfaces = new ArrayList<JavaInterface>(); + List<JavaInterface> interfaces = new ArrayList<>(); interfaces.addAll(javaModel.getInterfaces().values()); PortTypeProcessor portTypeProcessor = new PortTypeProcessor(context); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java index cd5943f..7c489a2 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java @@ -272,9 +272,9 @@ public class ParameterProcessor extends AbstractProcessor { Map<QName, MessagePartInfo> inputPartsMap = inputMessage.getMessagePartsMap(); List<MessagePartInfo> outputParts = - outputMessage == null ? new ArrayList<MessagePartInfo>() : outputMessage.getMessageParts(); + outputMessage == null ? new ArrayList<>() : outputMessage.getMessageParts(); // figure out output parts that are not present in input parts - List<MessagePartInfo> outParts = new ArrayList<MessagePartInfo>(); + List<MessagePartInfo> outParts = new ArrayList<>(); int numHeader = 0; if (isRequestResponse(method)) { for (MessagePartInfo outpart : outputParts) { @@ -676,12 +676,12 @@ public class ParameterProcessor extends AbstractProcessor { outputParts = outputPartsMap.values(); } else { outputPartsMap = new LinkedHashMap<QName, MessagePartInfo>(); - outputParts = new ArrayList<MessagePartInfo>(); + outputParts = new ArrayList<>(); } - List<MessagePartInfo> inputUnlistedParts = new ArrayList<MessagePartInfo>(); - List<MessagePartInfo> outputUnlistedParts = new ArrayList<MessagePartInfo>(); + List<MessagePartInfo> inputUnlistedParts = new ArrayList<>(); + List<MessagePartInfo> outputUnlistedParts = new ArrayList<>(); for (MessagePartInfo part : inputParts) { if (!parameterList.contains(part.getName().getLocalPart())) { @@ -766,7 +766,7 @@ public class ParameterProcessor extends AbstractProcessor { if (outputMessage != null) { outputParts = outputMessage.getMessageParts(); } else { - outputParts = new ArrayList<MessagePartInfo>(); + outputParts = new ArrayList<>(); } while (params.hasNext()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java index 9958ca1..1579640 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java @@ -42,7 +42,7 @@ import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding; import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.mapper.InterfaceMapper; public class PortTypeProcessor extends AbstractProcessor { - private List<QName> operationMap = new ArrayList<QName>(); + private List<QName> operationMap = new ArrayList<>(); public PortTypeProcessor(ToolContext c) { super(c); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 299af40..5514e57 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 @@ -362,7 +362,7 @@ public final class ProcessorUtil { } public static List<QName> getWrappedElementQNames(ToolContext context, QName partElement) { - List<QName> qnames = new ArrayList<QName>(); + List<QName> qnames = new ArrayList<>(); if (partElement == null) { return qnames; } @@ -373,7 +373,7 @@ public final class ProcessorUtil { } public static List<WrapperElement> getWrappedElement(ToolContext context, QName partElement) { - List<WrapperElement> qnames = new ArrayList<WrapperElement>(); + List<WrapperElement> qnames = new ArrayList<>(); ServiceInfo serviceInfo = context.get(ServiceInfo.class); SchemaCollection schema = serviceInfo.getXmlSchemaCollection(); @@ -415,7 +415,7 @@ public final class ProcessorUtil { private static List<WrapperElement> createWrappedElements(XmlSchemaSequence seq) { - List<WrapperElement> qnames = new ArrayList<WrapperElement>(); + List<WrapperElement> qnames = new ArrayList<>(); if (seq != null) { List<XmlSchemaSequenceMember> items = seq.getItems(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 e0980a0..e703dc6 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 @@ -466,7 +466,7 @@ public class ServiceProcessor extends AbstractProcessor { inbindings = operation.getInput().getExtensors(ExtensibilityElement.class); } if (inbindings == null) { - inbindings = new ArrayList<ExtensibilityElement>(); + inbindings = new ArrayList<>(); } String use = null; @@ -487,7 +487,7 @@ public class ServiceProcessor extends AbstractProcessor { List<ExtensibilityElement> outbindings = operation.getOutput().getExtensors(ExtensibilityElement.class); if (outbindings == null) { - outbindings = new ArrayList<ExtensibilityElement>(); + outbindings = new ArrayList<>(); } for (ExtensibilityElement ext : outbindings) { if (SOAPBindingUtil.isSOAPHeader(ext)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java index 787d728..efb86de 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WSActionAnnotator.java @@ -97,7 +97,7 @@ public final class WSActionAnnotator implements Annotator { } } if (operation.hasFaults()) { - List<JAnnotation> faultAnnotations = new ArrayList<JAnnotation>(); + List<JAnnotation> faultAnnotations = new ArrayList<>(); for (FaultInfo faultInfo : operation.getFaults()) { if (faultInfo.getExtensionAttributes() != null) { String faultAction = getAction(faultInfo); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WrapperAnnotator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WrapperAnnotator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WrapperAnnotator.java index c39e466..a4b582a 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WrapperAnnotator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WrapperAnnotator.java @@ -61,7 +61,7 @@ public class WrapperAnnotator implements Annotator { method.getInterface().addImports(requestAnnotation.getImports()); } if (wrapperResponse != null) { - List<JAnnotationElement> elements = new ArrayList<JAnnotationElement>(); + List<JAnnotationElement> elements = new ArrayList<>(); elements.add(new JAnnotationElement("localName", wrapperResponse.getType())); elements.add(new JAnnotationElement("targetNamespace", wrapperResponse.getTargetNamespace())); elements.add(new JAnnotationElement("className", wrapperResponse.getClassName())); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java index 3a5495e..28b2f27 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotator.java @@ -54,7 +54,7 @@ public final class XmlSeeAlsoAnnotator implements Annotator { JAnnotation jaxbAnnotation = new JAnnotation(XmlSeeAlso.class); intf.addImports(jaxbAnnotation.getImports()); - List<JavaType> types = new ArrayList<JavaType>(); + List<JavaType> types = new ArrayList<>(); for (String pkg : collector.getTypesPackages()) { if (pkg.equals(intf.getPackageName())) { types.add(new JavaType(null, "ObjectFactory", null)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 276b702..156f2da 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 @@ -96,7 +96,7 @@ public class UniqueBodyValidator extends ServiceValidator { uniqueNames.put(mName, op.getName()); if (action != null) { if (opActions == null) { - opActions = new HashSet<String>(); + opActions = new HashSet<>(); actions.put(mName, opActions); } opActions.add(action); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java index b9e3107..cf47f7c 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java @@ -45,7 +45,7 @@ public class WSDLToService extends AbstractCXFToolContainer { } private Set<String> getArrayKeys() { - return new HashSet<String>(); + return new HashSet<>(); } public void execute(boolean exitOnFinish) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java index d08feb1..c5357e0 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java @@ -48,7 +48,7 @@ public class WSDLToSoap extends AbstractCXFToolContainer { } private Set<String> getArrayKeys() { - return new HashSet<String>(); + return new HashSet<>(); } public void execute(boolean exitOnFinish) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java index f03e6cb..e5fd7f4 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java @@ -48,7 +48,7 @@ public class WSDLToXML extends AbstractCXFToolContainer { } private Set<String> getArrayKeys() { - return new HashSet<String>(); + return new HashSet<>(); } public void execute(boolean exitOnFinish) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java index b23047e..3ab5d26 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java @@ -46,7 +46,7 @@ public class XSDToWSDL extends AbstractCXFToolContainer { } private Set<String> getArrayKeys() { - return new HashSet<String>(); + return new HashSet<>(); } public void execute(boolean exitOnFinish) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java index 4478602..21be8dc 100644 --- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java +++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java @@ -1693,7 +1693,7 @@ public class CodeGenTest extends AbstractCodeGenTest { File clientjarFile = new File(output, "test-client.jar"); assertTrue(clientjarFile.exists()); - List<String> jarEntries = new ArrayList<String>(); + List<String> jarEntries = new ArrayList<>(); JarInputStream jarIns = new JarInputStream(new FileInputStream(clientjarFile)); JarEntry entry = null; while ((entry = jarIns.getNextJarEntry()) != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java index f99416b..4719805 100644 --- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java +++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java @@ -191,7 +191,7 @@ public class JAXWSContainerTest extends ProcessorTestBase { assertNotNull(m1); assertEquals(2, m1.getExceptions().size()); - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); for (JavaException exc : m1.getExceptions()) { names.add(exc.getName()); }
