Repository: aurora Updated Branches: refs/heads/master fff3e38b4 -> 38c2e769c
Replace Guava Joiner with String::join where simpler Now that `String::join` is part of the standard library some uses of Guava's `Joiner` can be removed. Testing Done: ./gradlew -Pq build Reviewed at https://reviews.apache.org/r/36703/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/38c2e769 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/38c2e769 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/38c2e769 Branch: refs/heads/master Commit: 38c2e769c66cc26b590e067e7e56855cdefbc72f Parents: fff3e38 Author: Kevin Sweeney <[email protected]> Authored: Wed Jul 22 16:20:38 2015 -0700 Committer: Kevin Sweeney <[email protected]> Committed: Wed Jul 22 16:20:38 2015 -0700 ---------------------------------------------------------------------- .../apache/aurora/scheduler/base/JobKeys.java | 3 +- .../aurora/scheduler/cron/CrontabEntry.java | 6 ++-- .../aurora/scheduler/cron/quartz/Quartz.java | 3 +- .../aurora/scheduler/http/CorsFilter.java | 30 +++++++++----------- .../thrift/aop/LoggingInterceptor.java | 3 +- 5 files changed, 21 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/38c2e769/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java b/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java index a5ffa5e..38d2863 100644 --- a/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java +++ b/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java @@ -20,7 +20,6 @@ import javax.annotation.Nullable; import com.google.common.base.Function; import com.google.common.base.Functions; -import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; @@ -131,7 +130,7 @@ public final class JobKeys { * @return Canonical "/"-delimited representation of the key. */ public static String canonicalString(IJobKey jobKey) { - return Joiner.on("/").join(jobKey.getRole(), jobKey.getEnvironment(), jobKey.getName()); + return String.join("/", jobKey.getRole(), jobKey.getEnvironment(), jobKey.getName()); } /** http://git-wip-us.apache.org/repos/asf/aurora/blob/38c2e769/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java b/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java index 904dd72..9d981da 100644 --- a/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java +++ b/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java @@ -21,7 +21,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.collect.BiMap; @@ -218,7 +217,7 @@ public final class CrontabEntry { components.add(set.first() + "-" + set.last()); } } - return Joiner.on(",").join(components); + return String.join(",", components); } /** @@ -262,7 +261,8 @@ public final class CrontabEntry { */ @Override public String toString() { - return Joiner.on(" ").join( + return String.join( + " ", getMinuteAsString(), getHourAsString(), getDayOfMonthAsString(), http://git-wip-us.apache.org/repos/asf/aurora/blob/38c2e769/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java index 45e062d..c379a32 100644 --- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java +++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/Quartz.java @@ -69,7 +69,8 @@ final class Quartz { dayOfWeek = Joiner.on(",").join(daysOfWeek); } - String rawCronExpresion = Joiner.on(" ").join( + String rawCronExpresion = String.join( + " ", "0", entry.getMinuteAsString(), entry.getHourAsString(), http://git-wip-us.apache.org/repos/asf/aurora/blob/38c2e769/src/main/java/org/apache/aurora/scheduler/http/CorsFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/http/CorsFilter.java b/src/main/java/org/apache/aurora/scheduler/http/CorsFilter.java index e413ad9..58be4b7 100644 --- a/src/main/java/org/apache/aurora/scheduler/http/CorsFilter.java +++ b/src/main/java/org/apache/aurora/scheduler/http/CorsFilter.java @@ -22,8 +22,6 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.HttpMethod; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; import com.google.common.net.HttpHeaders; import com.twitter.common.base.MorePreconditions; @@ -34,22 +32,22 @@ import com.twitter.common.base.MorePreconditions; public class CorsFilter extends AbstractFilter { @VisibleForTesting - static final String ALLOWED_METHODS = Joiner.on(",") - .join(ImmutableSet.of( - HttpMethod.DELETE, - HttpMethod.GET, - HttpMethod.HEAD, - HttpMethod.OPTIONS, - HttpMethod.POST, - HttpMethod.PUT)); + static final String ALLOWED_METHODS = String.join( + ",", + HttpMethod.DELETE, + HttpMethod.GET, + HttpMethod.HEAD, + HttpMethod.OPTIONS, + HttpMethod.POST, + HttpMethod.PUT); @VisibleForTesting - static final String ALLOWED_HEADERS = Joiner.on(",") - .join(ImmutableSet.of( - HttpHeaders.ACCEPT, - HttpHeaders.CONTENT_TYPE, - HttpHeaders.ORIGIN, - HttpHeaders.X_REQUESTED_WITH)); + static final String ALLOWED_HEADERS = String.join( + ",", + HttpHeaders.ACCEPT, + HttpHeaders.CONTENT_TYPE, + HttpHeaders.ORIGIN, + HttpHeaders.X_REQUESTED_WITH); private final String allowedOriginDomain; http://git-wip-us.apache.org/repos/asf/aurora/blob/38c2e769/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java index 7c8f8b9..d110b21 100644 --- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java +++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -96,7 +95,7 @@ class LoggingInterceptor implements MethodInterceptor { } } String methodName = invocation.getMethod().getName(); - String message = String.format("%s(%s)", methodName, Joiner.on(", ").join(argStrings)); + String message = String.format("%s(%s)", methodName, String.join(", ", argStrings)); LOG.info(message); try { return invocation.proceed();
