You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2015/07/10 02:11:24 UTC
[2/5] incubator-reef git commit: [REEF-410] Fix violations of
LineLength checkstyle
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java
index 6782451..b0247d3 100644
--- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java
+++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java
@@ -33,7 +33,8 @@ public final class Constants {
public static final String MAX_APP_ATTEMPTS = "max-app-attempts";
public static final String APPLICATION_TYPE = "application-type";
public static final String AM_CONTAINER_SPEC = "am-container-spec";
- public static final String KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS = "keep-containers-across-application-attempts";
+ public static final String KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS =
+ "keep-containers-across-application-attempts";
public static final String APPLICATION_TAGS = "application-tags";
public static final String QUEUE = "queue";
public static final String RESOURCE = "resource";
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java
index cbf2d8b..da975f3 100644
--- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java
+++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/HDInsightInstance.java
@@ -214,7 +214,8 @@ public final class HDInsightInstance {
return httpPut;
}
- private HttpClientContext getClientContext(final String hostname, final String username, final String password) throws IOException {
+ private HttpClientContext getClientContext(final String hostname, final String username, final String password)
+ throws IOException {
final HttpHost targetHost = new HttpHost(hostname, 443, "https");
final HttpClientContext result = HttpClientContext.create();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java
index 17c6780..33e3c4a 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/LocalRuntimeConfiguration.java
@@ -42,9 +42,9 @@ public class LocalRuntimeConfiguration extends ConfigurationModuleBuilder {
/**
* The number of threads or processes available to the resourcemanager. This is the upper limit on the number of
- * Evaluators that the local resourcemanager will hand out concurrently. This simulates the size of a physical cluster in
- * terms of the number of slots available on it with one important caveat: The Driver is not counted against this
- * number.
+ * Evaluators that the local resourcemanager will hand out concurrently.
+ * This simulates the size of a physical cluster in terms of the number of slots available on it
+ * with one important caveat: The Driver is not counted against this number.
*/
public static final OptionalParameter<Integer> MAX_NUMBER_OF_EVALUATORS = new OptionalParameter<>();
/**
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/MaxNumberOfEvaluators.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/MaxNumberOfEvaluators.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/MaxNumberOfEvaluators.java
index a2c360f..9130cbb 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/MaxNumberOfEvaluators.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/MaxNumberOfEvaluators.java
@@ -24,6 +24,7 @@ import org.apache.reef.tang.annotations.NamedParameter;
/**
* The maximum number of evaluators to allow to run at once.
*/
-@NamedParameter(default_value = "4", doc = "The maximum number of evaluators to allow to run at once", short_name = "maxEvaluators")
+@NamedParameter(default_value = "4", doc = "The maximum number of evaluators to allow to run at once",
+ short_name = "maxEvaluators")
public final class MaxNumberOfEvaluators implements Name<Integer> {
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java
index 04051c2..e39b9f3 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java
@@ -26,7 +26,8 @@ import java.util.Set;
/**
* The name of the default racks available in the local runtime.
*/
-@NamedParameter(short_name = "racks", doc = "The name of the racks the containers will be placed on", default_values = {RackNames.DEFAULT_RACK_NAME})
+@NamedParameter(short_name = "racks", doc = "The name of the racks the containers will be placed on",
+ default_values = {RackNames.DEFAULT_RACK_NAME})
public final class RackNames implements Name<Set<String>> {
private RackNames() {}
public static final String DEFAULT_RACK_NAME = "/default-rack";
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
index 1741ace..6eba822 100644
--- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
+++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/process/RunnableProcess.java
@@ -85,7 +85,8 @@ public final class RunnableProcess implements Runnable {
/**
* @param command the command to execute.
- * @param id The ID of the process. This is used to name files and in the logs created by this process.
+ * @param id The ID of the process. This is used to name files and in the logs created
+ * by this process.
* @param folder The folder in which this will store its stdout and stderr output
* @param processObserver will be informed of process state changes.
* @param standardOutFileName The name of the file used for redirecting STDOUT
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 e9a70fa..23cf746 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
@@ -111,7 +111,8 @@ final class MesosJobSubmissionHandler implements JobSubmissionHandler {
.set(MesosDriverConfiguration.JOB_IDENTIFIER, jobSubmissionEvent.getIdentifier())
.set(MesosDriverConfiguration.CLIENT_REMOTE_IDENTIFIER, jobSubmissionEvent.getRemoteId())
.set(MesosDriverConfiguration.JVM_HEAP_SLACK, this.jvmSlack)
- .set(MesosDriverConfiguration.SCHEDULER_DRIVER_CAPACITY, 1) // must be 1 as there is 1 scheduler at the same time
+ .set(MesosDriverConfiguration.SCHEDULER_DRIVER_CAPACITY, 1)
+ // must be 1 as there is 1 scheduler at the same time
.build(),
jobSubmissionEvent.getConfiguration());
final File runtimeConfigurationFile = new File(driverFolder, this.fileNames.getDriverConfigurationPath());
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFEventHandlers.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFEventHandlers.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFEventHandlers.java
index 6f3669d..8cb09fe 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFEventHandlers.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFEventHandlers.java
@@ -37,10 +37,14 @@ final class REEFEventHandlers {
private final EventHandler<ResourceStatusEvent> resourceStatusHandlerEventHandler;
@Inject
- REEFEventHandlers(@Parameter(RuntimeParameters.ResourceAllocationHandler.class) final EventHandler<ResourceAllocationEvent> resourceAllocationEventHandler,
- @Parameter(RuntimeParameters.RuntimeStatusHandler.class) final EventHandler<RuntimeStatusEvent> runtimeStatusEventHandler,
- @Parameter(RuntimeParameters.NodeDescriptorHandler.class) final EventHandler<NodeDescriptorEvent> nodeDescriptorEventHandler,
- @Parameter(RuntimeParameters.ResourceStatusHandler.class) final EventHandler<ResourceStatusEvent> resourceStatusHandlerEventHandler) {
+ REEFEventHandlers(@Parameter(RuntimeParameters.ResourceAllocationHandler.class)
+ final EventHandler<ResourceAllocationEvent> resourceAllocationEventHandler,
+ @Parameter(RuntimeParameters.RuntimeStatusHandler.class)
+ final EventHandler<RuntimeStatusEvent> runtimeStatusEventHandler,
+ @Parameter(RuntimeParameters.NodeDescriptorHandler.class)
+ final EventHandler<NodeDescriptorEvent> nodeDescriptorEventHandler,
+ @Parameter(RuntimeParameters.ResourceStatusHandler.class)
+ final EventHandler<ResourceStatusEvent> resourceStatusHandlerEventHandler) {
this.resourceAllocationEventHandler = resourceAllocationEventHandler;
this.runtimeStatusEventHandler = runtimeStatusEventHandler;
this.nodeDescriptorEventHandler = nodeDescriptorEventHandler;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 d2c1bd2..e7afdc4 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
@@ -92,7 +92,8 @@ final class REEFScheduler implements Scheduler {
private static final Logger LOG = Logger.getLogger(REEFScheduler.class.getName());
private static final String REEF_TAR = "reef.tar.gz";
private static final String RUNTIME_NAME = "MESOS";
- private static final int MESOS_SLAVE_PORT = 5051; // Assumes for now that all slaves use port 5051(default) TODO: make it configurable.
+ private static final int MESOS_SLAVE_PORT = 5051;
+ // Assumes for now that all slaves use port 5051(default) TODO: make it configurable.
private static final String REEF_JOB_NAME_PREFIX = "reef-job-";
private final String reefTarUri;
@@ -202,7 +203,8 @@ final class REEFScheduler implements Scheduler {
resourceStatus.setState(State.RUNNING);
break;
case TASK_FINISHED:
- if (taskStatus.getData().toStringUtf8().equals("eval_not_run")) { // TODO: a hack to pass closeEvaluator test, replace this with a better interface
+ if (taskStatus.getData().toStringUtf8().equals("eval_not_run")) {
+ // TODO: a hack to pass closeEvaluator test, replace this with a better interface
return;
}
resourceStatus.setState(State.DONE);
@@ -378,7 +380,8 @@ final class REEFScheduler implements Scheduler {
final EventHandler<EvaluatorControl> evaluatorControlHandler =
this.mesosRemoteManager.getHandler(taskStatus.getMessage(), EvaluatorControl.class);
- this.executors.add(taskStatus.getTaskId().getValue(), resourceRequestProto.getMemorySize().get(), evaluatorControlHandler);
+ this.executors.add(taskStatus.getTaskId().getValue(), resourceRequestProto.getMemorySize().get(),
+ evaluatorControlHandler);
final ResourceAllocationEvent alloc = ResourceAllocationEventImpl.newBuilder()
.setIdentifier(taskStatus.getTaskId().getValue())
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
index d04ff63..dcc4a26 100644
--- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
+++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/evaluator/REEFExecutor.java
@@ -164,7 +164,8 @@ public final class REEFExecutor implements Executor {
.setValue(mesosExecutorId)
.build())
.setState(TaskState.TASK_FINISHED)
- .setData(ByteString.copyFromUtf8("eval_not_run")) // TODO: a hack to pass closeEvaluator test, replace this with a better interface
+ .setData(ByteString.copyFromUtf8("eval_not_run"))
+ // TODO: a hack to pass closeEvaluator test, replace this with a better interface
.setMessage("Evaluator Process exited with status " + String.valueOf(evaluatorProcessExitValue))
.build());
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/YarnClasspathProvider.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/YarnClasspathProvider.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/YarnClasspathProvider.java
index 7973dd3..8b400de 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/YarnClasspathProvider.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/YarnClasspathProvider.java
@@ -38,7 +38,8 @@ public final class YarnClasspathProvider implements RuntimeClasspathProvider {
private static final Logger LOG = Logger.getLogger(YarnClasspathProvider.class.getName());
private static final Level CLASSPATH_LOG_LEVEL = Level.FINE;
- private static final String YARN_TOO_OLD_MESSAGE = "The version of YARN you are using is too old to support classpath assembly. Reverting to legacy method.";
+ private static final String YARN_TOO_OLD_MESSAGE =
+ "The version of YARN you are using is too old to support classpath assembly. Reverting to legacy method.";
private static final String HADOOP_CONF_DIR = OSUtils.formatVariable("HADOOP_CONF_DIR");
private static final String HADOOP_HOME = OSUtils.formatVariable("HADOOP_HOME");
private static final String HADOOP_COMMON_HOME = OSUtils.formatVariable("HADOOP_COMMON_HOME");
@@ -73,22 +74,28 @@ public final class YarnClasspathProvider implements RuntimeClasspathProvider {
@Inject
YarnClasspathProvider(final YarnConfiguration yarnConfiguration) {
- boolean needsLegacyClasspath = false; // will be set to true below whenever we encounter issues with the YARN Configuration
+ boolean needsLegacyClasspath = false;
+ // will be set to true below whenever we encounter issues with the YARN Configuration
final ClassPathBuilder builder = new ClassPathBuilder();
try {
// Add the classpath actually configured on this cluster
- final Optional<String[]> yarnClassPath = getTrimmedStrings(yarnConfiguration, YarnConfiguration.YARN_APPLICATION_CLASSPATH);
+ final Optional<String[]> yarnClassPath =
+ getTrimmedStrings(yarnConfiguration, YarnConfiguration.YARN_APPLICATION_CLASSPATH);
final String[] yarnDefaultClassPath = YarnConfiguration.DEFAULT_YARN_CROSS_PLATFORM_APPLICATION_CLASSPATH;
if (!yarnClassPath.isPresent()) {
- LOG.log(Level.SEVERE, "YarnConfiguration.YARN_APPLICATION_CLASSPATH is empty. This indicates a broken cluster configuration.");
+ LOG.log(Level.SEVERE,
+ "YarnConfiguration.YARN_APPLICATION_CLASSPATH is empty. This indicates a broken cluster configuration.");
needsLegacyClasspath = true;
} else {
if (LOG.isLoggable(CLASSPATH_LOG_LEVEL)) {
- LOG.log(CLASSPATH_LOG_LEVEL, "YarnConfiguration.YARN_APPLICATION_CLASSPATH is [" + StringUtils.join(yarnClassPath.get(), '|') + "]");
- LOG.log(CLASSPATH_LOG_LEVEL, "YarnConfiguration.DEFAULT_YARN_CROSS_PLATFORM_APPLICATION_CLASSPATH is [" + StringUtils.join(yarnDefaultClassPath, '|') + "]");
+ LOG.log(CLASSPATH_LOG_LEVEL,
+ "YarnConfiguration.YARN_APPLICATION_CLASSPATH is [" + StringUtils.join(yarnClassPath.get(), '|') + "]");
+ LOG.log(CLASSPATH_LOG_LEVEL,
+ "YarnConfiguration.DEFAULT_YARN_CROSS_PLATFORM_APPLICATION_CLASSPATH is [" +
+ StringUtils.join(yarnDefaultClassPath, '|') + "]");
}
builder.addAll(yarnClassPath.get());
builder.addAll(yarnDefaultClassPath);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 5bd17ac..0eb7246 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
@@ -96,7 +96,8 @@ final class YarnJobSubmissionHandler implements JobSubmissionHandler {
new YarnSubmissionHelper(this.yarnConfiguration, this.fileNames, this.classpath)) {
LOG.log(Level.FINE, "Assembling submission JAR for the Driver.");
- final Optional<String> userBoundJobSubmissionDirectory = getUserBoundJobSubmissionDirectory(jobSubmissionEvent.getConfiguration());
+ final Optional<String> userBoundJobSubmissionDirectory =
+ getUserBoundJobSubmissionDirectory(jobSubmissionEvent.getConfiguration());
final JobFolder jobFolderOnDfs = userBoundJobSubmissionDirectory.isPresent()
? this.uploader.createJobFolder(userBoundJobSubmissionDirectory.get())
: this.uploader.createJobFolder(submissionHelper.getApplicationId());
@@ -148,9 +149,10 @@ final class YarnJobSubmissionHandler implements JobSubmissionHandler {
return jobSubmissionEvent.getQueue().orElse(defaultQueue);
}
- private static org.apache.reef.util.Optional<String> getUserBoundJobSubmissionDirectory(final Configuration configuration) {
+ private static Optional<String> getUserBoundJobSubmissionDirectory(final Configuration configuration) {
try {
- return Optional.ofNullable(Tang.Factory.getTang().newInjector(configuration).getNamedInstance(DriverJobSubmissionDirectory.class));
+ return Optional.ofNullable(Tang.Factory.getTang().newInjector(configuration)
+ .getNamedInstance(DriverJobSubmissionDirectory.class));
} catch (InjectionException ex) {
return Optional.empty();
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java
index 637c6fd..352cb4f 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/client/YarnSubmissionHelper.java
@@ -146,7 +146,8 @@ public final class YarnSubmissionHelper implements Closeable{
.setStandardErr(ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" + this.fileNames.getDriverStderrFileName())
.build();
- this.applicationSubmissionContext.setAMContainerSpec(YarnTypes.getContainerLaunchContext(launchCommand, this.resources));
+ this.applicationSubmissionContext.setAMContainerSpec(YarnTypes.getContainerLaunchContext(launchCommand,
+ this.resources));
LOG.log(Level.INFO, "Submitting REEF Application to YARN. ID: {0}", this.applicationId);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 0222ddb..e2391c6 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
@@ -36,7 +36,8 @@ public final class JobSubmissionDirectoryProviderImpl implements JobSubmissionDi
private final REEFFileNames fileNames;
@Inject
- JobSubmissionDirectoryProviderImpl(@Parameter(JobSubmissionDirectoryPrefix.class) final String jobSubmissionDirectoryPrefix,
+ JobSubmissionDirectoryProviderImpl(@Parameter(JobSubmissionDirectoryPrefix.class)
+ final String jobSubmissionDirectoryPrefix,
final REEFFileNames fileNames) {
this.jobSubmissionDirectory = jobSubmissionDirectoryPrefix;
this.fileNames = fileNames;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/REEFEventHandlers.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/REEFEventHandlers.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/REEFEventHandlers.java
index 84757b5..35bb826 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/REEFEventHandlers.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/REEFEventHandlers.java
@@ -41,10 +41,14 @@ final class REEFEventHandlers implements AutoCloseable {
private final EventHandler<NodeDescriptorEvent> nodeDescriptorEventHandler;
@Inject
- REEFEventHandlers(@Parameter(RuntimeParameters.NodeDescriptorHandler.class) final EventHandler<NodeDescriptorEvent> nodeDescriptorEventHandler,
- @Parameter(RuntimeParameters.RuntimeStatusHandler.class) final EventHandler<RuntimeStatusEvent> runtimeStatusProtoEventHandler,
- @Parameter(RuntimeParameters.ResourceAllocationHandler.class) final EventHandler<ResourceAllocationEvent> resourceAllocationHandler,
- @Parameter(RuntimeParameters.ResourceStatusHandler.class) final EventHandler<ResourceStatusEvent> resourceStatusHandler) {
+ REEFEventHandlers(@Parameter(RuntimeParameters.NodeDescriptorHandler.class)
+ final EventHandler<NodeDescriptorEvent> nodeDescriptorEventHandler,
+ @Parameter(RuntimeParameters.RuntimeStatusHandler.class)
+ final EventHandler<RuntimeStatusEvent> runtimeStatusProtoEventHandler,
+ @Parameter(RuntimeParameters.ResourceAllocationHandler.class)
+ final EventHandler<ResourceAllocationEvent> resourceAllocationHandler,
+ @Parameter(RuntimeParameters.ResourceStatusHandler.class)
+ final EventHandler<ResourceStatusEvent> resourceStatusHandler) {
this.resourceAllocationHandler = resourceAllocationHandler;
this.resourceStatusHandler = resourceStatusHandler;
this.runtimeStatusHandler = runtimeStatusProtoEventHandler;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java
index d52f835..48c0cec 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YARNResourceLaunchHandler.java
@@ -81,8 +81,10 @@ public final class YARNResourceLaunchHandler implements ResourceLaunchHandler {
.setLaunchID(resourceLaunchEvent.getIdentifier())
.setConfigurationFileName(this.filenames.getEvaluatorConfigurationPath())
.setMemory((int) (this.jvmHeapFactor * container.getResource().getMemory()))
- .setStandardErr(ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" + this.filenames.getEvaluatorStderrFileName())
- .setStandardOut(ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" + this.filenames.getEvaluatorStdoutFileName())
+ .setStandardErr(ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" +
+ this.filenames.getEvaluatorStderrFileName())
+ .setStandardOut(ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" +
+ this.filenames.getEvaluatorStdoutFileName())
.getCommandLine();
if (LOG.isLoggable(Level.FINEST)) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 fdc7bb6..24edc75 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
@@ -256,7 +256,8 @@ final class YarnContainerManager
// when supported, obtain the list of the containers previously allocated, and write info to driver folder
if (YarnTypes.isAtOrAfterVersion(minVersionToGetPreviousContainer)) {
- LOG.log(Level.FINEST, "Hadoop version is {0} or after with support to retain previous containers, processing previous containers.", minVersionToGetPreviousContainer);
+ LOG.log(Level.FINEST, "Hadoop version is {0} or after with support to retain previous containers, " +
+ "processing previous containers.", minVersionToGetPreviousContainer);
processPreviousContainers();
}
}
@@ -321,7 +322,8 @@ final class YarnContainerManager
final int numPreviousContainers = previousContainers.size();
if (numExpectedContainers > numPreviousContainers) {
// we expected more containers to be alive, some containers must have died during driver restart
- LOG.log(Level.WARNING, "Expected {0} containers while only {1} are still alive", new Object[]{numExpectedContainers, numPreviousContainers});
+ LOG.log(Level.WARNING, "Expected {0} containers while only {1} are still alive",
+ new Object[]{numExpectedContainers, numPreviousContainers});
final Set<String> previousContainersIds = new HashSet<>();
for (final Container container : previousContainers) {
previousContainersIds.add(container.getId().toString());
@@ -329,14 +331,16 @@ final class YarnContainerManager
for (final String expectedContainerId : expectedContainers) {
if (!previousContainersIds.contains(expectedContainerId)) {
logContainerRemoval(expectedContainerId);
- LOG.log(Level.WARNING, "Expected container [{0}] not alive, must have failed during driver restart.", expectedContainerId);
+ LOG.log(Level.WARNING, "Expected container [{0}] not alive, must have failed during driver restart.",
+ expectedContainerId);
informAboutConatinerFailureDuringRestart(expectedContainerId);
}
}
}
if (numExpectedContainers < numPreviousContainers) {
// somehow we have more alive evaluators, this should not happen
- throw new RuntimeException("Expected only [" + numExpectedContainers + "] containers but resource manager believe that [" + numPreviousContainers + "] are outstanding for driver.");
+ throw new RuntimeException("Expected only [" + numExpectedContainers + "] containers " +
+ "but resource manager believe that [" + numPreviousContainers + "] are outstanding for driver.");
}
// numExpectedContainers == numPreviousContainers
@@ -427,23 +431,27 @@ final class YarnContainerManager
LOG.log(Level.FINEST, "{0} matched with {1}", new Object[]{container.toString(), matchedRequest.toString()});
- // Due to the bug YARN-314 and the workings of AMRMCClientAsync, when x-priority m-capacity zero-container request
- // and x-priority n-capacity nonzero-container request are sent together, where m > n, RM ignores the latter.
+ // Due to the bug YARN-314 and the workings of AMRMCClientAsync, when x-priority m-capacity zero-container
+ // request and x-priority n-capacity nonzero-container request are sent together, where m > n, RM ignores
+ // the latter.
// Therefore it is necessary avoid sending zero-container request, even it means getting extra containers.
- // It is okay to send nonzero m-capacity and n-capacity request together since bigger containers can be matched.
+ // It is okay to send nonzero m-capacity and n-capacity request together since bigger containers
+ // can be matched.
// TODO: revisit this when implementing locality-strictness (i.e. a specific rack request can be ignored)
if (this.requestsAfterSentToRM.size() > 1) {
try {
this.resourceManager.removeContainerRequest(matchedRequest);
} catch (final Exception e) {
- LOG.log(Level.WARNING, "Nothing to remove from Async AMRM client's queue, removal attempt failed with exception", e);
+ LOG.log(Level.WARNING, "Nothing to remove from Async AMRM client's queue, " +
+ "removal attempt failed with exception", e);
}
}
this.requestsAfterSentToRM.remove();
doHomogeneousRequests();
- LOG.log(Level.FINEST, "Allocated Container: memory = {0}, core number = {1}", new Object[]{container.getResource().getMemory(), container.getResource().getVirtualCores()});
+ LOG.log(Level.FINEST, "Allocated Container: memory = {0}, core number = {1}",
+ new Object[]{container.getResource().getMemory(), container.getResource().getVirtualCores()});
this.reefEventHandlers.onResourceAllocation(ResourceAllocationEventImpl.newBuilder()
.setIdentifier(container.getId().toString())
.setNodeId(container.getNodeId().toString())
@@ -465,7 +473,8 @@ final class YarnContainerManager
if (this.requestsAfterSentToRM.isEmpty()) {
final AMRMClient.ContainerRequest firstRequest = this.requestsBeforeSentToRM.peek();
- while (!this.requestsBeforeSentToRM.isEmpty() && isSameKindOfRequest(firstRequest, this.requestsBeforeSentToRM.peek())) {
+ while (!this.requestsBeforeSentToRM.isEmpty() &&
+ isSameKindOfRequest(firstRequest, this.requestsBeforeSentToRM.peek())) {
final AMRMClient.ContainerRequest homogeneousRequest = this.requestsBeforeSentToRM.remove();
this.resourceManager.addContainerRequest(homogeneousRequest);
this.requestsAfterSentToRM.add(homogeneousRequest);
@@ -492,7 +501,8 @@ final class YarnContainerManager
}
final AMRMClient.ContainerRequest request = this.requestsAfterSentToRM.peek();
- final boolean resourceCondition = container.getResource().getMemory() >= request.getCapability().getMemory(); // TODO: check vcores once YARN-2380 is resolved
+ final boolean resourceCondition = container.getResource().getMemory() >= request.getCapability().getMemory();
+ // TODO: check vcores once YARN-2380 is resolved
final boolean nodeCondition = request.getNodes() == null
|| request.getNodes().contains(container.getNodeId().getHost());
final boolean rackCondition = request.getRacks() == null
@@ -565,13 +575,15 @@ final class YarnContainerManager
if (line.startsWith(ADD_FLAG)) {
final String containerId = line.substring(ADD_FLAG.length());
if (expectedContainers.contains(containerId)) {
- throw new RuntimeException("Duplicated add container record found in the change log for container " + containerId);
+ throw new RuntimeException("Duplicated add container record found in the change log for container " +
+ containerId);
}
expectedContainers.add(containerId);
} else if (line.startsWith(REMOVE_FLAG)) {
final String containerId = line.substring(REMOVE_FLAG.length());
if (!expectedContainers.contains(containerId)) {
- throw new RuntimeException("Change log includes record that try to remove non-exist or duplicate remove record for container + " + containerId);
+ throw new RuntimeException("Change log includes record that try to remove non-exist or duplicate " +
+ "remove record for container + " + containerId);
}
expectedContainers.remove(containerId);
}
@@ -587,7 +599,8 @@ final class YarnContainerManager
private void informAboutConatinerFailureDuringRestart(final String containerId) {
LOG.log(Level.WARNING, "Container [" + containerId +
- "] has failed during driver restart process, FailedEvaluaorHandler will be triggered, but no additional evaluator can be requested due to YARN-2433.");
+ "] has failed during driver restart process, FailedEvaluatorHandler will be triggered, but " +
+ "no additional evaluator can be requested due to YARN-2433.");
// trigger a failed evaluator event
this.reefEventHandlers.onResourceStatus(ResourceStatusEventImpl.newBuilder()
.setIdentifier(containerId)
@@ -635,7 +648,8 @@ final class YarnContainerManager
* @throws java.io.IOException when the file can't be written.
*/
- private void appendByDeleteAndCreate(final FileSystem fs, final Path path, final String appendEntry) throws IOException {
+ private void appendByDeleteAndCreate(final FileSystem fs, final Path path, final String appendEntry)
+ throws IOException {
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
try (final InputStream inputStream = fs.open(path)) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
index 873ab65..baab946 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/YarnResourceRequestHandler.java
@@ -52,7 +52,8 @@ public final class YarnResourceRequestHandler implements ResourceRequestHandler
@Override
public synchronized void onNext(final ResourceRequestEvent resourceRequestEvent) {
- LOG.log(Level.FINEST, "Got ResourceRequestEvent in YarnResourceRequestHandler: memory = {0}, cores = {1}.", new Object[]{resourceRequestEvent.getMemorySize(), resourceRequestEvent.getVirtualCores()});
+ LOG.log(Level.FINEST, "Got ResourceRequestEvent in YarnResourceRequestHandler: memory = {0}, cores = {1}.",
+ new Object[]{resourceRequestEvent.getMemorySize(), resourceRequestEvent.getVirtualCores()});
final String[] nodes = resourceRequestEvent.getNodeNameList().size() == 0 ? null :
resourceRequestEvent.getNodeNameList().toArray(new String[resourceRequestEvent.getNodeNameList().size()]);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/util/YarnTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/util/YarnTypes.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/util/YarnTypes.java
index 536d7b5..72e058e 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/util/YarnTypes.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/util/YarnTypes.java
@@ -51,7 +51,8 @@ public final class YarnTypes {
final String hadoopVersion = VersionInfo.getVersion();
if (hadoopVersion == null || hadoopVersion.length() < version.length()) {
- throw new RuntimeException("unsupported or incomplete hadoop version number provided for comparison: " + hadoopVersion);
+ throw new RuntimeException("unsupported or incomplete hadoop version number provided for comparison: " +
+ hadoopVersion);
}
return hadoopVersion.substring(0, version.length()).compareTo(version) >= 0;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Aspect.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Aspect.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Aspect.java
index e2ff1cd..504821a 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Aspect.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Aspect.java
@@ -53,7 +53,8 @@ public interface Aspect {
* Note, it is inject()'s responsibility to call <tt>ret.getInstance() if ret instanceof ExternalConstructor</tt>.
* @throws A number of exceptions which are passed-through from the wrapped call to newInstance().
*/
- <T> T inject(ConstructorDef<T> def, Constructor<T> constructor, Object[] args) throws InvocationTargetException, IllegalAccessException, IllegalArgumentException, InstantiationException;
+ <T> T inject(ConstructorDef<T> def, Constructor<T> constructor, Object[] args)
+ throws InvocationTargetException, IllegalAccessException, IllegalArgumentException, InstantiationException;
/**
* TANG calls this the first time get() is called on an injection future. This informs the aspect of
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Configuration.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Configuration.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Configuration.java
index ded80fa..ac0cf82 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Configuration.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Configuration.java
@@ -88,7 +88,8 @@ public interface Configuration {
* If nothing was explicitly bound, the set will be empty (it will not reflect any default values).
*
* @param np A NamedParameterNode from this Configuration's class hierarchy.
- * @return A set of ClassHierarchy Node objects or a set of strings, depending on whether the NamedParameterNode refers to an interface or configuration options, respectively.
+ * @return A set of ClassHierarchy Node objects or a set of strings, depending on
+ * whether the NamedParameterNode refers to an interface or configuration options, respectively.
* @see getClassHierarchy()
*/
Set<Object> getBoundSet(NamedParameterNode<Set<?>> np);
@@ -112,7 +113,8 @@ public interface Configuration {
<T> ClassNode<T> getBoundImplementation(ClassNode<T> cn);
/**
- * Return the LegacyConstructor that has been bound to this Class. Such constructors are defined in the class, but missing their @Inject annotation.
+ * Return the LegacyConstructor that has been bound to this Class.
+ * Such constructors are defined in the class, but missing their @Inject annotation.
* <p/>
* For now, only one legacy constructor can be bound per class.
* <p/>
@@ -151,9 +153,11 @@ public interface Configuration {
/**
* Get the set bindings from set-valued NamedParameters to the values they were bound to.
* <p/>
- * TODO: This API seems wonky. Why not return a Set<NamedParameterNode<Set<?>>> instead, and let the caller invoke getBoundSet() above?
+ * TODO: This API seems wonky.
+ * Why not return a Set<NamedParameterNode<Set<?>>> instead, and let the caller invoke getBoundSet() above?
*
- * @return a flattened set with one entry for each binding (the same NamedParameterNode may be a key for multiple bindings.
+ * @return a flattened set with one entry for each binding
+ * (the same NamedParameterNode may be a key for multiple bindings.
* @deprecated
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ConfigurationBuilder.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ConfigurationBuilder.java
index f56ee0e..c7409b9 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ConfigurationBuilder.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/ConfigurationBuilder.java
@@ -121,7 +121,8 @@ public interface ConfigurationBuilder {
* instance returned by getClassHierarchy().
*
* @param cn The class the constructor instantiates.
- * @param args The parsed ConstructorArg objects correspdonding to the types of the arguments taken by the constructor, in declaration order.
+ * @param args The parsed ConstructorArg objects corresponding to the types of the arguments taken by the constructor,
+ * in declaration order.
* @throws BindException if the constructor does not exist, or if it has already been bound as a legacy constructor.
*/
void registerLegacyConstructor(ClassNode<?> c, ConstructorArg... args)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/JavaConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/JavaConfigurationBuilder.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/JavaConfigurationBuilder.java
index cf9d8a4..e1f81e2 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/JavaConfigurationBuilder.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/JavaConfigurationBuilder.java
@@ -75,11 +75,13 @@ public interface JavaConfigurationBuilder extends ConfigurationBuilder {
Class<? extends T> impl) throws BindException;
<T> JavaConfigurationBuilder bindConstructor(Class<T> c,
- Class<? extends ExternalConstructor<? extends T>> v) throws BindException;
+ Class<? extends ExternalConstructor<? extends T>> v)
+ throws BindException;
<T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, String value) throws BindException;
- <T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Class<? extends T> impl) throws BindException;
+ <T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Class<? extends T> impl)
+ throws BindException;
/**
* Binds a specfic list to a named parameter. List's elements can be string values or class implementations.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Tang.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Tang.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Tang.java
index 0e0a600..f5fd4e5 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Tang.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/Tang.java
@@ -53,7 +53,8 @@ public interface Tang {
* ClassHierarchy object.
*
* @param ch Any valid Tang ClassHierarchy, including ones derived from non-Java application binaries.
- * @return an instance of ConfigurationBuilder. In Tang's default implementation this returns an instance or JavaConfigurationBuilder if ch is backed by a Java classloader.
+ * @return an instance of ConfigurationBuilder. In Tang's default implementation this returns an instance
+ * or JavaConfigurationBuilder if ch is backed by a Java classloader.
*/
ConfigurationBuilder newConfigurationBuilder(ClassHierarchy ch);
@@ -92,7 +93,8 @@ public interface Tang {
*
* @return a new ConfigurationBuilder
*/
- JavaConfigurationBuilder newConfigurationBuilder(@SuppressWarnings("unchecked") Class<? extends ExternalConstructor<?>>... parameterParsers)
+ JavaConfigurationBuilder newConfigurationBuilder(
+ @SuppressWarnings("unchecked") Class<? extends ExternalConstructor<?>>... parameterParsers)
throws BindException;
/**
@@ -105,7 +107,9 @@ public interface Tang {
* this method.
*/
JavaConfigurationBuilder newConfigurationBuilder(URL[] jars,
- Configuration[] confs, Class<? extends ExternalConstructor<?>>[] parameterParsers) throws BindException;
+ Configuration[] confs,
+ Class<? extends ExternalConstructor<?>>[] parameterParsers)
+ throws BindException;
/**
* Create a new empty ConfigurationBuilder that is backed by the default
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 e166ae9..a97fa89 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
@@ -35,6 +35,9 @@ public class NameResolutionException extends BindException {
private static final long serialVersionUID = 1L;
public NameResolutionException(String name, 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 (check your classpath and the code that instantiated Tang)");
+ 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 " +
+ "(check your classpath and the code that instantiated Tang)");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 0eba022..c1f9e3b 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
@@ -62,7 +62,8 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize
public AvroConfigurationSerializer() {
}
- private static void fromAvro(final AvroConfiguration avroConfiguration, final ConfigurationBuilder configurationBuilder) throws BindException {
+ private static void fromAvro(final AvroConfiguration avroConfiguration,
+ final ConfigurationBuilder configurationBuilder) throws BindException {
// Note: This code is an adapted version of ConfigurationFile.processConfigFile();
// TODO: This method should implement list deserialization. Implement it when C# side is ready.
final Map<String, String> importedNames = new HashMap<>();
@@ -268,7 +269,8 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize
}
@Override
- public Configuration fromFile(final File file, final ClassHierarchy classHierarchy) throws IOException, BindException {
+ public Configuration fromFile(final File file, final ClassHierarchy classHierarchy)
+ throws IOException, BindException {
return fromAvro(avroFromFile(file), classHierarchy);
}
@@ -279,7 +281,8 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize
}
@Override
- public Configuration fromTextFile(final File file, final ClassHierarchy classHierarchy) throws IOException, BindException {
+ public Configuration fromTextFile(final File file, final ClassHierarchy classHierarchy)
+ throws IOException, BindException {
final StringBuilder result = readFromTextFile(file);
return this.fromString(result.toString(), classHierarchy);
}
@@ -302,7 +305,8 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize
}
@Override
- public Configuration fromByteArray(final byte[] theBytes, final ClassHierarchy classHierarchy) throws IOException, BindException {
+ public Configuration fromByteArray(final byte[] theBytes, final ClassHierarchy classHierarchy)
+ throws IOException, BindException {
return fromAvro(avroFromBytes(theBytes), classHierarchy);
}
@@ -312,7 +316,8 @@ public final class AvroConfigurationSerializer implements ConfigurationSerialize
}
@Override
- public Configuration fromString(final String theString, final ClassHierarchy classHierarchy) throws IOException, BindException {
+ public Configuration fromString(final String theString, final ClassHierarchy classHierarchy)
+ throws IOException, BindException {
return fromAvro(avroFromString(theString), classHierarchy);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 e258cb1..56abdef 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
@@ -75,7 +75,8 @@ public class ConfigurationModule {
private <T> void processSet(Object impl) {
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?");
+ throw new ClassHierarchyException("Unknown Impl/Param when setting " +
+ ReflectionUtilities.getSimpleName(impl.getClass()) + ". Did you pass in a field from some other module?");
}
if (!reqSet.contains(f)) {
reqSet.add(f);
@@ -260,10 +261,12 @@ public class ConfigurationModule {
}
for (Class<?> c : this.builder.freeParams.keySet()) {
- ret.add(new MyEntry(ReflectionUtilities.getFullName(c), this.builder.map.get(this.builder.freeParams.get(c)).getName()));
+ ret.add(new MyEntry(ReflectionUtilities.getFullName(c),
+ this.builder.map.get(this.builder.freeParams.get(c)).getName()));
}
for (Class<?> c : this.builder.freeImpls.keySet()) {
- ret.add(new MyEntry(ReflectionUtilities.getFullName(c), this.builder.map.get(this.builder.freeImpls.get(c)).getName()));
+ 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);
@@ -293,7 +296,8 @@ public class ConfigurationModule {
setImplLists.isEmpty() &&
setParamLists.isEmpty()
)) {
- throw new ClassHierarchyException("Detected statically set ConfigurationModule Parameter / Implementation. set() should only be used dynamically. Use bind...() instead.");
+ throw new ClassHierarchyException("Detected statically set ConfigurationModule Parameter / Implementation. " +
+ "set() should only be used dynamically. Use bind...() instead.");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/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 1d5139f..be0bfdf 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
@@ -130,12 +130,14 @@ public abstract class ConfigurationModuleBuilder {
*/
public final ConfigurationModuleBuilder merge(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.");
+ 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) {
- throw new ClassHierarchyException(ReflectionUtilities.getFullName(getClass()) + ": detected attempt to merge with ConfigurationModule that has had set() called on it", e);
+ throw new ClassHierarchyException(ReflectionUtilities.getFullName(getClass()) +
+ ": detected attempt to merge with ConfigurationModule that has had set() called on it", e);
}
ConfigurationModuleBuilder c = deepCopy();
try {
@@ -173,7 +175,8 @@ public abstract class ConfigurationModuleBuilder {
return c;
}
- public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Class<? extends T> impl) {
+ public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface,
+ Class<? extends T> impl) {
ConfigurationModuleBuilder c = deepCopy();
try {
c.b.bindSetEntry(iface, impl);
@@ -183,7 +186,8 @@ public abstract class ConfigurationModuleBuilder {
return c;
}
- public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Impl<? extends T> opt) {
+ public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface,
+ Impl<? extends T> opt) {
ConfigurationModuleBuilder c = deepCopy();
c.processUse(opt);
c.freeImpls.put(iface, opt);
@@ -193,7 +197,8 @@ public abstract class ConfigurationModuleBuilder {
return c;
}
- public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Param<? extends T> opt) {
+ public final <T> ConfigurationModuleBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface,
+ Param<? extends T> opt) {
ConfigurationModuleBuilder c = deepCopy();
c.processUse(opt);
c.freeParams.put(iface, opt);
@@ -269,7 +274,8 @@ public abstract class ConfigurationModuleBuilder {
}
public final <T> ConfigurationModuleBuilder bindConstructor(Class<T> clazz,
- Class<? extends ExternalConstructor<? extends T>> constructor) {
+ Class<? extends ExternalConstructor<? extends T>>
+ constructor) {
ConfigurationModuleBuilder c = deepCopy();
try {
c.b.bindConstructor(clazz, constructor);
@@ -312,7 +318,8 @@ public abstract class ConfigurationModuleBuilder {
private <T> void processUse(Object impl) {
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?");
+ throw new ClassHierarchyException("Unknown Impl/Param when binding " +
+ ReflectionUtilities.getSimpleName(impl.getClass()) + ". Did you pass in a field from some other module?");
}
if (!reqUsed.contains(f)) {
reqUsed.add(f);
@@ -345,7 +352,8 @@ public abstract class ConfigurationModuleBuilder {
try {
c.b.bind(ReflectionUtilities.getFullName(clz), c.lateBindClazz.get(clz));
} catch (NameResolutionException e) {
- throw new ClassHierarchyException("ConfigurationModule refers to unknown class: " + c.lateBindClazz.get(clz), e);
+ throw new ClassHierarchyException("ConfigurationModule refers to unknown class: " +
+ c.lateBindClazz.get(clz), e);
} catch (BindException e) {
throw new ClassHierarchyException("bind failed while initializing ConfigurationModuleBuilder", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationSerializer.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationSerializer.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationSerializer.java
index f4b811e..88c14cb 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationSerializer.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ConfigurationSerializer.java
@@ -129,7 +129,8 @@ public interface ConfigurationSerializer {
* @throws IOException if the byte[] can't be deserialized
* @throws BindException if the byte[] contains an illegal Configuration.
*/
- Configuration fromByteArray(final byte[] theBytes, final ClassHierarchy classHierarchy) throws IOException, BindException;
+ Configuration fromByteArray(final byte[] theBytes, final ClassHierarchy classHierarchy)
+ throws IOException, BindException;
/**
* Decodes a String generated via toString().
@@ -150,5 +151,6 @@ public interface ConfigurationSerializer {
* @throws IOException if theString can't be parsed.
* @throws BindException if theString contains an illegal Configuration.
*/
- Configuration fromString(final String theString, final ClassHierarchy classHierarchy) throws IOException, BindException;
+ Configuration fromString(final String theString, final ClassHierarchy classHierarchy)
+ throws IOException, BindException;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ParameterParser.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ParameterParser.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ParameterParser.java
index 5d40ead..32555c4 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ParameterParser.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/ParameterParser.java
@@ -56,7 +56,8 @@ public class ParameterParser {
addParser((Class) tc, (Class) ec);
}
- public <T, U extends T> void addParser(Class<U> clazz, Class<? extends ExternalConstructor<T>> ec) throws BindException {
+ public <T, U extends T> void addParser(Class<U> clazz, Class<? extends ExternalConstructor<T>> ec)
+ throws BindException {
Constructor<? extends ExternalConstructor<T>> c;
try {
c = ec.getDeclaredConstructor(String.class);
@@ -78,7 +79,8 @@ public class ParameterParser {
throw new IllegalArgumentException(
"Conflict detected when merging parameter parsers! To parse " + s
+ " I have a: " + ReflectionUtilities.getFullName(parsers.get(s).getDeclaringClass())
- + " the other instance has a: " + ReflectionUtilities.getFullName(p.parsers.get(s).getDeclaringClass()));
+ + " the other instance has a: "
+ + ReflectionUtilities.getFullName(p.parsers.get(s).getDeclaringClass()));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
index 3f0cdcc..e080748 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationBuilderImpl.java
@@ -38,7 +38,8 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
public static final String IMPORT = "import";
public static final String INIT = "<init>";
final TracingMonotonicMap<ClassNode<?>, ClassNode<?>> boundImpls = new TracingMonotonicTreeMap<>();
- final TracingMonotonicMap<ClassNode<?>, ClassNode<? extends ExternalConstructor<?>>> boundConstructors = new TracingMonotonicTreeMap<>();
+ final TracingMonotonicMap<ClassNode<?>, ClassNode<? extends ExternalConstructor<?>>> boundConstructors =
+ new TracingMonotonicTreeMap<>();
final Map<NamedParameterNode<?>, String> namedParameters = new TracingMonotonicTreeMap<>();
final Map<ClassNode<?>, ConstructorDef<?>> legacyConstructors = new TracingMonotonicTreeMap<>();
final MonotonicMultiMap<NamedParameterNode<Set<?>>, Object> boundSetEntries = new MonotonicMultiMap<>();
@@ -57,7 +58,9 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
this.namespace = namespace;
}
- protected ConfigurationBuilderImpl(URL[] jars, Configuration[] confs, Class<? extends ExternalConstructor<?>>[] parsers)
+ protected ConfigurationBuilderImpl(URL[] jars,
+ Configuration[] confs,
+ Class<? extends ExternalConstructor<?>>[] parsers)
throws BindException {
this.namespace = Tang.Factory.getTang().getDefaultClassHierarchy(jars, parsers);
for (Configuration tc : confs) {
@@ -176,7 +179,8 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
Node m = namespace.getNode(value);
bind((ClassNode<?>) n, (ClassNode<?>) m);
} else {
- throw new IllegalStateException("getNode() returned " + n + " which is neither a ClassNode nor a NamedParameterNode");
+ throw new IllegalStateException("getNode() returned " + n +
+ " which is neither a ClassNode nor a NamedParameterNode");
}
}
@@ -343,7 +347,8 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
ConfigurationBuilderImpl that = (ConfigurationBuilderImpl) o;
- if (boundConstructors != null ? !boundConstructors.equals(that.boundConstructors) : that.boundConstructors != null) {
+ if (boundConstructors != null ?
+ !boundConstructors.equals(that.boundConstructors) : that.boundConstructors != null) {
return false;
}
if (boundImpls != null ? !boundImpls.equals(that.boundImpls) : that.boundImpls != null) {
@@ -355,7 +360,8 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
if (boundLists != null ? !boundLists.equals(that.boundLists) : that.boundLists != null) {
return false;
}
- if (legacyConstructors != null ? !legacyConstructors.equals(that.legacyConstructors) : that.legacyConstructors != null) {
+ if (legacyConstructors != null ?
+ !legacyConstructors.equals(that.legacyConstructors) : that.legacyConstructors != null) {
return false;
}
if (namedParameters != null ? !namedParameters.equals(that.namedParameters) : that.namedParameters != null) {
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
index 4e251d9..7df15e0 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/TangImpl.java
@@ -86,7 +86,9 @@ public class TangImpl implements Tang {
@Override
public JavaConfigurationBuilder newConfigurationBuilder(URL[] jars,
- Configuration[] confs, Class<? extends ExternalConstructor<?>>[] parameterParsers) throws BindException {
+ Configuration[] confs,
+ Class<? extends ExternalConstructor<?>>[] parameterParsers)
+ throws BindException {
JavaConfigurationBuilder cb = new JavaConfigurationBuilderImpl(jars, confs, parameterParsers);
// for (Configuration c : confs) {
// cb.addConfiguration(c);
@@ -101,7 +103,8 @@ public class TangImpl implements Tang {
}
@Override
- public JavaClassHierarchy getDefaultClassHierarchy(URL[] jars, Class<? extends ExternalConstructor<?>>[] parameterParsers) {
+ public JavaClassHierarchy getDefaultClassHierarchy(URL[] jars,
+ Class<? extends ExternalConstructor<?>>[] parameterParsers) {
SetValuedKey key = new SetValuedKey(jars, parameterParsers);
JavaClassHierarchy ret = defaultClassHierarchy.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
index 10618a9..3011a0f 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/ClassHierarchyImpl.java
@@ -148,7 +148,8 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
try {
iface = (ClassNode<T>) getNode(np.getFullArgName());
} catch (NameResolutionException e) {
- throw new IllegalStateException("Could not parse validated named parameter argument type. NamedParameter is " + np.getFullName() + " argument type is " + np.getFullArgName());
+ throw new IllegalStateException("Could not parse validated named parameter argument type. NamedParameter is " +
+ np.getFullName() + " argument type is " + np.getFullArgName());
}
Class<?> clazz;
String fullName;
@@ -173,9 +174,11 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
return (T) impl;
}
}
- throw new ParseException("Name<" + iface.getFullName() + "> " + np.getFullName() + " cannot take non-subclass " + impl.getFullName(), e);
+ throw new ParseException("Name<" + iface.getFullName() + "> " + np.getFullName() +
+ " cannot take non-subclass " + impl.getFullName(), e);
} catch (NameResolutionException e2) {
- throw new ParseException("Name<" + iface.getFullName() + "> " + np.getFullName() + " cannot take non-class " + value, e);
+ throw new ParseException("Name<" + iface.getFullName() + "> " + np.getFullName() +
+ " cannot take non-class " + value, e);
}
}
}
@@ -216,7 +219,8 @@ public class ClassHierarchyImpl implements JavaClassHierarchy {
if (parameterParser.canParse(ReflectionUtilities.getFullName(argType))) {
if (clazz.getAnnotation(NamedParameter.class).default_class() != Void.class) {
- throw new ClassHierarchyException("Named parameter " + ReflectionUtilities.getFullName(clazz) + " defines default implementation for parsable type " + ReflectionUtilities.getFullName(argType));
+ throw new ClassHierarchyException("Named parameter " + ReflectionUtilities.getFullName(clazz) +
+ " defines default implementation for parsable type " + ReflectionUtilities.getFullName(argType));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
index fdbe880..6349326 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/InjectorImpl.java
@@ -135,7 +135,8 @@ public class InjectorImpl implements Injector {
private void assertNotConcurrent() {
if (concurrentModificationGuard) {
- throw new ConcurrentModificationException("Detected attempt to use Injector from within an injected constructor!");
+ throw new ConcurrentModificationException("Detected attempt to use Injector " +
+ "from within an injected constructor!");
}
}
@@ -287,7 +288,9 @@ public class InjectorImpl implements Injector {
@SuppressWarnings("unchecked")
private <T> InjectionPlan<T> wrapInjectionPlans(ClassNode<T> infeasibleNode,
- List<? extends InjectionPlan<T>> list, boolean forceAmbiguous, int selectedIndex) {
+ List<? extends InjectionPlan<T>> list,
+ boolean forceAmbiguous,
+ int selectedIndex) {
if (list.size() == 0) {
return new Subplan<>(infeasibleNode);
} else if ((!forceAmbiguous) && list.size() == 1) {
@@ -317,12 +320,14 @@ public class InjectorImpl implements Injector {
ret2.add(javaNamespace.parse(np, (String) o));
} catch (ParseException e) {
// Parsability is now pre-checked in bindSet, so it should not be reached!
- throw new IllegalStateException("Could not parse " + o + " which was passed into " + np + " FIXME: Parsability is not currently checked by bindSetEntry(Node,String)");
+ throw new IllegalStateException("Could not parse " + o + " which was passed into " + np +
+ " FIXME: Parsability is not currently checked by bindSetEntry(Node,String)");
}
} else if (o instanceof Node) {
ret2.add((T) o);
} else {
- throw new IllegalStateException("Unexpected object " + o + " in bound set. Should consist of nodes and strings");
+ throw new IllegalStateException("Unexpected object " + o + " in bound set. " +
+ "Should consist of nodes and strings");
}
}
return (T) ret2;
@@ -372,7 +377,8 @@ public class InjectorImpl implements Injector {
try {
return (ClassNode<T>) javaNamespace.getNode(cn.getDefaultImplementation());
} catch (ClassCastException | NameResolutionException e) {
- throw new IllegalStateException("After validation, " + cn + " had a bad default implementation named " + cn.getDefaultImplementation(), e);
+ throw new IllegalStateException("After validation, " + cn + " had a bad default implementation named " +
+ cn.getDefaultImplementation(), e);
}
} else {
return null;
@@ -635,7 +641,8 @@ public class InjectorImpl implements Injector {
ret = c.newInstance(args);
}
} catch (IllegalArgumentException e) {
- StringBuilder sb = new StringBuilder("Internal Tang error? Could not call constructor " + constructor.getConstructorDef() + " with arguments [");
+ StringBuilder sb = new StringBuilder("Internal Tang error? Could not call constructor " +
+ constructor.getConstructorDef() + " with arguments [");
for (Object o : args) {
sb.append("\n\t" + o);
}
@@ -648,7 +655,8 @@ public class InjectorImpl implements Injector {
instances.put(constructor.getNode(), ret);
return ret;
} catch (ReflectiveOperationException e) {
- throw new InjectionException("Could not invoke constructor: " + plan, e instanceof InvocationTargetException ? e.getCause() : e);
+ throw new InjectionException("Could not invoke constructor: " + plan,
+ e instanceof InvocationTargetException ? e.getCause() : e);
} finally {
concurrentModificationGuard = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaConfigurationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaConfigurationBuilderImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaConfigurationBuilderImpl.java
index e1d56f0..507481e 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaConfigurationBuilderImpl.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaConfigurationBuilderImpl.java
@@ -40,7 +40,9 @@ import java.util.Set;
public class JavaConfigurationBuilderImpl extends ConfigurationBuilderImpl
implements JavaConfigurationBuilder {
- public JavaConfigurationBuilderImpl(URL[] jars, Configuration[] confs, Class<? extends ExternalConstructor<?>>[] parsers)
+ public JavaConfigurationBuilderImpl(URL[] jars,
+ Configuration[] confs,
+ Class<? extends ExternalConstructor<?>>[] parsers)
throws BindException {
super(jars, confs, parsers);
}
@@ -129,7 +131,8 @@ public class JavaConfigurationBuilderImpl extends ConfigurationBuilderImpl
@SuppressWarnings({"unchecked"})
public <T> JavaConfigurationBuilder bindConstructor(Class<T> c,
- Class<? extends ExternalConstructor<? extends T>> v) throws BindException {
+ Class<? extends ExternalConstructor<? extends T>> v)
+ throws BindException {
final Node n = getNode(c);
final Node m = getNode(v);
if (!(n instanceof ClassNode)) {
@@ -144,7 +147,8 @@ public class JavaConfigurationBuilderImpl extends ConfigurationBuilderImpl
@SuppressWarnings("unchecked")
@Override
- public <T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, String value) throws BindException {
+ public <T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, String value)
+ throws BindException {
final Node n = getNode(iface);
if (!(n instanceof NamedParameterNode)) {
@@ -161,7 +165,8 @@ public class JavaConfigurationBuilderImpl extends ConfigurationBuilderImpl
@SuppressWarnings("unchecked")
@Override
- public <T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Class<? extends T> impl) throws BindException {
+ public <T> JavaConfigurationBuilder bindSetEntry(Class<? extends Name<Set<T>>> iface, Class<? extends T> impl)
+ throws BindException {
final Node n = getNode(iface);
final Node m = getNode(impl);
@@ -174,7 +179,8 @@ public class JavaConfigurationBuilderImpl extends ConfigurationBuilderImpl
}
final Type valType = ReflectionUtilities.getInterfaceTarget(Set.class, setType);
if (!ReflectionUtilities.getRawClass(valType).isAssignableFrom(impl)) {
- throw new BindException("BindSetEntry got implementation " + impl + " that is incompatible with expected type " + valType);
+ throw new BindException("BindSetEntry got implementation " + impl +
+ " that is incompatible with expected type " + valType);
}
super.bindSetEntry((NamedParameterNode<Set<T>>) n, m);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
index f0c2877..b7a2964 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaNodeFactory.java
@@ -72,7 +72,9 @@ public final class JavaNodeFactory {
}
if (unit && !foundNonStaticInnerClass) {
- throw new ClassHierarchyException("Class " + ReflectionUtilities.getFullName(clazz) + " has an @Unit annotation, but no non-static inner classes. Such @Unit annotations would have no effect, and are therefore disallowed.");
+ throw new ClassHierarchyException("Class " + ReflectionUtilities.getFullName(clazz) +
+ " has an @Unit annotation, but no non-static inner classes. " +
+ " Such @Unit annotations would have no effect, and are therefore disallowed.");
}
Constructor<T>[] constructors = (Constructor<T>[]) clazz
@@ -89,7 +91,8 @@ public final class JavaNodeFactory {
}
if (parentIsUnit && (constructorAnnotatedInjectable || constructors[k].getParameterTypes().length != 1)) {
throw new ClassHierarchyException(
- "Detected explicit constructor in class enclosed in @Unit " + fullName + " Such constructors are disallowed.");
+ "Detected explicit constructor in class enclosed in @Unit " + fullName +
+ " Such constructors are disallowed.");
}
boolean constructorInjectable = constructorAnnotatedInjectable || parentIsUnit;
// ConstructorDef's constructor checks for duplicate
@@ -140,7 +143,8 @@ public final class JavaNodeFactory {
* XXX: This method assumes that all generic types have exactly one type parameter.
*/
public static <T> NamedParameterNode<T> createNamedParameterNode(Node parent,
- Class<? extends Name<T>> clazz, Type argClass) throws ClassHierarchyException {
+ Class<? extends Name<T>> clazz, Type argClass)
+ throws ClassHierarchyException {
Class<?> argRawClass = ReflectionUtilities.getRawClass(argClass);
@@ -192,7 +196,8 @@ public final class JavaNodeFactory {
hasClassSetDefault = false;
}
if (defaultCount > 1) {
- throw new ClassHierarchyException("Named parameter " + fullName + " defines more than one of default_value, default_class, default_values and default_classes");
+ throw new ClassHierarchyException("Named parameter " + fullName +
+ " defines more than one of default_value, default_class, default_values and default_classes");
}
final String[] defaultInstanceAsStrings;
@@ -268,11 +273,13 @@ public final class JavaNodeFactory {
if (!(isSubclass)) {
throw new ClassHierarchyException(namedParameter + " defines a default class "
- + ReflectionUtilities.getFullName(defaultClass) + " with a raw type that does not extend of its target's raw type " + argRawClass);
+ + ReflectionUtilities.getFullName(defaultClass)
+ + " with a raw type that does not extend of its target's raw type " + argRawClass);
}
if (!(isGenericSubclass)) {
throw new ClassHierarchyException(namedParameter + " defines a default class "
- + ReflectionUtilities.getFullName(defaultClass) + " with a type that does not extend its target's type " + argClass);
+ + ReflectionUtilities.getFullName(defaultClass)
+ + " with a type that does not extend its target's type " + argClass);
}
}
@@ -286,7 +293,8 @@ public final class JavaNodeFactory {
// We don't support injection of non-static member classes with @Inject
// annotations.
if (injectable && !isClassInjectionCandidate) {
- throw new ClassHierarchyException("Cannot @Inject non-static member class unless the enclosing class an @Unit. Nested class is:"
+ throw new ClassHierarchyException("Cannot @Inject non-static member class unless the enclosing class an @Unit. "
+ + " Nested class is:"
+ ReflectionUtilities.getFullName(constructor.getDeclaringClass()));
}
// TODO: When we use paramTypes below, we strip generic parameters. Is that OK?