http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java index 4a2cf18..0ea4a06 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ApplicationSubmission.java @@ -67,7 +67,7 @@ public final class ApplicationSubmission { return applicationId; } - public ApplicationSubmission setApplicationId(String applicationId) { + public ApplicationSubmission setApplicationId(final String applicationId) { this.applicationId = applicationId; return this; } @@ -77,7 +77,7 @@ public final class ApplicationSubmission { return applicationName; } - public ApplicationSubmission setApplicationName(String applicationName) { + public ApplicationSubmission setApplicationName(final String applicationName) { this.applicationName = applicationName; return this; } @@ -87,7 +87,7 @@ public final class ApplicationSubmission { return applicationType; } - public ApplicationSubmission setApplicationType(String applicationType) { + public ApplicationSubmission setApplicationType(final String applicationType) { this.applicationType = applicationType; return this; } @@ -97,7 +97,7 @@ public final class ApplicationSubmission { return amContainerSpec; } - public ApplicationSubmission setAmContainerSpec(AmContainerSpec amContainerSpec) { + public ApplicationSubmission setAmContainerSpec(final AmContainerSpec amContainerSpec) { this.amContainerSpec = amContainerSpec; return this; } @@ -108,7 +108,7 @@ public final class ApplicationSubmission { } @SuppressWarnings("checkstyle:hiddenfield") - public ApplicationSubmission setUnmanagedAM(boolean isUnmanagedAM) { + public ApplicationSubmission setUnmanagedAM(final boolean isUnmanagedAM) { this.isUnmanagedAM = isUnmanagedAM; return this; } @@ -118,7 +118,7 @@ public final class ApplicationSubmission { return keepContainers; } - public ApplicationSubmission setKeepContainers(boolean keepContainers) { + public ApplicationSubmission setKeepContainers(final boolean keepContainers) { this.keepContainers = keepContainers; return this; } @@ -128,7 +128,7 @@ public final class ApplicationSubmission { return maxAppAttempts; } - public ApplicationSubmission setMaxAppAttempts(int maxAppAttempts) { + public ApplicationSubmission setMaxAppAttempts(final int maxAppAttempts) { this.maxAppAttempts = maxAppAttempts; return this; } @@ -138,7 +138,7 @@ public final class ApplicationSubmission { return priority; } - public ApplicationSubmission setPriority(int priority) { + public ApplicationSubmission setPriority(final int priority) { this.priority = priority; return this; } @@ -148,7 +148,7 @@ public final class ApplicationSubmission { return queue; } - public ApplicationSubmission setQueue(String queue) { + public ApplicationSubmission setQueue(final String queue) { this.queue = queue; return this; } @@ -158,12 +158,12 @@ public final class ApplicationSubmission { return resource; } - public ApplicationSubmission setResource(Resource resource) { + public ApplicationSubmission setResource(final Resource resource) { this.resource = resource; return this; } - public ApplicationSubmission addApplicationTag(String tag) { + public ApplicationSubmission addApplicationTag(final String tag) { this.applicationTags.add(tag); return this; } @@ -181,12 +181,12 @@ public final class ApplicationSubmission { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; }
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java index 0dec2b4..e250ba7 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java @@ -52,12 +52,12 @@ public final class Commands { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java index 32d4bcd..3962670 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java @@ -47,7 +47,7 @@ public class Credentials { this.secrets.put(Constants.ENTRY, new ArrayList<StringEntry>()); } - public Credentials addSecret(String key, String value) { + public Credentials addSecret(final String key, final String value) { if (!this.secrets.containsKey(Constants.ENTRY)) { this.secrets.put(Constants.ENTRY, new ArrayList<StringEntry>()); } @@ -55,7 +55,7 @@ public class Credentials { return this; } - public Credentials addToken(String key, String value) { + public Credentials addToken(final String key, final String value) { if (!this.tokens.containsKey(Constants.ENTRY)) { this.tokens.put(Constants.ENTRY, new ArrayList<StringEntry>()); } @@ -87,12 +87,12 @@ public class Credentials { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ListApplicationResponse.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ListApplicationResponse.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ListApplicationResponse.java index bd9f722..2e853f0 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ListApplicationResponse.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/ListApplicationResponse.java @@ -59,12 +59,12 @@ public final class ListApplicationResponse { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResource.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResource.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResource.java index 5b19c7c..30ca19f 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResource.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResource.java @@ -99,12 +99,12 @@ public final class LocalResource { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResourcesEntry.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResourcesEntry.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResourcesEntry.java index 1564bd1..c980a9d 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResourcesEntry.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/LocalResourcesEntry.java @@ -66,12 +66,12 @@ public final class LocalResourcesEntry { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Resource.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Resource.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Resource.java index 7ab98be..92c7dc2 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Resource.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Resource.java @@ -58,12 +58,12 @@ public final class Resource { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java index 994496b..2fa7b91 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/StringEntry.java @@ -62,12 +62,12 @@ public final class StringEntry { @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; + final StringWriter writer = new StringWriter(); + final String objectString; try { OBJECT_MAPPER.writeValue(writer, this); objectString = writer.toString(); - } catch (IOException e) { + } catch (final IOException e) { return null; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java b/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java index 8dc37c4..3bd776d 100644 --- a/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java +++ b/lang/java/reef-runtime-hdinsight/src/test/java/org/apache/reef/runtime/hdinsight/TestHDInsightRESTJsonSerialization.java @@ -45,18 +45,18 @@ public final class TestHDInsightRESTJsonSerialization { final String fileKey = "file"; // Create submission object - LocalResource archiveResource = new LocalResource() + final LocalResource archiveResource = new LocalResource() .setResource("archiveResourceLocation").setSize(100).setTimestamp(200) .setType(LocalResource.TYPE_ARCHIVE).setVisibility(LocalResource.VISIBILITY_PRIVATE); localResourceMap.put(archiveKey, archiveResource); - LocalResource fileResource = new LocalResource() + final LocalResource fileResource = new LocalResource() .setResource("fileResourceLocation").setSize(300).setTimestamp(400) .setType(LocalResource.TYPE_FILE).setVisibility(LocalResource.VISIBILITY_APPLICATION); localResourceMap.put(fileKey, fileResource); - Credentials creds = new Credentials().addSecret("secretKey", "secretVal").addToken("tokKey", "tokVal"); - AmContainerSpec containerSpec = new AmContainerSpec() + final Credentials creds = new Credentials().addSecret("secretKey", "secretVal").addToken("tokKey", "tokVal"); + final AmContainerSpec containerSpec = new AmContainerSpec() .setCommand("submission command") .addLocalResource(archiveKey, archiveResource) .addLocalResource(fileKey, fileResource) @@ -64,8 +64,8 @@ public final class TestHDInsightRESTJsonSerialization { .addApplicationAcl("aclKey", "aclVal") .addServiceData("sdKey", "sdVal") .setCredentials(creds); - Resource resource = new Resource().setMemory(500).setvCores(600); - ApplicationSubmission submission = new ApplicationSubmission() + final Resource resource = new Resource().setMemory(500).setvCores(600); + final ApplicationSubmission submission = new ApplicationSubmission() .setApplicationType(ApplicationSubmission.DEFAULT_APPLICATION_TYPE) .setMaxAppAttempts(ApplicationSubmission.DEFAULT_MAX_APP_ATTEMPTS) .setKeepContainers(ApplicationSubmission.DEFAULT_KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS) @@ -76,11 +76,11 @@ public final class TestHDInsightRESTJsonSerialization { .setResource(resource); // Json validation - ObjectMapper mapper = new ObjectMapper(); - StringWriter writer = new StringWriter(); + final ObjectMapper mapper = new ObjectMapper(); + final StringWriter writer = new StringWriter(); mapper.writeValue(writer, submission); - String jsonStr = writer.toString(); - JsonNode rootJsonNode = mapper.readTree(jsonStr); + final String jsonStr = writer.toString(); + final JsonNode rootJsonNode = mapper.readTree(jsonStr); Assert.assertEquals(rootJsonNode.get(Constants.APPLICATION_ID).asText(), submission.getApplicationId()); Assert.assertEquals(rootJsonNode.get(Constants.APPLICATION_NAME).asText(), submission.getApplicationName()); Assert.assertEquals(rootJsonNode.get(Constants.MAX_APP_ATTEMPTS).asInt(), submission.getMaxAppAttempts()); @@ -90,22 +90,22 @@ public final class TestHDInsightRESTJsonSerialization { Assert.assertEquals(rootJsonNode.get(Constants.PRIORITY).asInt(), submission.getPriority()); Assert.assertEquals(rootJsonNode.get(Constants.UNMANAGED_AM).asBoolean(), submission.isUnmanagedAM()); - JsonNode resourceNode = rootJsonNode.get(Constants.RESOURCE); + final JsonNode resourceNode = rootJsonNode.get(Constants.RESOURCE); Assert.assertNotNull(resourceNode); Assert.assertEquals(resourceNode.get(Constants.MEMORY).asInt(), resource.getMemory()); Assert.assertEquals(resourceNode.get(Constants.VCORES).asInt(), resource.getvCores()); - JsonNode amSpecNode = rootJsonNode.get(Constants.AM_CONTAINER_SPEC); + final JsonNode amSpecNode = rootJsonNode.get(Constants.AM_CONTAINER_SPEC); Assert.assertNotNull(amSpecNode); Assert.assertEquals(amSpecNode.get(Constants.COMMANDS).get(Constants.COMMAND).asText(), containerSpec.getCommands().getCommand()); - JsonNode locResourcesNode = amSpecNode.get(Constants.LOCAL_RESOURCES).get(Constants.ENTRY); + final JsonNode locResourcesNode = amSpecNode.get(Constants.LOCAL_RESOURCES).get(Constants.ENTRY); Assert.assertTrue(locResourcesNode.isArray()); for (final JsonNode localResourceKVNode : locResourcesNode) { - String localResourceKey = localResourceKVNode.get(Constants.KEY).asText(); + final String localResourceKey = localResourceKVNode.get(Constants.KEY).asText(); Assert.assertTrue(localResourceMap.containsKey(localResourceKey)); - LocalResource localResourceFromMap = localResourceMap.get(localResourceKey); - JsonNode localResourceNode = localResourceKVNode.get(Constants.VALUE); + final LocalResource localResourceFromMap = localResourceMap.get(localResourceKey); + final JsonNode localResourceNode = localResourceKVNode.get(Constants.VALUE); Assert.assertEquals(localResourceNode.get(Constants.RESOURCE).asText(), localResourceFromMap.getResource()); Assert.assertEquals(localResourceNode.get(Constants.SIZE).asLong(), localResourceFromMap.getSize()); Assert.assertEquals(localResourceNode.get(Constants.TIMESTAMP).asLong(), localResourceFromMap.getTimestamp()); @@ -116,48 +116,48 @@ public final class TestHDInsightRESTJsonSerialization { Assert.assertTrue(localResourceMap.isEmpty()); - JsonNode credsNode = amSpecNode.get(Constants.CREDENTIALS); + final JsonNode credsNode = amSpecNode.get(Constants.CREDENTIALS); Assert.assertNotNull(credsNode); - JsonNode toksNode = credsNode.get(Constants.TOKENS).get(Constants.ENTRY); + final JsonNode toksNode = credsNode.get(Constants.TOKENS).get(Constants.ENTRY); Assert.assertNotNull(toksNode); Assert.assertTrue(toksNode.isArray()); for (final JsonNode tokKVNode : toksNode) { - StringEntry tokenEntry = containerSpec.getCredentials().getTokens().get(Constants.ENTRY).get(0); + final StringEntry tokenEntry = containerSpec.getCredentials().getTokens().get(Constants.ENTRY).get(0); Assert.assertEquals(tokKVNode.get(Constants.KEY).asText(), tokenEntry.getKey()); Assert.assertEquals(tokKVNode.get(Constants.VALUE).asText(), tokenEntry.getValue()); } - JsonNode secretsNode = credsNode.get(Constants.SECRETS).get(Constants.ENTRY); + final JsonNode secretsNode = credsNode.get(Constants.SECRETS).get(Constants.ENTRY); Assert.assertNotNull(secretsNode); Assert.assertTrue(secretsNode.isArray()); for (final JsonNode secretsKVNode : secretsNode) { - StringEntry secretsEntry = containerSpec.getCredentials().getSecrets().get(Constants.ENTRY).get(0); + final StringEntry secretsEntry = containerSpec.getCredentials().getSecrets().get(Constants.ENTRY).get(0); Assert.assertEquals(secretsKVNode.get(Constants.KEY).asText(), secretsEntry.getKey()); Assert.assertEquals(secretsKVNode.get(Constants.VALUE).asText(), secretsEntry.getValue()); } - JsonNode envsNode = amSpecNode.get(Constants.ENVIRONMENT).get(Constants.ENTRY); + final JsonNode envsNode = amSpecNode.get(Constants.ENVIRONMENT).get(Constants.ENTRY); Assert.assertNotNull(envsNode); Assert.assertTrue(envsNode.isArray()); for (final JsonNode envsKVNode : envsNode) { - StringEntry envEntry = containerSpec.getEnvironment().get(Constants.ENTRY).get(0); + final StringEntry envEntry = containerSpec.getEnvironment().get(Constants.ENTRY).get(0); Assert.assertEquals(envsKVNode.get(Constants.KEY).asText(), envEntry.getKey()); Assert.assertEquals(envsKVNode.get(Constants.VALUE).asText(), envEntry.getValue()); } - JsonNode aclsNode = amSpecNode.get(Constants.APPLICATION_ACLS).get(Constants.ENTRY); + final JsonNode aclsNode = amSpecNode.get(Constants.APPLICATION_ACLS).get(Constants.ENTRY); Assert.assertNotNull(aclsNode); Assert.assertTrue(aclsNode.isArray()); for (final JsonNode aclsKVNode : aclsNode) { - StringEntry aclsEntry = containerSpec.getApplicationAcls().get(Constants.ENTRY).get(0); + final StringEntry aclsEntry = containerSpec.getApplicationAcls().get(Constants.ENTRY).get(0); Assert.assertEquals(aclsKVNode.get(Constants.KEY).asText(), aclsEntry.getKey()); Assert.assertEquals(aclsKVNode.get(Constants.VALUE).asText(), aclsEntry.getValue()); } - JsonNode sdatasNode = amSpecNode.get(Constants.SERVICE_DATA).get(Constants.ENTRY); + final JsonNode sdatasNode = amSpecNode.get(Constants.SERVICE_DATA).get(Constants.ENTRY); Assert.assertNotNull(sdatasNode); Assert.assertTrue(sdatasNode.isArray()); for (final JsonNode sdataKVNode : sdatasNode) { - StringEntry sdataEntry = containerSpec.getServiceData().get(Constants.ENTRY).get(0); + final StringEntry sdataEntry = containerSpec.getServiceData().get(Constants.ENTRY).get(0); Assert.assertEquals(sdataKVNode.get(Constants.KEY).asText(), sdataEntry.getKey()); Assert.assertEquals(sdataKVNode.get(Constants.VALUE).asText(), sdataEntry.getValue()); } @@ -178,7 +178,7 @@ public final class TestHDInsightRESTJsonSerialization { " }\n" + "}"; - ApplicationID appId = new ObjectMapper().readValue(getAppIdBody, ApplicationID.class); + final ApplicationID appId = new ObjectMapper().readValue(getAppIdBody, ApplicationID.class); Assert.assertEquals(appId.getApplicationId(), appIdStr); Assert.assertEquals(appId.getResource().getMemory(), memory); Assert.assertEquals(appId.getResource().getvCores(), vCores); @@ -232,8 +232,8 @@ public final class TestHDInsightRESTJsonSerialization { " }" + "}"; - ApplicationResponse appResponse = new ObjectMapper().readValue(getAppBody, ApplicationResponse.class); - ApplicationState appState = appResponse.getApplicationState(); + final ApplicationResponse appResponse = new ObjectMapper().readValue(getAppBody, ApplicationResponse.class); + final ApplicationState appState = appResponse.getApplicationState(); Assert.assertEquals(appState.getFinishedTime(), finishedTime); Assert.assertEquals(appState.getAmContainerLogs(), amContainerLogs); Assert.assertEquals(appState.getTrackingUI(), trackingUI); @@ -316,11 +316,11 @@ public final class TestHDInsightRESTJsonSerialization { " }\n" + "}"; - ListApplicationResponse listAppsResponse = + final ListApplicationResponse listAppsResponse = new ObjectMapper().readValue(listAppsBody, ListApplicationResponse.class); Assert.assertTrue(listAppsResponse.getApps().containsKey(Constants.APP)); Assert.assertEquals(listAppsResponse.getApplicationStates().size(), 2); - for (ApplicationState state : listAppsResponse.getApplicationStates()) { + for (final ApplicationState state : listAppsResponse.getApplicationStates()) { Assert.assertNotNull(state); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java index 9cc6523..2f0c691 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/PreparedDriverFolderLauncher.java @@ -53,7 +53,8 @@ public class PreparedDriverFolderLauncher { private static final Logger LOG = Logger.getLogger(PreparedDriverFolderLauncher.class.getName()); @Inject - PreparedDriverFolderLauncher(final ExecutorService executor, REEFFileNames fileNames, ClasspathProvider classpath) { + PreparedDriverFolderLauncher(final ExecutorService executor, final REEFFileNames fileNames, + final ClasspathProvider classpath) { this.executor = executor; this.fileNames = fileNames; this.classpath = classpath; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java index e32b18f..614582a 100644 --- a/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java +++ b/lang/java/reef-runtime-local/src/test/java/org/apache/reef/runtime/local/driver/ResourceManagerTest.java @@ -74,7 +74,7 @@ public class ResourceManagerTest { @SuppressWarnings("unchecked") @Before public void setUp() throws InjectionException { - JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); + final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindNamedParameter(RootFolder.class, "target/REEF_LOCAL_RUNTIME"); injector = Tang.Factory.getTang().newInjector(cb.build()); remoteManager = injector.getInstance(RemoteManager.class); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java index 15fbc06..7401f90 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/client/MesosJobSubmissionHandler.java @@ -133,7 +133,7 @@ final class MesosJobSubmissionHandler implements JobSubmissionHandler { .redirectError(errFile) .redirectOutput(outFile) .start(); - } catch (IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java index 3a13a65..0ddba98 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/MesosResourceLaunchHandler.java @@ -105,7 +105,7 @@ final class MesosResourceLaunchHandler implements ResourceLaunchHandler { this.executors.launchEvaluator( new EvaluatorLaunch(resourceLaunchEvent.getIdentifier(), StringUtils.join(command, ' '))); - } catch (IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java index 4874468..a363e6a 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java @@ -282,7 +282,7 @@ final class REEFScheduler implements Scheduler { this.mesosMaster.stop(); try { this.schedulerDriverEStage.close(); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException(e); } } @@ -413,7 +413,7 @@ final class REEFScheduler implements Scheduler { this.mesosMaster.stop(); try { this.schedulerDriverEStage.close(); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException(e); } @@ -503,7 +503,7 @@ final class REEFScheduler implements Scheduler { fileSystem.copyFromLocalFile(src, dst); return reefTarUriValue; - } catch (IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java index a4e3412..eda421f 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnJobSubmissionHandler.java @@ -70,7 +70,7 @@ final class YarnJobSubmissionHandler implements JobSubmissionHandler { final ClasspathProvider classpath, final JobUploader uploader, @Parameter(JVMHeapSlack.class) final double jvmSlack, - @Parameter(JobQueue.class) String defaultQueueName) throws IOException { + @Parameter(JobQueue.class) final String defaultQueueName) throws IOException { this.yarnConfiguration = yarnConfiguration; this.jobJarMaker = jobJarMaker; @@ -162,7 +162,7 @@ final class YarnJobSubmissionHandler implements JobSubmissionHandler { try { return Optional.ofNullable(Tang.Factory.getTang().newInjector(configuration) .getNamedInstance(DriverJobSubmissionDirectory.class)); - } catch (InjectionException ex) { + } catch (final InjectionException ex) { return Optional.empty(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobUploader.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobUploader.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobUploader.java index 98edbf5..299be70 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobUploader.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/uploader/JobUploader.java @@ -39,7 +39,7 @@ public final class JobUploader { @Inject JobUploader(final YarnConfiguration yarnConfiguration, - JobSubmissionDirectoryProvider jobSubmissionDirectoryProvider) throws IOException { + final JobSubmissionDirectoryProvider jobSubmissionDirectoryProvider) throws IOException { this.jobSubmissionDirectoryProvider = jobSubmissionDirectoryProvider; this.fileSystem = FileSystem.get(yarnConfiguration); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java index 435ee2b..00f26b6 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/EvaluatorSetupHelper.java @@ -79,7 +79,7 @@ final class EvaluatorSetupHelper { Map<String, LocalResource> getGlobalResources() { try { return this.globalJarUploader.call(); - } catch (IOException e) { + } catch (final IOException e) { throw new RuntimeException("Unable to upload the global JAR file to the job folder.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/GlobalJarUploader.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/GlobalJarUploader.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/GlobalJarUploader.java index 2c522e0..58be664 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/GlobalJarUploader.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/GlobalJarUploader.java @@ -89,7 +89,7 @@ final class GlobalJarUploader implements Callable<Map<String, LocalResource>> { this.isUploaded = true; } - LocalResource updatedGlobalJarResource = this.uploader.makeLocalResourceForJarFile(this.pathToGlobalJar); + final LocalResource updatedGlobalJarResource = this.uploader.makeLocalResourceForJarFile(this.pathToGlobalJar); if (this.globalJarResource != null && this.globalJarResource.getTimestamp() != updatedGlobalJarResource.getTimestamp()) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/JobSubmissionDirectoryProviderImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/JobSubmissionDirectoryProviderImpl.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/JobSubmissionDirectoryProviderImpl.java index e2391c6..056bccb 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/JobSubmissionDirectoryProviderImpl.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/JobSubmissionDirectoryProviderImpl.java @@ -44,7 +44,7 @@ public final class JobSubmissionDirectoryProviderImpl implements JobSubmissionDi } @Override - public Path getJobSubmissionDirectoryPath(String applicationId) { + public Path getJobSubmissionDirectoryPath(final String applicationId) { return new Path(this.jobSubmissionDirectory + "/" + new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss_").format(Calendar.getInstance().getTime()) + http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java index 6034086..5a8eac1 100644 --- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java +++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnContainerManager.java @@ -490,7 +490,7 @@ final class YarnContainerManager } } - private boolean isSameKindOfRequest(AMRMClient.ContainerRequest r1, AMRMClient.ContainerRequest r2) { + private boolean isSameKindOfRequest(final AMRMClient.ContainerRequest r1, final AMRMClient.ContainerRequest r2) { return r1.getPriority().compareTo(r2.getPriority()) == 0 && r1.getCapability().compareTo(r2.getCapability()) == 0 && r1.getRelaxLocality() == r2.getRelaxLocality() @@ -503,7 +503,7 @@ final class YarnContainerManager * We take into consideration that RM has some freedom in rounding * up the allocation and in placing containers on other machines. */ - private boolean matchContainerWithPendingRequest(Container container) { + private boolean matchContainerWithPendingRequest(final Container container) { if (this.requestsAfterSentToRM.isEmpty()) { return false; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java index f576791..4f72170 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/InjectionFuture.java @@ -78,20 +78,20 @@ public final class InjectionFuture<T> implements Future<T> { instance = null; } - public InjectionFuture(final Injector injector, Class<? extends T> iface) { + public InjectionFuture(final Injector injector, final Class<? extends T> iface) { this.injector = (InjectorImpl) injector; this.iface = iface; this.instance = null; } - public InjectionFuture(T instance) { + public InjectionFuture(final T instance) { this.injector = null; this.iface = null; this.instance = instance; } @Override - public boolean cancel(boolean mayInterruptIfRunning) { + public boolean cancel(final boolean mayInterruptIfRunning) { return false; } @@ -119,19 +119,19 @@ public final class InjectionFuture<T> implements Future<T> { } else { t = injector.getInstance(iface); } - Aspect a = injector.getAspect(); + final Aspect a = injector.getAspect(); if (a != null) { a.injectionFutureInstantiated(this, t); } return t; } - } catch (InjectionException e) { + } catch (final InjectionException e) { throw new RuntimeException(e); } } @Override - public T get(long timeout, TimeUnit unit) { + public T get(final long timeout, final TimeUnit unit) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/Timer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/Timer.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/Timer.java index b4103fc..7cfcc4b 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/Timer.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/Timer.java @@ -35,28 +35,28 @@ public class Timer { private final int seconds; @Inject - public Timer(@Parameter(Seconds.class) int seconds) { + public Timer(@Parameter(Seconds.class) final int seconds) { if (seconds < 0) { throw new IllegalArgumentException("Cannot sleep for negative time!"); } this.seconds = seconds; } - public static void main(String[] args) throws Exception { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); - CommandLine cl = new CommandLine(cb); + public static void main(final String[] args) throws Exception { + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = tang.newConfigurationBuilder(); + final CommandLine cl = new CommandLine(cb); cl.registerShortNameOfClass(Timer.Seconds.class); cl.processCommandLine(args); - Configuration conf = cb.build(); + final Configuration conf = cb.build(); System.out.println("start conf"); System.out.println(ConfigurationFile.toConfigurationString(conf)); System.out.println("end conf"); - InjectorImpl injector = (InjectorImpl) tang.newInjector(conf); - InjectionPlan<Timer> ip = injector.getInjectionPlan(Timer.class); + final InjectorImpl injector = (InjectorImpl) tang.newInjector(conf); + final InjectionPlan<Timer> ip = injector.getInjectionPlan(Timer.class); System.out.println(ip.toPrettyString()); System.out.println("Number of plans:" + ip.getNumAlternatives()); - Timer timer = injector.getInstance(Timer.class); + final Timer timer = injector.getInstance(Timer.class); System.out.println("Tick..."); timer.sleep(); System.out.println("Tock."); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/TimerV1.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/TimerV1.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/TimerV1.java index d5f428b..ff671a6 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/TimerV1.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/TimerV1.java @@ -35,22 +35,22 @@ public class TimerV1 { private final int seconds; @Inject - public TimerV1(@Parameter(Seconds.class) int seconds) { + public TimerV1(@Parameter(Seconds.class) final int seconds) { this.seconds = seconds; } - public static void main(String[] args) throws BindException, InjectionException { - Tang tang = Tang.Factory.getTang(); - JavaConfigurationBuilder cb = (JavaConfigurationBuilder) tang.newConfigurationBuilder(); - Configuration conf = cb.build(); - Injector injector = tang.newInjector(conf); - TimerV1 timer = injector.getInstance(TimerV1.class); + public static void main(final String[] args) throws BindException, InjectionException { + final Tang tang = Tang.Factory.getTang(); + final JavaConfigurationBuilder cb = (JavaConfigurationBuilder) tang.newConfigurationBuilder(); + final Configuration conf = cb.build(); + final Injector injector = tang.newInjector(conf); + final TimerV1 timer = injector.getInstance(TimerV1.class); try { System.out.println("Tick..."); timer.sleep(); System.out.println("Tock."); - } catch (InterruptedException e) { + } catch (final InterruptedException e) { e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerImpl.java index 5b5c973..875412b 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerImpl.java @@ -27,7 +27,7 @@ public class TimerImpl implements Timer { private final int seconds; @Inject - public TimerImpl(@Parameter(Timer.Seconds.class) int seconds) { + public TimerImpl(@Parameter(Timer.Seconds.class) final int seconds) { if (seconds < 0) { throw new IllegalArgumentException("Cannot sleep for negative time!"); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerMock.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerMock.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerMock.java index 5e22d8c..a92ea4f 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerMock.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/examples/timer/TimerMock.java @@ -38,18 +38,18 @@ public class TimerMock implements Timer { private final int seconds; @Inject - TimerMock(@Parameter(Timer.Seconds.class) int seconds) { + TimerMock(@Parameter(Timer.Seconds.class) final int seconds) { if (seconds < 0) { throw new IllegalArgumentException("Cannot sleep for negative time!"); } this.seconds = seconds; } - public static void main(String[] args) throws BindException, InjectionException, Exception { - Configuration c = TimerMock.CONF + public static void main(final String[] args) throws BindException, InjectionException, Exception { + final Configuration c = TimerMock.CONF .set(TimerMockConf.MOCK_SLEEP_TIME, 1) .build(); - Timer t = Tang.Factory.getTang().newInjector(c).getInstance(Timer.class); + final Timer t = Tang.Factory.getTang().newInjector(c).getInstance(Timer.class); System.out.println("Tick..."); t.sleep(); System.out.println("...tock."); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/BindException.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/BindException.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/BindException.java index 4b9e421..266d555 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/BindException.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/BindException.java @@ -33,11 +33,11 @@ package org.apache.reef.tang.exceptions; public class BindException extends RuntimeException { private static final long serialVersionUID = 1L; - public BindException(String msg, Throwable cause) { + public BindException(final String msg, final Throwable cause) { super(msg, cause); } - public BindException(String msg) { + public BindException(final String msg) { super(msg); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ClassHierarchyException.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ClassHierarchyException.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ClassHierarchyException.java index 52ac6ad..5f0d09b 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ClassHierarchyException.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ClassHierarchyException.java @@ -26,15 +26,15 @@ package org.apache.reef.tang.exceptions; public class ClassHierarchyException extends RuntimeException { private static final long serialVersionUID = 1L; - public ClassHierarchyException(Throwable cause) { + public ClassHierarchyException(final Throwable cause) { super(cause); } - public ClassHierarchyException(String msg) { + public ClassHierarchyException(final String msg) { super(msg); } - public ClassHierarchyException(String msg, Throwable cause) { + public ClassHierarchyException(final String msg, final Throwable cause) { super(msg, cause); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/InjectionException.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/InjectionException.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/InjectionException.java index 2ba642c..9b0f83f 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/InjectionException.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/InjectionException.java @@ -34,11 +34,11 @@ package org.apache.reef.tang.exceptions; public class InjectionException extends Exception { private static final long serialVersionUID = 1L; - public InjectionException(String msg, Throwable cause) { + public InjectionException(final String msg, final Throwable cause) { super(msg, cause); } - public InjectionException(String msg) { + public InjectionException(final String msg) { super(msg); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/NameResolutionException.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/NameResolutionException.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/NameResolutionException.java index a97fa89..2a0e9bb 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/NameResolutionException.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/NameResolutionException.java @@ -34,7 +34,7 @@ package org.apache.reef.tang.exceptions; public class NameResolutionException extends BindException { private static final long serialVersionUID = 1L; - public NameResolutionException(String name, String longestPrefix) { + public NameResolutionException(final String name, final String longestPrefix) { super("Could not resolve " + name + ". Search ended at prefix " + longestPrefix + " This can happen due to typos in class names that are passed as strings, or because Tang is configured " + "to use a classloader other than the one that generated the class reference " + http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ParseException.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ParseException.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ParseException.java index 55ed991..aae8007 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ParseException.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/exceptions/ParseException.java @@ -26,11 +26,11 @@ package org.apache.reef.tang.exceptions; public class ParseException extends BindException { private static final long serialVersionUID = 1L; - public ParseException(String msg, Throwable cause) { + public ParseException(final String msg, final Throwable cause) { super(msg, cause); } - public ParseException(String msg) { + public ParseException(final String msg) { super(msg); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/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 8d6d1ff..8351efe 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 @@ -84,7 +84,7 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize try { // TODO: Implement list deserialization // rawValue is String. - String value = rawValue.toString(); + final String value = rawValue.toString(); if (key.equals(ConfigurationBuilderImpl.IMPORT)) { configurationBuilder.getClassHierarchy().getNode(value); final String[] tok = value.split(ReflectionUtilities.REGEXP); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java index 07e35cc..f879d16 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java @@ -122,7 +122,7 @@ public final class CommandLine { @SafeVarargs @SuppressWarnings("checkstyle:redundantmodifier") public final <T> CommandLine processCommandLine( - final String[] args, Class<? extends Name<?>>... argClasses) + final String[] args, final Class<? extends Name<?>>... argClasses) throws IOException, BindException { for (final Class<? extends Name<?>> c : argClasses) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java index ae636c6..615df69 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationFile.java @@ -100,21 +100,21 @@ public final class ConfigurationFile { } } - private static void processConfigFile(ConfigurationBuilder conf, - PropertiesConfiguration confFile) throws IOException, BindException { - ConfigurationBuilderImpl ci = (ConfigurationBuilderImpl) conf; - Iterator<String> it = confFile.getKeys(); - Map<String, String> importedNames = new HashMap<>(); + private static void processConfigFile(final ConfigurationBuilder conf, + final PropertiesConfiguration confFile) throws IOException, BindException { + final ConfigurationBuilderImpl ci = (ConfigurationBuilderImpl) conf; + final Iterator<String> it = confFile.getKeys(); + final Map<String, String> importedNames = new HashMap<>(); while (it.hasNext()) { String key = it.next(); - String longName = importedNames.get(key); - String[] values = confFile.getStringArray(key); + final String longName = importedNames.get(key); + final String[] values = confFile.getStringArray(key); if (longName != null) { // System.err.println("Mapped " + key + " to " + longName); key = longName; } - for (String value : values) { + for (final String value : values) { try { if (key.equals(ConfigurationBuilderImpl.IMPORT)) { ci.getClassHierarchy().getNode(value); @@ -124,8 +124,8 @@ public final class ConfigurationFile { // ci.namespace.getNode(lastTok); ci.getClassHierarchy().getNode(lastTok); throw new IllegalArgumentException("Conflict on short name: " + lastTok); - } catch (BindException e) { - String oldValue = importedNames.put(lastTok, value); + } catch (final BindException e) { + final String oldValue = importedNames.put(lastTok, value); if (oldValue != null) { throw new IllegalArgumentException("Name conflict: " + lastTok + " maps to " + oldValue + " and " + value); @@ -136,14 +136,14 @@ public final class ConfigurationFile { ConfigurationBuilderImpl.INIT.length(), value.length()); parseValue = parseValue.replaceAll("^[\\s\\(]+", ""); parseValue = parseValue.replaceAll("[\\s\\)]+$", ""); - String[] classes = parseValue.split("[\\s\\-]+"); + final String[] classes = parseValue.split("[\\s\\-]+"); ci.registerLegacyConstructor(key, classes); } else { ci.bind(key, value); } - } catch (BindException e) { + } catch (final BindException e) { throw new BindException("Failed to process configuration tuple: [" + key + "=" + value + "]", e); - } catch (ClassHierarchyException e) { + } catch (final ClassHierarchyException e) { throw new ClassHierarchyException("Failed to process configuration tuple: [" + key + "=" + value + "]", e); } } @@ -156,7 +156,7 @@ public final class ConfigurationFile { * @param in * @return */ - private static String escape(String in) { + private static String escape(final String in) { // After regexp escaping \\\\ = 1 slash, \\\\\\\\ = 2 slashes. // Also, the second args of replaceAll are neither strings nor regexps, and @@ -183,8 +183,8 @@ public final class ConfigurationFile { */ @Deprecated public static String toConfigurationString(final Configuration c) { - StringBuilder sb = new StringBuilder(); - for (String s : toConfigurationStringList(c)) { + final StringBuilder sb = new StringBuilder(); + for (final String s : toConfigurationStringList(c)) { sb.append(s); sb.append('\n'); } @@ -196,25 +196,25 @@ public final class ConfigurationFile { */ @Deprecated static List<String> toConfigurationStringList(final Configuration c) { - ConfigurationImpl conf = (ConfigurationImpl) c; - List<String> l = new ArrayList<>(); - for (ClassNode<?> opt : conf.getBoundImplementations()) { + final ConfigurationImpl conf = (ConfigurationImpl) c; + final List<String> l = new ArrayList<>(); + for (final ClassNode<?> opt : conf.getBoundImplementations()) { l.add(opt.getFullName() + '=' + escape(conf.getBoundImplementation(opt).getFullName())); } - for (ClassNode<?> opt : conf.getBoundConstructors()) { + for (final ClassNode<?> opt : conf.getBoundConstructors()) { l.add(opt.getFullName() + '=' + escape(conf.getBoundConstructor(opt).getFullName())); } - for (NamedParameterNode<?> opt : conf.getNamedParameters()) { + for (final NamedParameterNode<?> opt : conf.getNamedParameters()) { l.add(opt.getFullName() + '=' + escape(conf.getNamedParameter(opt))); } - for (ClassNode<?> cn : conf.getLegacyConstructors()) { - StringBuilder sb = new StringBuilder(); + for (final ClassNode<?> cn : conf.getLegacyConstructors()) { + final StringBuilder sb = new StringBuilder(); join(sb, "-", conf.getLegacyConstructor(cn).getArgs()); l.add(cn.getFullName() + escape('=' @@ -226,7 +226,7 @@ public final class ConfigurationFile { //s.append(cn.getFullName()).append('=').append(ConfigurationBuilderImpl.INIT).append('('); // .append(")\n"); } - for (Entry<NamedParameterNode<Set<?>>, Object> e : conf.getBoundSets()) { + for (final Entry<NamedParameterNode<Set<?>>, Object> e : conf.getBoundSets()) { final String val; if (e.getValue() instanceof String) { val = (String) e.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java index 56abdef..c85bda1 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModule.java @@ -54,12 +54,12 @@ public class ConfigurationModule { private final Map<Impl<List>, List<?>> setImplLists = new MonotonicHashMap<>(); private final Map<Param<List>, List<?>> setParamLists = new MonotonicHashMap<>(); - protected ConfigurationModule(ConfigurationModuleBuilder builder) { + protected ConfigurationModule(final ConfigurationModuleBuilder builder) { this.builder = builder.deepCopy(); } private ConfigurationModule deepCopy() { - ConfigurationModule cm = new ConfigurationModule(builder.deepCopy()); + final ConfigurationModule cm = new ConfigurationModule(builder.deepCopy()); cm.setImpls.putAll(setImpls); cm.setImplSets.addAll(setImplSets); cm.setLateImplSets.addAll(setLateImplSets); @@ -72,8 +72,8 @@ public class ConfigurationModule { return cm; } - private <T> void processSet(Object impl) { - Field f = builder.map.get(impl); + private <T> void processSet(final Object impl) { + final Field f = builder.map.get(impl); if (f == null) { /* throw */ throw new ClassHierarchyException("Unknown Impl/Param when setting " + ReflectionUtilities.getSimpleName(impl.getClass()) + ". Did you pass in a field from some other module?"); @@ -83,8 +83,8 @@ public class ConfigurationModule { } } - public final <T> ConfigurationModule set(Impl<T> opt, Class<? extends T> impl) { - ConfigurationModule c = deepCopy(); + public final <T> ConfigurationModule set(final Impl<T> opt, final Class<? extends T> impl) { + final ConfigurationModule c = deepCopy(); c.processSet(opt); if (c.builder.setOpts.contains(opt)) { c.setImplSets.put(opt, impl); @@ -94,8 +94,8 @@ public class ConfigurationModule { return c; } - public final <T> ConfigurationModule set(Impl<T> opt, String impl) { - ConfigurationModule c = deepCopy(); + public final <T> ConfigurationModule set(final Impl<T> opt, final String impl) { + final ConfigurationModule c = deepCopy(); c.processSet(opt); if (c.builder.setOpts.contains(opt)) { c.setLateImplSets.put(opt, impl); @@ -113,27 +113,27 @@ public class ConfigurationModule { * @param <T> * @return */ - public final <T> ConfigurationModule set(Impl<List> opt, List implList) { - ConfigurationModule c = deepCopy(); + public final <T> ConfigurationModule set(final Impl<List> opt, final List implList) { + final ConfigurationModule c = deepCopy(); c.processSet(opt); c.setImplLists.put(opt, implList); return c; } - public final <T> ConfigurationModule set(Param<T> opt, Class<? extends T> val) { + public final <T> ConfigurationModule set(final Param<T> opt, final Class<? extends T> val) { return set(opt, ReflectionUtilities.getFullName(val)); } - public final ConfigurationModule set(Param<Boolean> opt, boolean val) { + public final ConfigurationModule set(final Param<Boolean> opt, final boolean val) { return set(opt, "" + val); } - public final ConfigurationModule set(Param<? extends Number> opt, Number val) { + public final ConfigurationModule set(final Param<? extends Number> opt, final Number val) { return set(opt, "" + val); } - public final <T> ConfigurationModule set(Param<T> opt, String val) { - ConfigurationModule c = deepCopy(); + public final <T> ConfigurationModule set(final Param<T> opt, final String val) { + final ConfigurationModule c = deepCopy(); c.processSet(opt); if (c.builder.setOpts.contains(opt)) { c.setParamSets.put(opt, val); @@ -151,8 +151,8 @@ public class ConfigurationModule { * @param <T> * @return */ - public final <T> ConfigurationModule set(Param<List> opt, List implList) { - ConfigurationModule c = deepCopy(); + public final <T> ConfigurationModule set(final Param<List> opt, final List implList) { + final ConfigurationModule c = deepCopy(); c.processSet(opt); c.setParamLists.put(opt, implList); return c; @@ -160,11 +160,11 @@ public class ConfigurationModule { @SuppressWarnings({"unchecked", "rawtypes"}) public Configuration build() throws BindException { - ConfigurationModule c = deepCopy(); + final ConfigurationModule c = deepCopy(); if (!c.reqSet.containsAll(c.builder.reqDecl)) { - Set<Field> missingSet = new MonotonicHashSet<>(); - for (Field f : c.builder.reqDecl) { + final Set<Field> missingSet = new MonotonicHashSet<>(); + for (final Field f : c.builder.reqDecl) { if (!c.reqSet.contains(f)) { missingSet.add(f); } @@ -174,38 +174,38 @@ public class ConfigurationModule { + builder.toString(missingSet)); } - for (Class<?> clazz : c.builder.freeImpls.keySet()) { - Impl<?> i = c.builder.freeImpls.get(clazz); + for (final Class<?> clazz : c.builder.freeImpls.keySet()) { + final Impl<?> i = c.builder.freeImpls.get(clazz); if (c.setImpls.containsKey(i)) { c.builder.b.bind(clazz, c.setImpls.get(i)); } else if (c.setLateImpls.containsKey(i)) { c.builder.b.bind(ReflectionUtilities.getFullName(clazz), c.setLateImpls.get(i)); } else if (c.setImplSets.containsKey(i) || c.setLateImplSets.containsKey(i)) { - for (Class<?> clz : c.setImplSets.getValuesForKey(i)) { + for (final Class<?> clz : c.setImplSets.getValuesForKey(i)) { c.builder.b.bindSetEntry((Class) clazz, (Class) clz); } - for (String s : c.setLateImplSets.getValuesForKey(i)) { + for (final String s : c.setLateImplSets.getValuesForKey(i)) { c.builder.b.bindSetEntry((Class) clazz, s); } } else if (c.setImplLists.containsKey(i)) { c.builder.b.bindList((Class) clazz, c.setImplLists.get(i)); } } - for (Class<? extends Name<?>> clazz : c.builder.freeParams.keySet()) { - Param<?> p = c.builder.freeParams.get(clazz); - String s = c.setParams.get(p); + for (final Class<? extends Name<?>> clazz : c.builder.freeParams.keySet()) { + final Param<?> p = c.builder.freeParams.get(clazz); + final String s = c.setParams.get(p); boolean foundOne = false; if (s != null) { c.builder.b.bindNamedParameter(clazz, s); foundOne = true; } // Find the bound list for the NamedParameter - List list = c.setParamLists.get(p); + final List list = c.setParamLists.get(p); if (list != null) { c.builder.b.bindList((Class) clazz, list); foundOne = true; } - for (String paramStr : c.setParamSets.getValuesForKey(p)) { + for (final String paramStr : c.setParamSets.getValuesForKey(p)) { c.builder.b.bindSetEntry((Class) clazz, paramStr); foundOne = true; } @@ -220,13 +220,13 @@ public class ConfigurationModule { } public Set<NamedParameterNode<?>> getBoundNamedParameters() { - Configuration c = this.builder.b.build(); - Set<NamedParameterNode<?>> nps = new MonotonicSet<>(); + final Configuration c = this.builder.b.build(); + final Set<NamedParameterNode<?>> nps = new MonotonicSet<>(); nps.addAll(c.getNamedParameters()); - for (Class<?> np : this.builder.freeParams.keySet()) { + for (final Class<?> np : this.builder.freeParams.keySet()) { try { nps.add((NamedParameterNode<?>) builder.b.getClassHierarchy().getNode(ReflectionUtilities.getFullName(np))); - } catch (NameResolutionException e) { + } catch (final NameResolutionException e) { throw new IllegalStateException(e); } } @@ -234,12 +234,12 @@ public class ConfigurationModule { } public List<Entry<String, String>> toStringPairs() { - List<Entry<String, String>> ret = new ArrayList<>(); + final List<Entry<String, String>> ret = new ArrayList<>(); class MyEntry implements Entry<String, String> { final String k; final String v; - public MyEntry(String k, String v) { + public MyEntry(final String k, final String v) { this.k = k; this.v = v; } @@ -255,21 +255,21 @@ public class ConfigurationModule { } @Override - public String setValue(String value) { + public String setValue(final String value) { throw new UnsupportedOperationException(); } } - for (Class<?> c : this.builder.freeParams.keySet()) { + for (final Class<?> c : this.builder.freeParams.keySet()) { ret.add(new MyEntry(ReflectionUtilities.getFullName(c), this.builder.map.get(this.builder.freeParams.get(c)).getName())); } - for (Class<?> c : this.builder.freeImpls.keySet()) { + for (final Class<?> c : this.builder.freeImpls.keySet()) { ret.add(new MyEntry(ReflectionUtilities.getFullName(c), this.builder.map.get(this.builder.freeImpls.get(c)).getName())); } - for (String s : ConfigurationFile.toConfigurationStringList(builder.b.build())) { - String[] tok = s.split("=", 2); + for (final String s : ConfigurationFile.toConfigurationStringList(builder.b.build())) { + final String[] tok = s.split("=", 2); ret.add(new MyEntry(tok[0], tok[1])); } @@ -277,9 +277,9 @@ public class ConfigurationModule { } public String toPrettyString() { - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); - for (Entry<String, String> l : toStringPairs()) { + for (final Entry<String, String> l : toStringPairs()) { sb.append(l.getKey() + "=" + l.getValue() + "\n"); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/141c7fa0/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java index be0bfdf..a8da150 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationModuleBuilder.java @@ -60,8 +60,8 @@ public abstract class ConfigurationModuleBuilder { private final Map<Class<?>, String> lateBindClazz = new MonotonicHashMap<>(); protected ConfigurationModuleBuilder() { - for (Field f : getClass().getDeclaredFields()) { - Class<?> t = f.getType(); + for (final Field f : getClass().getDeclaredFields()) { + final Class<?> t = f.getType(); if (PARAM_BLACKLIST.contains(t)) { throw new ClassHierarchyException( "Found a field of type " + t + " which should be a Required/Optional Parameter/Implementation instead" @@ -106,10 +106,10 @@ public abstract class ConfigurationModuleBuilder { } } - private ConfigurationModuleBuilder(ConfigurationModuleBuilder c) { + private ConfigurationModuleBuilder(final ConfigurationModuleBuilder c) { try { b.addConfiguration(c.b.build()); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } reqDecl.addAll(c.reqDecl); @@ -128,21 +128,21 @@ public abstract class ConfigurationModuleBuilder { * TODO: It would be nice if this incorporated d by reference so that static analysis / documentation tools * could document the dependency between c and d. */ - public final ConfigurationModuleBuilder merge(ConfigurationModule d) { + public final ConfigurationModuleBuilder merge(final ConfigurationModule d) { if (d == null) { throw new NullPointerException("If merge() was passed a static final field that is initialized to non-null, " + "then this is almost certainly caused by a circular class dependency."); } try { d.assertStaticClean(); - } catch (ClassHierarchyException e) { + } catch (final ClassHierarchyException e) { throw new ClassHierarchyException(ReflectionUtilities.getFullName(getClass()) + ": detected attempt to merge with ConfigurationModule that has had set() called on it", e); } - ConfigurationModuleBuilder c = deepCopy(); + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.addConfiguration(d.builder.b.build()); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } c.reqDecl.addAll(d.builder.reqDecl); @@ -158,37 +158,38 @@ public abstract class ConfigurationModuleBuilder { return c; } - public final <T> ConfigurationModuleBuilder bind(Class<?> iface, Impl<?> opt) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bind(final Class<?> iface, final Impl<?> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeImpls.put(iface, opt); return c; } - public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, String impl) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindSetEntry( + final Class<? extends Name<Set<T>>> iface, final String impl) { + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.bindSetEntry(iface, impl); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } return c; } - public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, - Class<? extends T> impl) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindSetEntry(final Class<? extends Name<Set<T>>> iface, + final Class<? extends T> impl) { + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.bindSetEntry(iface, impl); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } return c; } - public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, - Impl<? extends T> opt) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindSetEntry(final Class<? extends Name<Set<T>>> iface, + final Impl<? extends T> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeImpls.put(iface, opt); if (!setOpts.contains(opt)) { @@ -197,9 +198,9 @@ public abstract class ConfigurationModuleBuilder { return c; } - public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, - Param<? extends T> opt) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindSetEntry(final Class<? extends Name<Set<T>>> iface, + final Param<? extends T> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeParams.put(iface, opt); if (!setOpts.contains(opt)) { @@ -209,114 +210,114 @@ public abstract class ConfigurationModuleBuilder { } - public final <T> ConfigurationModuleBuilder bindImplementation(Class<T> iface, - Class<? extends T> impl) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindImplementation(final Class<T> iface, + final Class<? extends T> impl) { + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.bindImplementation(iface, impl); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } return c; } - public final <T> ConfigurationModuleBuilder bindImplementation(Class<T> iface, - String impl) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindImplementation(final Class<T> iface, + final String impl) { + final ConfigurationModuleBuilder c = deepCopy(); c.lateBindClazz.put(iface, impl); return c; } - public final <T> ConfigurationModuleBuilder bindImplementation(Class<T> iface, - Impl<? extends T> opt) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindImplementation(final Class<T> iface, + final Impl<? extends T> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeImpls.put(iface, opt); return c; } public final <T> ConfigurationModuleBuilder bindNamedParameter( - Class<? extends Name<T>> name, String value) { - ConfigurationModuleBuilder c = deepCopy(); + final Class<? extends Name<T>> name, final String value) { + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.bindNamedParameter(name, value); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } return c; } public final <T> ConfigurationModuleBuilder bindNamedParameter( - Class<? extends Name<T>> name, Param<T> opt) { - ConfigurationModuleBuilder c = deepCopy(); + final Class<? extends Name<T>> name, final Param<T> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeParams.put(name, opt); return c; } public final <T> ConfigurationModuleBuilder bindNamedParameter( - Class<? extends Name<T>> iface, Class<? extends T> impl) { - ConfigurationModuleBuilder c = deepCopy(); + final Class<? extends Name<T>> iface, final Class<? extends T> impl) { + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.bindNamedParameter(iface, impl); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } return c; } public final <T> ConfigurationModuleBuilder bindNamedParameter( - Class<? extends Name<T>> iface, Impl<? extends T> opt) { - ConfigurationModuleBuilder c = deepCopy(); + final Class<? extends Name<T>> iface, final Impl<? extends T> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeImpls.put(iface, opt); return c; } - public final <T> ConfigurationModuleBuilder bindConstructor(Class<T> clazz, - Class<? extends ExternalConstructor<? extends T>> + public final <T> ConfigurationModuleBuilder bindConstructor(final Class<T> clazz, + final Class<? extends ExternalConstructor<? extends T>> constructor) { - ConfigurationModuleBuilder c = deepCopy(); + final ConfigurationModuleBuilder c = deepCopy(); try { c.b.bindConstructor(clazz, constructor); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException(e); } return c; } - public final <T> ConfigurationModuleBuilder bindConstructor(Class<T> cons, - Impl<? extends ExternalConstructor<? extends T>> v) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindConstructor( + final Class<T> cons, final Impl<? extends ExternalConstructor<? extends T>> v) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(v); c.freeImpls.put(cons, v); return c; } - public final <T> ConfigurationModuleBuilder bindList(Class<? extends Name<List<T>>> iface, - Impl<List> opt) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindList(final Class<? extends Name<List<T>>> iface, + final Impl<List> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeImpls.put(iface, opt); return c; } - public final <T> ConfigurationModuleBuilder bindList(Class<? extends Name<List<T>>> iface, - Param<List> opt) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindList(final Class<? extends Name<List<T>>> iface, + final Param<List> opt) { + final ConfigurationModuleBuilder c = deepCopy(); c.processUse(opt); c.freeParams.put(iface, opt); return c; } - public final <T> ConfigurationModuleBuilder bindList(Class<? extends Name<List<T>>> iface, List list) { - ConfigurationModuleBuilder c = deepCopy(); + public final <T> ConfigurationModuleBuilder bindList(final Class<? extends Name<List<T>>> iface, final List list) { + final ConfigurationModuleBuilder c = deepCopy(); c.b.bindList(iface, list); return c; } - private <T> void processUse(Object impl) { - Field f = map.get(impl); + private <T> void processUse(final Object impl) { + final Field f = map.get(impl); if (f == null) { /* throw */ throw new ClassHierarchyException("Unknown Impl/Param when binding " + ReflectionUtilities.getSimpleName(impl.getClass()) + ". Did you pass in a field from some other module?"); @@ -330,16 +331,16 @@ public abstract class ConfigurationModuleBuilder { } public final ConfigurationModule build() throws ClassHierarchyException { - ConfigurationModuleBuilder c = deepCopy(); + final ConfigurationModuleBuilder c = deepCopy(); if (!(c.reqUsed.containsAll(c.reqDecl) && c.optUsed.containsAll(c.optDecl))) { - Set<Field> fset = new MonotonicHashSet<>(); - for (Field f : c.reqDecl) { + final Set<Field> fset = new MonotonicHashSet<>(); + for (final Field f : c.reqDecl) { if (!c.reqUsed.contains(f)) { fset.add(f); } } - for (Field f : c.optDecl) { + for (final Field f : c.optDecl) { if (!c.optUsed.contains(f)) { fset.add(f); } @@ -348,13 +349,13 @@ public abstract class ConfigurationModuleBuilder { "Found declared options that were not used in binds: " + toString(fset)); } - for (Class<?> clz : c.lateBindClazz.keySet()) { + for (final Class<?> clz : c.lateBindClazz.keySet()) { try { c.b.bind(ReflectionUtilities.getFullName(clz), c.lateBindClazz.get(clz)); - } catch (NameResolutionException e) { + } catch (final NameResolutionException e) { throw new ClassHierarchyException("ConfigurationModule refers to unknown class: " + c.lateBindClazz.get(clz), e); - } catch (BindException e) { + } catch (final BindException e) { throw new ClassHierarchyException("bind failed while initializing ConfigurationModuleBuilder", e); } } @@ -380,10 +381,10 @@ public abstract class ConfigurationModuleBuilder { }; } - final String toString(Set<Field> s) { - StringBuilder sb = new StringBuilder("{"); + final String toString(final Set<Field> s) { + final StringBuilder sb = new StringBuilder("{"); boolean first = true; - for (Field f : s) { + for (final Field f : s) { sb.append((first ? " " : ", ") + f.getName()); first = false; }
