You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/20 12:48:49 UTC
[cxf] 02/02: Removing some unnecessary autoboxing
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f1f26101d421e30560b6da5f125852708774718b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 20 12:48:25 2020 +0000
Removing some unnecessary autoboxing
---
.../java/org/apache/cxf/attachment/Rfc5987Util.java | 2 +-
.../org/apache/cxf/bus/blueprint/ConfigurerImpl.java | 6 +++---
.../apache/cxf/jaxrs/provider/XSLTJaxbProvider.java | 13 ++++++-------
.../interceptor/ResponseTimeMessageInInterceptor.java | 2 +-
.../ResponseTimeMessageInvokerInterceptor.java | 4 ++--
.../interceptor/ResponseTimeMessageOutInterceptor.java | 2 +-
.../org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 6 +++---
.../security/oauth/provider/DefaultOAuthValidator.java | 6 +++---
.../security/oidc/rp/OidcClientCodeRequestFilter.java | 2 +-
.../cxf/tools/corba/processors/idl/TypesUtils.java | 4 ++--
.../tools/corba/processors/wsdl/WSDLToIDLAction.java | 18 ++++++++----------
11 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java b/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
index 347e5d2..a7babf3 100644
--- a/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
+++ b/core/src/main/java/org/apache/cxf/attachment/Rfc5987Util.java
@@ -77,7 +77,7 @@ public final class Rfc5987Util {
while (matcher.find()) {
String matched = matcher.group();
if (matched.startsWith("%")) {
- Integer value = Integer.parseInt(matched.substring(1), 16);
+ int value = Integer.parseInt(matched.substring(1), 16);
bos.write(value);
} else {
bos.write(matched.charAt(0));
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
index 7466180..d9636ca 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
@@ -57,10 +57,10 @@ public class ConfigurerImpl implements Configurer {
}
@Override
public int compareTo(MatcherHolder mh) {
- Integer literalCharsLen1 = this.wildCardId.replace("*", "").length();
- Integer literalCharsLen2 = mh.wildCardId.replace("*", "").length();
+ int literalCharsLen1 = this.wildCardId.replace("*", "").length();
+ int literalCharsLen2 = mh.wildCardId.replace("*", "").length();
// The expression with more literal characters should end up on the top of the list
- return literalCharsLen1.compareTo(literalCharsLen2) * -1;
+ return Integer.compare(literalCharsLen1, literalCharsLen2) * -1;
}
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index 9c63de6..7fa4d6d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -340,7 +340,7 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
protected Result getStreamResult(OutputStream os, Annotation[] anns, MediaType mt) throws Exception {
return new StreamResult(os);
}
-
+
@Override
protected void marshalToOutputStream(Marshaller ms, Object obj, OutputStream os,
Annotation[] anns, MediaType mt)
@@ -513,13 +513,12 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
}
protected Templates createTemplates(URL urlStream) {
- try {
- if (urlStream == null) {
- return null;
- }
+ if (urlStream == null) {
+ return null;
+ }
- Reader r = new BufferedReader(
- new InputStreamReader(urlStream.openStream(), StandardCharsets.UTF_8));
+ try (Reader r = new BufferedReader(
+ new InputStreamReader(urlStream.openStream(), StandardCharsets.UTF_8))) {
Source source = new StreamSource(r);
source.setSystemId(urlStream.toExternalForm());
if (factory == null) {
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
index 3bda49f..1ae1e9e 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
@@ -36,7 +36,7 @@ public class ResponseTimeMessageInInterceptor extends AbstractMessageResponseTim
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
//if serviceCounter is disabled , all responseTimeInterceptors will be skipped
- Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
+ boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
if (isClient(message)) {
if (!ex.isOneWay()) {
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
index 3292c78..9742518 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
@@ -40,7 +40,7 @@ public class ResponseTimeMessageInvokerInterceptor extends AbstractMessageRespon
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
- Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
+ boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
message.getInterceptorChain().add(new ResponseTimeMessageInvokerEndingInteceptor());
}
@@ -50,7 +50,7 @@ public class ResponseTimeMessageInvokerInterceptor extends AbstractMessageRespon
@Override
public void handleFault(Message message) {
Exchange ex = message.getExchange();
- Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
+ boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (isServiceCounterEnabled(ex) && !forceDisabled) {
ex.put(FaultMode.class, message.get(FaultMode.class));
if (ex.isOneWay() && !isClient(message)) {
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
index f3d09cb..7bfdae3 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
@@ -36,7 +36,7 @@ public class ResponseTimeMessageOutInterceptor extends AbstractMessageResponseTi
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
- Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
+ boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
if (ex.get(Exception.class) != null) {
endHandlingMessage(ex);
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 1827e81..5b97373 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1194,9 +1194,9 @@ public class WadlGenerator implements ContainerRequestFilter {
}
if (result == 0 && ignoreOverloadedMethods
&& op1.getMethodToInvoke().getName().equals(op2.getMethodToInvoke().getName())) {
- Integer paramLen1 = op1.getMethodToInvoke().getParameterTypes().length;
- Integer paramLen2 = op2.getMethodToInvoke().getParameterTypes().length;
- result = paramLen1.compareTo(paramLen2) * -1;
+ int paramLen1 = op1.getMethodToInvoke().getParameterTypes().length;
+ int paramLen2 = op2.getMethodToInvoke().getParameterTypes().length;
+ result = Integer.compare(paramLen1, paramLen2) * -1;
}
return result;
}
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
index 28678d6..0ce7f17 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
@@ -49,10 +49,10 @@ public class DefaultOAuthValidator extends SimpleOAuthValidator {
if (token == null) {
throw new OAuthProblemException(OAuth.Problems.TOKEN_REJECTED);
}
- Long issuedAt = token.getIssuedAt();
- Long lifetime = token.getLifetime();
+ long issuedAt = token.getIssuedAt();
+ long lifetime = token.getLifetime();
if (lifetime != -1
- && (issuedAt + lifetime < (System.currentTimeMillis() / 1000))) {
+ && (issuedAt + lifetime < (System.currentTimeMillis() / 1000L))) {
provider.removeToken(token);
throw new OAuthProblemException(OAuth.Problems.TOKEN_EXPIRED);
}
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
index 33e59e8..9a0d1c0 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java
@@ -112,7 +112,7 @@ public class OidcClientCodeRequestFilter extends ClientCodeRequestFilter {
throw new OAuthServiceException(OAuthConstants.INVALID_REQUEST);
}
if (maxAgeOffset != null) {
- Long authTime = Long.parseLong(state.getFirst(MAX_AGE_PARAMETER));
+ long authTime = Long.parseLong(state.getFirst(MAX_AGE_PARAMETER));
Long tokenAuthTime = idToken.getAuthenticationTime();
if (tokenAuthTime > authTime) {
throw new OAuthServiceException(OAuthConstants.INVALID_REQUEST);
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
index 21b0d1b..d2ac074 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesUtils.java
@@ -86,12 +86,12 @@ public final class TypesUtils {
public static Scope generateAnonymousScopedName(Scope scope, XmlSchema schema) {
Scope scopedName = null;
XmlSchemaType anonSchemaType = null;
- Integer id = 0;
+ int id = 0;
do {
id++;
StringBuilder name = new StringBuilder();
name.append('_');
- name.append("Anon").append(id.toString());
+ name.append("Anon").append(Integer.toString(id));
name.append('_');
name.append(scope.tail());
scopedName = new Scope(scope.getParent(), name.toString());
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
index f3026aa..49fa4f7 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
@@ -501,9 +501,8 @@ public class WSDLToIDLAction {
if (corbaTypeImpl instanceof Anonstring) {
Anonstring as = (Anonstring)corbaTypeImpl;
- Long lbound = as.getBound();
- int bound = lbound.intValue();
- result = IdlString.create(bound);
+ long lbound = as.getBound();
+ result = IdlString.create((int)lbound);
}
return result;
}
@@ -705,19 +704,18 @@ public class WSDLToIDLAction {
private IdlType createFixed(Fixed f, IdlScopeBase scope, String local) {
IdlType idlType = null;
- Long digits = f.getDigits();
- Long scale = f.getScale();
- idlType = IdlFixed.create(scope, local, digits.intValue(),
- scale.intValue());
+ long digits = f.getDigits();
+ long scale = f.getScale();
+ idlType = IdlFixed.create(scope, local, (int)digits, (int)scale);
scope.addToScope(idlType);
return idlType;
}
private IdlType createAnonFixed(Anonfixed f, IdlScopeBase scope, String local) {
IdlType idlType = null;
- Long digits = f.getDigits();
- Long scale = f.getScale();
- idlType = IdlAnonFixed.create(scope, digits.intValue(), scale.intValue());
+ long digits = f.getDigits();
+ long scale = f.getScale();
+ idlType = IdlAnonFixed.create(scope, (int)digits, (int)scale);
scope.addToScope(idlType);
return idlType;
}