Repository: reef Updated Branches: refs/heads/master 7e2b1e0d5 -> 8ce74855e
[REEF-1150] Use `static` members properly by removing access by `instance` reference JIRA: [REEF-1150](https://issues.apache.org/jira/browse/REEF-1150) Pull Request: This closes #791 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/8ce74855 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/8ce74855 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/8ce74855 Branch: refs/heads/master Commit: 8ce74855e6de8f7e2565a1c9619c104fbcb303c8 Parents: 7e2b1e0 Author: Dongjoon Hyun <[email protected]> Authored: Mon Jan 25 11:29:44 2016 -0800 Committer: Andrew Chung <[email protected]> Committed: Mon Jan 25 13:13:07 2016 -0800 ---------------------------------------------------------------------- .../reef/javabridge/generic/JobClient.java | 2 +- .../reef/util/logging/LoggingScopeFactory.java | 48 ++++++++++---------- .../reef/io/network/naming/NamingTest.java | 8 ++-- .../formats/AvroConfigurationSerializer.java | 10 ++-- 4 files changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/8ce74855/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java index 4a2858a..f56156e 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java @@ -213,7 +213,7 @@ public class JobClient { final boolean local, final Configuration clientConfig) { try (final LoggingScope ls = this.loggingScopeFactory.driverSubmit(submitDriver)) { if (!local) { - this.driverConfiguration = Configurations.merge(this.driverConfiguration, this.getYarnConfiguration()); + this.driverConfiguration = Configurations.merge(this.driverConfiguration, getYarnConfiguration()); } try { http://git-wip-us.apache.org/repos/asf/reef/blob/8ce74855/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java index 5a31192..657b529 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java @@ -109,7 +109,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverStart(final StartTime startTime) { - return new LoggingScopeImpl(LOG, logLevel, DRIVER_START + " :" + startTime); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_START + ": " + startTime); } /** @@ -119,7 +119,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverStop(final long timeStamp) { - return new LoggingScopeImpl(LOG, logLevel, this.DRIVER_STOP + " :" + timeStamp); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_STOP + ": " + timeStamp); } /** @@ -155,7 +155,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope evaluatorRequestSubmitToJavaDriver(final int evaluatorsNumber) { - return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_BRIDGE_SUBMIT + ":" + evaluatorsNumber); + return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_BRIDGE_SUBMIT + ": " + evaluatorsNumber); } /** @@ -164,7 +164,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope evaluatorSubmit(final int evaluatorNumber) { - return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_SUBMIT + ":" + evaluatorNumber); + return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_SUBMIT + ": " + evaluatorNumber); } /** @@ -173,7 +173,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope evaluatorAllocated(final String evaluatorId) { - return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_ALLOCATED + " :" + evaluatorId); + return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_ALLOCATED + ": " + evaluatorId); } /** @@ -182,7 +182,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope evaluatorLaunch(final String evaluatorId) { - return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_LAUNCH + " :" + evaluatorId); + return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_LAUNCH + ": " + evaluatorId); } /** @@ -191,7 +191,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope evaluatorCompleted(final String evaluatorId) { - return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_COMPLETED + " :" + evaluatorId); + return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_COMPLETED + ": " + evaluatorId); } /** @@ -200,7 +200,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope evaluatorFailed(final String evaluatorId) { - return new LoggingScopeImpl(LOG, logLevel, this.EVALUATOR_FAILED + " :" + evaluatorId); + return new LoggingScopeImpl(LOG, logLevel, EVALUATOR_FAILED + ": " + evaluatorId); } /** @@ -209,7 +209,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope activeContextReceived(final String contextId) { - return new LoggingScopeImpl(LOG, logLevel, ACTIVE_CONTEXT + " :" + contextId); + return new LoggingScopeImpl(LOG, logLevel, ACTIVE_CONTEXT + ": " + contextId); } /** @@ -218,7 +218,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope closedContext(final String contextId) { - return new LoggingScopeImpl(LOG, logLevel, this.CONTEXT_CLOSE + " :" + contextId); + return new LoggingScopeImpl(LOG, logLevel, CONTEXT_CLOSE + ": " + contextId); } /** @@ -227,7 +227,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope taskRunning(final String taskId) { - return new LoggingScopeImpl(LOG, logLevel, TASK_RUNNING + " :" + taskId); + return new LoggingScopeImpl(LOG, logLevel, TASK_RUNNING + ": " + taskId); } /** @@ -236,7 +236,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope taskCompleted(final String taskId) { - return new LoggingScopeImpl(LOG, logLevel, TASK_COMPLETE + " :" + taskId); + return new LoggingScopeImpl(LOG, logLevel, TASK_COMPLETE + ": " + taskId); } /** @@ -245,7 +245,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope taskSuspended(final String taskId) { - return new LoggingScopeImpl(LOG, logLevel, TASK_SUSPEND + " :" + taskId); + return new LoggingScopeImpl(LOG, logLevel, TASK_SUSPEND + ": " + taskId); } /** @@ -254,7 +254,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope taskMessageReceived(final String msg) { - return new LoggingScopeImpl(LOG, logLevel, TASK_MESSAGE + " :" + msg); + return new LoggingScopeImpl(LOG, logLevel, TASK_MESSAGE + ": " + msg); } /** @@ -263,7 +263,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope contextMessageReceived(final String msg) { - return new LoggingScopeImpl(LOG, logLevel, CONTEXT_MESSAGE + " :" + msg); + return new LoggingScopeImpl(LOG, logLevel, CONTEXT_MESSAGE + ": " + msg); } /** @@ -272,7 +272,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverRestart(final StartTime startTime) { - return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART + " :" + startTime); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART + ": " + startTime); } /** @@ -281,7 +281,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverRestartCompleted(final long timeStamp) { - return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART_COMPLETE + " :" + timeStamp); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART_COMPLETE + ": " + timeStamp); } /** @@ -290,7 +290,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverRestartRunningTask(final String taskId) { - return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART_RUNNING_TASK + " :" + taskId); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART_RUNNING_TASK + ": " + taskId); } /** @@ -299,7 +299,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverRestartActiveContextReceived(final String contextId) { - return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART_ACTIVE_CONTEXT + " :" + contextId); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_RESTART_ACTIVE_CONTEXT + ": " + contextId); } /** @@ -308,7 +308,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope httpRequest(final String uri) { - return new LoggingScopeImpl(LOG, logLevel, this.HTTP_REQUEST + " :" + uri); + return new LoggingScopeImpl(LOG, logLevel, HTTP_REQUEST + ": " + uri); } /** @@ -316,7 +316,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope httpServer() { - return new LoggingScopeImpl(LOG, logLevel, this.HTTP_SERVER); + return new LoggingScopeImpl(LOG, logLevel, HTTP_SERVER); } /** @@ -325,7 +325,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope driverSubmit(final Boolean submitDriver) { - return new LoggingScopeImpl(LOG, logLevel, DRIVER_SUBMIT + " :" + submitDriver); + return new LoggingScopeImpl(LOG, logLevel, DRIVER_SUBMIT + ": " + submitDriver); } /** @@ -333,7 +333,7 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope reefSubmit() { - return new LoggingScopeImpl(LOG, logLevel, this.REEF_SUBMIT); + return new LoggingScopeImpl(LOG, logLevel, REEF_SUBMIT); } /** @@ -341,6 +341,6 @@ public final class LoggingScopeFactory { * @return */ public LoggingScope localJobSubmission() { - return new LoggingScopeImpl(LOG, logLevel, this.LOCAL_JOB_SUBMIT); + return new LoggingScopeImpl(LOG, logLevel, LOCAL_JOB_SUBMIT); } } http://git-wip-us.apache.org/repos/asf/reef/blob/8ce74855/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java index b3e4f54..2e6c66d 100644 --- a/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java +++ b/lang/java/reef-io/src/test/java/org/apache/reef/io/network/naming/NamingTest.java @@ -102,7 +102,7 @@ public class NamingTest { // run a client try (final NameLookupClient client = new NameLookupClient(localAddress, this.port, - 10000, this.factory, RETRY_COUNT, RETRY_TIMEOUT, new NameCache(this.TTL), this.localAddressProvider)) { + 10000, this.factory, RETRY_COUNT, RETRY_TIMEOUT, new NameCache(TTL), this.localAddressProvider)) { final Identifier id1 = this.factory.getNewInstance("task1"); final Identifier id2 = this.factory.getNewInstance("task2"); @@ -155,8 +155,8 @@ public class NamingTest { } // run a client - try (final NameLookupClient client = new NameLookupClient(localAddress, this.port, - 10000, this.factory, RETRY_COUNT, RETRY_TIMEOUT, new NameCache(this.TTL), this.localAddressProvider)) { + try (final NameLookupClient client = new NameLookupClient(localAddress, this.port, 10000, this.factory, + RETRY_COUNT, RETRY_TIMEOUT, new NameCache(TTL), this.localAddressProvider)) { final Identifier id1 = this.factory.getNewInstance("task1"); final Identifier id2 = this.factory.getNewInstance("task2"); @@ -311,7 +311,7 @@ public class NamingTest { final Configuration nameResolverConf = NameResolverConfiguration.CONF .set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, localAddress) .set(NameResolverConfiguration.NAME_SERVICE_PORT, this.port) - .set(NameResolverConfiguration.CACHE_TIMEOUT, this.TTL) + .set(NameResolverConfiguration.CACHE_TIMEOUT, TTL) .set(NameResolverConfiguration.RETRY_TIMEOUT, RETRY_TIMEOUT) .set(NameResolverConfiguration.RETRY_COUNT, RETRY_COUNT) .build(); http://git-wip-us.apache.org/repos/asf/reef/blob/8ce74855/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroConfigurationSerializer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroConfigurationSerializer.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroConfigurationSerializer.java index 05fed8b..010bbbb 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroConfigurationSerializer.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroConfigurationSerializer.java @@ -142,27 +142,27 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize final List<ConfigurationEntry> configurationEntries = new ArrayList<>(); for (final ClassNode<?> opt : configuration.getBoundImplementations()) { - configurationEntries.add(new ConfigurationEntry().newBuilder() + configurationEntries.add(ConfigurationEntry.newBuilder() .setKey(opt.getFullName()) .setValue(configuration.getBoundImplementation(opt).getFullName()) .build()); } for (final ClassNode<?> opt : configuration.getBoundConstructors()) { - configurationEntries.add(new ConfigurationEntry().newBuilder() + configurationEntries.add(ConfigurationEntry.newBuilder() .setKey(opt.getFullName()) .setValue(configuration.getBoundConstructor(opt).getFullName()) .build()); } for (final NamedParameterNode<?> opt : configuration.getNamedParameters()) { - configurationEntries.add(new ConfigurationEntry().newBuilder() + configurationEntries.add(ConfigurationEntry.newBuilder() .setKey(opt.getFullName()) .setValue(configuration.getNamedParameter(opt)) .build()); } for (final ClassNode<?> cn : configuration.getLegacyConstructors()) { final String legacyConstructors = StringUtils.join(configuration.getLegacyConstructor(cn).getArgs(), "-"); - configurationEntries.add(new ConfigurationEntry().newBuilder() + configurationEntries.add(ConfigurationEntry.newBuilder() .setKey(cn.getFullName()) .setValue("" + ConfigurationBuilderImpl.INIT + "(" + legacyConstructors + ")") .build()); @@ -177,7 +177,7 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize } else { throw new IllegalStateException(); } - configurationEntries.add(new ConfigurationEntry().newBuilder() + configurationEntries.add(ConfigurationEntry.newBuilder() .setKey(key.getFullName()) .setValue(val) .build());
