http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java index 1e1dd56..d9efdcd 100644 --- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java +++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java @@ -61,7 +61,7 @@ public class ExternalAttachmentProviderTest extends Assert { private Policy policy; private Assertion assertion; private PolicyAttachment attachment; - private Collection<PolicyAttachment> attachments = new ArrayList<PolicyAttachment>(); + private Collection<PolicyAttachment> attachments = new ArrayList<>(); @Before public void setUp() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java index 07238d7..8e06790 100644 --- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java +++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java @@ -58,7 +58,7 @@ public class ReferenceResolverTest extends Assert { LocalServiceModelReferenceResolver resolver = new LocalServiceModelReferenceResolver(di, builder); - List<UnknownExtensibilityElement> extensions = new ArrayList<UnknownExtensibilityElement>(); + List<UnknownExtensibilityElement> extensions = new ArrayList<>(); EasyMock.expect(di.getExtensors(UnknownExtensibilityElement.class)).andReturn(extensions); control.replay(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java index 3442fc5..89b9bd3 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java @@ -69,7 +69,7 @@ public class DestinationSequence extends AbstractSequence { private long nextInOrder; private List<Continuation> continuations = new LinkedList<Continuation>(); // this map is used for robust and redelivery tracking. for redelivery it holds the beingDeliverd messages - private Set<Long> deliveringMessageNumbers = new HashSet<Long>(); + private Set<Long> deliveringMessageNumbers = new HashSet<>(); public DestinationSequence(Identifier i, EndpointReferenceType a, Destination d, ProtocolVariation pv) { this(i, a, 0, false, null, pv); @@ -484,7 +484,7 @@ public class DestinationSequence extends AbstractSequence { synchronized void scheduleDeferredAcknowledgement(long delay) { if (null == deferredAcknowledgments) { - deferredAcknowledgments = new ArrayList<DeferredAcknowledgment>(); + deferredAcknowledgments = new ArrayList<>(); } long now = System.currentTimeMillis(); long expectedExecutionTime = now + delay; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java index c14bd84..fb22fe0 100755 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java @@ -215,7 +215,7 @@ public class ManagedRMEndpoint implements ManagedComponent { throw new IllegalArgumentException("no sequence"); } - List<Long> list = new ArrayList<Long>(); + List<Long> list = new ArrayList<>(); for (AcknowledgementRange r : ss.getAcknowledgement().getAcknowledgementRange()) { list.add(r.getLower()); @@ -234,7 +234,7 @@ public class ManagedRMEndpoint implements ManagedComponent { throw new IllegalArgumentException("no sequence"); } - List<Long> list = new ArrayList<Long>(); + List<Long> list = new ArrayList<>(); for (AcknowledgementRange r : ds.getAcknowledgment().getAcknowledgementRange()) { list.add(r.getLower()); @@ -334,7 +334,7 @@ public class ManagedRMEndpoint implements ManagedComponent { }) public String[] getSourceSequenceIds(boolean expired) { Source source = endpoint.getSource(); - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); for (SourceSequence ss : source.getAllSequences()) { if (expired || !ss.isExpired()) { list.add(ss.getIdentifier().getValue()); @@ -347,7 +347,7 @@ public class ManagedRMEndpoint implements ManagedComponent { @ManagedOperation(description = "List of Destination Sequence IDs") public String[] getDestinationSequenceIds() { Destination destination = endpoint.getDestination(); - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); for (DestinationSequence ds : destination.getAllSequences()) { list.add(ds.getIdentifier().getValue()); } @@ -442,7 +442,7 @@ public class ManagedRMEndpoint implements ManagedComponent { @ManagedOperationParameter(name = "expired", description = "The expired sequences included") }) public CompositeData[] getSourceSequences(boolean expired) throws JMException { - List<CompositeData> sps = new ArrayList<CompositeData>(); + List<CompositeData> sps = new ArrayList<>(); Source source = endpoint.getSource(); for (SourceSequence ss : source.getAllSequences()) { @@ -466,7 +466,7 @@ public class ManagedRMEndpoint implements ManagedComponent { @ManagedOperation(description = "Destination Sequences Properties") public CompositeData[] getDestinationSequences() throws JMException { - List<CompositeData> sps = new ArrayList<CompositeData>(); + List<CompositeData> sps = new ArrayList<>(); Destination destination = endpoint.getDestination(); for (DestinationSequence ds : destination.getAllSequences()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java index f98be8e..adcf97a 100755 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java @@ -60,7 +60,7 @@ public class ManagedRMManager implements ManagedComponent { @ManagedOperation public String[] getEndpointIdentifiers() { - Set<String> identifiers = new HashSet<String>(); + Set<String> identifiers = new HashSet<>(); for (Endpoint ep : manager.getReliableEndpointsMap().keySet()) { identifiers.add(RMUtils.getEndpointIdentifier(ep, manager.getBus())); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java index a3fec3d..bf4a85c 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java @@ -107,7 +107,7 @@ public final class RM10Constants extends RMConstants { public static final Set<String> ACTIONS; static { - Set<String> actions = new HashSet<String>(); + Set<String> actions = new HashSet<>(); actions.add(CREATE_SEQUENCE_ACTION); actions.add(CREATE_SEQUENCE_RESPONSE_ACTION); actions.add(TERMINATE_SEQUENCE_ACTION); @@ -139,7 +139,7 @@ public final class RM10Constants extends RMConstants { public static final Set<QName> HEADERS; static { - Set<QName> headers = new HashSet<QName>(); + Set<QName> headers = new HashSet<>(); headers.add(new QName(NAMESPACE_URI, SEQUENCE_NAME)); headers.add(new QName(NAMESPACE_URI, SEQUENCE_ACK_NAME)); headers.add(new QName(NAMESPACE_URI, ACK_REQUESTED_NAME)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java index 0340260..e91dab5 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java @@ -118,7 +118,7 @@ public final class RM11Constants extends RMConstants { public static final Set<String> ACTIONS; static { - Set<String> actions = new HashSet<String>(); + Set<String> actions = new HashSet<>(); actions.add(CREATE_SEQUENCE_ACTION); actions.add(CREATE_SEQUENCE_RESPONSE_ACTION); actions.add(TERMINATE_SEQUENCE_ACTION); @@ -158,7 +158,7 @@ public final class RM11Constants extends RMConstants { public static final Set<QName> HEADERS; static { - Set<QName> headers = new HashSet<QName>(); + Set<QName> headers = new HashSet<>(); headers.add(new QName(NAMESPACE_URI, SEQUENCE_NAME)); headers.add(new QName(NAMESPACE_URI, SEQUENCE_ACK_NAME)); headers.add(new QName(NAMESPACE_URI, ACK_REQUESTED_NAME)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java index 8d3aa17..befe079 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java @@ -150,7 +150,7 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> { || (mode == AckRequestModeType.PENDING && seq.needAcknowledge(rmpsIn.getMessageNumber()))) { Collection<AckRequestedType> reqs = rmpsIn.getAcksRequested(); if (reqs == null) { - reqs = new ArrayList<AckRequestedType>(); + reqs = new ArrayList<>(); } Identifier identifier = new Identifier(); identifier.setValue(sequence.getIdentifier().getValue()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java index f137803..22e47ee 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java @@ -97,7 +97,7 @@ public class RMProperties { public void addAck(DestinationSequence seq) { if (null == acks) { - acks = new ArrayList<SequenceAcknowledgement>(); + acks = new ArrayList<>(); } SequenceAcknowledgement ack = seq.getAcknowledgment(); acks.add(ack); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java index c1cfc49..5909d9f 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java @@ -31,7 +31,7 @@ public class SequenceMonitor { private static final Logger LOG = LogUtils.getL7dLogger(SequenceMonitor.class); private long monitorInterval = DEFAULT_MONITOR_INTERVAL; private long firstCheck; - private List<Long> receiveTimes = new ArrayList<Long>(); + private List<Long> receiveTimes = new ArrayList<>(); public void acknowledgeMessage() { long now = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java index 51f183e..307e707 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java @@ -95,7 +95,7 @@ public class Source extends AbstractEndpoint { * @return the collection of unacknowledged sequences. */ public Collection<SourceSequence> getAllUnacknowledgedSequences() { - Collection<SourceSequence> seqs = new ArrayList<SourceSequence>(); + Collection<SourceSequence> seqs = new ArrayList<>(); for (SourceSequence seq : map.values()) { if (!seq.allAcknowledged()) { seqs.add(seq); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java index e3cfa0b..212458e 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java @@ -511,7 +511,7 @@ public class RMTxStore implements RMStore { Connection con = verifyConnection(); PreparedStatement stmt = null; SQLException conex = null; - Collection<DestinationSequence> seqs = new ArrayList<DestinationSequence>(); + Collection<DestinationSequence> seqs = new ArrayList<>(); ResultSet res = null; try { stmt = getStatement(con, SELECT_DEST_SEQUENCES_STMT_STR); @@ -551,7 +551,7 @@ public class RMTxStore implements RMStore { Connection con = verifyConnection(); PreparedStatement stmt = null; SQLException conex = null; - Collection<SourceSequence> seqs = new ArrayList<SourceSequence>(); + Collection<SourceSequence> seqs = new ArrayList<>(); ResultSet res = null; try { stmt = getStatement(con, SELECT_SRC_SEQUENCES_STMT_STR); @@ -590,7 +590,7 @@ public class RMTxStore implements RMStore { Connection con = verifyConnection(); PreparedStatement stmt = null; SQLException conex = null; - Collection<RMMessage> msgs = new ArrayList<RMMessage>(); + Collection<RMMessage> msgs = new ArrayList<>(); ResultSet res = null; try { stmt = getStatement(con, outbound ? SELECT_OUTBOUND_MESSAGES_STMT_STR : SELECT_INBOUND_MESSAGES_STMT_STR); @@ -895,7 +895,7 @@ public class RMTxStore implements RMStore { try { DatabaseMetaData metadata = con.getMetaData(); ResultSet rs = metadata.getColumns(null, null, tableName, "%"); - Set<String> dbCols = new HashSet<String>(); + Set<String> dbCols = new HashSet<>(); List<String[]> newCols = new ArrayList<String[]>(); while (rs.next()) { dbCols.add(rs.getString(4)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java index 7830065..c846e6e 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java @@ -49,7 +49,7 @@ public class RMPolicyInterceptorProvider extends AbstractPolicyInterceptorProvid private RMDeliveryInterceptor rmDelivery = new RMDeliveryInterceptor(); static { - Collection<QName> types = new ArrayList<QName>(); + Collection<QName> types = new ArrayList<>(); types.add(RM10Constants.WSRMP_RMASSERTION_QNAME); types.add(RM11Constants.WSRMP_RMASSERTION_QNAME); types.add(MC11AssertionBuilder.MCSUPPORTED_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java index 72e3d9d..97dff8d 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java @@ -43,7 +43,7 @@ public final class RMPolicyUtilities { private static final List<QName> ASSERTION_NAMES; static { - ASSERTION_NAMES = new ArrayList<QName>(); + ASSERTION_NAMES = new ArrayList<>(); ASSERTION_NAMES.addAll(RM10AssertionBuilder.KNOWN_ELEMENTS); for (QName qn : RM12AssertionBuilder.KNOWN_ELEMENTS) { ASSERTION_NAMES.add(qn); @@ -87,7 +87,7 @@ public final class RMPolicyUtilities { * @return merged collection, never <code>null</code> */ public static Collection<AssertionInfo> collectRMAssertions(AssertionInfoMap aim) { - Collection<AssertionInfo> mergedAsserts = new ArrayList<AssertionInfo>(); + Collection<AssertionInfo> mergedAsserts = new ArrayList<>(); if (aim != null) { for (QName qn : ASSERTION_NAMES) { Collection<AssertionInfo> ais = aim.get(qn); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java index 9215031..4318bd5 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java @@ -84,7 +84,7 @@ public class RMSoapInInterceptor extends AbstractSoapInterceptor { private static final Set<QName> HEADERS; static { - Set<QName> set = new HashSet<QName>(); + Set<QName> set = new HashSet<>(); set.addAll(RM10Constants.HEADERS); set.addAll(RM11Constants.HEADERS); HEADERS = set; @@ -152,8 +152,8 @@ public class RMSoapInInterceptor extends AbstractSoapInterceptor { public void decodeHeaders(SoapMessage message, List<Header> headers, RMProperties rmps) { try { - Collection<SequenceAcknowledgement> acks = new ArrayList<SequenceAcknowledgement>(); - Collection<AckRequestedType> requested = new ArrayList<AckRequestedType>(); + Collection<SequenceAcknowledgement> acks = new ArrayList<>(); + Collection<AckRequestedType> requested = new ArrayList<>(); String rmUri = null; EncoderDecoder codec = null; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java index 26342d4..4a19e0b 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java @@ -64,7 +64,7 @@ public class RMSoapOutInterceptor extends AbstractSoapInterceptor { private static final Set<QName> HEADERS; static { - Set<QName> set = new HashSet<QName>(); + Set<QName> set = new HashSet<>(); set.addAll(RM10Constants.HEADERS); set.addAll(RM11Constants.HEADERS); HEADERS = set; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java index af12259..b0b953b 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java @@ -117,7 +117,7 @@ public class RedeliveryQueueImpl implements RedeliveryQueue { return 0 == getUndelivered().size(); } public void purgeAll(DestinationSequence seq) { - Collection<Long> purged = new ArrayList<Long>(); + Collection<Long> purged = new ArrayList<>(); synchronized (this) { LOG.fine("Start purging redeliver candidates."); List<RedeliverCandidate> sequenceCandidates = getSequenceCandidates(seq); @@ -145,7 +145,7 @@ public class RedeliveryQueueImpl implements RedeliveryQueue { } public List<Long> getUndeliveredMessageNumbers(DestinationSequence seq) { - List<Long> undelivered = new ArrayList<Long>(); + List<Long> undelivered = new ArrayList<>(); List<RedeliverCandidate> sequenceCandidates = getSequenceCandidates(seq); if (null != sequenceCandidates) { for (int i = 0; i < sequenceCandidates.size(); i++) { @@ -292,7 +292,7 @@ public class RedeliveryQueueImpl implements RedeliveryQueue { synchronized (this) { List<RedeliverCandidate> sequenceCandidates = getSequenceCandidates(key); if (null == sequenceCandidates) { - sequenceCandidates = new ArrayList<RedeliverCandidate>(); + sequenceCandidates = new ArrayList<>(); candidates.put(key, sequenceCandidates); } candidate = getRedeliverCandidate(st, sequenceCandidates); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java index 3181efe..936ac42 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java @@ -175,8 +175,8 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { } private void purgeCandidates(SourceSequence seq, boolean any) { - Collection<Long> purged = new ArrayList<Long>(); - Collection<ResendCandidate> resends = new ArrayList<ResendCandidate>(); + Collection<Long> purged = new ArrayList<>(); + Collection<ResendCandidate> resends = new ArrayList<>(); Identifier sid = seq.getIdentifier(); synchronized (this) { LOG.fine("Start purging resend candidates."); @@ -212,7 +212,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { } public List<Long> getUnacknowledgedMessageNumbers(SourceSequence seq) { - List<Long> unacknowledged = new ArrayList<Long>(); + List<Long> unacknowledged = new ArrayList<>(); List<ResendCandidate> sequenceCandidates = getSequenceCandidates(seq); if (null != sequenceCandidates) { for (int i = 0; i < sequenceCandidates.size(); i++) { @@ -344,7 +344,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { synchronized (this) { List<ResendCandidate> sequenceCandidates = getSequenceCandidates(key); if (null == sequenceCandidates) { - sequenceCandidates = new ArrayList<ResendCandidate>(); + sequenceCandidates = new ArrayList<>(); candidates.put(key, sequenceCandidates); } candidate = new ResendCandidate(message); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java index 1822135..097aecd 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java @@ -144,7 +144,7 @@ public class AbstractRMInterceptorTest extends Assert { Message message = control.createMock(Message.class); EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(null); AssertionInfoMap aim = control.createMock(AssertionInfoMap.class); - Collection<AssertionInfo> ais = new ArrayList<AssertionInfo>(); + Collection<AssertionInfo> ais = new ArrayList<>(); EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(aim).times(2); PolicyAssertion a = control.createMock(PolicyAssertion.class); AssertionInfo ai = new AssertionInfo(a); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java index 546f5f3..b28ac51 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java @@ -465,7 +465,7 @@ public class DestinationSequenceTest extends Assert { long mn = 10; SequenceAcknowledgement ack = control.createMock(SequenceAcknowledgement.class); - List<AcknowledgementRange> ranges = new ArrayList<AcknowledgementRange>(); + List<AcknowledgementRange> ranges = new ArrayList<>(); AcknowledgementRange r = control.createMock(AcknowledgementRange.class); EasyMock.expect(ack.getAcknowledgementRange()).andReturn(ranges); config.setDeliveryAssurance(DeliveryAssurance.AT_MOST_ONCE); @@ -500,7 +500,7 @@ public class DestinationSequenceTest extends Assert { config.setDeliveryAssurance(DeliveryAssurance.AT_LEAST_ONCE); SequenceAcknowledgement ack = factory.createSequenceAcknowledgement(); - List<AcknowledgementRange> ranges = new ArrayList<AcknowledgementRange>(); + List<AcknowledgementRange> ranges = new ArrayList<>(); final AcknowledgementRange r = factory.createSequenceAcknowledgementAcknowledgementRange(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java index e70963b..9942f92 100755 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java @@ -379,7 +379,7 @@ public class ManagedRMManagerTest extends Assert { private List<SourceSequence> createTestSourceSequences(Source source, EndpointReferenceType to) { - List<SourceSequence> sss = new ArrayList<SourceSequence>(); + List<SourceSequence> sss = new ArrayList<>(); sss.add(createTestSourceSequence(source, "seq1", to, ProtocolVariation.RM10WSA200408, new long[]{1L, 1L, 3L, 3L})); sss.add(createTestSourceSequence(source, "seq2", to, @@ -390,7 +390,7 @@ public class ManagedRMManagerTest extends Assert { private List<DestinationSequence> createTestDestinationSequences(Destination destination, EndpointReferenceType to) { - List<DestinationSequence> dss = new ArrayList<DestinationSequence>(); + List<DestinationSequence> dss = new ArrayList<>(); dss.add(createTestDestinationSequence(destination, "seq3", to, ProtocolVariation.RM10WSA200408, new long[]{1L, 1L, 3L, 3L})); dss.add(createTestDestinationSequence(destination, "seq4", to, @@ -465,13 +465,13 @@ public class ManagedRMManagerTest extends Assert { } private class TestRetransmissionQueue implements RetransmissionQueue { - private Set<String> suspended = new HashSet<String>(); + private Set<String> suspended = new HashSet<>(); private RetryStatus status = new TestRetransmissionStatus(); private Map<String, List<Long>> numlists = new HashMap<String, List<Long>>(); TestRetransmissionQueue() { - numlists.put("seq1", new ArrayList<Long>()); - numlists.put("seq2", new ArrayList<Long>()); + numlists.put("seq1", new ArrayList<>()); + numlists.put("seq2", new ArrayList<>()); Collections.addAll(numlists.get("seq1"), 2L, 4L); Collections.addAll(numlists.get("seq2"), 3L); } @@ -505,7 +505,7 @@ public class ManagedRMManagerTest extends Assert { public List<Long> getUnacknowledgedMessageNumbers(SourceSequence seq) { final String key = seq.getIdentifier().getValue(); List<Long> list = numlists.get(key); - return list != null ? list : new ArrayList<Long>(); + return list != null ? list : new ArrayList<>(); } public RetryStatus getRetransmissionStatus(SourceSequence seq, long num) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java index acd179c..ff0c1d8 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java @@ -210,8 +210,8 @@ public class RMEndpointTest extends Assert { control.reset(); ExtensibilityElement ua = control.createMock(ExtensibilityElement.class); ei = control.createMock(EndpointInfo.class); - List<ExtensibilityElement> noExts = new ArrayList<ExtensibilityElement>(); - List<ExtensibilityElement> exts = new ArrayList<ExtensibilityElement>(); + List<ExtensibilityElement> noExts = new ArrayList<>(); + List<ExtensibilityElement> exts = new ArrayList<>(); exts.add(ua); EasyMock.expect(ei.getExtensors(ExtensibilityElement.class)).andReturn(noExts); BindingInfo bi = control.createMock(BindingInfo.class); @@ -227,7 +227,7 @@ public class RMEndpointTest extends Assert { @Test public void testGetUsingAddressingFromExtensions() { - List<ExtensibilityElement> exts = new ArrayList<ExtensibilityElement>(); + List<ExtensibilityElement> exts = new ArrayList<>(); ExtensibilityElement ua = control.createMock(ExtensibilityElement.class); exts.add(ua); EasyMock.expect(ua.getElementType()).andReturn(Names.WSAW_USING_ADDRESSING_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java index 0796a46..b60d785 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java @@ -243,7 +243,7 @@ public class RMInInterceptorTest extends Assert { interceptor.setManager(manager); SequenceAcknowledgement ack1 = control.createMock(SequenceAcknowledgement.class); SequenceAcknowledgement ack2 = control.createMock(SequenceAcknowledgement.class); - Collection<SequenceAcknowledgement> acks = new ArrayList<SequenceAcknowledgement>(); + Collection<SequenceAcknowledgement> acks = new ArrayList<>(); acks.add(ack1); acks.add(ack2); EasyMock.expect(rmps.getAcks()).andReturn(acks); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java index 5231bd4..b1d5aca 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java @@ -398,7 +398,7 @@ public class RMManagerTest extends Assert { manager = control.createMock(RMManager.class, new Method[] {m}); Message message = control.createMock(Message.class); Exchange exchange = control.createMock(Exchange.class); - EasyMock.expect(message.getContextualPropertyKeys()).andReturn(new HashSet<String>()).anyTimes(); + EasyMock.expect(message.getContextualPropertyKeys()).andReturn(new HashSet<>()).anyTimes(); EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes(); EasyMock.expect(exchange.getOutMessage()).andReturn(message).anyTimes(); EasyMock.expect(exchange.getInMessage()).andReturn(null).anyTimes(); @@ -595,7 +595,7 @@ public class RMManagerTest extends Assert { manager.setRetransmissionQueue(oqueue); manager.setRedeliveryQueue(iqueue); - Collection<SourceSequence> sss = new ArrayList<SourceSequence>(); + Collection<SourceSequence> sss = new ArrayList<>(); if (null != ss) { sss.add(ss); } @@ -605,7 +605,7 @@ public class RMManagerTest extends Assert { return; } - Collection<DestinationSequence> dss = new ArrayList<DestinationSequence>(); + Collection<DestinationSequence> dss = new ArrayList<>(); if (null != ds) { dss.add(ds); } @@ -615,7 +615,7 @@ public class RMManagerTest extends Assert { return; } - Collection<RMMessage> ms = new ArrayList<RMMessage>(); + Collection<RMMessage> ms = new ArrayList<>(); if (null != m) { ms.add(m); } @@ -684,7 +684,7 @@ public class RMManagerTest extends Assert { manager.setRetransmissionQueue(oqueue); manager.setRedeliveryQueue(iqueue); - Collection<SourceSequence> sss = new ArrayList<SourceSequence>(); + Collection<SourceSequence> sss = new ArrayList<>(); if (null != ss) { sss.add(ss); } @@ -694,7 +694,7 @@ public class RMManagerTest extends Assert { return; } - Collection<DestinationSequence> dss = new ArrayList<DestinationSequence>(); + Collection<DestinationSequence> dss = new ArrayList<>(); if (null != ds) { dss.add(ds); } @@ -703,7 +703,7 @@ public class RMManagerTest extends Assert { if (null == ds) { return; } - Collection<RMMessage> ms = new ArrayList<RMMessage>(); + Collection<RMMessage> ms = new ArrayList<>(); if (null != m) { ms.add(m); } @@ -776,7 +776,7 @@ public class RMManagerTest extends Assert { MyControl() { c = EasyMock.createNiceControl(); - mocks = new ArrayList<Object>(); + mocks = new ArrayList<>(); } void replay() { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java index 9cccd2a..a9c910c 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/PersistenceUtilsTest.java @@ -138,7 +138,7 @@ public class PersistenceUtilsTest extends Assert { } private static void addAttachment(Message msg) throws IOException { - Collection<Attachment> attachments = new ArrayList<Attachment>(); + Collection<Attachment> attachments = new ArrayList<>(); DataHandler dh = new DataHandler(new ByteArrayDataSource("hello world!", "text/plain")); Attachment a = new AttachmentImpl("test.xml", dh); attachments.add(a); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java index 87d8e6e..133f032 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java @@ -283,7 +283,7 @@ public abstract class RMTxStoreTestBase extends Assert { } control.verify(); - Collection<Long> messageNrs = new ArrayList<Long>(); + Collection<Long> messageNrs = new ArrayList<>(); messageNrs.add(ZERO); messageNrs.add(TEN); messageNrs.add(ONE); @@ -559,7 +559,7 @@ public abstract class RMTxStoreTestBase extends Assert { assertEquals(2, in.size()); checkRecoveredMessages(in); } finally { - Collection<Long> msgNrs = new ArrayList<Long>(); + Collection<Long> msgNrs = new ArrayList<>(); msgNrs.add(ONE); msgNrs.add(TEN); @@ -627,7 +627,7 @@ public abstract class RMTxStoreTestBase extends Assert { if (null != sid1) { store.removeSourceSequence(sid1); } - Collection<Long> msgNrs = new ArrayList<Long>(); + Collection<Long> msgNrs = new ArrayList<>(); msgNrs.add(ONE); store.removeMessages(sid1, msgNrs, true); } @@ -691,7 +691,7 @@ public abstract class RMTxStoreTestBase extends Assert { if (null != sid1) { store.removeDestinationSequence(sid1); } - Collection<Long> msgNrs = new ArrayList<Long>(); + Collection<Long> msgNrs = new ArrayList<>(); msgNrs.add(ONE); store.removeMessages(sid1, msgNrs, false); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java index ec64fd7..f4289a1 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java @@ -114,7 +114,7 @@ public class RMTxStoreUpgradeTest extends Assert { // verify the presence of the new fields DatabaseMetaData metadata = store.getConnection().getMetaData(); ResultSet rs = metadata.getColumns(null, null, tableName, "%"); - Set<String> colNames = new HashSet<String>(); + Set<String> colNames = new HashSet<>(); Collections.addAll(colNames, cols); while (rs.next()) { colNames.remove(rs.getString(4)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java index 960786c..6869b28 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java @@ -135,7 +135,7 @@ public class PolicyUtilsTest extends Assert { control.reset(); AssertionInfoMap aim = control.createMock(AssertionInfoMap.class); EasyMock.expect(message.get(AssertionInfoMap.class)).andReturn(aim); - Collection<AssertionInfo> ais = new ArrayList<AssertionInfo>(); + Collection<AssertionInfo> ais = new ArrayList<>(); EasyMock.expect(aim.get(RM10Constants.RMASSERTION_QNAME)).andReturn(ais); control.replay(); assertSame(cfg, RMPolicyUtilities.getRMConfiguration(cfg, message)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java index 3d10125..161220c 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java @@ -102,7 +102,7 @@ public class RMSoapOutInterceptorTest extends Assert { message = setupOutboundMessage(); rmps = RMContextUtils.retrieveRMProperties(message, true); - Collection<SequenceAcknowledgement> acks = new ArrayList<SequenceAcknowledgement>(); + Collection<SequenceAcknowledgement> acks = new ArrayList<>(); acks.add(ack1); rmps.setAcks(acks); codec.encode(message); @@ -122,7 +122,7 @@ public class RMSoapOutInterceptorTest extends Assert { message = setupOutboundMessage(); rmps = RMContextUtils.retrieveRMProperties(message, true); - Collection<AckRequestedType> requested = new ArrayList<AckRequestedType>(); + Collection<AckRequestedType> requested = new ArrayList<>(); requested.add(ar1); rmps.setAcksRequested(requested); codec.encode(message); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java index e1f2501..abb6c18 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java @@ -62,11 +62,11 @@ public class RetransmissionQueueImplTest extends Assert { private Executor executor; private RetransmissionQueueImpl queue; private TestResender resender; - private List<Message> messages = new ArrayList<Message>(); - private List<RMProperties> properties = new ArrayList<RMProperties>(); - private List<SequenceType> sequences = new ArrayList<SequenceType>(); - private List<Identifier> identifiers = new ArrayList<Identifier>(); - private List<Object> mocks = new ArrayList<Object>(); + private List<Message> messages = new ArrayList<>(); + private List<RMProperties> properties = new ArrayList<>(); + private List<SequenceType> sequences = new ArrayList<>(); + private List<Identifier> identifiers = new ArrayList<>(); + private List<Object> mocks = new ArrayList<>(); @Before public void setUp() throws RMException { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java index 649532f..a0eb9c3 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java @@ -402,7 +402,7 @@ public final class SecurityConstants extends org.apache.cxf.rt.security.Security public static final Set<String> ALL_PROPERTIES; static { - Set<String> s = new HashSet<String>(Arrays.asList(new String[] { + Set<String> s = new HashSet<>(Arrays.asList(new String[] { ACTOR, VALIDATE_TOKEN, ALWAYS_ENCRYPT_UT, IS_BSP_COMPLIANT, ENABLE_NONCE_CACHE, ENABLE_TIMESTAMP_CACHE, TIMESTAMP_TTL, TIMESTAMP_FUTURE_TTL, KERBEROS_CLIENT, SPNEGO_CLIENT_ACTION, KERBEROS_JAAS_CONTEXT_NAME, KERBEROS_SPN, http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java index a32b145..fcd716b 100755 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java @@ -528,7 +528,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv Metadata metadata = exc.get2004(); Definition definition = null; - List<Schema> schemas = new ArrayList<Schema>(); + List<Schema> schemas = new ArrayList<>(); // Parse the MetadataSections into WSDL definition + associated schemas for (MetadataSection s : metadata.getMetadataSection()) { if ("http://schemas.xmlsoap.org/wsdl/".equals(s.getDialect())) { @@ -1275,7 +1275,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv addrNamespace = "http://www.w3.org/2005/08/addressing";; } - List<Header> headers = new ArrayList<Header>(); + List<Header> headers = new ArrayList<>(); headers.add(new Header("To", addrNamespace)); headers.add(new Header("From", addrNamespace)); headers.add(new Header("FaultTo", addrNamespace)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java index b23e124..d5c70e1 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java @@ -235,7 +235,7 @@ public class STSLoginModule implements LoginModule { } String password = new String(tmpPassword); - roles = new HashSet<Principal>(); + roles = new HashSet<>(); userPrincipal = null; STSTokenValidator validator = new STSTokenValidator(true); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java index fd52bb6..4c895fa 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java @@ -287,7 +287,7 @@ public class WSS4JStaxInInterceptor extends AbstractWSS4JStaxInterceptor { enableAudienceRestriction = Boolean.parseBoolean(audRestrStr); } if (enableAudienceRestriction) { - List<String> audiences = new ArrayList<String>(); + List<String> audiences = new ArrayList<>(); if (msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL) != null) { audiences.add((String)msg.getContextualProperty(org.apache.cxf.message.Message.REQUEST_URL)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java index bea5631..a2ad5cf 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java @@ -371,7 +371,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { private void encryptTokensInSecurityHeader(AbstractToken encryptionToken, WSSecBase encrBase) { - List<WSEncryptionPart> secondEncrParts = new ArrayList<WSEncryptionPart>(); + List<WSEncryptionPart> secondEncrParts = new ArrayList<>(); // Check for signature protection if (abinding.isEncryptSignature()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java index b0495e6..4b04102 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java @@ -228,7 +228,7 @@ public class TransportBindingHandler extends AbstractBindingBuilder { SupportingTokens suppTokens = (SupportingTokens)ai.getAssertion(); if (suppTokens != null && suppTokens.getTokens() != null && suppTokens.getTokens().size() > 0) { - handleSupportingTokens(suppTokens, false, new ArrayList<SupportingToken>()); + handleSupportingTokens(suppTokens, false, new ArrayList<>()); } ai.setAsserted(true); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java index 96363dd..7bce1d0 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java @@ -92,7 +92,7 @@ public class STSClientTest extends Assert { NodeList metadataSections = doc.getElementsByTagNameNS("http://schemas.xmlsoap.org/ws/2004/09/mex";, "MetadataSection"); Element wsdlDefinition = null; - List<Element> schemas = new ArrayList<Element>(); + List<Element> schemas = new ArrayList<>(); for (int i = 0; i < metadataSections.getLength(); i++) { Node node = metadataSections.item(i); if (node instanceof Element) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java index 549e8bf..2e4f7d7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java @@ -62,7 +62,7 @@ public class SecurityActionTokenTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties"); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/ds:Signature"); @@ -92,7 +92,7 @@ public class SecurityActionTokenTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties"); inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback()); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//s:Body/xenc:EncryptedData"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java index 31debf3..f1088f7 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java @@ -97,7 +97,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties"); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/ds:Signature"); @@ -124,7 +124,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties"); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/wsse:BinarySecurityToken"); xpaths.add("//wsse:Security/ds:Signature"); @@ -152,7 +152,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties"); inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback()); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//s:Body/xenc:EncryptedData"); @@ -211,7 +211,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties"); inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback()); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); SoapMessage inmsg = makeInvocation(outProperties, xpaths, inProperties); @@ -252,7 +252,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback()); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); // @@ -410,7 +410,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties"); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/ds:Signature"); @@ -453,7 +453,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { ); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties"); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/ds:Signature"); xpaths.add("//wsse:Security/wsse:UsernameToken"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java index 34a5aaa..52836ab 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java @@ -49,7 +49,7 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest { "saml_assertion_policy.xml", null, Arrays.asList(SP12Constants.SAML_TOKEN, SP12Constants.SUPPORTING_TOKENS), - new ArrayList<CoverageType>()); + new ArrayList<>()); // // This should pass as the policy wants a SAML1 assertion and it is in the request // @@ -58,7 +58,7 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest { "saml_assertion_policy.xml", Arrays.asList(SP12Constants.SAML_TOKEN), null, - new ArrayList<CoverageType>()); + new ArrayList<>()); // // This should fail as the policy wants a SAML1 assertion and a SAML2 Assertion // is in the request @@ -68,7 +68,7 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest { "saml_assertion_policy.xml", null, Arrays.asList(SP12Constants.SAML_TOKEN), - new ArrayList<CoverageType>()); + new ArrayList<>()); } @Test @@ -81,7 +81,7 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest { "saml2_assertion_policy.xml", null, Arrays.asList(SP12Constants.SAML_TOKEN, SP12Constants.SUPPORTING_TOKENS), - new ArrayList<CoverageType>()); + new ArrayList<>()); // // This should pass as the policy wants a SAML2 assertion and it is in the request // @@ -90,7 +90,7 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest { "saml2_assertion_policy.xml", Arrays.asList(SP12Constants.SAML_TOKEN), null, - new ArrayList<CoverageType>()); + new ArrayList<>()); // // This should fail as the policy wants a SAML2 assertion and a SAML1 Assertion // is in the request @@ -100,7 +100,7 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest { "saml2_assertion_policy.xml", null, Arrays.asList(SP12Constants.SAML_TOKEN), - new ArrayList<CoverageType>()); + new ArrayList<>()); } @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java index 1425a34..69e3e9e 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java @@ -94,7 +94,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml1:Assertion"); @@ -141,7 +141,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml1:Assertion"); @@ -177,7 +177,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml2:Assertion"); @@ -219,7 +219,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml2:Assertion"); @@ -268,7 +268,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml1:Assertion"); @@ -324,7 +324,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml2:Assertion"); @@ -393,7 +393,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml2:Assertion"); @@ -451,7 +451,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml2:Assertion"); @@ -508,7 +508,7 @@ public class SamlTokenTest extends AbstractSecurityTest { customMap.put(WSConstants.SAML2_TOKEN, validator); inProperties.put(WSS4JInInterceptor.VALIDATOR_MAP, customMap); - List<String> xpaths = new ArrayList<String>(); + List<String> xpaths = new ArrayList<>(); xpaths.add("//wsse:Security"); xpaths.add("//wsse:Security/saml1:Assertion"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java ---------------------------------------------------------------------- diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java index 8498ff8..41869d3 100644 --- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java +++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java @@ -287,12 +287,12 @@ public class FragmentDialect implements Dialect { String mode, ValueType value) { if (resourceFragment instanceof Node) { - List<Node> nodeList = new ArrayList<Node>(); + List<Node> nodeList = new ArrayList<>(); nodeList.add((Node) resourceFragment); return modifyRepresentationMode(nodeList, mode, value); } else if (resourceFragment instanceof NodeList) { NodeList rfNodeList = (NodeList) resourceFragment; - List<Node> nodeList = new ArrayList<Node>(); + List<Node> nodeList = new ArrayList<>(); for (int i = 0; i < rfNodeList.getLength(); i++) { nodeList.add(rfNodeList.item(i)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java index 5d67161..660d913 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLHelper.java @@ -78,7 +78,7 @@ public class WSDLHelper { } public List<PortType> getPortTypes(Definition def) { - List<PortType> portTypes = new ArrayList<PortType>(); + List<PortType> portTypes = new ArrayList<>(); Collection<PortType> ite = CastUtils.cast(def.getPortTypes().values()); for (PortType portType : ite) { portTypes.add(portType); @@ -88,7 +88,7 @@ public class WSDLHelper { public List<Part> getInMessageParts(Operation operation) { Input input = operation.getInput(); - List<Part> partsList = new ArrayList<Part>(); + List<Part> partsList = new ArrayList<>(); if (input != null && input.getMessage() != null) { Collection<Part> parts = CastUtils.cast(input.getMessage().getParts().values()); for (Part p : parts) { @@ -100,7 +100,7 @@ public class WSDLHelper { public List<Part> getOutMessageParts(Operation operation) { Output output = operation.getOutput(); - List<Part> partsList = new ArrayList<Part>(); + List<Part> partsList = new ArrayList<>(); if (output != null && output.getMessage() != null) { Collection<Part> parts = CastUtils.cast(output.getMessage().getParts().values()); for (Part p : parts) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java index 5541235..e89dddf 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java @@ -50,7 +50,7 @@ import org.apache.cxf.staxutils.StaxUtils; public class BareInInterceptor extends AbstractInDatabindingInterceptor { private static final Logger LOG = LogUtils.getL7dLogger(BareInInterceptor.class); - private static Set<String> filter = new HashSet<String>(); + private static Set<String> filter = new HashSet<>(); static { filter.add("void"); @@ -85,7 +85,7 @@ public class BareInInterceptor extends AbstractInDatabindingInterceptor { Collection<OperationInfo> ops = null; if (bop == null) { - ops = new ArrayList<OperationInfo>(); + ops = new ArrayList<>(); ops.addAll(si.getInterface().getOperations()); if (xmlReader.getEventType() == XMLStreamReader.END_ELEMENT && !client) { //empty input http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java index cfc704c..4f7d825 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java @@ -150,7 +150,7 @@ public class DocLiteralInInterceptor extends AbstractInDatabindingInterceptor { } Collection<OperationInfo> operations = null; - operations = new ArrayList<OperationInfo>(); + operations = new ArrayList<>(); operations.addAll(si.getInterface().getOperations()); if (xmlReader == null || !StaxUtils.toNextElement(xmlReader)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java index c55b832..9acc662 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java @@ -158,12 +158,12 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory protected final Map<String, String> schemaLocationMapping = new HashMap<String, String>(); private List<AbstractServiceConfiguration> serviceConfigurations = - new ArrayList<AbstractServiceConfiguration>(); + new ArrayList<>(); private QName serviceName; private Invoker invoker; private Executor executor; - private List<String> ignoredClasses = new ArrayList<String>(); - private List<Method> ignoredMethods = new ArrayList<Method>(); + private List<String> ignoredClasses = new ArrayList<>(); + private List<Method> ignoredMethods = new ArrayList<>(); private MethodDispatcher methodDispatcher = new SimpleMethodDispatcher(); private Boolean wrappedStyle; private Map<String, Object> properties; @@ -634,7 +634,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory } protected void initializeWSDLOperations() { - List<OperationInfo> removes = new ArrayList<OperationInfo>(); + List<OperationInfo> removes = new ArrayList<>(); Method[] methods = serviceClass.getMethods(); Arrays.sort(methods, new MethodComparator()); @@ -675,7 +675,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory // Update the bindings. for (ServiceInfo service : getService().getServiceInfos()) { for (BindingInfo bi : service.getBindings()) { - List<BindingOperationInfo> biremoves = new ArrayList<BindingOperationInfo>(); + List<BindingOperationInfo> biremoves = new ArrayList<>(); for (BindingOperationInfo binfo : bi.getOperations()) { if (removes.contains(binfo.getOperationInfo())) { biremoves.add(binfo); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java index 4b79611..1d7e076 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java @@ -155,7 +155,7 @@ class XercesSchemaValidationUtils { void tryToParseSchemas(XmlSchemaCollection collection, DOMErrorHandler handler) throws Exception { - final List<DOMLSInput> inputs = new ArrayList<DOMLSInput>(); + final List<DOMLSInput> inputs = new ArrayList<>(); final Map<String, LSInput> resolverMap = new HashMap<String, LSInput>(); for (XmlSchema schema : collection.getXmlSchemas()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java index fc099d1..fd9b188 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java @@ -201,7 +201,7 @@ public final class SOAPBindingUtil { } public static List<SOAPHeader> getSoapHeaders(List<ExtensibilityElement> exts) { - List<SOAPHeader> headers = new ArrayList<SOAPHeader>(); + List<SOAPHeader> headers = new ArrayList<>(); if (exts != null) { for (ExtensibilityElement ext : exts) { if (isSOAPHeader(ext)) { @@ -277,7 +277,7 @@ public final class SOAPBindingUtil { } public static List<SOAPFault> getBindingOperationSoapFaults(BindingOperation bop) { - List<SOAPFault> faults = new ArrayList<SOAPFault>(); + List<SOAPFault> faults = new ArrayList<>(); for (Object obj : bop.getBindingFaults().values()) { if (!(obj instanceof BindingFault)) { continue; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java index 175b877..958a502 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java @@ -68,7 +68,7 @@ public final class SchemaUtil { public void getSchemas(final Definition def, final SchemaCollection schemaCol, List<SchemaInfo> schemas) { - List<Definition> defList = new ArrayList<Definition>(); + List<Definition> defList = new ArrayList<>(); parseImports(def, defList); extractSchema(def, schemaCol, schemas); // added @@ -152,7 +152,7 @@ public final class SchemaUtil { } private void parseImports(Definition def, List<Definition> defList) { - List<Import> importList = new ArrayList<Import>(); + List<Import> importList = new ArrayList<>(); Collection<List<Import>> ilist = cast(def.getImports().values()); for (List<Import> list : ilist) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java index 99b7698..a017414 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java @@ -176,7 +176,7 @@ public class ServiceWSDLBuilder { addNamespace(WSDLConstants.CONVENTIONAL_TNS_PREFIX, si.getTargetNamespace(), definition); addExtensibilityElements(definition, definition, getWSDL11Extensors(si.getDescription())); - Collection<PortType> portTypes = new HashSet<PortType>(); + Collection<PortType> portTypes = new HashSet<>(); for (ServiceInfo service : services) { Definition portTypeDef = definition; Definition orig = definition; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java index 75e3ff7..b9d8554 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java @@ -304,7 +304,7 @@ public class WSDLManagerImpl implements WSDLManager { public void removeDefinition(Definition wsdl) { synchronized (definitionsMap) { - List<Object> keys = new ArrayList<Object>(); + List<Object> keys = new ArrayList<>(); for (Map.Entry<Object, Definition> e : definitionsMap.entrySet()) { if (e.getValue() == wsdl) { keys.add(e.getKey()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java index 4f9f481..ee330ae 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java @@ -171,7 +171,7 @@ public class WSDLServiceBuilder { copyExtensors(description, d.getExtensibilityElements()); copyExtensionAttributes(description, d); - List<ServiceInfo> serviceList = new ArrayList<ServiceInfo>(); + List<ServiceInfo> serviceList = new ArrayList<>(); for (java.util.Iterator<QName> ite = CastUtils.cast(d.getServices().keySet().iterator()); ite .hasNext();) { QName qn = ite.next(); @@ -210,8 +210,8 @@ public class WSDLServiceBuilder { } public List<ServiceInfo> buildMockServices(Definition d) { - List<ServiceInfo> serviceList = new ArrayList<ServiceInfo>(); - List<Definition> defList = new ArrayList<Definition>(); + List<ServiceInfo> serviceList = new ArrayList<>(); + List<Definition> defList = new ArrayList<>(); defList.add(d); parseImports(d, defList); for (Definition def : defList) { @@ -297,7 +297,7 @@ public class WSDLServiceBuilder { copyExtensors(description, def.getExtensibilityElements()); copyExtensionAttributes(description, def); - Set<Definition> done = new HashSet<Definition>(); + Set<Definition> done = new HashSet<>(); done.add(def); Collection<List<Import>> values = CastUtils.cast(def.getImports().values()); for (List<Import> imports : values) { @@ -362,7 +362,7 @@ public class WSDLServiceBuilder { buildEndpoint(service, bi, port); } - return new ArrayList<ServiceInfo>(services.values()); + return new ArrayList<>(services.values()); } @@ -391,7 +391,7 @@ public class WSDLServiceBuilder { private void parseImports(Definition def, List<Definition> defList) { - List<Import> importList = new ArrayList<Import>(); + List<Import> importList = new ArrayList<>(); Collection<List<Import>> ilist = cast(def.getImports().values()); for (List<Import> list : ilist) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java index 0362a26..82f2201 100644 --- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java +++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java @@ -142,7 +142,7 @@ public class DocLiteralInInterceptorTest extends Assert { EasyMock.expect(endpointInfo.getName()).andReturn(new QName("http://foo.com";, "endpoint")).anyTimes(); EasyMock.expect(endpointInfo.getProperty("URI", URI.class)).andReturn(new URI("dummy")).anyTimes(); - List<OperationInfo> operations = new ArrayList<OperationInfo>(); + List<OperationInfo> operations = new ArrayList<>(); EasyMock.expect(interfaceInfo.getOperations()).andReturn(operations).anyTimes(); m.setExchange(exchange); @@ -233,7 +233,7 @@ public class DocLiteralInInterceptorTest extends Assert { EasyMock.expect(endpointInfo.getName()).andReturn(new QName("http://foo.com";, "endpoint")).anyTimes(); EasyMock.expect(endpointInfo.getProperty("URI", URI.class)).andReturn(new URI("dummy")).anyTimes(); - List<OperationInfo> operations = new ArrayList<OperationInfo>(); + List<OperationInfo> operations = new ArrayList<>(); EasyMock.expect(interfaceInfo.getOperations()).andReturn(operations).anyTimes(); m.setExchange(exchange); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java index 0bb2900..d1e0723 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java @@ -360,7 +360,7 @@ public class ClaimsManager { return Collections.emptyList(); } - List<ProcessedClaim> collection = new ArrayList<ProcessedClaim>(); + List<ProcessedClaim> collection = new ArrayList<>(); for (org.opensaml.saml.saml2.core.AttributeStatement statement : attributeStatements) { if (LOG.isLoggable(Level.FINEST)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java index 77de94c..710ae88 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java @@ -125,7 +125,7 @@ public class LdapClaimsHandler implements ClaimsHandler, RealmSupport { public List<URI> getSupportedClaimTypes() { - List<URI> uriList = new ArrayList<URI>(); + List<URI> uriList = new ArrayList<>(); for (String uri : getClaimsLdapAttributeMapping().keySet()) { try { uriList.add(new URI(uri)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java index 51e01a8..a373a65 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java @@ -320,7 +320,7 @@ public class LdapGroupClaimsHandler implements ClaimsHandler, RealmSupport { ProcessedClaim c = new ProcessedClaim(); c.setClaimType(URI.create(this.groupURI)); c.setPrincipal(principal); - c.setValues(new ArrayList<Object>(filteredGroups)); + c.setValues(new ArrayList<>(filteredGroups)); // c.setIssuer(issuer); // c.setOriginalIssuer(originalIssuer); // c.setNamespace(namespace);
