http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java index 0317064..3c11d58 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java @@ -34,7 +34,7 @@ public class UriDomainFactoryBeanListener implements FactoryBeanListener { if (ev.equals(Event.START_CREATE)) { // Remove original URIDomainExpressionBuilder to be replaced on custom one ExtensionManagerImpl orig = (ExtensionManagerImpl)factory.getBus().getExtension(ExtensionManager.class); - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); names.add(org.apache.cxf.ws.policy.attachment.external.URIDomainExpressionBuilder.class.getName()); ((ExtensionManagerImpl)orig).removeBeansOfNames(names); }
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/DummyHandler.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/DummyHandler.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/DummyHandler.java index 2f03300..0c7a1fb 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/DummyHandler.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/DummyHandler.java @@ -44,7 +44,7 @@ public class DummyHandler implements SOAPHandler<SOAPMessageContext> { @Override public Set<QName> getHeaders() { - Set<QName> understoodHeaders = new HashSet<QName>(); + Set<QName> understoodHeaders = new HashSet<>(); QName securityHeader = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";, "Security"); understoodHeaders.add(securityHeader); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java index 188d05c..a8eae8c 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java @@ -1028,7 +1028,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { // Create a SAML Token with an AudienceRestrictionCondition ConditionsBean conditions = new ConditionsBean(); - List<AudienceRestrictionBean> audienceRestrictions = new ArrayList<AudienceRestrictionBean>(); + List<AudienceRestrictionBean> audienceRestrictions = new ArrayList<>(); AudienceRestrictionBean audienceRestriction = new AudienceRestrictionBean(); audienceRestriction.setAudienceURIs(Collections.singletonList( "https://localhost:"; + portNumber + "/DoubleItSaml2Transport2")); @@ -1083,7 +1083,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { // Create a SAML Token with an AudienceRestrictionCondition ConditionsBean conditions = new ConditionsBean(); - List<AudienceRestrictionBean> audienceRestrictions = new ArrayList<AudienceRestrictionBean>(); + List<AudienceRestrictionBean> audienceRestrictions = new ArrayList<>(); AudienceRestrictionBean audienceRestriction = new AudienceRestrictionBean(); audienceRestriction.setAudienceURIs(Collections.singletonList( service.getServiceName().toString())); @@ -1122,7 +1122,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { // Create a SAML Token with an AudienceRestrictionCondition ConditionsBean conditions = new ConditionsBean(); - List<AudienceRestrictionBean> audienceRestrictions = new ArrayList<AudienceRestrictionBean>(); + List<AudienceRestrictionBean> audienceRestrictions = new ArrayList<>(); AudienceRestrictionBean audienceRestriction = new AudienceRestrictionBean(); audienceRestriction.setAudienceURIs(Collections.singletonList( service.getServiceName().toString() + ".xyz")); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java index 3e21958..f0a617f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java @@ -266,7 +266,7 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase { // with the explicitly configured SAAJOutInterceptor // @SuppressWarnings("rawtypes") - List<Handler> handlerChain = new ArrayList<Handler>(); + List<Handler> handlerChain = new ArrayList<>(); Binding binding = ((BindingProvider)greeter).getBinding(); TestOutHandler handler = new TestOutHandler(); handlerChain.add(handler); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java index aa6e9d4..807b06e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java @@ -48,7 +48,7 @@ public class SecurityHeaderCacheInterceptor implements PhaseInterceptor<SoapMess private static final QName SEC_HEADER = new QName(WSConstants.WSSE_NS, WSConstants.WSSE_LN, WSConstants.WSSE_PREFIX); - private Set<String> afterInterceptors = new HashSet<String>(); + private Set<String> afterInterceptors = new HashSet<>(); private SOAPHeaderElement cachedSecurityHeader; public SecurityHeaderCacheInterceptor() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java index 3d52467..97bf034 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java @@ -315,7 +315,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { binding.setProtectTokens(false); all.addPolicyComponent(binding); - List<Header> headers = new ArrayList<Header>(); + List<Header> headers = new ArrayList<>(); SignedParts signedParts = new SignedParts(SPConstants.SPVersion.SP12, true, null, headers, false); all.addPolicyComponent(signedParts); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java index f902fe6..fd05488 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java @@ -1397,7 +1397,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType2.class); updateAddressPort(x509Port, PORT); - List<Header> headers = new ArrayList<Header>(); + List<Header> headers = new ArrayList<>(); Header dummyHeader = new Header(new QName("uri:org.apache.cxf", "dummy"), "dummy-header", new JAXBDataBinding(String.class)); headers.add(dummyHeader); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java index c84ad49..7aec9ed 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java @@ -127,7 +127,7 @@ public class HeaderVerifier extends AbstractSoapInterceptor { private void verify(SoapMessage message, boolean outgoingPartialResponse) { try { - List<String> wsaHeaders = new ArrayList<String>(); + List<String> wsaHeaders = new ArrayList<>(); List<Header> headers = message.getHeaders(); if (headers != null) { recordWSAHeaders(headers, http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java index 62ff2e9..63c4352 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java @@ -41,7 +41,7 @@ import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES */ public class MAPVerifier extends AbstractPhaseInterceptor<Message> { VerificationCache verificationCache; - List<String> expectedExposedAs = new ArrayList<String>(); + List<String> expectedExposedAs = new ArrayList<>(); private Map<String, Object> mapProperties; public MAPVerifier() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 03919a5..748942b 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 @@ -47,8 +47,8 @@ public class MessageFlow extends Assert { public MessageFlow(List<byte[]> out, List<byte[]> in, String addrns, String rmns) throws Exception { addressingNamespace = addrns; rmNamespace = rmns; - inboundMessages = new ArrayList<Document>(); - outboundMessages = new ArrayList<Document>(); + inboundMessages = new ArrayList<>(); + outboundMessages = new ArrayList<>(); reset(out, in); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java ---------------------------------------------------------------------- diff --git a/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java b/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java index 38381c3..d47ab57 100644 --- a/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java +++ b/testutils/src/main/java/org/apache/cxf/authservice/AuthServiceImpl.java @@ -45,7 +45,7 @@ public class AuthServiceImpl implements AuthService { } public List<String> getRoles(String sid) { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); list.add(sid); list.add(sid + "-1"); list.add(sid + "-2"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java ---------------------------------------------------------------------- diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java index 6e018ee..7d6224b 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractClientServerTestBase.java @@ -30,7 +30,7 @@ import org.junit.Assert; public abstract class AbstractClientServerTestBase extends Assert { - private static List<ServerLauncher> launchers = new ArrayList<ServerLauncher>(); + private static List<ServerLauncher> launchers = new ArrayList<>(); @AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java ---------------------------------------------------------------------- diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java index eac489b..421ea6e 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java @@ -369,7 +369,7 @@ public class ServerLauncher { private List<String> getCommand() throws URISyntaxException { - List<String> cmd = new ArrayList<String>(); + List<String> cmd = new ArrayList<>(); cmd.add(javaExe); if (null != properties) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java b/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java index c5d68a9..8f5b896 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java @@ -246,7 +246,7 @@ public abstract class AbstractCXFToolContainer extends AbstractToolContainer { } protected String[] getDefaultExcludedNamespaces(String excludeProps) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); Properties props = loadProperties(excludeProps); java.util.Enumeration<?> nexcludes = props.propertyNames(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java index 1ac6744..5510f9d 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java @@ -68,9 +68,9 @@ public class ClassUtils { String outPutDir = (String)context.get(ToolConstants.CFG_OUTPUTDIR); - Set<String> dirSet = new HashSet<String>(); + Set<String> dirSet = new HashSet<>(); ClassCollector classCollector = context.get(ClassCollector.class); - List<String> fileList = new ArrayList<String>(); + List<String> fileList = new ArrayList<>(); Iterator<String> ite = classCollector.getGeneratedFileInfo().iterator(); while (ite.hasNext()) { String fileName = ite.next(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java index c7ee70d..3ef0d69 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java @@ -85,7 +85,7 @@ public class ProcessorTestBase extends Assert { protected final void addQNameAttribute(QName element, String local) { Set<String> a = qnameAtts.get(element); if (a == null) { - qnameAtts.put(element, new HashSet<String>()); + qnameAtts.put(element, new HashSet<>()); a = qnameAtts.get(element); } a.add(local); @@ -179,7 +179,7 @@ public class ProcessorTestBase extends Assert { // So, when we encounter a mismatch, put the unmatched token in a // list and check this list when matching subsequent tokens. // It would be much better to do a proper xml comparison. - List<String> unmatched = new ArrayList<String>(); + List<String> unmatched = new ArrayList<>(); while (st1.hasMoreTokens()) { String tok1 = st1.nextToken(); String tok2 = null; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java b/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java index 8bdbf3d..7f5f320 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java @@ -38,7 +38,7 @@ public class Tag { public List<String> getIgnoreAttr() { if (ignoreAttr == null) { - ignoreAttr = new ArrayList<String>(); + ignoreAttr = new ArrayList<>(); } return ignoreAttr; } @@ -53,7 +53,7 @@ public class Tag { public List<Tag> getTags() { if (tags == null) { - tags = new ArrayList<Tag>(); + tags = new ArrayList<>(); } return tags; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java index d522437..92fc6a0 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java @@ -43,9 +43,9 @@ public class ToolContext { private ToolErrorListener errors; private Map<String, String> namespacePackageMap = new HashMap<String, String>(); private Map<String, String> excludeNamespacePackageMap = new HashMap<String, String>(); - private List<InputSource> jaxbBindingFiles = new ArrayList<InputSource>(); - private List<String> excludePkgList = new ArrayList<String>(); - private List<String> excludeFileList = new ArrayList<String>(); + private List<InputSource> jaxbBindingFiles = new ArrayList<>(); + private List<String> excludePkgList = new ArrayList<>(); + private List<String> excludeFileList = new ArrayList<>(); public ToolContext() { } @@ -312,9 +312,9 @@ public class ToolContext { newCopy.packageNameChanged = packageNameChanged; newCopy.namespacePackageMap = new HashMap<String, String>(namespacePackageMap); newCopy.excludeNamespacePackageMap = new HashMap<String, String>(excludeNamespacePackageMap); - newCopy.jaxbBindingFiles = new ArrayList<InputSource>(jaxbBindingFiles); - newCopy.excludePkgList = new ArrayList<String>(excludePkgList); - newCopy.excludeFileList = new ArrayList<String>(excludeFileList); + newCopy.jaxbBindingFiles = new ArrayList<>(jaxbBindingFiles); + newCopy.excludePkgList = new ArrayList<>(excludePkgList); + newCopy.excludeFileList = new ArrayList<>(excludeFileList); newCopy.errors = errors; return newCopy; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java index 5fc2cda..99ded7d 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java @@ -30,7 +30,7 @@ import org.apache.cxf.common.i18n.Message; */ public class ToolException extends RuntimeException { private static final long serialVersionUID = -4418907917249006910L; - List<Throwable> suppressed = new ArrayList<Throwable>(0); + List<Throwable> suppressed = new ArrayList<>(0); boolean hasSuppressed; public ToolException() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java index 6720950..ef2a80c 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java @@ -27,8 +27,8 @@ import java.util.Set; public final class JAnnotation { private Class<?> type; - private List<JAnnotationElement> elements = new ArrayList<JAnnotationElement>(); - private Set<String> imports = new HashSet<String>(); + private List<JAnnotationElement> elements = new ArrayList<>(); + private Set<String> imports = new HashSet<>(); public JAnnotation() { // empty http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java index 877c793..c34e2f7 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java @@ -29,7 +29,7 @@ public final class JAnnotationElement { private Object value; private boolean isPrimitive; - private Set<String> imports = new HashSet<String>(); + private Set<String> imports = new HashSet<>(); public JAnnotationElement() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaClass.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaClass.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaClass.java index b056154..3a705b2 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaClass.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaClass.java @@ -26,7 +26,7 @@ import org.apache.cxf.common.util.StringUtils; public class JavaClass extends JavaInterface { - private final List<JavaField> jfield = new ArrayList<JavaField>(); + private final List<JavaField> jfield = new ArrayList<>(); public JavaClass() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaCodeBlock.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaCodeBlock.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaCodeBlock.java index 49cfa61..0b081fb 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaCodeBlock.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaCodeBlock.java @@ -27,7 +27,7 @@ public class JavaCodeBlock { /** * Describe expressions here. */ - private List<JavaExpression> expressions = new ArrayList<JavaExpression>(); + private List<JavaExpression> expressions = new ArrayList<>(); /** * Get the <code>Expressions</code> value. http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java index 465fb41..fc58d55 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaField.java @@ -27,7 +27,7 @@ import org.apache.cxf.common.util.URIParserUtil; public class JavaField extends JavaType implements JavaAnnotatable { private String modifier; - private List<JAnnotation> annotations = new ArrayList<JAnnotation>(); + private List<JAnnotation> annotations = new ArrayList<>(); private Annotation[] jaxbAnnotations; public JavaField() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java index ddcf385..d5f0b0a 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java @@ -42,10 +42,10 @@ public class JavaInterface implements JavaAnnotatable { private SOAPBinding.Use soapUse; private SOAPBinding.ParameterStyle soapParameterStyle; - private final List<JavaMethod> methods = new ArrayList<JavaMethod>(); - private final List<JAnnotation> annotations = new ArrayList<JAnnotation>(); + private final List<JavaMethod> methods = new ArrayList<>(); + private final List<JAnnotation> annotations = new ArrayList<>(); private final Set<String> imports = new TreeSet<String>(); - private final List<String> supers = new ArrayList<String>(); + private final List<String> supers = new ArrayList<>(); private String webserviceName; private Element handlerChains; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java index be16dba..9bb7d5c 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java @@ -49,8 +49,8 @@ public class JavaMethod implements JavaAnnotatable { private boolean wrapperStyle; private boolean enableMime; private JavaInterface javaInterface; - private final List<JavaParameter> parameters = new ArrayList<JavaParameter>(); - private final List<JavaException> exceptions = new ArrayList<JavaException>(); + private final List<JavaParameter> parameters = new ArrayList<>(); + private final List<JavaException> exceptions = new ArrayList<>(); private final Map<String, JAnnotation> annotations = new HashMap<String, JAnnotation>(); private JavaCodeBlock block; @@ -314,7 +314,7 @@ public class JavaMethod implements JavaAnnotatable { } public List<String> getParameterList(boolean includeAnnotation) { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); StringBuilder sb = new StringBuilder(); for (int i = 0; i < parameters.size(); i++) { JavaParameter parameter = parameters.get(i); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java index 4d75e8b..8a712c0 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java @@ -29,7 +29,7 @@ public class JavaPort { private String name; private String portType; private String bindingName; - private final List<JavaMethod> operations = new ArrayList<JavaMethod>(); + private final List<JavaMethod> operations = new ArrayList<>(); private String address; private String soapVersion; private SOAPBinding.Style style; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaServiceClass.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaServiceClass.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaServiceClass.java index cccc273..1ee1e9d 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaServiceClass.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaServiceClass.java @@ -24,7 +24,7 @@ import java.util.List; public class JavaServiceClass extends JavaClass { - private final List<JavaPort> ports = new ArrayList<JavaPort>(); + private final List<JavaPort> ports = new ArrayList<>(); private String serviceName; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java index 8bd9457..aeb6874 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java @@ -175,7 +175,7 @@ public class ToolSpec { } public List<String> getInstreamIds() { - List<String> res = new ArrayList<String>(); + List<String> res = new ArrayList<>(); Element streams = getStreams(); if (streams != null) { @@ -190,7 +190,7 @@ public class ToolSpec { } public List<String> getOutstreamIds() { - List<String> res = new ArrayList<String>(); + List<String> res = new ArrayList<>(); Element streams = getStreams(); if (streams != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java index bcbd2b7..b6a4a44 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java @@ -45,7 +45,7 @@ public class CommandDocument { if (d == null) { throw new NullPointerException("CommandDocument cannot be created with a null document"); } - values = new ArrayList<Element>(); + values = new ArrayList<>(); this.doc = d; NodeList nl = doc.getDocumentElement().getElementsByTagName("option"); @@ -82,7 +82,7 @@ public class CommandDocument { if (LOG.isLoggable(Level.FINE)) { LOG.fine("Getting parameters for " + name); } - List<Object> result = new ArrayList<Object>(); + List<Object> result = new ArrayList<>(); if (values != null) { for (Element el : values) { @@ -106,7 +106,7 @@ public class CommandDocument { } public String[] getParameterNames() { - List<Object> result = new ArrayList<Object>(); + List<Object> result = new ArrayList<>(); if (values != null) { for (Element el : values) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java index 7036eb4..7735952 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java @@ -61,7 +61,7 @@ public class CommandLineParser { public static String[] getArgsFromString(String s) { StringTokenizer toker = new StringTokenizer(s); - List<Object> res = new ArrayList<Object>(); + List<Object> res = new ArrayList<>(); while (toker.hasMoreTokens()) { res.add(toker.nextToken()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java index 966a8bc..3183df4 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java @@ -33,7 +33,7 @@ public class ErrorVisitor { private static final Logger LOG = LogUtils.getL7dLogger(ErrorVisitor.class); - private final Set<CommandLineError> errors = new HashSet<CommandLineError>(); + private final Set<CommandLineError> errors = new HashSet<>(); public static class MissingOption implements CommandLineError { private final Option o; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java index 9199d82..dbb0073 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java @@ -37,9 +37,9 @@ public class Form implements TokenConsumer { private static final Logger LOG = LogUtils.getL7dLogger(Form.class); private final Element element; - private final List<Object> arguments = new ArrayList<Object>(); - private final List<Object> optionGroups = new ArrayList<Object>(); - private final List<Object> options = new ArrayList<Object>(); + private final List<Object> arguments = new ArrayList<>(); + private final List<Object> optionGroups = new ArrayList<>(); + private final List<Object> options = new ArrayList<>(); public Form(Element el) { this.element = el; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java index 1d835e2..cd54e6f 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java @@ -35,7 +35,7 @@ public class OptionGroup implements TokenConsumer { private static final Logger LOG = LogUtils.getL7dLogger(OptionGroup.class); private final Element element; - private final List<Option> options = new ArrayList<Option>(); + private final List<Option> options = new ArrayList<>(); public OptionGroup(Element el) { this.element = el; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java index 9435a70..484f851 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java @@ -30,7 +30,7 @@ public final class BuiltInTypesJavaMappingUtil { private static final String NS_XSD = "http://www.w3.org/2001/XMLSchema";; private static final String NS_XSI = "http://www.w3.org/2001/XMLSchema-instance";; - private static Set<String> nameSpaces = new HashSet<String>(); + private static Set<String> nameSpaces = new HashSet<>(); static { nameSpaces.add(XML_SCHEMA_NS.toLowerCase()); nameSpaces.add(NS_XMLNS.toLowerCase()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java b/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java index 4e84026..03cf441 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java @@ -40,7 +40,7 @@ public class ClassCollector { private final Map<String, String> reservedClassNames = new HashMap<String, String>(); - private final Set<String> typesPackages = new HashSet<String>(); + private final Set<String> typesPackages = new HashSet<>(); public ClassCollector() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java index 37fdae7..6438df8 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java @@ -150,7 +150,7 @@ public final class NameUtil { return toWordList(s, false); } public static List<String> toWordList(String s, boolean allowUnderscore) { - List<String> ss = new ArrayList<String>(); + List<String> ss = new ArrayList<>(); int n = s.length(); for (int i = 0; i < n;) { while (i < n) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java b/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java index 2a5a35e..12fde0d 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java @@ -42,7 +42,7 @@ public final class ToolsStaxUtils { } public static List<Tag> getTags(final File source) throws Exception { - List<Tag> tags = new ArrayList<Tag>(); + List<Tag> tags = new ArrayList<>(); List<String> ignoreEmptyTags = Arrays.asList(new String[]{"sequence"}); try (InputStream is = new BufferedInputStream(new FileInputStream(source))) { @@ -100,7 +100,7 @@ public final class ToolsStaxUtils { } public static Tag getTagTree(final File source) throws Exception { - return getTagTree(source, new ArrayList<String>()); + return getTagTree(source, new ArrayList<>()); } public static Tag getTagTree(final File source, final List<String> ignoreAttr) throws Exception { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java index 694fb17..9c5f59e 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java @@ -51,7 +51,7 @@ public class IDLToWSDL extends AbstractCXFToolContainer { } private Set<String> getArrayKeys() { - Set<String> arrayKeys = new HashSet<String>(); + Set<String> arrayKeys = new HashSet<>(); arrayKeys.add(ToolCorbaConstants.CFG_INCLUDEDIR); return arrayKeys; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java index 607fef7..2ab8b45 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java @@ -53,7 +53,7 @@ public class WSDLToIDL 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/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java index 9a1acb8..6510ef7 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java @@ -33,7 +33,7 @@ public final class IdlRoot extends IdlScopeBase { private IdlRoot() { super(null, ""); primitiveTypes = new HashMap<String, IdlType>(); - includeList = new ArrayList<String>(); + includeList = new ArrayList<>(); for (short i = IdlPrimitive.MINIMUM; i <= IdlPrimitive.MAXIMUM; ++i) { IdlPrimitive prim = IdlPrimitive.create(this, i); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java index c509152..a116868 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java @@ -38,7 +38,7 @@ public final class DeferredActionCollection { public void add(Scope scope, DeferredAction action) { List<DeferredAction> list = deferredActions.get(scope.toString()); if (list == null) { - list = new ArrayList<DeferredAction>(); + list = new ArrayList<>(); deferredActions.put(scope.toString(), list); } list.add(action); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java index d261258..33aab48 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java @@ -672,7 +672,7 @@ public class IDLToWSDLProcessor extends IDLProcessor { while (tokens.hasMoreTokens()) { String token = tokens.nextToken(); //Revisit, Do we also take in the imports of the wsdl/schema? - exModules.put(token, new ArrayList<String>()); + exModules.put(token, new ArrayList<>()); } } else if (modules.startsWith(":")) { //TO DO http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java index c82aa25..8d2e469 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PortTypeVisitor.java @@ -277,7 +277,7 @@ public class PortTypeVisitor extends VisitorBase { AST interfaceNameNode = interfaceInheritanceSpecNode.getFirstChild(); BindingType corbaBinding = findCorbaBinding(binding); - List<Scope> inheritedScopes = new ArrayList<Scope>(); + List<Scope> inheritedScopes = new ArrayList<>(); while (interfaceNameNode != null) { //check for porttypes in current & parent scopes http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java index d81c999..5717874 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java @@ -38,7 +38,7 @@ public class PrimitiveTypesVisitor implements Visitor { private static XmlSchemaPrimitiveMap xmlSchemaPrimitiveMap = new XmlSchemaPrimitiveMap(); - private static final List<Integer> PRIMITIVE_TYPES = new ArrayList<Integer>(); + private static final List<Integer> PRIMITIVE_TYPES = new ArrayList<>(); static { PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_float)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java index d9de4ea..5802f09 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java @@ -35,7 +35,7 @@ public final class Scope implements Comparable<Object> { private String prefix; public Scope() { - scope = new ArrayList<String>(); + scope = new ArrayList<>(); parent = this; } @@ -54,13 +54,13 @@ public final class Scope implements Comparable<Object> { } public Scope(Scope containingScope) { - scope = new ArrayList<String>(containingScope.scope); + scope = new ArrayList<>(containingScope.scope); parent = containingScope.getParent(); this.setPrefix(parent.getPrefix()); } public Scope(Scope containingScope, String str) { - scope = new ArrayList<String>(containingScope.scope); + scope = new ArrayList<>(containingScope.scope); scope.add(str); parent = containingScope; this.setPrefix(parent.getPrefix()); @@ -68,7 +68,7 @@ public final class Scope implements Comparable<Object> { // This is used for interface inheritance public Scope(Scope containingScope, Scope prefixScope, String str) { - scope = new ArrayList<String>(containingScope.scope); + scope = new ArrayList<>(containingScope.scope); scope.addAll(prefixScope.scope); scope.add(str); parent = containingScope; @@ -76,7 +76,7 @@ public final class Scope implements Comparable<Object> { } public Scope(Scope containingScope, AST node) { - scope = new ArrayList<String>(containingScope.scope); + scope = new ArrayList<>(containingScope.scope); if (node != null) { scope.add(node.toString()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java index 6c0d0ac..c7ddf9a 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopedNameVisitor.java @@ -404,7 +404,7 @@ public class ScopedNameVisitor extends VisitorBase { boolean result = false; List<Scope> baseScopes = wsdlVisitor.getInheritedScopeMap().get(scope); if (baseScopes != null) { - List<Scope> scopeList = new ArrayList<Scope>(); + List<Scope> scopeList = new ArrayList<>(); for (Scope scopeName : baseScopes) { scopeList.add(scopeName); } @@ -419,7 +419,7 @@ public class ScopedNameVisitor extends VisitorBase { Definition defn, XmlSchema schemaRef, AST node, WSDLASTVisitor wsdlVisitor, VisitorTypeHolder holder) { - List<Scope> inheritedList = new ArrayList<Scope>(); + List<Scope> inheritedList = new ArrayList<>(); boolean result = false; if (scopeList != null) { @@ -443,7 +443,7 @@ public class ScopedNameVisitor extends VisitorBase { } if (!inheritedList.isEmpty()) { - List<Scope> baseList = new ArrayList<Scope>(); + List<Scope> baseList = new ArrayList<>(); for (Scope scopeName : inheritedList) { baseList.add(scopeName); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java index d52cf54..11b8f33 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java @@ -249,7 +249,7 @@ public final class WSDLASTVisitor implements ASTVisitor { } public Binding[] getCorbaBindings() { - List<Binding> result = new ArrayList<Binding>(); + List<Binding> result = new ArrayList<>(); Map<QName, Binding> bindings = CastUtils.cast(definition.getBindings()); for (Binding binding : bindings.values()) { List<ExtensibilityElement> extElements http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java index 8f2d66f..003b77a 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java @@ -76,7 +76,7 @@ public class WSDLSchemaManager { importedSchemas = new HashMap<File, XmlSchema>(); defnSchemas = new HashMap<String, XmlSchema>(); - deferredAttachments = new ArrayList<DeferredSchemaAttachment>(); + deferredAttachments = new ArrayList<>(); } public Definition createWSDLDefinition(String tns) throws WSDLException, JAXBException { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java index f55882f..a2e23f9 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java @@ -59,9 +59,9 @@ public final class WSDLParameter { List<ArgType> returns, boolean simpleOrdering) throws Exception { definition = def; - List<ParamType> inputs = new ArrayList<ParamType>(); - List<ParamType> outputs = new ArrayList<ParamType>(); - List<ArgType> returnOutputs = new ArrayList<ArgType>(); + List<ParamType> inputs = new ArrayList<>(); + List<ParamType> outputs = new ArrayList<>(); + List<ArgType> returnOutputs = new ArrayList<>(); boolean isWrapped = isWrappedOperation(operation, xmlSchemaList); if (isWrapped) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java index 7e482e1..d471369 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java @@ -92,7 +92,7 @@ public class WSDLToCorbaBinding { TypeMappingType typeMappingType; ExtensionRegistry extReg; - List<String> interfaceNames = new ArrayList<String>(); + List<String> interfaceNames = new ArrayList<>(); Map<Object, Object> bindingNameMap = new HashMap<Object, Object>(); String bindingName; String address; @@ -139,7 +139,7 @@ public class WSDLToCorbaBinding { List<PortType> intfs = null; if (interfaceNames.size() > 0) { - intfs = new ArrayList<PortType>(interfaceNames.size()); + intfs = new ArrayList<>(interfaceNames.size()); for (String interfaceName : interfaceNames) { PortType portType = null; @@ -186,7 +186,7 @@ public class WSDLToCorbaBinding { throw new Exception(msg.toString()); } else { PortType portType = null; - intfs = new ArrayList<PortType>(); + intfs = new ArrayList<>(); if (portTypes.size() == 1) { portType = portTypes.values().iterator().next(); interfaceNames.add(portType.getQName().getLocalPart()); @@ -226,7 +226,7 @@ public class WSDLToCorbaBinding { extReg = def.getExtensionRegistry(); } - bindingNames = new ArrayList<String>(); + bindingNames = new ArrayList<>(); String interfaceName = portType.getQName().getLocalPart(); String bname = getMappedBindingName(interfaceName); @@ -419,8 +419,8 @@ public class WSDLToCorbaBinding { } operationType.setName(op.getName()); - List<ParamType> params = new ArrayList<ParamType>(); - List<ArgType> returns = new ArrayList<ArgType>(); + List<ParamType> params = new ArrayList<>(); + List<ArgType> returns = new ArrayList<>(); wsdlParameter.processParameters(this, op, def, xmlSchemaList, params, returns, true); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java index ebefbd4..d364184 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java @@ -167,7 +167,7 @@ public class WSDLToCorbaHelper { QName defaultName, QName schemaTypeName) throws Exception { - List<MemberType> members = new ArrayList<MemberType>(); + List<MemberType> members = new ArrayList<>(); Iterator<? extends XmlSchemaObjectBase> iterL = null; if (particle instanceof XmlSchemaSequence) { @@ -526,7 +526,7 @@ public class WSDLToCorbaHelper { protected List<MemberType> processAttributesAsMembers(List<XmlSchemaAttributeOrGroupRef> list, String uri) throws Exception { QName memName = null; - List <MemberType>members = new ArrayList<MemberType>(); + List <MemberType>members = new ArrayList<>(); for (XmlSchemaAttributeOrGroupRef aog : list) { if (!(aog instanceof XmlSchemaAttribute)) { @@ -1409,7 +1409,7 @@ public class WSDLToCorbaHelper { List<MemberType> fields = processContainerAsMembers(choice, defaultName, schematypeName); - List<String> caselist = new ArrayList<String>(); + List<String> caselist = new ArrayList<>(); if (disctype instanceof Enum) { Enum corbaenum = (Enum)disctype; @@ -1496,7 +1496,7 @@ public class WSDLToCorbaHelper { List<MemberType> fields = processContainerAsMembers(choice, defaultName, schematypeName); //Choose an Integer as a Discriminator - List<String> caselist = new ArrayList<String>(); + List<String> caselist = new ArrayList<>(); for (int i = 0; i < fields.size(); i++) { caselist.add(Integer.toString(i)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java index efa45b2..46ec079 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java @@ -135,7 +135,7 @@ public class WSDLToIDLAction { org.apache.cxf.common.i18n.Message msg = new org.apache.cxf.common.i18n.Message(msgStr, LOG); throw new Exception(msg.toString()); } else { - List<QName> portTypes = new ArrayList<QName>(); + List<QName> portTypes = new ArrayList<>(); for (Binding binding : bindings) { List<?> ext = binding.getExtensibilityElements(); if (!(ext.get(0) instanceof BindingType)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java index 3123af0..e77ec6d 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java @@ -48,7 +48,7 @@ public class JavaToJS extends AbstractCXFToolContainer { super.execute(exitOnFinish); if (!hasInfoOption()) { ToolContext env = new ToolContext(); - env.setParameters(getParametersMap(new HashSet<String>())); + env.setParameters(getParametersMap(new HashSet<>())); if (env.get(ToolConstants.CFG_OUTPUTDIR) == null) { env.put(ToolConstants.CFG_OUTPUTDIR, "."); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java index 6e56540..e44b15f 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java @@ -125,7 +125,7 @@ public class JavaToJSProcessor implements Processor { @SuppressWarnings("unchecked") public ServiceBuilder getServiceBuilder() throws ToolException { Object beanFilesParameter = context.get(ToolConstants.CFG_BEAN_CONFIG); - List<String> beanDefinitions = new ArrayList<String>(); + List<String> beanDefinitions = new ArrayList<>(); if (beanFilesParameter != null) { if (beanFilesParameter instanceof String) { beanDefinitions.add((String)beanFilesParameter); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java index 3e4d030..15fb555 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java @@ -51,7 +51,7 @@ public class JavaToWSContainer extends AbstractCXFToolContainer { //checkParams(errors); if (!hasInfoOption()) { ToolContext env = new ToolContext(); - env.setParameters(getParametersMap(new HashSet<String>())); + env.setParameters(getParametersMap(new HashSet<>())); if (env.get(ToolConstants.CFG_OUTPUTDIR) == null) { env.put(ToolConstants.CFG_OUTPUTDIR, "."); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java index ca5683f..b982166 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java @@ -65,7 +65,7 @@ public class BeanGenerator extends AbstractGenerator<File> { VelocityGenerator generator = new VelocityGenerator(false); generator.setBaseDir(dir.toString()); - List<File> generatedFiles = new ArrayList<File>(); + List<File> generatedFiles = new ArrayList<>(); try { for (JavaClass wrapperClass : wrapperClasses) { generator.setCommonAttributes(); @@ -84,7 +84,7 @@ public class BeanGenerator extends AbstractGenerator<File> { //compile the classes Compiler compiler = new Compiler(); compiler.setOutputDir(compileToDir); - List<String> files = new ArrayList<String>(generatedFiles.size()); + List<String> files = new ArrayList<>(generatedFiles.size()); for (File file : generatedFiles) { files.add(file.getAbsolutePath()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java index 70ef1d3..04b5e8a 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java @@ -43,7 +43,7 @@ public final class DateTypeCustomGenerator extends AbstractGenerator<File> { private static final String CALENDAR_ADAPTER = "javax.xml.bind.DatatypeConverter"; private String wsdlName; - private List<String> schemaFiles = new ArrayList<String>(); + private List<String> schemaFiles = new ArrayList<>(); public void addSchemaFiles(final Collection<String> s) { this.schemaFiles.addAll(s); @@ -61,7 +61,7 @@ public final class DateTypeCustomGenerator extends AbstractGenerator<File> { } public List<String> getSchemaNamespaces() { - List<String> ns = new ArrayList<String>(); + List<String> ns = new ArrayList<>(); for (SchemaInfo schema : getServiceModel().getSchemas()) { ns.add(schema.getNamespaceURI()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java index d4ffcc0..10bcdcc 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java @@ -54,7 +54,7 @@ public final class FaultBeanGenerator extends BeanGenerator { seiPackageName = getSEIPackage(method); } - Collection<JavaClass> faultBeanClasses = new HashSet<JavaClass>(); + Collection<JavaClass> faultBeanClasses = new HashSet<>(); String defaultPackage = seiPackageName + ".jaxws"; FaultBean bean = new FaultBean(); for (Class<?> clz : exceptionClasses) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java index 160c4fa..214de3f 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java @@ -31,7 +31,7 @@ import org.apache.cxf.tools.java2wsdl.processor.internal.jaxws.ResponseWrapper; public final class WrapperBeanGenerator extends BeanGenerator { protected Collection<JavaClass> generateBeanClasses(final ServiceInfo serviceInfo) { - Collection<JavaClass> wrapperClasses = new HashSet<JavaClass>(); + Collection<JavaClass> wrapperClasses = new HashSet<>(); for (OperationInfo op : serviceInfo.getInterface().getOperations()) { if (op.getUnwrappedOperation() != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java index 06b870b..de23b31 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java @@ -91,7 +91,7 @@ public class WrapperBeanAnnotator implements Annotator { } } - List<String> props = new ArrayList<String>(); + List<String> props = new ArrayList<>(); for (JavaField f : beanClass.getFields()) { props.add(f.getParaName()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java index 0814227..3f85a14 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java @@ -91,7 +91,7 @@ public final class FrontendFactory { } private List<Method> getWSMethods() { - List<Method> methods = new ArrayList<Method>(); + List<Method> methods = new ArrayList<>(); for (Method method : serviceClass.getMethods()) { if (method.getDeclaringClass().equals(Object.class) || !Modifier.isPublic(method.getModifiers()) http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java index 7985436..5d6a889 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java @@ -116,7 +116,7 @@ public class JavaToWSDLProcessor implements Processor { } generate(service, outputDir); - List<ServiceInfo> serviceList = new ArrayList<ServiceInfo>(); + List<ServiceInfo> serviceList = new ArrayList<>(); serviceList.add(service); context.put(ToolConstants.SERVICE_LIST, serviceList); System.setProperty(JAVA_CLASS_PATH, oldClassPath); @@ -160,7 +160,7 @@ public class JavaToWSDLProcessor implements Processor { @SuppressWarnings("unchecked") public ServiceBuilder getServiceBuilder() throws ToolException { Object beanFilesParameter = context.get(ToolConstants.CFG_BEAN_CONFIG); - List<String> beanDefinitions = new ArrayList<String>(); + List<String> beanDefinitions = new ArrayList<>(); if (beanFilesParameter != null) { if (beanFilesParameter instanceof String) { beanDefinitions.add((String)beanFilesParameter); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java index e8a220e..f33c887 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java @@ -56,7 +56,7 @@ public final class SpringServiceBuilderFactory extends ServiceBuilderFactory { public SpringServiceBuilderFactory() { super(); - this.beanDefinitions = new ArrayList<String>(0); + this.beanDefinitions = new ArrayList<>(0); } /** http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java index e4ab80a..40437e4 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java @@ -61,8 +61,8 @@ public class JAXWSFrontEndProcessor implements Processor { private static final String SEI_SUFFIX = "_PortType"; private static final Logger LOG = LogUtils.getL7dLogger(JAXWSFrontEndProcessor.class); private ToolContext context; - private List<AbstractGenerator> generators = new ArrayList<AbstractGenerator>(); - private List<String> infList = new ArrayList<String>(); + private List<AbstractGenerator> generators = new ArrayList<>(); + private List<String> infList = new ArrayList<>(); @SuppressWarnings("unchecked") public void process() throws ToolException { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java index 6eb570a..1010d81 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapper.java @@ -63,7 +63,7 @@ public class RequestWrapper extends Wrapper { } protected List<JavaField> buildFields(final Method method, final MessageInfo message) { - List<JavaField> fields = new ArrayList<JavaField>(); + List<JavaField> fields = new ArrayList<>(); final Type[] paramClasses = method.getGenericParameterTypes(); final Annotation[][] paramAnnotations = method.getParameterAnnotations(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java index 08c8682..c8b9c20 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapper.java @@ -68,7 +68,7 @@ public final class ResponseWrapper extends Wrapper { } protected List<JavaField> buildFields(final Method method, final MessageInfo message) { - List<JavaField> fields = new ArrayList<JavaField>(); + List<JavaField> fields = new ArrayList<>(); final Class<?> returnType = method.getReturnType(); JavaField field = new JavaField(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java index f827abb..aad3cd0 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/Wrapper.java @@ -187,7 +187,7 @@ public class Wrapper { } protected List<JavaField> buildFields() { - return new ArrayList<JavaField>(); + return new ArrayList<>(); } public Method getMethod() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtil.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtil.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtil.java index 238abcf..6ec51e1 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtil.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtil.java @@ -54,7 +54,7 @@ public final class WrapperUtil { } public static List<Annotation> getJaxbAnnotations(Method method) { - List<Annotation> jaxbAnnotation = new ArrayList<Annotation>(); + List<Annotation> jaxbAnnotation = new ArrayList<>(); Annotation ann = method.getAnnotation(XmlAttachmentRef.class); if (ann != null) { jaxbAnnotation.add(ann); @@ -75,7 +75,7 @@ public final class WrapperUtil { } public static List<Annotation> getJaxbAnnotations(Method method, int idx) { - List<Annotation> jaxbAnnotation = new ArrayList<Annotation>(); + List<Annotation> jaxbAnnotation = new ArrayList<>(); Annotation[][] anns = method.getParameterAnnotations(); for (int i = 0; i < method.getParameterTypes().length; i++) { if (i == idx) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java index 67821b6..ecb751f 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java @@ -38,7 +38,7 @@ import org.apache.cxf.tools.wsdlto.core.AbstractGenerator; public class SimpleFrontEndProcessor implements Processor { private ToolContext context; - private List<AbstractGenerator> generators = new ArrayList<AbstractGenerator>(); + private List<AbstractGenerator> generators = new ArrayList<>(); @SuppressWarnings("unchecked") public void process() throws ToolException { List<ServiceInfo> services = (List<ServiceInfo>)context.get(ToolConstants.SERVICE_LIST); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java index 5dfcf3e..aa5065c 100644 --- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java +++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java @@ -30,7 +30,7 @@ import org.junit.Assert; import org.junit.Test; public class ServiceBuilderFactoryTest extends Assert { - ServiceBuilderFactory factory = ServiceBuilderFactory.getInstance(new ArrayList<String>(), + ServiceBuilderFactory factory = ServiceBuilderFactory.getInstance(new ArrayList<>(), "jaxb"); @Test http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java index 9080260..4961a06 100644 --- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java +++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java @@ -65,7 +65,7 @@ public class JaxwsServiceBuilderRPCTest extends ProcessorTestBase { //MOXy doesn't put a final attribute on the array types, we can ignore that //for the purpose of this test - List<String> ignores = new ArrayList<String>(DEFAULT_IGNORE_ATTR); + List<String> ignores = new ArrayList<>(DEFAULT_IGNORE_ATTR); ignores.add("final"); assertWsdlEquals(expectedFile, output, ignores, DEFAULT_IGNORE_TAG); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java index 736ec60..aa1eace 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java @@ -44,7 +44,7 @@ public class WSDLValidator extends AbstractCXFToolContainer { } private Set<String> getArrayKeys() { - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); set.add(ToolConstants.CFG_SCHEMA_URL); return set; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java ---------------------------------------------------------------------- diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java index d3b9bda..1801c04 100644 --- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java +++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java @@ -68,7 +68,7 @@ public class MIMEBindingValidator boolean gotRootPart = false; List<MIMEPart> parts = CastUtils.cast(mimeExt.getMIMEParts()); for (MIMEPart mPart : parts) { - List<MIMEContent> mimeContents = new ArrayList<MIMEContent>(); + List<MIMEContent> mimeContents = new ArrayList<>(); List<ExtensibilityElement> extns = CastUtils.cast(mPart.getExtensibilityElements()); for (ExtensibilityElement extElement : extns) { if (SOAPBindingUtil.isSOAPBody(extElement)) {
