Repository: aurora Updated Branches: refs/heads/master d884680ad -> 8cf446592
Upgrade to gradle 2.7 and checkstyle 6.11.2. Reviewed at https://reviews.apache.org/r/39095/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/8cf44659 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/8cf44659 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/8cf44659 Branch: refs/heads/master Commit: 8cf446592a79512b86b6bbea7a4982209070e907 Parents: d884680 Author: Bill Farner <[email protected]> Authored: Wed Oct 7 10:09:43 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Wed Oct 7 10:09:43 2015 -0700 ---------------------------------------------------------------------- build.gradle | 2 +- buildSrc/gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/org/apache/aurora/scheduler/Resources.java | 2 +- .../java/org/apache/aurora/scheduler/log/mesos/MesosLog.java | 2 +- .../org/apache/aurora/scheduler/quota/QuotaCheckResult.java | 6 +++--- src/main/java/org/apache/aurora/scheduler/spi/Permissions.java | 2 +- .../org/apache/aurora/scheduler/state/TaskStateMachine.java | 4 ++-- .../org/apache/aurora/scheduler/stats/SlotSizeCounter.java | 2 +- .../org/apache/aurora/scheduler/storage/db/LockKeyMapper.java | 2 +- .../aurora/scheduler/thrift/SchedulerThriftInterface.java | 4 ++-- .../org/apache/aurora/scheduler/updater/InstanceAction.java | 2 +- .../aurora/scheduler/http/api/security/ModuleParserTest.java | 2 +- .../apache/aurora/scheduler/storage/log/LogManagerTest.java | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 0401a9c..6c7644e 100644 --- a/build.gradle +++ b/build.gradle @@ -394,7 +394,7 @@ codeQualityTasks.each { checkstyle { sourceSets = [sourceSets.main , sourceSets.test, sourceSets.jmh] - toolVersion = '6.7' + toolVersion = '6.11.2' } tasks.withType(FindBugs) { http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/buildSrc/gradle.properties ---------------------------------------------------------------------- diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index bbfdeb2..9e3f26f 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1 +1 @@ -GRADLE_VERSION = 2.6 +GRADLE_VERSION = 2.7 http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6475df2..7eedd25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/Resources.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/Resources.java b/src/main/java/org/apache/aurora/scheduler/Resources.java index 712876e..f7d105e 100644 --- a/src/main/java/org/apache/aurora/scheduler/Resources.java +++ b/src/main/java/org/apache/aurora/scheduler/Resources.java @@ -170,7 +170,7 @@ public final class Resources { * Thrown when there are insufficient resources to satisfy a request. */ static class InsufficientResourcesException extends RuntimeException { - public InsufficientResourcesException(String message) { + InsufficientResourcesException(String message) { super(message); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java index 9726a09..4afd077 100644 --- a/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java +++ b/src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLog.java @@ -402,7 +402,7 @@ public class MesosLog implements org.apache.aurora.scheduler.log.Log { private static class LogEntry implements org.apache.aurora.scheduler.log.Log.Entry { private final Log.Entry underlying; - public LogEntry(Log.Entry entry) { + LogEntry(Log.Entry entry) { this.underlying = entry; } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java index cf1b919..3437c65 100644 --- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java +++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaCheckResult.java @@ -28,7 +28,7 @@ public class QuotaCheckResult { /** * Quota check result. */ - public static enum Result { + public enum Result { /** * There is sufficient quota for the requested operation. */ @@ -40,13 +40,13 @@ public class QuotaCheckResult { INSUFFICIENT_QUOTA } - private static enum Resource { + enum Resource { CPU("core(s)"), RAM("MB"), DISK("MB"); private final String unit; - private Resource(String unit) { + Resource(String unit) { this.unit = unit; } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/spi/Permissions.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/spi/Permissions.java b/src/main/java/org/apache/aurora/scheduler/spi/Permissions.java index c2919ab..843621c 100644 --- a/src/main/java/org/apache/aurora/scheduler/spi/Permissions.java +++ b/src/main/java/org/apache/aurora/scheduler/spi/Permissions.java @@ -55,7 +55,7 @@ public final class Permissions { /** * Domain of a permitted RPC (the first part of a {@link WildcardPermission}). */ - public static enum Domain { + public enum Domain { /** * RPCs on the {@link org.apache.aurora.gen.AuroraSchedulerManager} service. */ http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java index 1be533b..3709c77 100644 --- a/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java +++ b/src/main/java/org/apache/aurora/scheduler/state/TaskStateMachine.java @@ -143,7 +143,7 @@ class TaskStateMachine { * * @param name Name of the state machine, for logging. */ - public TaskStateMachine(String name) { + TaskStateMachine(String name) { this(name, Optional.absent()); } @@ -153,7 +153,7 @@ class TaskStateMachine { *. * @param task Read-only task that this state machine manages. */ - public TaskStateMachine(IScheduledTask task) { + TaskStateMachine(IScheduledTask task) { this(Tasks.id(task), Optional.of(task)); } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java b/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java index e7be8e2..ced6b67 100644 --- a/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java +++ b/src/main/java/org/apache/aurora/scheduler/stats/SlotSizeCounter.java @@ -69,7 +69,7 @@ class SlotSizeCounter implements Runnable { private final boolean dedicated; private final boolean revocable; - public MachineResource(IResourceAggregate size, boolean dedicated, boolean revocable) { + MachineResource(IResourceAggregate size, boolean dedicated, boolean revocable) { this.size = requireNonNull(size); this.dedicated = dedicated; this.revocable = revocable; http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java b/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java index 8f1ee7d..9760674 100644 --- a/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java +++ b/src/main/java/org/apache/aurora/scheduler/storage/db/LockKeyMapper.java @@ -35,7 +35,7 @@ class LockKeyMapper { private final JobKeyMapper jobKeyMapper; @Inject - public LockKeyMapper(JobKeyMapper jobKeyMapper) { + LockKeyMapper(JobKeyMapper jobKeyMapper) { this.jobKeyMapper = requireNonNull(jobKeyMapper); } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/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 14b5a00..fd07365 100644 --- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java +++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java @@ -298,7 +298,7 @@ class SchedulerThriftInterface implements AnnotatedAuroraAdmin { } private static class JobExistsException extends Exception { - public JobExistsException(String message) { + JobExistsException(String message) { super(message); } } @@ -1040,7 +1040,7 @@ class SchedulerThriftInterface implements AnnotatedAuroraAdmin { } private static class TaskValidationException extends Exception { - public TaskValidationException(String message) { + TaskValidationException(String message) { super(message); } } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java b/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java index a329b07..b4cd01b 100644 --- a/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java +++ b/src/main/java/org/apache/aurora/scheduler/updater/InstanceAction.java @@ -30,7 +30,7 @@ enum InstanceAction { private final Optional<InstanceActionHandler> handler; - private InstanceAction(Optional<InstanceActionHandler> handler) { + InstanceAction(Optional<InstanceActionHandler> handler) { this.handler = handler; } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/test/java/org/apache/aurora/scheduler/http/api/security/ModuleParserTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/api/security/ModuleParserTest.java b/src/test/java/org/apache/aurora/scheduler/http/api/security/ModuleParserTest.java index 9ad9012..42eec12 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/api/security/ModuleParserTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/api/security/ModuleParserTest.java @@ -20,7 +20,7 @@ import org.junit.Test; public class ModuleParserTest { static class NoOpModule implements Module { - public NoOpModule() { + NoOpModule() { // No-op. } http://git-wip-us.apache.org/repos/asf/aurora/blob/8cf44659/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java index 2bca8bf..36900a8 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java @@ -294,7 +294,7 @@ public class LogManagerTest extends EasyMockTest { private final LogEntry header; private final ImmutableList<LogEntry> chunks; - public Message(Amount<Integer, Data> chunkSize, Frame header, Iterable<Frame> chunks) { + Message(Amount<Integer, Data> chunkSize, Frame header, Iterable<Frame> chunks) { this.chunkSize = chunkSize; this.header = LogEntry.frame(header); this.chunks = ImmutableList.copyOf(Iterables.transform(chunks,
