You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/06/30 10:38:59 UTC
[camel] 03/13: (chores) camel-cxf: reduce verbosity of generics code
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6cb8cf2c31f98b58184434a5bcd7ded8179e7d20
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 30 11:09:38 2023 +0200
(chores) camel-cxf: reduce verbosity of generics code
---
.../org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 4 ++--
.../org/apache/camel/component/cxf/jaxws/CxfComponent.java | 4 ++--
.../java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java | 10 +++++-----
.../java/org/apache/camel/component/cxf/jaxws/CxfProducer.java | 2 +-
.../cxf/spring/jaxrs/SpringJAXRSClientFactoryBean.java | 2 +-
.../cxf/spring/jaxrs/SpringJAXRSServerFactoryBean.java | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 6bf4fb8e931..1abd447319d 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -387,7 +387,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
}
if (this.isSkipFaultLogging()) {
if (factory.getProperties() == null) {
- factory.setProperties(new HashMap<String, Object>());
+ factory.setProperties(new HashMap<>());
}
factory.getProperties().put(FaultListener.class.getName(), new NullFaultListener());
}
@@ -698,7 +698,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
* Set the feature list to the CxfRs endpoint.
*/
public void setFeatures(List<Feature> features) {
- this.features = new ArrayList<Feature>(features);
+ this.features = new ArrayList<>(features);
}
public Map<String, Object> getProperties() {
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfComponent.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfComponent.java
index 13f40097537..db04fb573cf 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfComponent.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfComponent.java
@@ -44,7 +44,7 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
@Metadata(label = "security", defaultValue = "false")
private boolean useGlobalSslContextParameters;
- private Map<String, BeanCacheEntry> beanCache = new HashMap<String, BeanCacheEntry>();
+ private Map<String, BeanCacheEntry> beanCache = new HashMap<>();
public CxfComponent() {
}
@@ -124,7 +124,7 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
+ " but with different parameters. Please use the proper Bean scope ");
}
} else {
- beanCache.put(beanId, new BeanCacheEntry(result, new HashMap<String, Object>(parameters)));
+ beanCache.put(beanId, new BeanCacheEntry(result, new HashMap<>(parameters)));
}
} else {
// endpoint URI does not specify a bean
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index d8015b59b7e..36630dc8144 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -367,14 +367,14 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
}
if (this.isSkipPayloadMessagePartCheck()) {
if (sfb.getProperties() == null) {
- sfb.setProperties(new HashMap<String, Object>());
+ sfb.setProperties(new HashMap<>());
}
sfb.getProperties().put("soap.no.validate.parts", Boolean.TRUE);
}
if (this.isSkipFaultLogging()) {
if (sfb.getProperties() == null) {
- sfb.setProperties(new HashMap<String, Object>());
+ sfb.setProperties(new HashMap<>());
}
sfb.getProperties().put(FaultListener.class.getName(), new NullFaultListener());
}
@@ -563,21 +563,21 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
authPolicy.setUserName(username);
authPolicy.setPassword(password);
if (factoryBean.getProperties() == null) {
- factoryBean.setProperties(new HashMap<String, Object>());
+ factoryBean.setProperties(new HashMap<>());
}
factoryBean.getProperties().put(AuthorizationPolicy.class.getName(), authPolicy);
}
if (this.isSkipPayloadMessagePartCheck()) {
if (factoryBean.getProperties() == null) {
- factoryBean.setProperties(new HashMap<String, Object>());
+ factoryBean.setProperties(new HashMap<>());
}
factoryBean.getProperties().put("soap.no.validate.parts", Boolean.TRUE);
}
if (this.isSkipFaultLogging()) {
if (factoryBean.getProperties() == null) {
- factoryBean.setProperties(new HashMap<String, Object>());
+ factoryBean.setProperties(new HashMap<>());
}
factoryBean.getProperties().put(FaultListener.class.getName(), new NullFaultListener());
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
index 8edc5993f10..fb8801cd612 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
@@ -188,7 +188,7 @@ public class CxfProducer extends DefaultAsyncProducer {
// create invocation context
WrappedMessageContext requestContext
- = new WrappedMessageContext(new HashMap<String, Object>(), null, Scope.APPLICATION);
+ = new WrappedMessageContext(new HashMap<>(), null, Scope.APPLICATION);
camelExchange.setProperty(Message.MTOM_ENABLED, String.valueOf(endpoint.isMtomEnabled()));
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSClientFactoryBean.java b/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSClientFactoryBean.java
index 9e6f5f7411d..e2bfee31282 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSClientFactoryBean.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSClientFactoryBean.java
@@ -103,7 +103,7 @@ public class SpringJAXRSClientFactoryBean extends JAXRSClientFactoryBean
public void setSkipFaultLogging(boolean skipFaultLogging) {
if (skipFaultLogging) {
if (this.getProperties() == null) {
- this.setProperties(new HashMap<String, Object>());
+ this.setProperties(new HashMap<>());
}
this.getProperties().put(FaultListener.class.getName(), new NullFaultListener());
}
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSServerFactoryBean.java b/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSServerFactoryBean.java
index 2b9b51bdcaa..e9dc801dd90 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSServerFactoryBean.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/main/java/org/apache/camel/component/cxf/spring/jaxrs/SpringJAXRSServerFactoryBean.java
@@ -110,7 +110,7 @@ public class SpringJAXRSServerFactoryBean extends JAXRSServerFactoryBean
public void setSkipFaultLogging(boolean skipFaultLogging) {
if (skipFaultLogging) {
if (this.getProperties() == null) {
- this.setProperties(new HashMap<String, Object>());
+ this.setProperties(new HashMap<>());
}
this.getProperties().put(FaultListener.class.getName(), new NullFaultListener());
}