Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4AEB611B23 for ; Wed, 21 May 2014 21:55:59 +0000 (UTC) Received: (qmail 63274 invoked by uid 500); 21 May 2014 21:55:59 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 63242 invoked by uid 500); 21 May 2014 21:55:59 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 63235 invoked by uid 99); 21 May 2014 21:55:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 21:55:59 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 May 2014 21:55:54 +0000 Received: (qmail 62473 invoked by uid 99); 21 May 2014 21:55:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 21:55:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 877EF99CF60; Wed, 21 May 2014 21:55:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: <559d00e801cb42a9b20e0535c61d21b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Enable a few checkstyle checks. Date: Wed, 21 May 2014 21:55:29 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 0df27d7ae -> b20708852 Enable a few checkstyle checks. Reviewed at https://reviews.apache.org/r/21753/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/b2070885 Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/b2070885 Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/b2070885 Branch: refs/heads/master Commit: b20708852812be3a15754c6f9ab1217ee7e78ec8 Parents: 0df27d7 Author: Bill Farner Authored: Wed May 21 14:54:45 2014 -0700 Committer: Bill Farner Committed: Wed May 21 14:54:45 2014 -0700 ---------------------------------------------------------------------- config/checkstyle/checkstyle.xml | 402 ++++++++++--------- .../scheduler/async/GcExecutorLauncher.java | 2 +- .../aurora/scheduler/async/OfferQueue.java | 2 +- .../aurora/scheduler/async/TaskScheduler.java | 2 +- .../scheduler/base/ResourceAggregates.java | 4 +- .../scheduler/configuration/Resources.java | 6 +- .../aurora/scheduler/cron/CrontabEntry.java | 28 +- .../scheduler/state/MaintenanceController.java | 2 +- .../scheduler/state/SchedulerCoreImpl.java | 1 - .../thrift/SchedulerThriftInterface.java | 1 - .../scheduler/async/TaskSchedulerTest.java | 1 - .../configuration/ConfigurationManagerTest.java | 1 - .../scheduler/state/TaskAssignerImplTest.java | 1 - .../storage/log/SnapshotStoreImplTest.java | 1 - .../thrift/SchedulerThriftInterfaceTest.java | 1 - 15 files changed, 233 insertions(+), 222 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/config/checkstyle/checkstyle.xml ---------------------------------------------------------------------- diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 8e869f3..367304d 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -47,210 +47,220 @@ limitations under the License. + If you set the basedir property below, then all reported file + names will be relative to the specified directory. See + http://checkstyle.sourceforge.net/config.html#Checker + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java b/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java index e599cac..b6624d7 100644 --- a/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java +++ b/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java @@ -67,7 +67,7 @@ import static com.google.common.base.Preconditions.checkNotNull; /** * A task launcher that periodically initiates garbage collection on a host, re-using a single - * garbage collection executor + * garbage collection executor. */ public class GcExecutorLauncher implements TaskLauncher { private static final Logger LOG = Logger.getLogger(GcExecutorLauncher.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java b/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java index 87c3797..e8acf0a 100644 --- a/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java +++ b/src/main/java/org/apache/aurora/scheduler/async/OfferQueue.java @@ -57,7 +57,7 @@ import static org.apache.aurora.gen.MaintenanceMode.NONE; import static org.apache.aurora.gen.MaintenanceMode.SCHEDULED; /** - * Tracks the Offers currently known by the scheduler + * Tracks the Offers currently known by the scheduler. */ public interface OfferQueue extends EventSubscriber { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java b/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java index f7f418a..8fa08b2 100644 --- a/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java +++ b/src/main/java/org/apache/aurora/scheduler/async/TaskScheduler.java @@ -92,7 +92,7 @@ interface TaskScheduler extends EventSubscriber { */ class TaskSchedulerImpl implements TaskScheduler { /** - * Binding annotation for the time duration of reservations + * Binding annotation for the time duration of reservations. */ @BindingAnnotation @Target({ FIELD, PARAMETER, METHOD }) @Retention(RUNTIME) http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/base/ResourceAggregates.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/base/ResourceAggregates.java b/src/main/java/org/apache/aurora/scheduler/base/ResourceAggregates.java index 7804300..0739792 100644 --- a/src/main/java/org/apache/aurora/scheduler/base/ResourceAggregates.java +++ b/src/main/java/org/apache/aurora/scheduler/base/ResourceAggregates.java @@ -54,7 +54,7 @@ public final class ResourceAggregates { } /** - * a * m + * a * m. */ public static IResourceAggregate scale(IResourceAggregate a, int m) { return IResourceAggregate.build(new ResourceAggregate() @@ -64,7 +64,7 @@ public final class ResourceAggregates { } /** - * a / b + * a / b. *

