Repository: aurora Updated Branches: refs/heads/master 8e07b04bb -> 4e46fd892
Use built-in string formating capabilities of Preconditions.checkArgument. We can gain a little bit of performance if we only run the string formatting when necessary. Reviewed at https://reviews.apache.org/r/54185/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/c8135c0f Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/c8135c0f Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/c8135c0f Branch: refs/heads/master Commit: c8135c0f129cc34bb53fa132c9778b2ec76fe790 Parents: 8e07b04 Author: Stephan Erb <s...@apache.org> Authored: Wed Nov 30 09:43:01 2016 +0100 Committer: Stephan Erb <s...@apache.org> Committed: Wed Nov 30 09:43:01 2016 +0100 ---------------------------------------------------------------------- src/main/java/org/apache/aurora/GuiceUtils.java | 2 +- .../org/apache/aurora/scheduler/base/Conversions.java | 2 +- .../java/org/apache/aurora/scheduler/base/JobKeys.java | 2 +- .../org/apache/aurora/scheduler/cron/CrontabEntry.java | 12 ++++++------ .../scheduler/cron/quartz/AuroraCronJobFactory.java | 4 ++-- .../scheduler/http/api/security/ThriftFieldGetter.java | 10 ++++------ .../aurora/scheduler/reconciliation/TaskReconciler.java | 6 +++--- 7 files changed, 18 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/src/main/java/org/apache/aurora/GuiceUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/GuiceUtils.java b/src/main/java/org/apache/aurora/GuiceUtils.java index 879373b..cc7b921 100644 --- a/src/main/java/org/apache/aurora/GuiceUtils.java +++ b/src/main/java/org/apache/aurora/GuiceUtils.java @@ -149,7 +149,7 @@ public final class GuiceUtils { ImmutableList.copyOf(wrapInterface.getMethods()), Predicates.and(Predicates.not(IS_WHITELISTED), Predicates.not(VOID_METHOD)))); Preconditions.checkArgument(disallowed.isEmpty(), - "Non-void methods must be explicitly whitelisted with @AllowUnchecked: " + disallowed); + "Non-void methods must be explicitly whitelisted with @AllowUnchecked: %s", disallowed); Matcher<Method> matcher = Matchers.not(WHITELIST_MATCHER).and(interfaceMatcher(wrapInterface, false)); http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/src/main/java/org/apache/aurora/scheduler/base/Conversions.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/base/Conversions.java b/src/main/java/org/apache/aurora/scheduler/base/Conversions.java index 66e69d4..4a1e087 100644 --- a/src/main/java/org/apache/aurora/scheduler/base/Conversions.java +++ b/src/main/java/org/apache/aurora/scheduler/base/Conversions.java @@ -74,7 +74,7 @@ public final class Conversions { */ public static ScheduleStatus convertProtoState(TaskState taskState) { ScheduleStatus status = STATE_TRANSLATION.get(taskState); - Preconditions.checkArgument(status != null, "Unrecognized task state " + taskState); + Preconditions.checkArgument(status != null, "Unrecognized task state %s", taskState); return status; } http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/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 7bbb1f7..0136afb 100644 --- a/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java +++ b/src/main/java/org/apache/aurora/scheduler/base/JobKeys.java @@ -144,7 +144,7 @@ public final class JobKeys { throws IllegalArgumentException { for (IJobKey jobKey : jobKeys) { - checkArgument(isValid(jobKey), "Invalid job key format:" + jobKey); + checkArgument(isValid(jobKey), "Invalid job key format: %s", jobKey); } return jobKeys; http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/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 9d981da..6e56867 100644 --- a/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java +++ b/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java @@ -348,7 +348,7 @@ public final class CrontabEntry { Parser(String schedule) throws IllegalArgumentException { Matcher matcher = CRONTAB_ENTRY.matcher(schedule); - checkArgument(matcher.matches(), "Invalid cron schedule " + schedule); + checkArgument(matcher.matches(), "Invalid cron schedule %s", schedule); rawMinute = requireNonNull(matcher.group("minute")); rawHour = requireNonNull(matcher.group("hour")); @@ -393,7 +393,7 @@ public final class CrontabEntry { int number = Integer.parseInt(matcher.group("number")); Range<Integer> range = Range.singleton(number).canonical(DiscreteDomain.integers()); - checkArgument(enclosure.encloses(range), enclosure + " does not enclose " + range); + checkArgument(enclosure.encloses(range), "%s does not enclose %s", enclosure, range); return ImmutableRangeSet.of(range); } @@ -404,7 +404,7 @@ public final class CrontabEntry { int upper = Integer.parseInt(matcher.group("upper")); Range<Integer> range = Range.closed(lower, upper).canonical(DiscreteDomain.integers()); - checkArgument(enclosure.encloses(range), enclosure + " does not enclose " + range); + checkArgument(enclosure.encloses(range), "%s does not enclose %s", enclosure, range); return ImmutableRangeSet.of(range); } @@ -430,9 +430,9 @@ public final class CrontabEntry { final int skip = Integer.parseInt(matcher.group("skip")); Range<Integer> range = Range.closed(lower, upper).canonical(DiscreteDomain.integers()); - checkArgument(enclosure.encloses(range), enclosure + " does not enclose " + range); - checkArgument(skip > 0, "skip value " + skip + " must be >0"); - checkArgument(skip < upper, "skip value " + skip + " must be smaller than " + upper); + checkArgument(enclosure.encloses(range), "%s does not enclose %s", enclosure, range); + checkArgument(skip > 0, "skip value %s must be >0", skip); + checkArgument(skip < upper, "skip value %s must be smaller than %s", skip, upper); ImmutableRangeSet.Builder<Integer> rangeSet = ImmutableRangeSet.builder(); for (int i = lower; range.contains(i); i += skip) { http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java index bb3bbbd..2c10dc5 100644 --- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java +++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobFactory.java @@ -40,8 +40,8 @@ class AuroraCronJobFactory implements JobFactory { @Override public Job newJob(TriggerFiredBundle bundle, Scheduler scheduler) throws SchedulerException { checkState(AuroraCronJob.class.equals(bundle.getJobDetail().getJobClass()), - "Quartz tried to run a type of job we don't know about: " - + bundle.getJobDetail().getJobClass()); + "Quartz tried to run a type of job we don't know about: %s", + bundle.getJobDetail().getJobClass()); return auroraCronJobProvider.get(); } http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/src/main/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetter.java b/src/main/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetter.java index 2044b79..0b64d1a 100644 --- a/src/main/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetter.java +++ b/src/main/java/org/apache/aurora/scheduler/http/api/security/ThriftFieldGetter.java @@ -44,12 +44,10 @@ class ThriftFieldGetter<T extends TBase<T, F>, F extends TFieldIdEnum, V extends StructMetaData structMetaData = (StructMetaData) fieldValueMetaData; checkArgument( valueClass.equals(structMetaData.structClass), - "Value class " - + valueClass.getName() - + " does not match field metadata for " - + fieldId - + " (expected " + structMetaData.structClass - + ")."); + "Value class %s does not match field metadata for %s (expected %s)", + valueClass.getName(), + fieldId, + structMetaData.structClass); this.fieldId = fieldId; } http://git-wip-us.apache.org/repos/asf/aurora/blob/c8135c0f/src/main/java/org/apache/aurora/scheduler/reconciliation/TaskReconciler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/reconciliation/TaskReconciler.java b/src/main/java/org/apache/aurora/scheduler/reconciliation/TaskReconciler.java index 343ffdb..003fe53 100644 --- a/src/main/java/org/apache/aurora/scheduler/reconciliation/TaskReconciler.java +++ b/src/main/java/org/apache/aurora/scheduler/reconciliation/TaskReconciler.java @@ -93,13 +93,13 @@ public class TaskReconciler extends AbstractIdleService { checkArgument( explicitDelayMinutes >= 0, - "Invalid explicit reconciliation delay: " + explicitDelayMinutes); + "Invalid explicit reconciliation delay: %s", explicitDelayMinutes); checkArgument( implicitDelayMinutes >= 0L, - "Invalid implicit reconciliation delay: " + implicitDelayMinutes); + "Invalid implicit reconciliation delay: %s", implicitDelayMinutes); checkArgument( explicitBatchDelaySeconds >= 0L, - "Invalid explicit batch reconciliation delay: " + explicitBatchDelaySeconds + "Invalid explicit batch reconciliation delay: %s", explicitBatchDelaySeconds ); } }
