This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 056718651b33095216d46e97d14f12d7144c9e2b
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Wed Apr 18 16:54:00 2018 +0200
polish
---
.../velocity/VelocityContentCacheTest.java | 2 +-
.../VelocitySomeValuesNotInExchangeTest.java | 4 +--
.../velocity/VelocitySupplementalContextTest.java | 2 +-
.../camel/component/velocity/VelocityTest.java | 4 +--
.../dataformat/xmljson/XmlJsonDataFormat.java | 4 +--
.../dataformat/xmljson/XmlJsonDataFormatTest.java | 4 +--
.../dataformat/xmljson/XmlJsonOptionsTest.java | 2 +-
.../camel/component/xmlrpc/XmlRpcEndpoint.java | 2 +-
.../xmlsecurity/api/DefaultKeyAccessor.java | 2 +-
.../api/DefaultXmlSignature2Message.java | 4 +--
.../xmlsecurity/api/XAdESSignatureProperties.java | 24 ++++++++---------
.../xmlsecurity/api/XmlSignatureHelper.java | 6 ++---
.../xmlsecurity/processor/XmlSignerProcessor.java | 18 ++++++-------
.../processor/XmlVerifierProcessor.java | 4 +--
.../xmlsecurity/SignatureAlgorithmTest.java | 2 +-
.../xmlsecurity/SignatureDigestMethodTest.java | 2 +-
.../xmlsecurity/XAdESSignaturePropertiesTest.java | 8 +++---
.../component/xmlsecurity/XmlSignatureTest.java | 30 +++++++++++-----------
.../util/EnvelopingXmlSignatureChecker.java | 2 +-
...ature2Message2MessageWithTimestampProperty.java | 2 +-
.../xmlsecurity/XMLSecurityDataFormatTest.java | 4 +--
.../apache/camel/component/xmpp/XmppBinding.java | 2 +-
.../camel/dataformat/xstream/JsonDataFormat.java | 2 +-
.../camel/dataformat/xstream/MarshalListTest.java | 10 ++++----
.../xstream/XStreamConfigurationTest.java | 12 ++++-----
.../xstream/XStreamDataFormatOmitFieldsTest.java | 2 +-
.../zendesk/AbstractZendeskTestSupport.java | 3 +--
.../zendesk/ZendeskTicketIntegrationTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../component/zookeepermaster/CamelNodeState.java | 2 --
.../group/internal/DelegateZooKeeperGroup.java | 4 +--
.../internal/DelegateZooKeeperMultiGroup.java | 2 +-
.../group/internal/StaticManagedGroupFactory.java | 8 +++---
.../group/internal/ZooKeeperGroup.java | 18 ++++++-------
.../group/internal/ZooKeeperGroupFactory.java | 8 +++---
.../internal/osgi/OsgiManagedGroupFactory.java | 4 +--
.../internal/osgi/TrackingZooKeeperGroup.java | 2 +-
.../component/zookeepermaster/group/GroupTest.java | 14 +++++-----
.../zookeeper/ZooKeeperConfiguration.java | 2 +-
.../component/zookeeper/ZooKeeperConsumer.java | 2 +-
.../zookeeper/operations/CreateOperation.java | 4 +--
.../zookeeper/operations/DataChangedOperation.java | 2 +-
.../zookeeper/operations/DeleteOperation.java | 4 +--
.../operations/ExistenceChangedOperation.java | 4 +--
.../zookeeper/operations/ExistsOperation.java | 4 +--
.../zookeeper/operations/GetChildrenOperation.java | 4 +--
.../zookeeper/operations/GetDataOperation.java | 4 +--
.../zookeeper/operations/SetDataOperation.java | 4 +--
.../zookeeper/operations/ZooKeeperOperation.java | 2 +-
.../zookeeper/policy/CuratorLeaderElection.java | 3 +--
.../zookeeper/policy/CuratorLeaderRoutePolicy.java | 2 +-
.../policy/CuratorMultiMasterLeaderElection.java | 2 +-
.../CuratorMultiMasterLeaderRoutePolicy.java | 2 +-
.../zookeeper/policy/ZooKeeperElection.java | 2 +-
.../zookeeper/policy/ZooKeeperRoutePolicy.java | 2 +-
.../zookeeper/NaturalSortComparatorTest.java | 2 +-
.../component/zookeeper/ZooKeeperTestSupport.java | 2 +-
.../operations/FutureEventDrivenOperationTest.java | 2 +-
58 files changed, 140 insertions(+), 144 deletions(-)
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
index 5fb55ce..7951075 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
@@ -125,7 +125,7 @@ public class VelocityContentCacheTest extends
CamelTestSupport {
// clear the cache via the mbean server
MBeanServer mbeanServer =
context.getManagementStrategy().getManagementAgent().getMBeanServer();
Set<ObjectName> objNameSet = mbeanServer.queryNames(new
ObjectName("org.apache.camel:type=endpoints,name=\"velocity:*contentCache=true*\",*"),
null);
- ObjectName managedObjName = new
ArrayList<ObjectName>(objNameSet).get(0);
+ ObjectName managedObjName = new ArrayList<>(objNameSet).get(0);
mbeanServer.invoke(managedObjName, "clearContentCache", null, null);
// now change content in the file in the classpath
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
index 3ba0819..b42d1d0 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
@@ -36,7 +36,7 @@ public class VelocitySomeValuesNotInExchangeTest extends
CamelTestSupport {
mock.message(0).constant("Hello Claus");
mock.message(0).constant("You have id: 123 if an id was assigned to
you.");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("name", "Claus");
headers.put("id", 123);
template.sendBodyAndHeaders("direct:a", "", headers);
@@ -51,7 +51,7 @@ public class VelocitySomeValuesNotInExchangeTest extends
CamelTestSupport {
mock.message(0).constant("Hello Claus");
mock.message(0).constant("You have id: if an id was assigned to
you.");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("name", "Claus");
template.sendBodyAndHeaders("direct:a", "", headers);
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
index 22ae92f..ac22301 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
@@ -42,7 +42,7 @@ public class VelocitySupplementalContextTest extends
CamelTestSupport {
outputEndpoint.expectedHeaderReceived("in.body", "old_body");
outputEndpoint.expectedBodiesReceived("bar");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(VelocityConstants.VELOCITY_TEMPLATE,
"#set( $headers.body = ${body} )\n#set( $headers['in.body'] =
$in.body )\n" + "bar");
inputEndpoint.sendBodyAndHeaders("old_body", headers);
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
index e3b0cd1..7e97ac1 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
@@ -55,8 +55,8 @@ public class VelocityTest extends CamelTestSupport {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("");
exchange.getIn().setHeader("name", "Christian");
- Map<String, Object> variableMap = new HashMap<String,
Object>();
- Map<String, Object> headersMap = new HashMap<String, Object>();
+ Map<String, Object> variableMap = new HashMap<>();
+ Map<String, Object> headersMap = new HashMap<>();
headersMap.put("name", "Willem");
variableMap.put("headers", headersMap);
variableMap.put("body", "Monday");
diff --git
a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
index 8d38db1..713e30d 100644
---
a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
+++
b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
@@ -423,13 +423,13 @@ public class XmlJsonDataFormat extends ServiceSupport
implements DataFormat, Dat
public NamespacesPerElementMapping(String element, String prefix,
String uri) {
this.element = element;
- this.namespaces = new HashMap<String, String>();
+ this.namespaces = new HashMap<>();
this.namespaces.put(prefix, uri);
}
public NamespacesPerElementMapping(String element, String
pipeSeparatedMappings) {
this.element = element;
- this.namespaces = new HashMap<String, String>();
+ this.namespaces = new HashMap<>();
String[] origTokens = pipeSeparatedMappings.split("\\|");
// drop the first token
String[] tokens = Arrays.copyOfRange(origTokens, 1,
origTokens.length);
diff --git
a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
index 8632a8b..10b5ebb 100644
---
a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
+++
b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
@@ -238,7 +238,7 @@ public class XmlJsonDataFormatTest extends
AbstractJsonTestSupport {
// from JSON to XML - inline dataformat
from("direct:unmarshalInline").unmarshal().xmljson().to("mock:xmlInline");
- Map<String, String> xmlJsonOptions = new HashMap<String,
String>();
+ Map<String, String> xmlJsonOptions = new HashMap<>();
xmlJsonOptions.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.ENCODING,
"UTF-8");
xmlJsonOptions.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.FORCE_TOP_LEVEL_OBJECT,
"true");
xmlJsonOptions.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.TRIM_SPACES,
"true");
@@ -252,7 +252,7 @@ public class XmlJsonDataFormatTest extends
AbstractJsonTestSupport {
// from JSON to XML - inline dataformat w/ options
from("direct:unmarshalInlineOptions").unmarshal().xmljson(xmlJsonOptions).to("mock:xmlInlineOptions");
- Map<String, String> xmlJsonOptionsArrays = new HashMap<String,
String>();
+ Map<String, String> xmlJsonOptionsArrays = new HashMap<>();
xmlJsonOptionsArrays.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.ELEMENT_NAME,
"el");
xmlJsonOptionsArrays.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.ARRAY_NAME,
"ar");
diff --git
a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java
b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java
index ee85f03..e732f02 100644
---
a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java
+++
b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonOptionsTest.java
@@ -218,7 +218,7 @@ public class XmlJsonOptionsTest extends
AbstractJsonTestSupport {
from("direct:unmarshal").unmarshal(format).to("mock:xml");
XmlJsonDataFormat namespacesFormat = new XmlJsonDataFormat();
- List<XmlJsonDataFormat.NamespacesPerElementMapping> namespaces
= new ArrayList<XmlJsonDataFormat.NamespacesPerElementMapping>();
+ List<XmlJsonDataFormat.NamespacesPerElementMapping> namespaces
= new ArrayList<>();
namespaces.add(new
XmlJsonDataFormat.NamespacesPerElementMapping("",
"|ns1|http://camel.apache.org/test1||http://camel.apache.org/default|"));
namespaces.add(new
XmlJsonDataFormat.NamespacesPerElementMapping("surname",
"|ns2|http://camel.apache.org/personalData|ns3|http://camel.apache.org/personalData2|"));
namespacesFormat.setNamespaceMappings(namespaces);
diff --git
a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
b/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
index a57e936..9cd44b8 100644
---
a/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
+++
b/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcEndpoint.java
@@ -149,7 +149,7 @@ public class XmlRpcEndpoint extends DefaultEndpoint {
clientConfig = new XmlRpcClientConfigImpl();
}
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
// do not include null values
IntrospectionSupport.getProperties(configuration, params, null, false);
setProperties(clientConfig, params);
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java
index 7f97ffb..cd8f6ee 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java
@@ -87,7 +87,7 @@ public class DefaultKeyAccessor extends DefaultKeySelector
implements KeyAccesso
if (certs == null) {
return null;
}
- ArrayList<X509Certificate> certList = new
ArrayList<X509Certificate>(certs.length);
+ ArrayList<X509Certificate> certList = new ArrayList<>(certs.length);
for (Certificate cert : certs) {
if (cert instanceof X509Certificate) {
certList.add((X509Certificate) cert);
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
index 0e3a437..b8d0f62 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
@@ -327,7 +327,7 @@ public class DefaultXmlSignature2Message implements
XmlSignature2Message {
protected void removeSignatureElements(Node node) {
Document doc = XmlSignatureHelper.getDocument(node);
NodeList nl = doc.getElementsByTagNameNS(XMLSignature.XMLNS,
"Signature");
- List<Node> nodesToBeRemoved = new ArrayList<Node>(nl.getLength());
+ List<Node> nodesToBeRemoved = new ArrayList<>(nl.getLength());
for (int i = 0; i < nl.getLength(); i++) {
// you cannot remove the nodes within this loop, because nl list
would change
nodesToBeRemoved.add(nl.item(i));
@@ -452,7 +452,7 @@ public class DefaultXmlSignature2Message implements
XmlSignature2Message {
}
protected List<XMLObject> getReferencedSameDocumentObjects(List<Reference>
relevantReferences, List<XMLObject> relevantObjects) {
- List<XMLObject> referencedObjects = new ArrayList<XMLObject>(1);
+ List<XMLObject> referencedObjects = new ArrayList<>(1);
for (Reference ref : relevantReferences) {
String refUri = getSameDocumentReferenceUri(ref);
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
index da263dd..29073ce 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
@@ -99,7 +99,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
private static final Logger LOG =
LoggerFactory.getLogger(XAdESSignatureProperties.class);
- private static final Set<String> SIG_POLICY_VALUES = new TreeSet<String>();
+ private static final Set<String> SIG_POLICY_VALUES = new TreeSet<>();
private boolean addSigningTime = true;
@@ -222,7 +222,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
if (signingCertificateURIs == null) {
throw new IllegalArgumentException("Parameter
'signingCertificateURIs' is null");
}
- this.signingCertificateURIs = new
ArrayList<String>(signingCertificateURIs);
+ this.signingCertificateURIs = new ArrayList<>(signingCertificateURIs);
}
public List<String> getSigningCertificateURIs() {
@@ -371,7 +371,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
throw new IllegalArgumentException("At least one of the policy
qualifiers is null or empty");
}
}
- this.sigPolicyQualifiers = new ArrayList<String>(sigPolicyQualifiers);
+ this.sigPolicyQualifiers = new ArrayList<>(sigPolicyQualifiers);
}
public String getDataObjectFormatDescription() {
@@ -441,7 +441,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
throw new IllegalArgumentException("At least one reference of
the identifier of the data object format is null or empty");
}
}
- this.dataObjectFormatIdentifierDocumentationReferences = new
ArrayList<String>(dataObjectFormatIdentifierDocumentationReferences);
+ this.dataObjectFormatIdentifierDocumentationReferences = new
ArrayList<>(dataObjectFormatIdentifierDocumentationReferences);
}
public List<String> getSignerClaimedRoles() {
@@ -465,7 +465,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
throw new IllegalArgumentException("At least one of the signer
claimed roles is null or empty");
}
}
- this.signerClaimedRoles = new ArrayList<String>(signerClaimedRoles);
+ this.signerClaimedRoles = new ArrayList<>(signerClaimedRoles);
}
public List<XAdESEncapsulatedPKIData> getSignerCertifiedRoles() {
@@ -487,7 +487,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
throw new IllegalArgumentException("At least one of the signer
certified roles is null");
}
}
- this.signerCertifiedRoles = new
ArrayList<XAdESEncapsulatedPKIData>(signerCertifiedRoles);
+ this.signerCertifiedRoles = new ArrayList<>(signerCertifiedRoles);
}
public String getSignatureProductionPlaceCity() {
@@ -573,7 +573,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
throw new IllegalArgumentException("At least one documentation
reference of the commitment type is null or empty");
}
}
- this.commitmentTypeIdDocumentationReferences = new
ArrayList<String>(commitmentTypeIdDocumentationReferences);
+ this.commitmentTypeIdDocumentationReferences = new
ArrayList<>(commitmentTypeIdDocumentationReferences);
}
public List<String> getCommitmentTypeQualifiers() {
@@ -598,7 +598,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
throw new IllegalArgumentException("At least one qualifier of
the commitment type is null or empty");
}
}
- this.commitmentTypeQualifiers = new
ArrayList<String>(commitmentTypeQualifiers);
+ this.commitmentTypeQualifiers = new
ArrayList<>(commitmentTypeQualifiers);
}
@Override
@@ -1011,7 +1011,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
List<Element> childElements = getChildElements(el);
- List<Element> collectedNewChildElements = new ArrayList<Element>();
+ List<Element> collectedNewChildElements = new ArrayList<>();
for (; !childElements.isEmpty();) {
collectedNewChildElements.clear();
for (Element child : childElements) {
@@ -1019,12 +1019,12 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
List<Element> newChildElements = getChildElements(child);
collectedNewChildElements.addAll(newChildElements);
}
- childElements = new ArrayList<Element>(collectedNewChildElements);
+ childElements = new ArrayList<>(collectedNewChildElements);
}
}
protected List<Element> getChildElements(Element el) {
- List<Element> childElements = new ArrayList<Element>(5);
+ List<Element> childElements = new ArrayList<>(5);
NodeList children = el.getChildNodes();
int length = children.getLength();
for (int i = 0; i < length; i++) {
@@ -1039,7 +1039,7 @@ public class XAdESSignatureProperties implements
XmlSignatureProperties {
protected void replacePrefix(Element el, Input input) {
replacePrefixForNode(el, input);
NamedNodeMap nnm = el.getAttributes();
- List<Attr> xmlnsToBeRemoved = new ArrayList<Attr>(2);
+ List<Attr> xmlnsToBeRemoved = new ArrayList<>(2);
int length = nnm.getLength();
for (int i = 0; i < length; i++) {
Node attr = nnm.item(i);
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
index 6111457..f66e351 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
@@ -244,7 +244,7 @@ public final class XmlSignatureHelper {
XPathAndFilter xpathAndFilter = new XPathAndFilter();
xpathAndFilter.setXpath(xpath);
xpathAndFilter.setFilter(filter);
- List<XPathAndFilter> list = new
ArrayList<XmlSignatureHelper.XPathAndFilter>(1);
+ List<XPathAndFilter> list = new ArrayList<>(1);
list.add(xpathAndFilter);
return getXPath2Transform(list, namespaceMap);
}
@@ -278,7 +278,7 @@ public final class XmlSignatureHelper {
}
private static List<XPathType> getXPathTypeList(List<XPathAndFilter>
xpathAndFilterList, Map<String, String> namespaceMap) {
- List<XPathType> list = new
ArrayList<XPathType>(xpathAndFilterList.size());
+ List<XPathType> list = new ArrayList<>(xpathAndFilterList.size());
for (XPathAndFilter xpathAndFilter : xpathAndFilterList) {
XPathType.Filter xpathFilter;
if
(XPathType.Filter.INTERSECT.toString().equals(xpathAndFilter.getFilter())) {
@@ -380,7 +380,7 @@ public final class XmlSignatureHelper {
}
public static List<Node> getTextAndElementChildren(Node node) {
- List<Node> result = new LinkedList<Node>();
+ List<Node> result = new LinkedList<>();
NodeList children = node.getChildNodes();
if (children == null) {
return result;
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
index 8a7f567..b197402 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java
@@ -575,7 +575,7 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
int propsRefsSize = properties == null || properties.getReferences()
== null || properties.getReferences().isEmpty() ? 0
: properties.getReferences().size();
int size = keyInfoRef == null ? propsRefsSize + 1 : propsRefsSize + 2;
- List<Reference> referenceList = new ArrayList<Reference>(size);
+ List<Reference> referenceList = new ArrayList<>(size);
referenceList.add(ref);
if (keyInfoRef != null) {
referenceList.add(keyInfoRef);
@@ -604,7 +604,7 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
if (properties == null || properties.getObjects() == null ||
properties.getObjects().isEmpty()) {
return Collections.singletonList(obj);
}
- List<XMLObject> result = new
ArrayList<XMLObject>(properties.getObjects().size() + 1);
+ List<XMLObject> result = new
ArrayList<>(properties.getObjects().size() + 1);
result.add(obj);
result.addAll(properties.getObjects());
return result;
@@ -701,7 +701,7 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
// should not happen, has already been checked earlier
throw new IllegalStateException("List of XPATHs to ID attributes
is empty in detached signature case");
}
- List<ComparableNode> result = new
ArrayList<ComparableNode>(xpathsToIdAttributes.size());
+ List<ComparableNode> result = new
ArrayList<>(xpathsToIdAttributes.size());
for (XPathFilterParameterSpec xp : xpathsToIdAttributes) {
XPathExpression exp;
try {
@@ -775,19 +775,19 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
// add enveloped transform if necessary
if (configuredTrafos.size() > 0) {
if (!containsEnvelopedTransform(configuredTrafos)) {
- configuredTrafos = new
ArrayList<AlgorithmMethod>(configuredTrafos.size() + 1);
+ configuredTrafos = new
ArrayList<>(configuredTrafos.size() + 1);
configuredTrafos.add(XmlSignatureHelper.getEnvelopedTransform());
configuredTrafos.addAll(getConfiguration().getTransformMethods());
}
} else {
// add enveloped and C14N trafo
- configuredTrafos = new ArrayList<AlgorithmMethod>(2);
+ configuredTrafos = new ArrayList<>(2);
configuredTrafos.add(XmlSignatureHelper.getEnvelopedTransform());
configuredTrafos.add(XmlSignatureHelper.getCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE));
}
}
- List<Transform> transforms = new
ArrayList<Transform>(configuredTrafos.size());
+ List<Transform> transforms = new
ArrayList<>(configuredTrafos.size());
for (AlgorithmMethod trafo : configuredTrafos) {
Transform transform = fac.newTransform(trafo.getAlgorithm(),
(TransformParameterSpec) trafo.getParameterSpec());
transforms.add(transform);
@@ -797,7 +797,7 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
} else {
LOG.debug("Header {} with value '{}' found",
XmlSignatureConstants.HEADER_TRANSFORM_METHODS, transformMethodsHeaderValue);
String[] transformAlgorithms =
transformMethodsHeaderValue.split(",");
- List<Transform> transforms = new
ArrayList<Transform>(transformAlgorithms.length);
+ List<Transform> transforms = new
ArrayList<>(transformAlgorithms.length);
for (String transformAlgorithm : transformAlgorithms) {
transformAlgorithm = transformAlgorithm.trim();
Transform transform = fac.newTransform(transformAlgorithm,
(TransformParameterSpec) null);
@@ -860,7 +860,7 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
}
LOG.debug("Creating reference to key info element with Id: {}",
keyInfoId);
- List<Transform> transforms = new ArrayList<Transform>(1);
+ List<Transform> transforms = new ArrayList<>(1);
Transform transform =
fac.newTransform(CanonicalizationMethod.INCLUSIVE, (TransformParameterSpec)
null);
transforms.add(transform);
return fac.newReference("#" + keyInfoId,
fac.newDigestMethod(digestAlgorithm, null), transforms, null, null);
@@ -1057,7 +1057,7 @@ public class XmlSignerProcessor extends
XmlSignatureProcessor {
}
static List<String> getReferenceUris(List<ComparableNode> input) {
- List<String> result = new ArrayList<String>(input.size());
+ List<String> result = new ArrayList<>(input.size());
for (ComparableNode cn : input) {
result.add(cn.getReferenceUri());
}
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
index 34faadf..62ef2cc 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierProcessor.java
@@ -128,8 +128,8 @@ public class XmlVerifierProcessor extends
XmlSignatureProcessor {
NodeList signatureNodes = getSignatureNodes(doc);
- List<XMLObject> collectedObjects = new ArrayList<XMLObject>(3);
- List<Reference> collectedReferences = new ArrayList<Reference>(3);
+ List<XMLObject> collectedObjects = new ArrayList<>(3);
+ List<Reference> collectedReferences = new ArrayList<>(3);
int totalCount = signatureNodes.getLength();
for (int i = 0; i < totalCount; i++) {
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index d62d0eb..99769b2 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -500,7 +500,7 @@ public class SignatureAlgorithmTest extends
CamelTestSupport {
}
private AlgorithmMethod getCanonicalizationMethod() {
- List<String> inclusivePrefixes = new ArrayList<String>(1);
+ List<String> inclusivePrefixes = new ArrayList<>(1);
inclusivePrefixes.add("ds");
return
XmlSignatureHelper.getCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE,
inclusivePrefixes);
}
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index f438e60..215f236 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -392,7 +392,7 @@ public class SignatureDigestMethodTest extends
CamelTestSupport {
}
private AlgorithmMethod getCanonicalizationMethod() {
- List<String> inclusivePrefixes = new ArrayList<String>(1);
+ List<String> inclusivePrefixes = new ArrayList<>(1);
inclusivePrefixes.add("ds");
return
XmlSignatureHelper.getCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE,
inclusivePrefixes);
}
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index a3cd093..14d41bc 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -410,7 +410,7 @@ public class XAdESSignaturePropertiesTest extends
CamelTestSupport {
Document doc = testEnveloping();
- Map<String, String> prefix2Namespace = new TreeMap<String, String>();
+ Map<String, String> prefix2Namespace = new TreeMap<>();
prefix2Namespace.put("ds", XMLSignature.XMLNS);
prefix2Namespace.put("etsi",
XAdESSignatureProperties.HTTP_URI_ETSI_ORG_01903_V1_1_1);
@@ -424,7 +424,7 @@ public class XAdESSignaturePropertiesTest extends
CamelTestSupport {
@Test
public void headers() throws Exception {
- Map<String, Object> header = new TreeMap<String, Object>();
+ Map<String, Object> header = new TreeMap<>();
header.put(XmlSignatureConstants.HEADER_XADES_PREFIX, "ns1");
header.put(XmlSignatureConstants.HEADER_XADES_NAMESPACE,
XAdESSignatureProperties.HTTP_URI_ETSI_ORG_01903_V1_2_2);
@@ -443,7 +443,7 @@ public class XAdESSignaturePropertiesTest extends
CamelTestSupport {
Document doc = testEnveloping("direct:enveloping", header);
- Map<String, String> prefix2Namespace = new TreeMap<String, String>();
+ Map<String, String> prefix2Namespace = new TreeMap<>();
prefix2Namespace.put("ds", XMLSignature.XMLNS);
prefix2Namespace.put("etsi",
XAdESSignatureProperties.HTTP_URI_ETSI_ORG_01903_V1_2_2);
@@ -732,7 +732,7 @@ public class XAdESSignaturePropertiesTest extends
CamelTestSupport {
}
static Map<String, String> getPrefix2NamespaceMap() {
- Map<String, String> prefix2Namespace = new TreeMap<String, String>();
+ Map<String, String> prefix2Namespace = new TreeMap<>();
prefix2Namespace.put("ds", XMLSignature.XMLNS);
prefix2Namespace.put("etsi",
XAdESSignatureProperties.HTTP_URI_ETSI_ORG_01903_V1_3_2);
return prefix2Namespace;
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
index a6cc11e..ef6551f 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
@@ -408,7 +408,7 @@ public class XmlSignatureTest extends CamelTestSupport {
public void testEnvelopingSignatureWithPlainTextSetByHeaders() throws
Exception {
String text = "plain test text";
setupMock(text);
- Map<String, Object> headers = new TreeMap<String, Object>();
+ Map<String, Object> headers = new TreeMap<>();
headers.put(XmlSignatureConstants.HEADER_MESSAGE_IS_PLAIN_TEXT,
Boolean.TRUE);
headers.put(XmlSignatureConstants.HEADER_PLAIN_TEXT_ENCODING, "UTF-8");
sendBody("direct:enveloping", text, headers);
@@ -419,7 +419,7 @@ public class XmlSignatureTest extends CamelTestSupport {
public void testExceptionSignatureForPlainTextWithWrongEncoding() throws
Exception {
String text = "plain test text";
MockEndpoint mock = setupExceptionMock();
- Map<String, Object> headers = new TreeMap<String, Object>();
+ Map<String, Object> headers = new TreeMap<>();
headers.put(XmlSignatureConstants.HEADER_MESSAGE_IS_PLAIN_TEXT,
Boolean.TRUE);
headers.put(XmlSignatureConstants.HEADER_PLAIN_TEXT_ENCODING,
"wrongEncoding");
sendBody("direct:enveloping", text, headers);
@@ -451,7 +451,7 @@ public class XmlSignatureTest extends CamelTestSupport {
// payload root element renamed to a -> parent name in route definition
// does not fit
String payload = "plain text Message";
- Map<String, Object> headers = new HashMap<String, Object>(1);
+ Map<String, Object> headers = new HashMap<>(1);
headers.put(XmlSignatureConstants.HEADER_MESSAGE_IS_PLAIN_TEXT,
Boolean.TRUE);
MockEndpoint mock = setupExceptionMock();
sendBody("direct:enveloped", payload, headers);
@@ -467,7 +467,7 @@ public class XmlSignatureTest extends CamelTestSupport {
public void testOmitXmlDeclarationViaHeader() throws Exception {
String payloadOut = "<root xmlns=\"http://test/test\";><test>Test
Message</test></root>";
setupMock(payloadOut);
- Map<String, Object> headers = new TreeMap<String, Object>();
+ Map<String, Object> headers = new TreeMap<>();
headers.put(XmlSignatureConstants.HEADER_OMIT_XML_DECLARATION,
Boolean.TRUE);
InputStream payload = XmlSignatureTest.class
.getResourceAsStream("/org/apache/camel/component/xmlsecurity/ExampleEnvelopedXmlSig.xml");
@@ -872,7 +872,7 @@ public class XmlSignatureTest extends CamelTestSupport {
mockVerified.expectedBodiesReceived(detachedPayload);
sendBody("direct:detached", detachedPayload, headers);
assertMockEndpointsSatisfied();
- Map<String, String> namespaceMap = new TreeMap<String, String>();
+ Map<String, String> namespaceMap = new TreeMap<>();
namespaceMap.put("ns", "http://test";);
namespaceMap.put("ds", XMLSignature.XMLNS);
Object obj = checkXpath(mock, "ns:root/ds:Signature", namespaceMap);
@@ -910,21 +910,21 @@ public class XmlSignatureTest extends CamelTestSupport {
mock.expectedMessageCount(1);
MockEndpoint mockVerified = getMockEndpoint("mock:verified");
mockVerified.expectedBodiesReceived(detachedPayload);
- Map<String, Object> headers = new TreeMap<String, Object>();
+ Map<String, Object> headers = new TreeMap<>();
headers.put(XmlSignatureConstants.HEADER_SCHEMA_RESOURCE_URI,
"org/apache/camel/component/xmlsecurity/TestComplex.xsd");
- Map<String, String> namespaceMap = new TreeMap<String, String>();
+ Map<String, String> namespaceMap = new TreeMap<>();
namespaceMap.put("ns", "http://test";);
namespaceMap.put("ns1", "http://testB";);
XPathFilterParameterSpec xpath1 =
XmlSignatureHelper.getXpathFilter(xpath1exp, namespaceMap);
XPathFilterParameterSpec xpath2 =
XmlSignatureHelper.getXpathFilter(xpath2exp, namespaceMap);
- List<XPathFilterParameterSpec> xpaths = new
ArrayList<XPathFilterParameterSpec>();
+ List<XPathFilterParameterSpec> xpaths = new ArrayList<>();
xpaths.add(xpath1);
xpaths.add(xpath2);
headers.put(XmlSignatureConstants.HEADER_XPATHS_TO_ID_ATTRIBUTES,
xpaths);
sendBody("direct:detached", detachedPayload, headers);
assertMockEndpointsSatisfied();
- Map<String, String> namespaceMap2 = new TreeMap<String, String>();
+ Map<String, String> namespaceMap2 = new TreeMap<>();
namespaceMap2.put("ns", "http://test";);
namespaceMap2.put("ds", XMLSignature.XMLNS);
namespaceMap2.put("nsB", "http://testB";);
@@ -1425,28 +1425,28 @@ public class XmlSignatureTest extends CamelTestSupport {
}
private AlgorithmMethod getCanonicalizationMethod() {
- List<String> inclusivePrefixes = new ArrayList<String>(1);
+ List<String> inclusivePrefixes = new ArrayList<>(1);
inclusivePrefixes.add("ds");
return
XmlSignatureHelper.getCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE,
inclusivePrefixes);
}
private List<AlgorithmMethod> getTransformsXPath2() {
- List<XPathAndFilter> list = new ArrayList<XPathAndFilter>(3);
+ List<XPathAndFilter> list = new ArrayList<>(3);
XPathAndFilter xpath1 = new XPathAndFilter("//n0:ToBeSigned",
XPathType.Filter.INTERSECT.toString());
list.add(xpath1);
XPathAndFilter xpath2 = new XPathAndFilter("//n0:NotToBeSigned",
XPathType.Filter.SUBTRACT.toString());
list.add(xpath2);
XPathAndFilter xpath3 = new XPathAndFilter("//n0:ReallyToBeSigned",
XPathType.Filter.UNION.toString());
list.add(xpath3);
- List<AlgorithmMethod> result = new ArrayList<AlgorithmMethod>(2);
+ List<AlgorithmMethod> result = new ArrayList<>(2);
result.add(XmlSignatureHelper.getCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE));
result.add(XmlSignatureHelper.getXPath2Transform(list,
getNamespaceMap()));
return result;
}
private Map<String, String> getNamespaceMap() {
- Map<String, String> result = new HashMap<String, String>(1);
+ Map<String, String> result = new HashMap<>(1);
result.put("n0", "http://test/test";);
return result;
}
@@ -1454,13 +1454,13 @@ public class XmlSignatureTest extends CamelTestSupport {
private List<AlgorithmMethod> getTransformsXsltXpath() {
try {
AlgorithmMethod transformXslt =
XmlSignatureHelper.getXslTransform("/org/apache/camel/component/xmlsecurity/xslt_test.xsl");
- Map<String, String> namespaceMap = new HashMap<String, String>(1);
+ Map<String, String> namespaceMap = new HashMap<>(1);
namespaceMap.put("n0",
"https://org.apache/camel/xmlsecurity/test";);
AlgorithmMethod transformXpath =
XmlSignatureHelper.getXPathTransform("//n0:XMLSecurity/n0:Content",
namespaceMap);
// I removed base 64 transform because the JDK implementation does
// not correctly support this transformation
// AlgorithmMethod transformBase64 = helper.getBase64Transform();
- List<AlgorithmMethod> result = new ArrayList<AlgorithmMethod>(3);
+ List<AlgorithmMethod> result = new ArrayList<>(3);
result.add(XmlSignatureHelper.getCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE));
result.add(transformXslt);
result.add(transformXpath);
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/EnvelopingXmlSignatureChecker.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/EnvelopingXmlSignatureChecker.java
index 2f2c9b7..654eea8 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/EnvelopingXmlSignatureChecker.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/EnvelopingXmlSignatureChecker.java
@@ -31,7 +31,7 @@ import
org.apache.camel.component.xmlsecurity.api.XmlSignatureInvalidException;
*/
public class EnvelopingXmlSignatureChecker implements XmlSignatureChecker {
- private static final Set<String> ALLOWED_TRANSFORM_ALGORITHMS = new
HashSet<String>(4);
+ private static final Set<String> ALLOWED_TRANSFORM_ALGORITHMS = new
HashSet<>(4);
static {
ALLOWED_TRANSFORM_ALGORITHMS.add(CanonicalizationMethod.INCLUSIVE);
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/XmlSignature2Message2MessageWithTimestampProperty.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/XmlSignature2Message2MessageWithTimestampProperty.java
index 5d6e798..ef8ead7 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/XmlSignature2Message2MessageWithTimestampProperty.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/XmlSignature2Message2MessageWithTimestampProperty.java
@@ -31,7 +31,7 @@ public class
XmlSignature2Message2MessageWithTimestampProperty extends DefaultXm
protected List<Reference> getReferencesForMessageMapping(Input input)
throws Exception {
- List<Reference> result = new ArrayList<Reference>(1);
+ List<Reference> result = new ArrayList<>(1);
for (Reference ref : input.getReferences()) {
if (ref.getURI() != null && ref.getURI().contains("propert")) {
// do not add
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
index a9045db..16c863a 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
@@ -381,7 +381,7 @@ public class XMLSecurityDataFormatTest extends
CamelTestSupport {
@Test
public void testPartialPayloadAsymmetricKeyDecryption() throws Exception {
- final Map<String, String> namespaces = new HashMap<String, String>();
+ final Map<String, String> namespaces = new HashMap<>();
namespaces.put("ns1", "http://cheese.xmlsecurity.camel.apache.org/";);
final KeyStoreParameters tsParameters = new KeyStoreParameters();
@@ -413,7 +413,7 @@ public class XMLSecurityDataFormatTest extends
CamelTestSupport {
ksParameters.setResource("recipient.ks");
- final Map<String, String> namespaces = new HashMap<String, String>();
+ final Map<String, String> namespaces = new HashMap<>();
namespaces.put("cust", "http://cheese.xmlsecurity.camel.apache.org/";);
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
index 084885a..807e24b 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
@@ -132,7 +132,7 @@ public class XmppBinding {
}
public Map<String, Object> extractHeadersFromXmpp(Stanza stanza, Exchange
exchange) {
- Map<String, Object> answer = new HashMap<String, Object>();
+ Map<String, Object> answer = new HashMap<>();
ExtensionElement jpe =
stanza.getExtension(JivePropertiesExtension.NAMESPACE);
if (jpe instanceof JivePropertiesExtension) {
diff --git
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
index 6252c8b..4602ec1 100644
---
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
+++
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
@@ -50,7 +50,7 @@ public class JsonDataFormat extends AbstractXStreamWrapper {
private boolean prettyPrint;
public JsonDataFormat() {
- final Map<?, ?> nstjsons = new HashMap<Object, Object>();
+ final Map<?, ?> nstjsons = new HashMap<>();
mof = new MappedXMLOutputFactory(nstjsons);
mif = new MappedXMLInputFactory(nstjsons);
}
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
index 350e3af..1c134a0 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
@@ -42,7 +42,7 @@ public class MarshalListTest extends CamelTestSupport {
mock.expectedBodiesReceived("<?xml version='1.0'
encoding='ISO-8859-1'?>"
+ "<list><string>Hello World</string></list>");
- List<String> body = new ArrayList<String>();
+ List<String> body = new ArrayList<>();
body.add("Hello World");
template.sendBodyAndProperty("direct:in", body, Exchange.CHARSET_NAME,
"ISO-8859-1");
@@ -57,8 +57,8 @@ public class MarshalListTest extends CamelTestSupport {
"<?xml version='1.0'
encoding='UTF-8'?><list><map><entry><string>city</string>"
+ "<string>London\u0E08</string></entry></map></list>");
- List<Map<Object, String>> body = new ArrayList<Map<Object, String>>();
- Map<Object, String> row = new HashMap<Object, String>();
+ List<Map<Object, String>> body = new ArrayList<>();
+ Map<Object, String> row = new HashMap<>();
row.put("city", "London\u0E08");
body.add(row);
@@ -74,8 +74,8 @@ public class MarshalListTest extends CamelTestSupport {
"<?xml version='1.0'
encoding='UTF-8'?><list><map><entry><string>city</string>"
+ "<string>London\u0E08</string></entry></map></list>");
- List<Map<Object, String>> body = new ArrayList<Map<Object, String>>();
- Map<Object, String> row = new HashMap<Object, String>();
+ List<Map<Object, String>> body = new ArrayList<>();
+ Map<Object, String> row = new HashMap<>();
row.put("city", "London\u0E08");
body.add(row);
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
index c56ec8f..5f01199 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java
@@ -79,7 +79,7 @@ public class XStreamConfigurationTest extends
CamelTestSupport {
mock.expectedMessageCount(2);
PurchaseHistory history = new PurchaseHistory();
- List<Double> list = new ArrayList<Double>();
+ List<Double> list = new ArrayList<>();
list.add(11.5);
list.add(97.5);
history.setHistory(list);
@@ -136,19 +136,19 @@ public class XStreamConfigurationTest extends
CamelTestSupport {
@Override
public void configure() throws Exception {
XStreamDataFormat xstreamDefinition = new XStreamDataFormat();
- Map<String, String> aliases = new HashMap<String, String>();
+ Map<String, String> aliases = new HashMap<>();
aliases.put("purchase-order", PurchaseOrder.class.getName());
xstreamDefinition.setAliases(aliases);
xstreamDefinition.setPermissions(PurchaseOrder.class,
PurchaseHistory.class);
- List<String> converters = new ArrayList<String>();
+ List<String> converters = new ArrayList<>();
converters.add(PurchaseOrderConverter.class.getName());
converters.add(CheckMethodInjection.class.getName());
converters.add(CheckConstructorInjection.class.getName());
xstreamDefinition.setConverters(converters);
- Map<String, String[]> implicits = new HashMap<String,
String[]>();
+ Map<String, String[]> implicits = new HashMap<>();
implicits.put(PurchaseHistory.class.getName(), new String[]
{"history"});
xstreamDefinition.setImplicitCollections(implicits);
@@ -157,12 +157,12 @@ public class XStreamConfigurationTest extends
CamelTestSupport {
xstreamDefinition = new XStreamDataFormat();
xstreamDefinition.setDriver("json");
- aliases = new HashMap<String, String>();
+ aliases = new HashMap<>();
aliases.put("purchase-order", PurchaseOrder.class.getName());
xstreamDefinition.setAliases(aliases);
xstreamDefinition.setPermissions(PurchaseOrder.class,
PurchaseHistory.class);
- converters = new ArrayList<String>();
+ converters = new ArrayList<>();
converters.add(PurchaseOrderConverter.class.getName());
xstreamDefinition.setConverters(converters);
from("direct:marshal-json").marshal(xstreamDefinition).to("mock:result");
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
index 18f0466..0788dbaa 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
@@ -54,7 +54,7 @@ public class XStreamDataFormatOmitFieldsTest extends
CamelTestSupport {
return new RouteBuilder() {
public void configure() {
XStreamDataFormat xStreamDataFormat = new XStreamDataFormat();
- Map<String, String[]> omitFields = new HashMap<String,
String[]>();
+ Map<String, String[]> omitFields = new HashMap<>();
omitFields.put(PurchaseOrder.class.getName(), new
String[]{"price"});
xStreamDataFormat.setOmitFields(omitFields);
diff --git
a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
index ddafa7f..d087855 100644
---
a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
+++
b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.zendesk;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -54,7 +53,7 @@ public class AbstractZendeskTestSupport extends
CamelTestSupport {
final Properties properties = new Properties();
try {
properties.load(getClass().getResourceAsStream(TEST_OPTIONS_PROPERTIES));
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
options.put(entry.getKey().toString(), entry.getValue());
}
diff --git
a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java
b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java
index de17730..113d59f 100644
---
a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java
+++
b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIntegrationTest.java
@@ -86,7 +86,7 @@ public class ZendeskTicketIntegrationTest extends
AbstractZendeskTestSupport {
// add a comment to the ticket
String commentBody = "This is a comment from camel-zendesk.";
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
Assert.assertEquals("ticketId",
ZendeskApiMethod.CREATECOMMENT.getArgNames().get(0));
Assert.assertEquals(long.class,
ZendeskApiMethod.CREATECOMMENT.getArgTypes().get(0));
headers.put("CamelZendesk.ticketId", answer.getId());
diff --git
a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
index f4fd199..05ea5df 100644
---
a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
+++
b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
@@ -53,7 +53,7 @@ public class AggregationStrategyWithPreservationTest extends
CamelTestSupport {
assertTrue("Should be a file in target/out directory", files.length >
0);
File resultFile = files[0];
- Set<String> expectedZipFiles = new
HashSet<String>(Arrays.asList("another" + File.separator + "hello.txt",
+ Set<String> expectedZipFiles = new HashSet<>(Arrays.asList("another" +
File.separator + "hello.txt",
"other" + File.separator + "greetings.txt",
"chiau.txt", "hi.txt", "hola.txt"));
ZipInputStream zin = new ZipInputStream(new
FileInputStream(resultFile));
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/CamelNodeState.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/CamelNodeState.java
index 19ba901..4ab36e7 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/CamelNodeState.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/CamelNodeState.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.zookeepermaster;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.component.zookeepermaster.group.NodeState;
public class CamelNodeState extends NodeState {
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperGroup.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperGroup.java
index f0e3f64..baa6302 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperGroup.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperGroup.java
@@ -40,7 +40,7 @@ public class DelegateZooKeeperGroup<T extends NodeState>
implements Group<T> {
private AtomicBoolean started = new AtomicBoolean();
public DelegateZooKeeperGroup(String path, Class<T> clazz) {
- this.listeners = new ArrayList<GroupListener<T>>();
+ this.listeners = new ArrayList<>();
this.path = path;
this.clazz = clazz;
}
@@ -64,7 +64,7 @@ public class DelegateZooKeeperGroup<T extends NodeState>
implements Group<T> {
}
protected Group<T> createGroup(CuratorFramework client, String path,
Class<T> clazz) {
- return new ZooKeeperGroup<T>(client, path, clazz);
+ return new ZooKeeperGroup<>(client, path, clazz);
}
@Override
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperMultiGroup.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperMultiGroup.java
index 16afc2d..7134cdb 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperMultiGroup.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/DelegateZooKeeperMultiGroup.java
@@ -28,7 +28,7 @@ public class DelegateZooKeeperMultiGroup<T extends NodeState>
extends DelegateZo
}
protected Group<T> createGroup(CuratorFramework client, String path,
Class<T> clazz) {
- return new ZooKeeperMultiGroup<T>(client, path, clazz);
+ return new ZooKeeperMultiGroup<>(client, path, clazz);
}
@Override
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/StaticManagedGroupFactory.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/StaticManagedGroupFactory.java
index 3b91ccd..6c0aa5e 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/StaticManagedGroupFactory.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/StaticManagedGroupFactory.java
@@ -39,22 +39,22 @@ public class StaticManagedGroupFactory implements
ManagedGroupFactory {
@Override
public <T extends NodeState> Group<T> createGroup(String path, Class<T>
clazz) {
- return new ZooKeeperGroup<T>(curator, path, clazz);
+ return new ZooKeeperGroup<>(curator, path, clazz);
}
@Override
public <T extends NodeState> Group<T> createGroup(String path, Class<T>
clazz, ThreadFactory threadFactory) {
- return new ZooKeeperGroup<T>(curator, path, clazz, threadFactory);
+ return new ZooKeeperGroup<>(curator, path, clazz, threadFactory);
}
@Override
public <T extends NodeState> Group<T> createMultiGroup(String path,
Class<T> clazz) {
- return new ZooKeeperMultiGroup<T>(curator, path, clazz);
+ return new ZooKeeperMultiGroup<>(curator, path, clazz);
}
@Override
public <T extends NodeState> Group<T> createMultiGroup(String path,
Class<T> clazz, ThreadFactory threadFactory) {
- return new ZooKeeperMultiGroup<T>(curator, path, clazz, threadFactory);
+ return new ZooKeeperMultiGroup<>(curator, path, clazz, threadFactory);
}
@Override
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
index f297e43..f529a38 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
@@ -80,8 +80,8 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
private final String path;
private final ExecutorService executorService;
private final EnsurePath ensurePath;
- private final BlockingQueue<Operation> operations = new
LinkedBlockingQueue<Operation>();
- private final ListenerContainer<GroupListener<T>> listeners = new
ListenerContainer<GroupListener<T>>();
+ private final BlockingQueue<Operation> operations = new
LinkedBlockingQueue<>();
+ private final ListenerContainer<GroupListener<T>> listeners = new
ListenerContainer<>();
private final ConcurrentMap<String, ChildData<T>> currentData = new
ConcurrentHashMap<>();
private final AtomicBoolean started = new AtomicBoolean();
private final AtomicBoolean connected = new AtomicBoolean();
@@ -241,7 +241,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
if (update) {
offerOperation(new CompositeOperation(
new RefreshOperation(this,
RefreshMode.FORCE_GET_DATA_AND_STAT),
- new UpdateOperation<T>(this, state)
+ new UpdateOperation<>(this, state)
));
}
}
@@ -312,7 +312,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
private void prunePartialState(final T ourState, final String pathId)
throws Exception {
if (ourState.uuid != null) {
clearAndRefresh(true, true);
- List<ChildData<T>> children = new
ArrayList<ChildData<T>>(currentData.values());
+ List<ChildData<T>> children = new
ArrayList<>(currentData.values());
for (ChildData<T> child : children) {
if (ourState.uuid.equals(child.getNode().uuid) &&
!child.getPath().equals(pathId)) {
LOG.debug("Deleting partially created znode: " +
child.getPath());
@@ -326,7 +326,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
public Map<String, T> members() {
List<ChildData<T>> children = getActiveChildren();
Collections.sort(children, sequenceComparator);
- Map<String, T> members = new LinkedHashMap<String, T>();
+ Map<String, T> members = new LinkedHashMap<>();
for (ChildData<T> child : children) {
members.put(child.getPath(), child.getNode());
}
@@ -354,7 +354,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
public List<T> slaves() {
List<ChildData<T>> children = getActiveChildren();
Collections.sort(children, sequenceComparator);
- List<T> slaves = new ArrayList<T>();
+ List<T> slaves = new ArrayList<>();
for (int i = 1; i < children.size(); i++) {
slaves.add(children.get(i).getNode());
}
@@ -536,7 +536,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
connected.set(true);
offerOperation(new CompositeOperation(
new RefreshOperation(this,
RefreshMode.FORCE_GET_DATA_AND_STAT),
- new UpdateOperation<T>(this, state),
+ new UpdateOperation<>(this, state),
new EventOperation(this, GroupListener.GroupEvent.CONNECTED)
));
break;
@@ -571,7 +571,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
private void applyNewData(String fullPath, int resultCode, Stat stat,
byte[] bytes) {
if (resultCode == KeeperException.Code.OK.intValue()) {
// otherwise - node must have dropped or something - we should be
getting another event
- ChildData<T> data = new ChildData<T>(fullPath, stat, bytes,
decode(bytes));
+ ChildData<T> data = new ChildData<>(fullPath, stat, bytes,
decode(bytes));
ChildData<T> previousData = currentData.put(fullPath, data);
if (previousData == null || previousData.getStat().getVersion() !=
stat.getVersion()) {
offerOperation(new EventOperation(this,
GroupListener.GroupEvent.CHANGED));
@@ -618,7 +618,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
}
public static <T> Map<String, T> members(ObjectMapper mapper,
CuratorFramework curator, String path, Class<T> clazz) throws Exception {
- Map<String, T> map = new TreeMap<String, T>();
+ Map<String, T> map = new TreeMap<>();
List<String> nodes = curator.getChildren().forPath(path);
for (String node : nodes) {
byte[] data = curator.getData().forPath(path + "/" + node);
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupFactory.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupFactory.java
index bcf2e70..877e2e8 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupFactory.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupFactory.java
@@ -35,22 +35,22 @@ public class ZooKeeperGroupFactory implements GroupFactory {
@Override
public <T extends NodeState> Group<T> createGroup(String path, Class<T>
clazz) {
- return new ZooKeeperGroup<T>(curator, path, clazz);
+ return new ZooKeeperGroup<>(curator, path, clazz);
}
@Override
public <T extends NodeState> Group<T> createGroup(String path, Class<T>
clazz, ThreadFactory threadFactory) {
- return new ZooKeeperGroup<T>(curator, path, clazz, threadFactory);
+ return new ZooKeeperGroup<>(curator, path, clazz, threadFactory);
}
@Override
public <T extends NodeState> Group<T> createMultiGroup(String path,
Class<T> clazz) {
- return new ZooKeeperMultiGroup<T>(curator, path, clazz);
+ return new ZooKeeperMultiGroup<>(curator, path, clazz);
}
@Override
public <T extends NodeState> Group<T> createMultiGroup(String path,
Class<T> clazz, ThreadFactory threadFactory) {
- return new ZooKeeperMultiGroup<T>(curator, path, clazz, threadFactory);
+ return new ZooKeeperMultiGroup<>(curator, path, clazz, threadFactory);
}
}
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/OsgiManagedGroupFactory.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/OsgiManagedGroupFactory.java
index 2507225..2b30966 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/OsgiManagedGroupFactory.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/OsgiManagedGroupFactory.java
@@ -79,7 +79,7 @@ public class OsgiManagedGroupFactory implements
ManagedGroupFactory {
private final BundleContext bundleContext;
private final ServiceTracker<CuratorFramework, CuratorFramework>
tracker;
private CuratorFramework curator;
- private final List<DelegateZooKeeperGroup<?>> groups = new
ArrayList<DelegateZooKeeperGroup<?>>();
+ private final List<DelegateZooKeeperGroup<?>> groups = new
ArrayList<>();
OsgiTrackingManagedGroupFactory(ClassLoader loader) {
this(getBundleContext(loader));
@@ -87,7 +87,7 @@ public class OsgiManagedGroupFactory implements
ManagedGroupFactory {
OsgiTrackingManagedGroupFactory(BundleContext bundleContext) {
this.bundleContext = bundleContext;
- this.tracker = new ServiceTracker<CuratorFramework,
CuratorFramework>(
+ this.tracker = new ServiceTracker<>(
bundleContext, CuratorFramework.class, this);
this.tracker.open();
}
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/TrackingZooKeeperGroup.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/TrackingZooKeeperGroup.java
index 26df150..1349a2a 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/TrackingZooKeeperGroup.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/osgi/TrackingZooKeeperGroup.java
@@ -32,7 +32,7 @@ public class TrackingZooKeeperGroup<T extends NodeState>
extends DelegateZooKeep
public TrackingZooKeeperGroup(BundleContext bundleContext, String path,
Class<T> clazz) {
super(path, clazz);
this.bundleContext = bundleContext;
- this.tracker = new ServiceTracker<CuratorFramework,
CuratorFramework>(bundleContext, CuratorFramework.class, new
ServiceTrackerCustomizer<CuratorFramework, CuratorFramework>() {
+ this.tracker = new ServiceTracker<>(bundleContext,
CuratorFramework.class, new ServiceTrackerCustomizer<CuratorFramework,
CuratorFramework>() {
@Override
public CuratorFramework
addingService(ServiceReference<CuratorFramework> reference) {
CuratorFramework curator =
TrackingZooKeeperGroup.this.bundleContext.getService(reference);
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
index 6bc5757..884e071 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
@@ -91,9 +91,9 @@ public class GroupTest {
final String path = "/singletons/test/Order" +
System.currentTimeMillis();
- ArrayList<ZooKeeperGroup> members = new ArrayList<ZooKeeperGroup>();
+ ArrayList<ZooKeeperGroup> members = new ArrayList<>();
for (int i = 0; i < 4; i++) {
- ZooKeeperGroup<NodeState> group = new
ZooKeeperGroup<NodeState>(curator, path, NodeState.class);
+ ZooKeeperGroup<NodeState> group = new ZooKeeperGroup<>(curator,
path, NodeState.class);
group.add(listener);
members.add(group);
}
@@ -143,7 +143,7 @@ public class GroupTest {
.build();
curator.start();
- final Group<NodeState> group = new ZooKeeperGroup<NodeState>(curator,
"/singletons/test" + System.currentTimeMillis(), NodeState.class);
+ final Group<NodeState> group = new ZooKeeperGroup<>(curator,
"/singletons/test" + System.currentTimeMillis(), NodeState.class);
group.add(listener);
group.start();
@@ -180,7 +180,7 @@ public class GroupTest {
.build();
curator.start();
- Group<NodeState> group = new ZooKeeperGroup<NodeState>(curator,
"/singletons/test" + System.currentTimeMillis(), NodeState.class);
+ Group<NodeState> group = new ZooKeeperGroup<>(curator,
"/singletons/test" + System.currentTimeMillis(), NodeState.class);
group.add(listener);
group.start();
@@ -216,7 +216,7 @@ public class GroupTest {
curator.start();
NIOServerCnxnFactory cnxnFactory = startZooKeeper(port);
- Group<NodeState> group = new ZooKeeperGroup<NodeState>(curator,
"/singletons/test" + System.currentTimeMillis(), NodeState.class);
+ Group<NodeState> group = new ZooKeeperGroup<>(curator,
"/singletons/test" + System.currentTimeMillis(), NodeState.class);
group.add(listener);
group.update(new NodeState("foo"));
group.start();
@@ -273,7 +273,7 @@ public class GroupTest {
curator.create().creatingParentsIfNeeded().forPath(groupNode);
for (int i = 0; i < 100; i++) {
- ZooKeeperGroup<NodeState> group = new
ZooKeeperGroup<NodeState>(curator, groupNode, NodeState.class);
+ ZooKeeperGroup<NodeState> group = new ZooKeeperGroup<>(curator,
groupNode, NodeState.class);
group.add(listener);
group.update(new NodeState("foo"));
group.start();
@@ -311,7 +311,7 @@ public class GroupTest {
curator.getZookeeperClient().blockUntilConnectedOrTimedOut();
- final ZooKeeperGroup<NodeState> group = new
ZooKeeperGroup<NodeState>(curator, groupNode, NodeState.class);
+ final ZooKeeperGroup<NodeState> group = new ZooKeeperGroup<>(curator,
groupNode, NodeState.class);
group.add(listener);
group.start();
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
index 34d3edb..39db460 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
@@ -61,7 +61,7 @@ public class ZooKeeperConfiguration implements Cloneable {
public void addZookeeperServer(String server) {
if (servers == null) {
- servers = new ArrayList<String>();
+ servers = new ArrayList<>();
}
servers.add(server);
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
index 96b2686..0b046d6 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConsumer.java
@@ -44,7 +44,7 @@ public class ZooKeeperConsumer extends DefaultConsumer {
private final ZooKeeperConnectionManager zkm;
private ZooKeeper connection;
private ZooKeeperConfiguration configuration;
- private LinkedBlockingQueue<ZooKeeperOperation> operations = new
LinkedBlockingQueue<ZooKeeperOperation>();
+ private LinkedBlockingQueue<ZooKeeperOperation> operations = new
LinkedBlockingQueue<>();
private ExecutorService executor;
private volatile boolean shuttingDown;
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/CreateOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/CreateOperation.java
index 75220e4..d1dc8bb 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/CreateOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/CreateOperation.java
@@ -56,9 +56,9 @@ public class CreateOperation extends
ZooKeeperOperation<String> {
LOG.debug(format("Created node '%s' using mode '%s'", created,
createMode));
}
// for consistency with other operations return an empty stats set.
- return new OperationResult<String>(created, new Stat());
+ return new OperationResult<>(created, new Stat());
} catch (Exception e) {
- return new OperationResult<String>(e);
+ return new OperationResult<>(e);
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DataChangedOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DataChangedOperation.java
index 044b9ff..bd9e5de 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DataChangedOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DataChangedOperation.java
@@ -55,7 +55,7 @@ public class DataChangedOperation extends
FutureEventDrivenOperation<byte[]> {
public OperationResult<byte[]> getResult() {
OperationResult<byte[]> answer;
if (EventType.NodeDeleted.equals(getWatchedEvent().getType()) &&
sendEmptyMessageOnDelete) {
- answer = new OperationResult<byte[]>((byte[])null, null);
+ answer = new OperationResult<>((byte[])null, null);
} else if (getChangedData) {
answer = new GetDataOperation(connection, getNode()).getResult();
} else {
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java
index 599dcf7..3598979 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java
@@ -44,9 +44,9 @@ public class DeleteOperation extends
ZooKeeperOperation<Boolean> {
LOG.debug(format("Set data of node '%s'", node));
}
}
- return new OperationResult<Boolean>(true, null, true);
+ return new OperationResult<>(true, null, true);
} catch (Exception e) {
- return new OperationResult<Boolean>(e);
+ return new OperationResult<>(e);
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperation.java
index eec19f7..f5cee6b 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperation.java
@@ -48,9 +48,9 @@ public class ExistenceChangedOperation extends
FutureEventDrivenOperation<String
try {
String path = getNode();
Stat statistics = connection.exists(path, true);
- return new OperationResult<String>(path, statistics);
+ return new OperationResult<>(path, statistics);
} catch (Exception e) {
- return new OperationResult<String>(e);
+ return new OperationResult<>(e);
}
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistsOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistsOperation.java
index f255032..c6a14d6 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistsOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ExistsOperation.java
@@ -44,9 +44,9 @@ public class ExistsOperation extends
ZooKeeperOperation<String> {
if (LOG.isTraceEnabled()) {
LOG.trace(ok ? "node exists" : "node does not exist");
}
- return new OperationResult<String>(node, statistics, ok);
+ return new OperationResult<>(node, statistics, ok);
} catch (Exception e) {
- return new OperationResult<String>(e);
+ return new OperationResult<>(e);
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetChildrenOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetChildrenOperation.java
index 81166e3..fe593c0 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetChildrenOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetChildrenOperation.java
@@ -45,9 +45,9 @@ public class GetChildrenOperation extends
ZooKeeperOperation<List<String>> {
LOG.debug(format("Received children from '%s' path ",
node));
}
}
- return new OperationResult<List<String>>(children, statistics);
+ return new OperationResult<>(children, statistics);
} catch (Exception e) {
- return new OperationResult<List<String>>(e);
+ return new OperationResult<>(e);
}
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetDataOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetDataOperation.java
index 059b6e3..8005739 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetDataOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/GetDataOperation.java
@@ -42,9 +42,9 @@ public class GetDataOperation extends
ZooKeeperOperation<byte[]> {
LOG.debug(format("Received data from '%s' path ", node));
}
}
- return new OperationResult<byte[]>(connection.getData(node, true,
statistics), statistics);
+ return new OperationResult<>(connection.getData(node, true,
statistics), statistics);
} catch (Exception e) {
- return new OperationResult<byte[]>(e);
+ return new OperationResult<>(e);
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/SetDataOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/SetDataOperation.java
index b8642f6..c02ee69 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/SetDataOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/SetDataOperation.java
@@ -48,9 +48,9 @@ public class SetDataOperation extends
ZooKeeperOperation<byte[]> {
LOG.debug(format("Set data of node '%s' with '%d' bytes of
data", node, data != null ? data.length : 0));
}
}
- return new OperationResult<byte[]>(data, statistics);
+ return new OperationResult<>(data, statistics);
} catch (Exception e) {
- return new OperationResult<byte[]>(e);
+ return new OperationResult<>(e);
}
}
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ZooKeeperOperation.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ZooKeeperOperation.java
index c60a774..4f582dc 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ZooKeeperOperation.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/ZooKeeperOperation.java
@@ -41,7 +41,7 @@ public abstract class ZooKeeperOperation<ResultType> {
protected ZooKeeper connection;
- protected Set<Thread> waitingThreads = new CopyOnWriteArraySet<Thread>();
+ protected Set<Thread> waitingThreads = new CopyOnWriteArraySet<>();
protected OperationResult<ResultType> result;
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderElection.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderElection.java
index 79dd39a..2d858ba 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderElection.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderElection.java
@@ -26,7 +26,6 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
import org.apache.camel.StatefulService;
import org.apache.camel.impl.JavaUuidGenerator;
import org.apache.camel.spi.UuidGenerator;
@@ -60,7 +59,7 @@ public class CuratorLeaderElection {
private final String candidateName;
private final Lock lock = new ReentrantLock();
private final CountDownLatch electionComplete = new CountDownLatch(1);
- private final List<ElectionWatcher> watchers = new
ArrayList<ElectionWatcher>();
+ private final List<ElectionWatcher> watchers = new ArrayList<>();
private AtomicBoolean masterNode = new AtomicBoolean(false);
private volatile boolean isCandidateCreated;
private int enabledCount = 1;
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderRoutePolicy.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderRoutePolicy.java
index d604bec..ef9f9e2 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderRoutePolicy.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorLeaderRoutePolicy.java
@@ -57,7 +57,7 @@ public class CuratorLeaderRoutePolicy extends
RoutePolicySupport implements Elec
private static final Logger LOG =
LoggerFactory.getLogger(CuratorLeaderRoutePolicy.class);
private final String uri;
private final Lock lock = new ReentrantLock();
- private final Set<Route> suspendedRoutes = new
CopyOnWriteArraySet<Route>();
+ private final Set<Route> suspendedRoutes = new CopyOnWriteArraySet<>();
private final AtomicBoolean shouldProcessExchanges = new AtomicBoolean();
private volatile boolean shouldStopRoute = true;
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderElection.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderElection.java
index 9c91b73..d4e6d52 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderElection.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderElection.java
@@ -54,7 +54,7 @@ public class CuratorMultiMasterLeaderElection implements
ConnectionStateListener
private static final Logger LOG =
LoggerFactory.getLogger(CuratorMultiMasterLeaderElection.class);
private final String candidateName;
- private final List<ElectionWatcher> watchers = new
ArrayList<ElectionWatcher>();
+ private final List<ElectionWatcher> watchers = new ArrayList<>();
private final int desiredActiveNodes;
private AtomicBoolean activeNode = new AtomicBoolean(false);
private UuidGenerator uuidGenerator = new JavaUuidGenerator();
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderRoutePolicy.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderRoutePolicy.java
index b220ee4..cfacc45 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderRoutePolicy.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/CuratorMultiMasterLeaderRoutePolicy.java
@@ -57,7 +57,7 @@ public class CuratorMultiMasterLeaderRoutePolicy extends
RoutePolicySupport impl
private static final Logger LOG =
LoggerFactory.getLogger(CuratorMultiMasterLeaderRoutePolicy.class);
private final String uri;
private final Lock lock = new ReentrantLock();
- private final Set<Route> suspendedRoutes = new
CopyOnWriteArraySet<Route>();
+ private final Set<Route> suspendedRoutes = new CopyOnWriteArraySet<>();
private final AtomicBoolean shouldProcessExchanges = new AtomicBoolean();
private volatile boolean shouldStopRoute = true;
private final int enabledCount;
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java
index cee0e2b..856b209 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperElection.java
@@ -73,7 +73,7 @@ public class ZooKeeperElection {
private volatile boolean isCandidateCreated;
private int enabledCount = 1;
private UuidGenerator uuidGenerator = new JavaUuidGenerator();
- private final List<ElectionWatcher> watchers = new
ArrayList<ElectionWatcher>();
+ private final List<ElectionWatcher> watchers = new ArrayList<>();
public ZooKeeperElection(CamelContext camelContext, String uri, int
enabledCount) {
this(camelContext.createProducerTemplate(), camelContext, uri,
enabledCount);
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
index 11faea4..b4bd9ce 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
@@ -54,7 +54,7 @@ public class ZooKeeperRoutePolicy extends RoutePolicySupport
implements Election
private final String uri;
private final int enabledCount;
private final Lock lock = new ReentrantLock();
- private final Set<Route> suspendedRoutes = new
CopyOnWriteArraySet<Route>();
+ private final Set<Route> suspendedRoutes = new CopyOnWriteArraySet<>();
private final AtomicBoolean shouldProcessExchanges = new AtomicBoolean();
private volatile boolean shouldStopConsumer = true;
diff --git
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
index a1fff77..e378160 100644
---
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
+++
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
@@ -35,7 +35,7 @@ public class NaturalSortComparatorTest {
List<String> sorted = Arrays
.asList(new String[] {"0", "1", "3", "4.0", "11", "30", "55",
"225", "333", "camel-2.1.0", "camel-2.1.1", "camel-2.1.1-SNAPSHOT",
"camel-2.2.0"});
- List<String> unsorted = new ArrayList<String>(sorted);
+ List<String> unsorted = new ArrayList<>(sorted);
Collections.shuffle(unsorted);
Collections.sort(unsorted, new NaturalSortComparator());
compareLists(sorted, unsorted);
diff --git
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
index ae27c78..3740996 100644
---
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
+++
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
@@ -305,7 +305,7 @@ public class ZooKeeperTestSupport extends CamelTestSupport {
}
public static void deleteDir(File f) {
- LinkedList<File> deleteStack = new LinkedList<File>();
+ LinkedList<File> deleteStack = new LinkedList<>();
deleteStack.addLast(f);
deleteDir(deleteStack);
}
diff --git
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
index 388d353..803083a 100644
---
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
+++
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
@@ -38,7 +38,7 @@ public class FutureEventDrivenOperationTest {
@Override
public OperationResult<String> getResult() {
- return new OperationResult<String>(data, statistics);
+ return new OperationResult<>(data, statistics);
}
};
--
To stop receiving notification emails like this one, please contact
bvah...@apache.org.