* This calculates how many times {@code b} "fits into" {@code a}. Behavior is undefined when * {@code b} contains resources with a value of zero. http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java index 9139b06..a2679c3 100644 --- a/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java +++ b/src/main/java/org/apache/aurora/scheduler/configuration/Resources.java @@ -205,7 +205,7 @@ public class Resources { } /** - * a - b + * a - b. */ public static Resources subtract(Resources a, Resources b) { return new Resources( @@ -216,14 +216,14 @@ public class Resources { } /** - * sum(a, b) + * sum(a, b). */ public static Resources sum(Resources a, Resources b) { return sum(ImmutableList.of(a, b)); } /** - * sum(rs) + * sum(rs). */ public static Resources sum(Iterable rs) { Resources sum = none(); http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/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 6411244..99ce7d1 100644 --- a/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java +++ b/src/main/java/org/apache/aurora/scheduler/cron/CrontabEntry.java @@ -193,7 +193,6 @@ public final class CrontabEntry { return getDayOfMonth().encloses(DAY_OF_MONTH); } - @VisibleForTesting boolean hasWildcardMonth() { return getMonth().encloses(MONTH); @@ -259,7 +258,7 @@ public final class CrontabEntry { /** * Returns a parsable string representation schedule such that - * c.equals(CrontabEntry.parse(c.toString()) + * {@code c.equals(CrontabEntry.parse(c.toString())}. */ @Override public String toString() { @@ -389,15 +388,18 @@ public final class CrontabEntry { return ImmutableRangeSet.of(enclosure); } - Matcher matcher; - if ((matcher = NUMBER.matcher(rawComponent)).matches()) { + Matcher matcher = NUMBER.matcher(rawComponent); + if (matcher.matches()) { int number = Integer.parseInt(matcher.group("number")); Range range = Range.singleton(number).canonical(DiscreteDomain.integers()); checkArgument(enclosure.encloses(range), enclosure + " does not enclose " + range); return ImmutableRangeSet.of(range); - } else if ((matcher = RANGE.matcher(rawComponent)).matches()) { + } + + matcher = RANGE.matcher(rawComponent); + if (matcher.matches()) { int lower = Integer.parseInt(matcher.group("lower")); int upper = Integer.parseInt(matcher.group("upper")); Range range = Range.closed(lower, upper).canonical(DiscreteDomain.integers()); @@ -405,7 +407,10 @@ public final class CrontabEntry { checkArgument(enclosure.encloses(range), enclosure + " does not enclose " + range); return ImmutableRangeSet.of(range); - } else if ((matcher = WILDCARD_WITH_SKIP.matcher(rawComponent)).matches()) { + } + + matcher = WILDCARD_WITH_SKIP.matcher(rawComponent); + if (matcher.matches()) { int skip = Integer.parseInt(matcher.group("skip")); int start = enclosure.lowerEndpoint(); @@ -416,7 +421,10 @@ public final class CrontabEntry { rangeSet.add(Range.singleton(i).canonical(DiscreteDomain.integers())); } return rangeSet.build(); - } else if ((matcher = RANGE_WITH_SKIP.matcher(rawComponent)).matches()) { + } + + matcher = RANGE_WITH_SKIP.matcher(rawComponent); + if (matcher.matches()) { final int lower = Integer.parseInt(matcher.group("lower")); final int upper = Integer.parseInt(matcher.group("upper")); final int skip = Integer.parseInt(matcher.group("skip")); @@ -431,10 +439,10 @@ public final class CrontabEntry { rangeSet.add(Range.singleton(i).canonical(DiscreteDomain.integers())); } return rangeSet.build(); - } else { - throw new IllegalArgumentException( - "Cron schedule component " + rawComponent + " does not match any known patterns."); } + + throw new IllegalArgumentException( + "Cron schedule component " + rawComponent + " does not match any known patterns."); } private RangeSet parseMinute() { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java index 155fdd1..b34210c 100644 --- a/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java +++ b/src/main/java/org/apache/aurora/scheduler/state/MaintenanceController.java @@ -146,7 +146,7 @@ public interface MaintenanceController { } /** - * Notifies the MaintenanceController that a task has changed state + * Notifies the MaintenanceController that a task has changed state. * * @param change Event */ http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java index fa52c33..8560bd1 100644 --- a/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java +++ b/src/main/java/org/apache/aurora/scheduler/state/SchedulerCoreImpl.java @@ -15,7 +15,6 @@ */ package org.apache.aurora.scheduler.state; - import java.util.Set; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java index 71b3880..88bd20d 100644 --- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java +++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java @@ -679,7 +679,6 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface { return okResponse(Result.getQuotaResult(result)); } - @Requires(whitelist = Capability.PROVISIONER) @Override public Response setQuota( http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java index bf1391e..c5ce965 100644 --- a/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/async/TaskSchedulerTest.java @@ -233,7 +233,6 @@ public class TaskSchedulerTest extends EasyMockTest { .setEnvironment("env-" + taskId)))); } - private IScheduledTask makeTask(String taskId, ScheduleStatus status) { return IScheduledTask.build(makeTask(taskId).newBuilder().setStatus(status)); } http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java b/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java index 05e80e8..8bf0ab4 100644 --- a/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/configuration/ConfigurationManagerTest.java @@ -78,7 +78,6 @@ public class ConfigurationManagerTest { .setRole("owner-role") .setUser("owner-user")); - @Test public void testIsGoodIdentifier() { for (String identifier : VALID_IDENTIFIERS) { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java index b4aeaf2..f84346d 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/TaskAssignerImplTest.java @@ -115,7 +115,6 @@ public class TaskAssignerImplTest extends EasyMockTest { assertEquals(Optional.of(TASK_INFO), assigner.maybeAssign(OFFER, TASK, emptyJob)); } - @Test public void testAssignVetoes() { expect(filter.filter( http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java index b985fbb..488df66 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java @@ -86,7 +86,6 @@ public class SnapshotStoreImplTest extends EasyMockTest { .setFrameworkId(frameworkId) .setVersion(CURRENT_API_VERSION); - storageUtil.expectOperations(); expect(storageUtil.taskStore.fetchTasks(Query.unscoped())).andReturn(tasks); expect(storageUtil.quotaStore.fetchQuotas()) http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b2070885/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java b/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java index 4ed655d..a9e5d89 100644 --- a/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java +++ b/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java @@ -755,7 +755,6 @@ public class SchedulerThriftInterfaceTest extends EasyMockTest { thrift.descheduleCronJob(CRON_JOB.getKey(), DEFAULT_LOCK, SESSION)); } - @Test public void testRewriteShardTaskMissing() throws Exception { InstanceKey instance = new InstanceKey(JobKeys.from("foo", "bar", "baz").newBuilder(), 0);