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 2018/04/25 11:01:45 UTC
[cxf] 02/02: Use String.join instead of StringBuilder
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 2c9a1639f03119b4ed70465f0a7f4b3ded523c51
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Apr 25 12:01:19 2018 +0100
Use String.join instead of StringBuilder
---
.../main/java/org/apache/cxf/attachment/AttachmentUtil.java | 9 +--------
.../java/org/apache/cxf/maven_plugin/WsdlUtilities.java | 12 ++----------
.../org/apache/cxf/maven_plugin/wadlto/OptionLoader.java | 12 ++----------
.../java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java | 12 ++----------
.../apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java | 9 +--------
.../apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java | 9 +--------
.../rs/security/oauth2/client/ClientCodeRequestFilter.java | 9 +--------
.../org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 9 +--------
.../security/oidc/idp/OidcDynamicRegistrationService.java | 10 ++--------
.../org/apache/cxf/rs/security/oidc/utils/OidcUtils.java | 9 +--------
.../java/org/apache/cxf/transport/jms/JMSMessageUtils.java | 13 +------------
11 files changed, 15 insertions(+), 98 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 0496ec2..448eef8 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -359,14 +359,7 @@ public final class AttachmentUtil {
}
static String getHeaderValue(List<String> v, String delim) {
if (v != null && !v.isEmpty()) {
- StringBuilder b = new StringBuilder();
- for (String s : v) {
- if (b.length() > 0) {
- b.append(delim);
- }
- b.append(s);
- }
- return b.toString();
+ return String.join(delim, v);
}
return null;
}
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
index 399de26..10ff437 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
@@ -52,18 +52,10 @@ public final class WsdlUtilities {
}
public static String joinWithComma(String[] arr) {
- if (arr == null) {
+ if (arr == null || arr.length == 0) {
return "";
}
- StringBuilder str = new StringBuilder();
-
- for (String s : arr) {
- if (str.length() > 0) {
- str.append(',');
- }
- str.append(s);
- }
- return str.toString();
+ return String.join(",", arr);
}
public static List<File> getWsdlFiles(File dir, String includes[], String excludes[])
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
index d0c728f..1bb2b36 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
@@ -111,18 +111,10 @@ public final class OptionLoader {
}
private static String joinWithComma(String[] arr) {
- if (arr == null) {
+ if (arr == null || arr.length == 0) {
return "";
}
- StringBuilder str = new StringBuilder();
-
- for (String s : arr) {
- if (str.length() > 0) {
- str.append(',');
- }
- str.append(s);
- }
- return str.toString();
+ return String.join(",", arr);
}
private static List<File> getWadlFiles(File dir, String includes[], String excludes[])
diff --git a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
index 15d2cb5..3cdb215 100644
--- a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
+++ b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
@@ -80,18 +80,10 @@ public class WSDLValidatorMojo extends AbstractMojo {
private String excludes[];
private String getIncludeExcludeString(String[] arr) {
- if (arr == null) {
+ if (arr == null || arr.length == 0) {
return "";
}
- StringBuilder str = new StringBuilder();
-
- for (String s : arr) {
- if (str.length() > 0) {
- str.append(',');
- }
- str.append(s);
- }
- return str.toString();
+ return String.join(",", arr);
}
private List<File> getWsdlFiles(File dir)
diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java
index 510a7d6..985bd53 100644
--- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java
+++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java
@@ -240,14 +240,7 @@ public final class OpenApiParseUtils {
private static String listToString(List<String> list) {
if (list != null) {
- StringBuilder sb = new StringBuilder();
- for (String s : list) {
- if (sb.length() > 0) {
- sb.append(',');
- }
- sb.append(s);
- }
- return sb.toString();
+ return String.join(",", list);
}
return null;
}
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
index fbf86b3..27bbb12 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
@@ -200,14 +200,7 @@ public final class SwaggerParseUtils {
private static String listToString(List<String> list) {
if (list != null) {
- StringBuilder sb = new StringBuilder();
- for (String s : list) {
- if (sb.length() > 0) {
- sb.append(',');
- }
- sb.append(s);
- }
- return sb.toString();
+ return String.join(",", list);
}
return null;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index e5a9295..7911f9a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -320,14 +320,7 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter {
}
public void setScopeList(List<String> list) {
- StringBuilder sb = new StringBuilder();
- for (String s : list) {
- if (sb.length() > 0) {
- sb.append(" ");
- }
- sb.append(s);
- }
- setScopes(sb.toString());
+ setScopes(String.join(" ", list));
}
public void setScopes(String scopes) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index dda5829..062689a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -441,13 +441,6 @@ public final class OAuthUtils {
}
public static String convertListOfScopesToString(List<String> registeredScopes) {
- StringBuilder sb = new StringBuilder();
- for (String s : registeredScopes) {
- if (sb.length() > 0) {
- sb.append(", ");
- }
- sb.append(s);
- }
- return sb.toString();
+ return String.join(", ", registeredScopes);
}
}
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
index af5d7b9..d211f01 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcDynamicRegistrationService.java
@@ -36,14 +36,8 @@ public class OidcDynamicRegistrationService extends DynamicRegistrationService {
Client client = super.createNewClient(request);
List<String> postLogoutUris = request.getListStringProperty(POST_LOGOUT_LOGOUT_URIS);
if (postLogoutUris != null) {
- StringBuilder sb = new StringBuilder();
- for (String uri : postLogoutUris) {
- if (sb.length() > 0) {
- sb.append(" ");
- }
- sb.append(uri);
- }
- client.getProperties().put(POST_LOGOUT_LOGOUT_URIS, sb.toString());
+ client.getProperties().put(POST_LOGOUT_LOGOUT_URIS,
+ String.join(" ", postLogoutUris));
}
String backChannelLogoutUri = request.getStringProperty(BACK_CHANNEL_LOGOUT_URI);
if (backChannelLogoutUri != null) {
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index 282bb62..5a61379 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -142,14 +142,7 @@ public final class OidcUtils {
}
private static String getScope(String... scopes) {
- StringBuilder sb = new StringBuilder();
- for (String scope : scopes) {
- if (sb.length() > 0) {
- sb.append(" ");
- }
- sb.append(scope);
- }
- return sb.toString();
+ return String.join(" ", scopes);
}
public static void validateAccessTokenHash(ClientAccessToken at, JwtToken jwt) {
validateAccessTokenHash(at, jwt, true);
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index e52f163..200d72d 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -271,7 +271,7 @@ final class JMSMessageUtils {
for (Map.Entry<String, List<String>> ent : headers.entrySet()) {
if (!ent.getKey().equals(org.apache.cxf.message.Message.CONTENT_TYPE)
&& !ent.getKey().equals(HttpHeaderHelper.CONTENT_LENGTH)) {
- messageHeaders.putProperty(ent.getKey(), JMSMessageUtils.join(ent.getValue(), ','));
+ messageHeaders.putProperty(ent.getKey(), String.join(",", ent.getValue()));
}
}
}
@@ -291,17 +291,6 @@ final class JMSMessageUtils {
return messageProperties;
}
- private static String join(List<String> valueList, char seperator) {
- StringBuilder b = new StringBuilder();
- for (String s : valueList) {
- if (b.length() > 0) {
- b.append(seperator);
- }
- b.append(s);
- }
- return b.toString();
- }
-
private static String getSoapAction(JMSMessageHeadersType messageProperties,
org.apache.cxf.message.Message outMessage,
Map<String, List<String>> headers) {
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.