[REEF-441] Fix violations of VisibilityModifier checkstyle This addressed the issue by * allowing protected class members together with private * fixing violations
JIRA: [REEF-441](https://issues.apache.org/jira/browse/REEF-441) Pull Request: This closes #323 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/c9e1bf9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/c9e1bf9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/c9e1bf9b Branch: refs/heads/master Commit: c9e1bf9b3d73d04e34e76236a6818477ed4f74e6 Parents: 84feeaf Author: Mariia Mykhailova <[email protected]> Authored: Mon Jul 27 16:32:26 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Fri Jul 31 10:23:55 2015 -0700 ---------------------------------------------------------------------- .../apache/reef/javabridge/InteropLogger.java | 2 +- .../reef/javabridge/InteropReturnInfo.java | 4 +- .../org/apache/reef/common/AbstractFailure.java | 10 ++-- .../runtime/common/utils/DispatchingEStage.java | 4 +- .../org/apache/reef/util/logging/LogParser.java | 18 ++++++- .../src/main/resources/checkstyle.xml | 2 +- .../reef/examples/group/bgd/ExampleList.java | 2 +- .../group/bgd/LineSearchReduceFunction.java | 6 +-- .../bgd/LossAndGradientReduceFunction.java | 8 +-- .../reef/examples/group/bgd/MasterTask.java | 22 ++++---- .../reef/examples/group/bgd/SlaveTask.java | 4 +- .../scheduler/SchedulerHttpHandler.java | 2 +- .../reef/io/data/loading/api/DataLoader.java | 4 +- .../AbstractEvaluatorToPartitionStrategy.java | 2 +- .../data/loading/impl/InputFormatDataSet.java | 2 +- .../group/impl/config/ReduceOperatorSpec.java | 2 +- .../group/impl/driver/ExceptionHandler.java | 2 +- .../impl/utils/BroadcastingEventHandler.java | 2 +- .../org/apache/reef/io/network/util/Pair.java | 11 +++- .../reef/io/storage/FramingInputStream.java | 2 +- .../io/storage/FramingTupleDeserializer.java | 2 +- .../reef/io/storage/FramingTupleSerializer.java | 2 +- .../reef/io/storage/util/GetAllIterable.java | 4 +- .../reef/services/network/NameClientTest.java | 14 ++--- .../reef/services/network/NamingTest.java | 4 +- .../reef/services/storage/SpoolFileTest.java | 4 +- .../java/org/apache/reef/tang/examples/A.java | 2 +- .../apache/reef/tang/formats/CommandLine.java | 2 +- .../reef/tang/formats/ConfigurationModule.java | 10 ++-- .../formats/ConfigurationModuleBuilder.java | 33 ++++++------ .../reef/tang/formats/ParameterParser.java | 2 +- .../ConfigurationBuilderImpl.java | 21 ++++---- .../tang/implementation/ConfigurationImpl.java | 8 ++- .../reef/tang/implementation/Constructor.java | 10 ++-- .../tang/implementation/StackBindLocation.java | 2 +- .../reef/tang/implementation/TangImpl.java | 2 +- .../implementation/java/ClassHierarchyImpl.java | 6 ++- .../tang/implementation/java/InjectorImpl.java | 6 +-- .../java/JavaConfigurationBuilderImpl.java | 2 +- .../tang/implementation/java/JavaInstance.java | 6 ++- .../tang/util/AbstractMonotonicMultiMap.java | 4 +- .../java/org/apache/reef/tang/util/Tint.java | 12 ++--- .../org/apache/reef/tang/TestBindSingleton.java | 22 ++++---- .../org/apache/reef/tang/TestListInjection.java | 55 +++++++++++++------- .../org/apache/reef/tang/TestSetInjection.java | 24 ++++++--- .../java/org/apache/reef/tang/TestTang.java | 48 ++++++++--------- .../tang/implementation/TestClassHierarchy.java | 12 ++--- .../java/TestParameterParser.java | 11 ++-- .../reef/tests/fail/driver/FailDriver.java | 4 +- .../org/apache/reef/wake/AbstractEStage.java | 4 +- .../org/apache/reef/wake/IdentifierParser.java | 2 +- .../reef/wake/examples/join/BlockingJoin.java | 2 +- .../reef/wake/examples/join/TupleSource.java | 4 +- .../reef/wake/impl/MergingEventHandler.java | 24 +++++++-- .../apache/reef/wake/profiler/WakeProfiler.java | 22 +++++--- .../apache/reef/wake/storage/ReadRequest.java | 17 ++++-- .../apache/reef/wake/storage/ReadResponse.java | 16 ++++-- .../reef/wake/storage/SequentialFileReader.java | 18 +++---- .../reef/wake/test/MergingEventHandlerTest.java | 40 +++++++------- .../webserver/HttpServerReefEventHandler.java | 4 +- .../webserver/TestAvroSerializerForHttp.java | 4 +- .../webserver/TestReefEventStateManager.java | 2 +- 62 files changed, 357 insertions(+), 247 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java index 76df191..bc19cd9 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropLogger.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class InteropLogger { private static final Logger LOG = Logger.getLogger("InteropLogger"); - HashMap<Integer, Level> levelHashMap; + private HashMap<Integer, Level> levelHashMap; { levelHashMap = new HashMap<Integer, Level>(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java index 3a27f3a..831e090 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/InteropReturnInfo.java @@ -22,8 +22,8 @@ import java.util.ArrayList; public class InteropReturnInfo { - int returnCode; - ArrayList<String> exceptionList = new ArrayList<String>(); + private int returnCode; + private ArrayList<String> exceptionList = new ArrayList<String>(); public void addExceptionString(final String exceptionString) { exceptionList.add(exceptionString); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-common/src/main/java/org/apache/reef/common/AbstractFailure.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/common/AbstractFailure.java b/lang/java/reef-common/src/main/java/org/apache/reef/common/AbstractFailure.java index 9fda1c2..dc0e07c 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/common/AbstractFailure.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/common/AbstractFailure.java @@ -31,29 +31,29 @@ public abstract class AbstractFailure implements Failure { /** * Identifier of the entity that produced the error. Cannot be null. */ - protected final String id; + private final String id; /** * One-line error message. For wrapped exceptions, this equals * to the Exception.getMessage() result. Cannot be null. */ - protected final String message; + private final String message; /** * Optional error description (long). * For exceptions it is by default populates with the stack trace. */ - protected final Optional<String> description; + private final Optional<String> description; /** * Optional Java exception that caused the error. */ - protected final Optional<Throwable> cause; + private final Optional<Throwable> cause; /** * Optional byte array that contains serialized version of the exception. */ - protected final Optional<byte[]> data; + private final Optional<byte[]> data; /** * @param id Identifier of the entity that produced the error. Cannot be null. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java index 80b14db..e6e8e9a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java @@ -133,8 +133,8 @@ public final class DispatchingEStage implements AutoCloseable { */ private static final class DelayedOnNext { - public final EventHandler<Object> handler; - public final Object message; + private final EventHandler<Object> handler; + private final Object message; @SuppressWarnings("unchecked") public <T, U extends T> DelayedOnNext(final EventHandler<T> handler, final U message) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java index b49922b..67fb5d1 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java @@ -29,7 +29,7 @@ import java.util.ArrayList; */ public final class LogParser { - public static String[] endIndicators = { + public static final String[] END_INDICATORS = { LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.BRIDGE_SETUP, LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.EVALUATOR_SUBMIT, LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.EVALUATOR_BRIDGE_SUBMIT, @@ -41,7 +41,14 @@ public final class LogParser { LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.TASK_COMPLETE }; - public static String[] startIndicators = { + /** + * @deprecated in 0.12. Use END_INDICATORS instead + */ + @Deprecated + @SuppressWarnings("checkstyle:constantname") + public static final String[] endIndicators = END_INDICATORS; + + public static final String[] START_INDICATORS = { LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.DRIVER_START, LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.BRIDGE_SETUP, LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.EVALUATOR_BRIDGE_SUBMIT, @@ -53,6 +60,13 @@ public final class LogParser { LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.TASK_COMPLETE }; + /** + * @deprecated in 0.12. Use START_INDICATORS instead + */ + @Deprecated + @SuppressWarnings("checkstyle:constantname") + public static final String[] startIndicators = START_INDICATORS; + private LogParser() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-common/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/checkstyle.xml b/lang/java/reef-common/src/main/resources/checkstyle.xml index 1ab4b3e..6a0fe87 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle.xml @@ -192,7 +192,7 @@ <module name="HideUtilityClassConstructor"/> <module name="InterfaceIsType"/> <module name="VisibilityModifier"> - <property name="severity" value="warning"/> + <property name="protectedAllowed" value="true"/> </module> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/ExampleList.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/ExampleList.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/ExampleList.java index 2b9ea81..9a3b7d4 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/ExampleList.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/ExampleList.java @@ -62,7 +62,7 @@ public class ExampleList { LOG.info("Loading data"); int i = 0; for (final Pair<LongWritable, Text> examplePair : dataSet) { - final Example example = parser.parse(examplePair.second.toString()); + final Example example = parser.parse(examplePair.getSecond().toString()); examples.add(example); if (++i % 2000 == 0) { LOG.log(Level.FINE, "Done parsing {0} lines", i); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LineSearchReduceFunction.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LineSearchReduceFunction.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LineSearchReduceFunction.java index 9c50c61..ae2ea81 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LineSearchReduceFunction.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LineSearchReduceFunction.java @@ -39,11 +39,11 @@ public class LineSearchReduceFunction implements Reduce.ReduceFunction<Pair<Vect for (final Pair<Vector, Integer> eval : evals) { if (combinedEvaluations == null) { - combinedEvaluations = new DenseVector(eval.first); + combinedEvaluations = new DenseVector(eval.getFirst()); } else { - combinedEvaluations.add(eval.first); + combinedEvaluations.add(eval.getFirst()); } - numEx += eval.second; + numEx += eval.getSecond(); } return new Pair<>(combinedEvaluations, numEx); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LossAndGradientReduceFunction.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LossAndGradientReduceFunction.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LossAndGradientReduceFunction.java index 91f855d..2cc6d54 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LossAndGradientReduceFunction.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/LossAndGradientReduceFunction.java @@ -42,12 +42,12 @@ public class LossAndGradientReduceFunction for (final Pair<Pair<Double, Integer>, Vector> lag : lags) { if (combinedGradient == null) { - combinedGradient = new DenseVector(lag.second); + combinedGradient = new DenseVector(lag.getSecond()); } else { - combinedGradient.add(lag.second); + combinedGradient.add(lag.getSecond()); } - lossSum += lag.first.first; - numEx += lag.first.second; + lossSum += lag.getFirst().getFirst(); + numEx += lag.getFirst().getSecond(); } return new Pair<>(new Pair<>(lossSum, numEx), combinedGradient); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java index 70302ae..953f73a 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java @@ -60,12 +60,12 @@ public class MasterTask implements Task { private final StepSizes ts; private final double lambda; private final int maxIters; - final ArrayList<Double> losses = new ArrayList<>(); - final Codec<ArrayList<Double>> lossCodec = new SerializableCodec<ArrayList<Double>>(); + private final ArrayList<Double> losses = new ArrayList<>(); + private final Codec<ArrayList<Double>> lossCodec = new SerializableCodec<ArrayList<Double>>(); private final Vector model; - boolean sendModel = true; - double minEta = 0; + private boolean sendModel = true; + private double minEta = 0; @Inject public MasterTask( @@ -99,8 +99,8 @@ public class MasterTask implements Task { for (int iteration = 1; !converged(iteration, gradientNorm); ++iteration) { try (final Timer t = new Timer("Current Iteration(" + (iteration) + ")")) { final Pair<Double, Vector> lossAndGradient = computeLossAndGradient(); - losses.add(lossAndGradient.first); - final Vector descentDirection = getDescentDirection(lossAndGradient.second); + losses.add(lossAndGradient.getFirst()); + final Vector descentDirection = getDescentDirection(lossAndGradient.getSecond()); updateModel(descentDirection); @@ -143,8 +143,8 @@ public class MasterTask implements Task { } final Pair<Vector, Integer> lineSearchEvals = lineSearchEvaluationsReducer.reduce(); if (lineSearchEvals != null) { - final int numExamples = lineSearchEvals.second; - lineSearchResults = lineSearchEvals.first; + final int numExamples = lineSearchEvals.getSecond(); + lineSearchResults = lineSearchEvals.getFirst(); lineSearchResults.scale(1.0 / numExamples); LOG.log(Level.INFO, "OUT: #Examples: {0}", numExamples); LOG.log(Level.INFO, "OUT: LineSearchEvals: {0}", lineSearchResults); @@ -176,13 +176,13 @@ public class MasterTask implements Task { final Pair<Pair<Double, Integer>, Vector> lossAndGradient = lossAndGradientReducer.reduce(); if (lossAndGradient != null) { - final int numExamples = lossAndGradient.first.second; + final int numExamples = lossAndGradient.getFirst().getSecond(); LOG.log(Level.INFO, "OUT: #Examples: {0}", numExamples); - final double lossPerExample = lossAndGradient.first.first / numExamples; + final double lossPerExample = lossAndGradient.getFirst().getFirst() / numExamples; LOG.log(Level.INFO, "OUT: Loss: {0}", lossPerExample); final double objFunc = ((lambda / 2) * model.norm2Sqr()) + lossPerExample; LOG.log(Level.INFO, "OUT: Objective Func Value: {0}", objFunc); - final Vector gradient = lossAndGradient.second; + final Vector gradient = lossAndGradient.getSecond(); gradient.scale(1.0 / numExamples); LOG.log(Level.INFO, "OUT: Gradient: {0}", gradient); returnValue = new Pair<>(objFunc, gradient); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java index e414bb7..460100c 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java @@ -128,8 +128,8 @@ public class SlaveTask implements Task { case DoLineSearchWithModel: failPerhaps(); final Pair<Vector, Vector> modelAndDescentDir = modelAndDescentDirectionBroadcaster.receive(); - this.model = modelAndDescentDir.first; - this.descentDirection = modelAndDescentDir.second; + this.model = modelAndDescentDir.getFirst(); + this.descentDirection = modelAndDescentDir.getSecond(); lineSearchEvaluationsReducer.send(lineSearchEvals()); break; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java index 1a92861..c8fd8f3 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java @@ -33,7 +33,7 @@ import java.util.Map; * Receive HttpRequest so that it can handle the command list. */ final class SchedulerHttpHandler implements HttpHandler { - final InjectionFuture<SchedulerDriver> schedulerDriver; + private final InjectionFuture<SchedulerDriver> schedulerDriver; private String uriSpecification = "reef-example-scheduler"; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java index f384bae..f3b0f4c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java @@ -217,7 +217,7 @@ public class DataLoader { final Pair<Configuration, Configuration> confPair = failedDataEvalConfigs.poll(); if (confPair != null) { LOG.log(Level.FINE, "Satisfying failed configuration for {0}", evalId); - allocatedEvaluator.submitContextAndService(confPair.first, confPair.second); + allocatedEvaluator.submitContextAndService(confPair.getFirst(), confPair.getSecond()); submittedDataEvalConfigs.put(evalId, confPair); return; } @@ -258,7 +258,7 @@ public class DataLoader { dataLoadingService.getServiceConfiguration(allocatedEvaluator)); LOG.log(Level.FINE, "Submitting data loading context to {0}", evalId); - allocatedEvaluator.submitContextAndService(confPair.first, confPair.second); + allocatedEvaluator.submitContextAndService(confPair.getFirst(), confPair.getSecond()); submittedDataEvalConfigs.put(allocatedEvaluator.getId(), confPair); // release the gate to keep on asking for more "data" evaluators. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/AbstractEvaluatorToPartitionStrategy.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/AbstractEvaluatorToPartitionStrategy.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/AbstractEvaluatorToPartitionStrategy.java index f6ea0dd..fbef1ea 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/AbstractEvaluatorToPartitionStrategy.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/AbstractEvaluatorToPartitionStrategy.java @@ -56,7 +56,7 @@ import java.util.logging.Logger; public abstract class AbstractEvaluatorToPartitionStrategy implements EvaluatorToPartitionStrategy<InputSplit> { private static final Logger LOG = Logger.getLogger(AbstractEvaluatorToPartitionStrategy.class.getName()); - protected final ConcurrentMap<String, BlockingQueue<NumberedSplit<InputSplit>>> locationToSplits;; + protected final ConcurrentMap<String, BlockingQueue<NumberedSplit<InputSplit>>> locationToSplits; protected final ConcurrentMap<String, NumberedSplit<InputSplit>> evaluatorToSplits; protected final BlockingQueue<NumberedSplit<InputSplit>> unallocatedSplits; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/InputFormatDataSet.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/InputFormatDataSet.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/InputFormatDataSet.java index 1fa55ca..aadf09f 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/InputFormatDataSet.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/impl/InputFormatDataSet.java @@ -108,7 +108,7 @@ public final class private void fetchRecord() { this.recordPair = new Pair<>(this.recordReader.createKey(), this.recordReader.createValue()); try { - this.hasNext = this.recordReader.next(this.recordPair.first, this.recordPair.second); + this.hasNext = this.recordReader.next(this.recordPair.getFirst(), this.recordPair.getSecond()); } catch (final IOException ex) { throw new RuntimeException("Unable to get InputSplits using the specified InputFormat", ex); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java index e2313ab..856c19f 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/config/ReduceOperatorSpec.java @@ -38,7 +38,7 @@ public class ReduceOperatorSpec implements OperatorSpec { /** * The reduce function to be used for operations that do reduction. */ - public final Class<? extends ReduceFunction> redFuncClass; + private final Class<? extends ReduceFunction> redFuncClass; public ReduceOperatorSpec(final String receiverId, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/ExceptionHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/ExceptionHandler.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/ExceptionHandler.java index be8ae84..b68a37b 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/ExceptionHandler.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/ExceptionHandler.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; */ public class ExceptionHandler implements EventHandler<Exception> { private static final Logger LOG = Logger.getLogger(ExceptionHandler.class.getName()); - List<Exception> exceptions = new ArrayList<>(); + private List<Exception> exceptions = new ArrayList<>(); @Inject public ExceptionHandler() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/BroadcastingEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/BroadcastingEventHandler.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/BroadcastingEventHandler.java index d608f7d..2a05b71 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/BroadcastingEventHandler.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/utils/BroadcastingEventHandler.java @@ -28,7 +28,7 @@ import java.util.List; */ public class BroadcastingEventHandler<T> implements EventHandler<T> { - List<EventHandler<T>> handlers = new ArrayList<>(); + private List<EventHandler<T>> handlers = new ArrayList<>(); public void addHandler(final EventHandler<T> handler) { handlers.add(handler); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Pair.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Pair.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Pair.java index 8d8ebb8..e4a5a00 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Pair.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Pair.java @@ -21,9 +21,16 @@ package org.apache.reef.io.network.util; import java.io.Serializable; public final class Pair<T1, T2> implements Serializable { + private final T1 first; + private final T2 second; - public final T1 first; - public final T2 second; + public T1 getFirst() { + return first; + } + + public T2 getSecond() { + return second; + } private String pairStr = null; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingInputStream.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingInputStream.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingInputStream.java index 664e5a5..f9a628f 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingInputStream.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingInputStream.java @@ -45,7 +45,7 @@ public class FramingInputStream extends DataInputStream implements Iterable<byte public Iterator<byte[]> iterator() { try { return new Iterator<byte[]>() { - byte[] cur = readFrame(); + private byte[] cur = readFrame(); @Override public boolean hasNext() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleDeserializer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleDeserializer.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleDeserializer.java index eeb28ec..9b44df8 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleDeserializer.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleDeserializer.java @@ -62,7 +62,7 @@ public class FramingTupleDeserializer<K, V> implements } } - int nextFrameLength = readFrameLength(); + private int nextFrameLength = readFrameLength(); @Override public boolean hasNext() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleSerializer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleSerializer.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleSerializer.java index a6cd0ad..5da8e3b 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleSerializer.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/FramingTupleSerializer.java @@ -55,7 +55,7 @@ public class FramingTupleSerializer<K, V> implements final Accumulator<V> valAccumulator = valSerializer.create(faos) .accumulator(); return new Accumulator<Tuple<K, V>>() { - boolean first = true; + private boolean first = true; @Override public void add(final Tuple<K, V> datum) throws ServiceException { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java index a8d1665..4ff2f4e 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/util/GetAllIterable.java @@ -39,8 +39,8 @@ public class GetAllIterable<T> implements public Iterator<Map.Entry<CharSequence, T>> iterator() { final Iterator<? extends CharSequence> k = keys.iterator(); return new Iterator<Map.Entry<CharSequence, T>>() { - CharSequence lastKey = null; - CharSequence curKey = findNextKey(); + private CharSequence lastKey = null; + private CharSequence curKey = findNextKey(); private CharSequence findNextKey() { while (k.hasNext()) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java index a0b7997..b66f3da 100644 --- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java +++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NameClientTest.java @@ -47,13 +47,13 @@ public class NameClientTest { this.localAddressProvider = LocalAddressProviderFactory.getInstance(); } - static int retryCount, retryTimeout; + private static final int RETRY_COUNT, RETRY_TIMEOUT; static { final Tang tang = Tang.Factory.getTang(); try { - retryCount = tang.newInjector().getNamedInstance(NameResolverRetryCount.class); - retryTimeout = tang.newInjector().getNamedInstance(NameResolverRetryTimeout.class); + RETRY_COUNT = tang.newInjector().getNamedInstance(NameResolverRetryCount.class); + RETRY_TIMEOUT = tang.newInjector().getNamedInstance(NameResolverRetryTimeout.class); } catch (final InjectionException e1) { throw new RuntimeException("Exception while trying to find default values for retryCount & Timeout", e1); } @@ -92,8 +92,8 @@ public class NameClientTest { .set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, localAddress) .set(NameResolverConfiguration.NAME_SERVICE_PORT, serverPort) .set(NameResolverConfiguration.CACHE_TIMEOUT, 10000) - .set(NameResolverConfiguration.RETRY_TIMEOUT, retryTimeout) - .set(NameResolverConfiguration.RETRY_COUNT, retryCount) + .set(NameResolverConfiguration.RETRY_TIMEOUT, RETRY_TIMEOUT) + .set(NameResolverConfiguration.RETRY_COUNT, RETRY_COUNT) .build(); try (final NameResolver client = @@ -127,8 +127,8 @@ public class NameClientTest { .set(NameResolverConfiguration.NAME_SERVER_HOSTNAME, localAddress) .set(NameResolverConfiguration.NAME_SERVICE_PORT, serverPort) .set(NameResolverConfiguration.CACHE_TIMEOUT, 150) - .set(NameResolverConfiguration.RETRY_TIMEOUT, retryTimeout) - .set(NameResolverConfiguration.RETRY_COUNT, retryCount) + .set(NameResolverConfiguration.RETRY_TIMEOUT, RETRY_TIMEOUT) + .set(NameResolverConfiguration.RETRY_COUNT, RETRY_COUNT) .build(); try (final NameResolver client = http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java index 472dde3..d550dae 100644 --- a/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java +++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/network/NamingTest.java @@ -69,8 +69,8 @@ public class NamingTest { @Rule public final TestName name = new TestName(); static final long TTL = 30000; - final IdentifierFactory factory = new StringIdentifierFactory(); - int port; + private final IdentifierFactory factory = new StringIdentifierFactory(); + private int port; public NamingTest() throws InjectionException { this.localAddressProvider = LocalAddressProviderFactory.getInstance(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java index 2ff6744..edd9ac1 100644 --- a/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java +++ b/lang/java/reef-io/src/test/java/org/apache/reef/services/storage/SpoolFileTest.java @@ -89,8 +89,8 @@ public class SpoolFileTest { @Override public Iterator<Integer> iterator() { final Iterator<Integer> it = new Iterator<Integer>() { - final byte[] inb = new byte[4]; - Integer nextInt; + private final byte[] inb = new byte[4]; + private Integer nextInt; @Override public boolean hasNext() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java b/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java index 96c80ab..0ae38e7 100644 --- a/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java +++ b/lang/java/reef-tang/tang-test-jarA/src/main/java/org/apache/reef/tang/examples/A.java @@ -19,5 +19,5 @@ package org.apache.reef.tang.examples; public class A { - int iAmAClass = 0; + private int iAmAClass = 0; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 f879d16..fd49512 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 @@ -36,7 +36,7 @@ import java.util.Map; public final class CommandLine { - final Map<Option, CommandLineCallback> applicationOptions = new HashMap<>(); + private final Map<Option, CommandLineCallback> applicationOptions = new HashMap<>(); private final ConfigurationBuilder conf; private final Map<String, String> shortNames = new MonotonicTreeMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 c85bda1..a926833 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 @@ -42,7 +42,7 @@ import java.util.Set; * @see org.apache.reef.tang.formats.TestConfigurationModule for more information and examples. */ public class ConfigurationModule { - final ConfigurationModuleBuilder builder; + private final ConfigurationModuleBuilder builder; // Set of required unset parameters. Must be empty before build. private final Set<Field> reqSet = new MonotonicHashSet<>(); private final Map<Impl<?>, Class<?>> setImpls = new MonotonicHashMap<>(); @@ -236,8 +236,8 @@ public class ConfigurationModule { public List<Entry<String, String>> toStringPairs() { final List<Entry<String, String>> ret = new ArrayList<>(); class MyEntry implements Entry<String, String> { - final String k; - final String v; + private final String k; + private final String v; public MyEntry(final String k, final String v) { this.k = k; @@ -300,4 +300,8 @@ public class ConfigurationModule { "set() should only be used dynamically. Use bind...() instead."); } } + + public ConfigurationModuleBuilder getBuilder() { + return builder; + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 a8da150..d450723 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 @@ -42,16 +42,16 @@ public abstract class ConfigurationModuleBuilder { private static final Set<Class<?>> PARAM_TYPES = new MonotonicHashSet<Class<?>>( RequiredImpl.class, OptionalImpl.class, RequiredParameter.class, OptionalParameter.class); - final JavaConfigurationBuilder b = Tang.Factory.getTang() + protected final JavaConfigurationBuilder b = Tang.Factory.getTang() .newConfigurationBuilder(); // Sets of things that have been declared - final Set<Field> reqDecl = new MonotonicHashSet<>(); - final Set<Object> setOpts = new MonotonicHashSet<>(); + protected final Set<Field> reqDecl = new MonotonicHashSet<>(); + protected final Set<Object> setOpts = new MonotonicHashSet<>(); // Maps from field instance variables to the fields that they // are assigned to. These better be unique! - final Map<Object, Field> map = new MonotonicHashMap<>(); - final Map<Class<?>, Impl<?>> freeImpls = new MonotonicHashMap<>(); - final Map<Class<? extends Name<?>>, Param<?>> freeParams = new MonotonicHashMap<>(); + protected Map<Object, Field> map = new MonotonicHashMap<>(); + protected final Map<Class<?>, Impl<?>> freeImpls = new MonotonicHashMap<>(); + protected final Map<Class<? extends Name<?>>, Param<?>> freeParams = new MonotonicHashMap<>(); private final Set<Field> optDecl = new MonotonicHashSet<>(); // Set of things that have been used in a bind. These must be equal // to the decl counterparts before build() is called. @@ -140,20 +140,21 @@ public abstract class ConfigurationModuleBuilder { ": detected attempt to merge with ConfigurationModule that has had set() called on it", e); } final ConfigurationModuleBuilder c = deepCopy(); + final ConfigurationModuleBuilder builder = d.getBuilder(); try { - c.b.addConfiguration(d.builder.b.build()); + c.b.addConfiguration(builder.b.build()); } catch (final BindException e) { throw new ClassHierarchyException(e); } - c.reqDecl.addAll(d.builder.reqDecl); - c.optDecl.addAll(d.builder.optDecl); - c.reqUsed.addAll(d.builder.reqUsed); - c.optUsed.addAll(d.builder.optUsed); - c.setOpts.addAll(d.builder.setOpts); - c.map.putAll(d.builder.map); - c.freeImpls.putAll(d.builder.freeImpls); - c.freeParams.putAll(d.builder.freeParams); - c.lateBindClazz.putAll(d.builder.lateBindClazz); + c.reqDecl.addAll(builder.reqDecl); + c.optDecl.addAll(builder.optDecl); + c.reqUsed.addAll(builder.reqUsed); + c.optUsed.addAll(builder.optUsed); + c.setOpts.addAll(builder.setOpts); + c.map.putAll(builder.map); + c.freeImpls.putAll(builder.freeImpls); + c.freeParams.putAll(builder.freeParams); + c.lateBindClazz.putAll(builder.lateBindClazz); return c; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 3d0f28b..9396b96 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 @@ -47,7 +47,7 @@ public class ParameterParser { Void.class.getName()); } }; - MonotonicTreeMap<String, Constructor<? extends ExternalConstructor<?>>> parsers = new MonotonicTreeMap<>(); + private MonotonicTreeMap<String, Constructor<? extends ExternalConstructor<?>>> parsers = new MonotonicTreeMap<>(); @SuppressWarnings({"unchecked", "rawtypes"}) public void addParser(final Class<? extends ExternalConstructor<?>> ec) throws BindException { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 ce70b37..a8cfab2 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 @@ -37,18 +37,19 @@ import java.util.Set; 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 = + protected final TracingMonotonicMap<ClassNode<?>, ClassNode<?>> boundImpls = new TracingMonotonicTreeMap<>(); + protected final TracingMonotonicMap<ClassNode<?>, ClassNode<? extends ExternalConstructor<?>>> boundConstructors = + new TracingMonotonicTreeMap<>(); + protected final Map<NamedParameterNode<?>, String> namedParameters = new TracingMonotonicTreeMap<>(); + protected final Map<ClassNode<?>, ConstructorDef<?>> legacyConstructors = new TracingMonotonicTreeMap<>(); + protected final MonotonicMultiMap<NamedParameterNode<Set<?>>, Object> boundSetEntries = new MonotonicMultiMap<>(); + protected final TracingMonotonicMap<NamedParameterNode<List<?>>, List<Object>> boundLists = new TracingMonotonicTreeMap<>(); - final Map<NamedParameterNode<?>, String> namedParameters = new TracingMonotonicTreeMap<>(); - final Map<ClassNode<?>, ConstructorDef<?>> legacyConstructors = new TracingMonotonicTreeMap<>(); - final MonotonicMultiMap<NamedParameterNode<Set<?>>, Object> boundSetEntries = new MonotonicMultiMap<>(); - final TracingMonotonicMap<NamedParameterNode<List<?>>, List<Object>> boundLists = new TracingMonotonicTreeMap<>(); // TODO: None of these should be public! - Move to configurationBuilder. Have // that wrap itself // in a sane Configuration interface... // TODO: Should be final again! - public ClassHierarchy namespace; + private ClassHierarchy namespace; protected ConfigurationBuilderImpl() { this.namespace = Tang.Factory.getTang().getDefaultClassHierarchy(); @@ -90,7 +91,7 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder { @Override public void addConfiguration(final Configuration conf) throws BindException { // XXX remove cast! - addConfiguration(conf.getClassHierarchy(), ((ConfigurationImpl) conf).builder); + addConfiguration(conf.getClassHierarchy(), ((ConfigurationImpl) conf).getBuilder()); } @SuppressWarnings("unchecked") @@ -99,8 +100,8 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder { namespace = namespace.merge(ns); if ((namespace instanceof ClassHierarchyImpl || builder.namespace instanceof ClassHierarchyImpl)) { if ((namespace instanceof ClassHierarchyImpl && builder.namespace instanceof ClassHierarchyImpl)) { - ((ClassHierarchyImpl) namespace).parameterParser - .mergeIn(((ClassHierarchyImpl) builder.namespace).parameterParser); + ((ClassHierarchyImpl) namespace).getParameterParser() + .mergeIn(((ClassHierarchyImpl) builder.namespace).getParameterParser()); } else { throw new IllegalArgumentException("Attempt to merge Java and non-Java class hierarchy! Not supported."); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationImpl.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationImpl.java index 42ab78b..484a88b 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationImpl.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/ConfigurationImpl.java @@ -32,7 +32,7 @@ import java.util.Map.Entry; import java.util.Set; public class ConfigurationImpl implements Configuration { - final ConfigurationBuilderImpl builder; + private final ConfigurationBuilderImpl builder; protected ConfigurationImpl(final ConfigurationBuilderImpl builder) { this.builder = builder; @@ -89,7 +89,7 @@ public class ConfigurationImpl implements Configuration { @Override public ClassHierarchy getClassHierarchy() { - return builder.namespace; + return builder.getClassHierarchy(); } @Override @@ -140,4 +140,8 @@ public class ConfigurationImpl implements Configuration { public int hashCode() { return builder != null ? builder.hashCode() : 0; } + + public ConfigurationBuilderImpl getBuilder() { + return builder; + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Constructor.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Constructor.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Constructor.java index 27f8d1f..5884b23 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Constructor.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/Constructor.java @@ -25,11 +25,11 @@ import java.util.*; public final class Constructor<T> extends InjectionPlan<T> { - final ConstructorDef<T> constructor; - final InjectionPlan<?>[] args; - final int numAlternatives; - final boolean isAmbiguous; - final boolean isInjectable; + private final ConstructorDef<T> constructor; + private final InjectionPlan<?>[] args; + private final int numAlternatives; + private final boolean isAmbiguous; + private final boolean isInjectable; public Constructor(final ClassNode<T> classNode, final ConstructorDef<T> constructor, final InjectionPlan<?>[] args) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java index 55f9bec..8a6c662 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/StackBindLocation.java @@ -23,7 +23,7 @@ import org.apache.reef.tang.BindLocation; import java.util.Arrays; public class StackBindLocation implements BindLocation { - final StackTraceElement[] stack; + private final StackTraceElement[] stack; public StackBindLocation() { final StackTraceElement[] stackTrace = new Throwable().getStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 a4125b2..c9eb1b3 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 @@ -133,7 +133,7 @@ public class TangImpl implements Tang { } private class SetValuedKey { - public final Set<Object> key; + private final Set<Object> key; public SetValuedKey(final Object[] ts, final Object[] us) { key = new HashSet<Object>(Arrays.asList(ts)); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 5d5f953..08f29aa 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 @@ -49,7 +49,7 @@ public class ClassHierarchyImpl implements JavaClassHierarchy { * Custom parameter parsers allow applications to extend the set of classes * that Tang can parse. */ - public final ParameterParser parameterParser = new ParameterParser(); + private final ParameterParser parameterParser = new ParameterParser(); /** * The classloader that was used to populate this class hierarchy. */ @@ -417,6 +417,10 @@ public class ClassHierarchyImpl implements JavaClassHierarchy { return namespace; } + public ParameterParser getParameterParser() { + return parameterParser; + } + @Override public synchronized boolean isImplementation(final ClassNode<?> inter, final ClassNode<?> impl) { return impl.isImplementationOf(inter); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 08787ab..33aaafd 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 @@ -74,8 +74,8 @@ public class InjectorImpl implements Injector { } }; - final Map<ClassNode<?>, Object> instances = new TracingMonotonicTreeMap<>(); - final Map<NamedParameterNode<?>, Object> namedParameterInstances = new TracingMonotonicTreeMap<>(); + private final Map<ClassNode<?>, Object> instances = new TracingMonotonicTreeMap<>(); + private final Map<NamedParameterNode<?>, Object> namedParameterInstances = new TracingMonotonicTreeMap<>(); private final Configuration c; private final ClassHierarchy namespace; private final JavaClassHierarchy javaNamespace; @@ -618,7 +618,7 @@ public class InjectorImpl implements Injector { } else if (plan instanceof JavaInstance) { // TODO: Must be named parameter node. Check. // throw new IllegalStateException("Instance from plan not in Injector's set of instances?!?"); - return ((JavaInstance<T>) plan).instance; + return ((JavaInstance<T>) plan).getInstance(); } else if (plan instanceof Constructor) { final Constructor<T> constructor = (Constructor<T>) plan; final Object[] args = new Object[constructor.getArgs().length]; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/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 0113da1..fb8eeb9 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 @@ -70,7 +70,7 @@ public class JavaConfigurationBuilderImpl extends ConfigurationBuilderImpl } private Node getNode(final Class<?> c) { - return ((JavaClassHierarchy) namespace).getNode(c); + return ((JavaClassHierarchy) getClassHierarchy()).getNode(c); } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaInstance.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaInstance.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaInstance.java index d47ce83..5dc0c02 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaInstance.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/java/JavaInstance.java @@ -22,7 +22,7 @@ import org.apache.reef.tang.implementation.InjectionPlan; import org.apache.reef.tang.types.Node; public final class JavaInstance<T> extends InjectionPlan<T> { - final T instance; + private final T instance; public JavaInstance(final Node name, final T instance) { super(name); @@ -49,6 +49,10 @@ public final class JavaInstance<T> extends InjectionPlan<T> { return instance != null; } + public T getInstance() { + return instance; + } + public String getInstanceAsString() { return instance.toString(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java index c044654..cb84e9e 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/AbstractMonotonicMultiMap.java @@ -107,8 +107,8 @@ public abstract class AbstractMonotonicMultiMap<K, V> implements Collection<Entr public Iterator<Entry<K, V>> iterator() { final Iterator<Entry<K, Set<V>>> it = map.entrySet().iterator(); return new Iterator<Entry<K, V>>() { - Iterator<V> cur; - K curKey; + private Iterator<V> cur; + private K curKey; @Override public boolean hasNext() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java index e1e489e..0192be5 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java @@ -54,13 +54,13 @@ public class Tint { private static final String SETTERS = "setters"; private static final String USES = "uses"; private static final String FULLNAME = "fullName"; - final JavaClassHierarchy ch; - final Map<Field, ConfigurationModule> modules = new MonotonicHashMap<>(); - final MonotonicMultiMap<String, String> setters = new MonotonicMultiMap<>(); + private final JavaClassHierarchy ch; + private final Map<Field, ConfigurationModule> modules = new MonotonicHashMap<>(); + private final MonotonicMultiMap<String, String> setters = new MonotonicMultiMap<>(); // map from thing that was used to user of the thing. - final MonotonicMultiMap<String, String> usages = new MonotonicMultiMap<>(); - final Set<ClassNode<?>> knownClasses = new MonotonicSet<>(); - final Set<String> divs = new MonotonicSet<>(); + private final MonotonicMultiMap<String, String> usages = new MonotonicMultiMap<>(); + private final Set<ClassNode<?>> knownClasses = new MonotonicSet<>(); + private final Set<String> divs = new MonotonicSet<>(); { divs.add("doc"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java index e1e611b..43dedec 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java @@ -283,7 +283,7 @@ class LateBoundVolatile { class InbredSingletons { static class A { - static int count = 0; + protected static int count = 0; @Inject A(final B b) { @@ -293,7 +293,7 @@ class InbredSingletons { } static class B { - static int count = 0; + protected static int count = 0; @Inject B(final C c) { @@ -303,7 +303,7 @@ class InbredSingletons { } static class C { - static int count = 0; + protected static int count = 0; @Inject C() { @@ -315,7 +315,7 @@ class InbredSingletons { class IncestuousSingletons { static class A { - static int count = 0; + protected static int count = 0; @Inject A(final C c, final B b) { @@ -325,7 +325,7 @@ class IncestuousSingletons { } static class B { - static int count = 0; + protected static int count = 0; protected B() { } @@ -338,7 +338,7 @@ class IncestuousSingletons { } static class BN extends B { - static int count = 0; + protected static int count = 0; @Inject BN(final C c) { @@ -349,7 +349,7 @@ class IncestuousSingletons { } static class C { - static int count = 0; + protected static int count = 0; @Inject C() { @@ -370,7 +370,7 @@ class IncestuousInterfaceSingletons { } static class A implements AI { - static int count = 0; + protected static int count = 0; @Inject A(final CI c, final BI b) { @@ -380,7 +380,7 @@ class IncestuousInterfaceSingletons { } static class B implements BI { - static int count = 0; + protected static int count = 0; protected B() { } @@ -393,7 +393,7 @@ class IncestuousInterfaceSingletons { } static class BN extends B { - static int count = 0; + protected static int count = 0; @Inject BN(final CI c) { @@ -404,7 +404,7 @@ class IncestuousInterfaceSingletons { } static class C implements CI { - static int count = 0; + protected static int count = 0; @Inject C() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java index 8594005..2bdc6b4 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestListInjection.java @@ -46,7 +46,7 @@ public class TestListInjection { */ @Test public void testStringInjectDefault() throws InjectionException { - final List<String> actual = Tang.Factory.getTang().newInjector().getInstance(StringClass.class).stringList; + final List<String> actual = Tang.Factory.getTang().newInjector().getInstance(StringClass.class).getStringList(); final List<String> expected = new ArrayList<>(); expected.add("bye"); expected.add("hello"); @@ -61,7 +61,7 @@ public class TestListInjection { */ @Test public void testIntegerInjectDefault() throws InjectionException { - final List<Integer> actual = Tang.Factory.getTang().newInjector().getInstance(IntegerClass.class).integerList; + final List<Integer> actual = Tang.Factory.getTang().newInjector().getInstance(IntegerClass.class).getIntegerList(); final List<Integer> expected = new ArrayList<>(); expected.add(1); expected.add(2); @@ -82,7 +82,7 @@ public class TestListInjection { final Injector injector = Tang.Factory.getTang().newInjector(); injector.bindVolatileInstance(Integer.class, integer); injector.bindVolatileInstance(Float.class, ffloat); - final List<Number> actual = injector.getInstance(NumberClass.class).numberList; + final List<Number> actual = injector.getInstance(NumberClass.class).getNumberList(); final List<Number> expected = new ArrayList<>(); expected.add(integer); expected.add(ffloat); @@ -102,8 +102,8 @@ public class TestListInjection { injected.add("bye"); final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(StringList.class, injected); - final List<String> actual = - Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).stringList; + final List<String> actual = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).getStringList(); final List<String> expected = new ArrayList<>(); expected.add("hi"); expected.add("hello"); @@ -126,7 +126,7 @@ public class TestListInjection { cb.bindList(IntegerList.class, injected); final List<Integer> actual = - Tang.Factory.getTang().newInjector(cb.build()).getInstance(IntegerClass.class).integerList; + Tang.Factory.getTang().newInjector(cb.build()).getInstance(IntegerClass.class).getIntegerList(); final List<Integer> expected = new ArrayList<>(); expected.add(1); expected.add(2); @@ -153,7 +153,7 @@ public class TestListInjection { final Injector injector1 = Tang.Factory.getTang().newInjector(cb1.build()); injector1.bindVolatileInstance(Integer.class, integer); injector1.bindVolatileInstance(Float.class, ffloat); - final List<Number> actual1 = injector1.getInstance(NumberClass.class).numberList; + final List<Number> actual1 = injector1.getInstance(NumberClass.class).getNumberList(); // Inject implementations via class name final List<String> injected2 = new ArrayList<>(); @@ -164,7 +164,7 @@ public class TestListInjection { final Injector injector2 = Tang.Factory.getTang().newInjector(cb.build()); injector2.bindVolatileInstance(Integer.class, integer); injector2.bindVolatileInstance(Float.class, ffloat); - final List<Number> actual2 = injector2.getInstance(NumberClass.class).numberList; + final List<Number> actual2 = injector2.getInstance(NumberClass.class).getNumberList(); final List<Number> expected = new ArrayList<>(); expected.add(integer); @@ -183,7 +183,8 @@ public class TestListInjection { @Test public void testInjectSelectiveConstructor() throws InjectionException { // Test injection without list binding - final List<String> actual1 = Tang.Factory.getTang().newInjector().getInstance(SelectiveConsructorClass.class).list; + final List<String> actual1 = + Tang.Factory.getTang().newInjector().getInstance(SelectiveConsructorClass.class).getList(); final List<String> expected1 = new ArrayList<>(); Assert.assertEquals(expected1, actual1); // Test injection with list binding @@ -193,8 +194,8 @@ public class TestListInjection { injected.add("bye"); final JavaConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(SelectiveInjectTestList.class, injected); - final List<String> actual2 = - Tang.Factory.getTang().newInjector(cb.build()).getInstance(SelectiveConsructorClass.class).list; + final List<String> actual2 = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(SelectiveConsructorClass.class).getList(); final List<String> expected2 = new ArrayList<>(); expected2.add("hi"); expected2.add("hello"); @@ -218,8 +219,8 @@ public class TestListInjection { final ConfigurationBuilder cb = Tang.Factory.getTang().newConfigurationBuilder(); cb.bindList(np, injected); - final List<String> actual = - Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).stringList; + final List<String> actual = + Tang.Factory.getTang().newInjector(cb.build()).getInstance(StringClass.class).getStringList(); final List<String> expected = new ArrayList<>(); expected.add("hi"); expected.add("hello"); @@ -249,7 +250,7 @@ public class TestListInjection { final Injector injector = Tang.Factory.getTang().newInjector(cb.build()); injector.bindVolatileInstance(Integer.class, integer); injector.bindVolatileInstance(Float.class, ffloat); - final List<Number> actual = injector.getInstance(NumberClass.class).numberList; + final List<Number> actual = injector.getInstance(NumberClass.class).getNumberList(); final List<Number> expected = new ArrayList<>(); expected.add(integer); expected.add(ffloat); @@ -270,7 +271,7 @@ public class TestListInjection { final Configuration conf = StringClassConfiguration.CONF .set(StringClassConfiguration.STRING_LIST, injected) .build(); - final List<String> actual = Tang.Factory.getTang().newInjector(conf).getInstance(StringClass.class).stringList; + final List<String> actual = Tang.Factory.getTang().newInjector(conf).getInstance(StringClass.class).getStringList(); final List<String> expected = new ArrayList<>(); expected.add("hi"); expected.add("hello"); @@ -305,7 +306,11 @@ class SelectiveInjectTestList implements Name<List<String>> { } class SelectiveConsructorClass { - public final List<String> list; + private final List<String> list; + + public List<String> getList() { + return list; + } @Inject SelectiveConsructorClass() { @@ -320,7 +325,11 @@ class SelectiveConsructorClass { } class StringClass { - public final List<String> stringList; + private final List<String> stringList; + + public List<String> getStringList() { + return stringList; + } @Inject StringClass(@Parameter(StringList.class) final List<String> stringList) { @@ -329,7 +338,11 @@ class StringClass { } class IntegerClass { - public final List<Integer> integerList; + private final List<Integer> integerList; + + public List<Integer> getIntegerList() { + return integerList; + } @Inject IntegerClass(@Parameter(IntegerList.class) final List<Integer> integerList) { @@ -338,7 +351,11 @@ class IntegerClass { } class NumberClass { - public final List<Number> numberList; + private final List<Number> numberList; + + public List<Number> getNumberList() { + return numberList; + } @Inject NumberClass(@Parameter(NumberList.class) final List<Number> numberList) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java index 5c02c41..085cc11 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestSetInjection.java @@ -36,7 +36,7 @@ import java.util.Set; public class TestSetInjection { @Test public void testStringInjectDefault() throws InjectionException { - final Set<String> actual = Tang.Factory.getTang().newInjector().getInstance(Box.class).strings; + final Set<String> actual = Tang.Factory.getTang().newInjector().getInstance(Box.class).getStrings(); final Set<String> expected = new HashSet<>(); expected.add("one"); @@ -51,7 +51,7 @@ public class TestSetInjection { final Injector i = Tang.Factory.getTang().newInjector(); i.bindVolatileInstance(Integer.class, 42); i.bindVolatileInstance(Float.class, 42.0001f); - final Set<Number> actual = i.getInstance(Pool.class).numbers; + final Set<Number> actual = i.getInstance(Pool.class).getNumbers(); final Set<Number> expected = new HashSet<>(); expected.add(42); expected.add(42.0001f); @@ -64,7 +64,7 @@ public class TestSetInjection { cb.bindSetEntry(SetOfStrings.class, "four"); cb.bindSetEntry(SetOfStrings.class, "five"); cb.bindSetEntry(SetOfStrings.class, "six"); - final Set<String> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(Box.class).strings; + final Set<String> actual = Tang.Factory.getTang().newInjector(cb.build()).getInstance(Box.class).getStrings(); final Set<String> expected = new HashSet<>(); expected.add("four"); @@ -83,7 +83,7 @@ public class TestSetInjection { final Injector i = Tang.Factory.getTang().newInjector(cb.build()); i.bindVolatileInstance(Short.class, (short) 4); i.bindVolatileInstance(Float.class, 42.0001f); - final Set<Number> actual = i.getInstance(Pool.class).numbers; + final Set<Number> actual = i.getInstance(Pool.class).getNumbers(); final Set<Number> expected = new HashSet<>(); expected.add((short) 4); expected.add(42.0001f); @@ -104,7 +104,7 @@ public class TestSetInjection { final Configuration conf = serializer.fromString(s); cb2.addConfiguration(conf); - final Set<String> actual = Tang.Factory.getTang().newInjector(cb2.build()).getInstance(Box.class).strings; + final Set<String> actual = Tang.Factory.getTang().newInjector(cb2.build()).getInstance(Box.class).getStrings(); final Set<String> expected = new HashSet<>(); expected.add("four"); @@ -130,7 +130,7 @@ public class TestSetInjection { final Injector i = Tang.Factory.getTang().newInjector(cb2.build()); i.bindVolatileInstance(Short.class, (short) 4); i.bindVolatileInstance(Float.class, 42.0001f); - final Set<Number> actual = i.getInstance(Pool.class).numbers; + final Set<Number> actual = i.getInstance(Pool.class).getNumbers(); final Set<Number> expected = new HashSet<>(); expected.add((short) 4); expected.add(42.0001f); @@ -155,7 +155,11 @@ class SetOfStrings implements Name<Set<String>> { } class Box { - public final Set<String> strings; + private final Set<String> strings; + + public Set<String> getStrings() { + return strings; + } @Inject Box(@Parameter(SetOfStrings.class) final Set<String> strings) { @@ -168,7 +172,11 @@ class SetOfClasses implements Name<Set<Number>> { } class Pool { - public final Set<Number> numbers; + private final Set<Number> numbers; + + public Set<Number> getNumbers() { + return numbers; + } @Inject Pool(@Parameter(SetOfClasses.class) final Set<Number> numbers) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java index dfdebc9..55b043f 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestTang.java @@ -84,7 +84,7 @@ interface CheckChildIface { public class TestTang { @Rule public ExpectedException thrown = ExpectedException.none(); - Tang tang; + protected Tang tang; @Before public void setUp() throws Exception { @@ -729,7 +729,7 @@ class Pass { @SuppressWarnings("checkstyle:hideutilityclassconstructor") class IsFuture { - static boolean instantiated; + protected static boolean instantiated; @Inject IsFuture(final NeedsFuture nf) { @@ -744,7 +744,7 @@ class NeedsFuture { } class InjectInjector { - public final Injector i; + protected final Injector i; @Inject InjectInjector(final Injector i) { @@ -806,7 +806,7 @@ class Impl implements Interf { @SuppressWarnings("checkstyle:hideutilityclassconstructor") class MustBeSingleton { - static boolean alreadyInstantiated; + protected static boolean alreadyInstantiated; @Inject public MustBeSingleton() { @@ -880,7 +880,7 @@ class OneNamedSingletonArgs { } class OneNamedStringArg { - public final String s; + protected final String s; @Inject OneNamedStringArg(@Parameter(A.class) final String s) { @@ -893,8 +893,8 @@ class OneNamedStringArg { } class TwoNamedStringArgs { - public final String a; - public final String b; + protected final String a; + protected final String b; @Inject TwoNamedStringArgs(@Parameter(A.class) final String a, @Parameter(B.class) final String b) { @@ -924,8 +924,8 @@ class BextendsAinjectA { class ExternalConstructorExample { static class LegacyWrapper implements ExternalConstructor<Legacy> { - final Integer x; - final String y; + protected final Integer x; + protected final String y; @Inject LegacyWrapper(final Integer x, final String y) { @@ -941,8 +941,8 @@ class ExternalConstructorExample { } class Legacy { - final Integer x; - final String y; + protected final Integer x; + protected final String y; public Legacy(final Integer x, final String y) { this.x = x; @@ -952,8 +952,8 @@ class ExternalConstructorExample { } class LegacyConstructor { - final Integer x; - final String y; + protected final Integer x; + protected final String y; public LegacyConstructor(final Integer x, final String y) { this.x = x; @@ -1013,7 +1013,7 @@ class NamedImpl { @Unit class OuterUnit { - final OuterUnit self; + protected final OuterUnit self; @Inject OuterUnit() { @@ -1021,17 +1021,17 @@ class OuterUnit { } class InA { - OuterUnit slf = self; + protected OuterUnit slf = self; } class InB { - OuterUnit slf = self; + protected OuterUnit slf = self; } } class MissOuterUnit { - final MissOuterUnit self; + protected final MissOuterUnit self; @Inject MissOuterUnit() { @@ -1039,11 +1039,11 @@ class MissOuterUnit { } class InA { - MissOuterUnit slf = self; + protected MissOuterUnit slf = self; } class InB { - MissOuterUnit slf = self; + protected MissOuterUnit slf = self; @Inject InB() { @@ -1053,9 +1053,9 @@ class MissOuterUnit { class ThreeConstructors { - final int i; - final String s; - final Float f; + protected final int i; + protected final String s; + protected final Float f; @Inject ThreeConstructors(@Parameter(TCInt.class) final int i, @Parameter(TCString.class) final String s) { @@ -1096,8 +1096,8 @@ class ThreeConstructors { class TwoConstructors { - final int i; - final String s; + protected final int i; + protected final String s; @Inject TwoConstructors(@Parameter(TCInt.class) final int i, @Parameter(TCString.class) final String s) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java index 8df60ca..183f641 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/TestClassHierarchy.java @@ -48,8 +48,8 @@ interface I1 { } public class TestClassHierarchy { - public ClassHierarchy ns; - public ClassHierarchySerializer serializer; + protected ClassHierarchy ns; + protected ClassHierarchySerializer serializer; @Rule public ExpectedException thrown = ExpectedException.none(); @@ -607,13 +607,13 @@ class Nested { @SuppressWarnings("checkstyle:hideutilityclassconstructor") class AnonNested { - static X x = new X() { + protected static X x = new X() { @SuppressWarnings("unused") - int i; + private int i; }; - static X y = new X() { + protected static X y = new X() { @SuppressWarnings("unused") - int j; + private int j; }; interface X { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java index 5c97ab4..8bfa82b 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/implementation/java/TestParameterParser.java @@ -63,7 +63,7 @@ public class TestParameterParser { final ParameterParser p = new ParameterParser(); p.addParser(BarParser.class); final Bar f = (Bar) p.parse(Foo.class, "woot"); - Assert.assertEquals(f.s, "woot"); + Assert.assertEquals(f.getS(), "woot"); } @@ -161,7 +161,10 @@ public class TestParameterParser { } private static class Foo { - public final String s; + private final String s; + String getS() { + return s; + } public Foo(final String s) { this.s = s; @@ -182,7 +185,7 @@ public class TestParameterParser { @Inject ILikeBars(@Parameter(SomeNamedFoo.class) final Foo bar) { final Bar b = (Bar) bar; - Assert.assertEquals(b.s, "hdfs://woot"); + Assert.assertEquals(b.getS(), "hdfs://woot"); } } @@ -198,7 +201,7 @@ public class TestParameterParser { } private static class TypeParser implements ExternalConstructor<ParseableType> { - ParseableType instance; + private ParseableType instance; @Inject public TypeParser(final String s) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java index cf864bd..22265d3 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/driver/FailDriver.java @@ -157,8 +157,8 @@ public final class FailDriver { public static final class ExpectedMessage { - public final transient Class<?> msgClass; - public final transient RequiredFlag requiredFlag; + private final transient Class<?> msgClass; + private final transient RequiredFlag requiredFlag; private final transient String repr; public ExpectedMessage(final Class<?> clazz, final RequiredFlag requiredFlag) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/AbstractEStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/AbstractEStage.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/AbstractEStage.java index f244083..9cde40f 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/AbstractEStage.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/AbstractEStage.java @@ -31,12 +31,12 @@ public abstract class AbstractEStage<T> implements EStage<T> { protected final AtomicBoolean closed; protected final String name; - protected final Meter inMeter; + private final Meter inMeter; /** * outputs share a single meter. */ - protected final Meter outMeter; + private final Meter outMeter; /** * Constructs an abstract estage. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c9e1bf9b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java index 7f8ccf1..b4550e3 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/IdentifierParser.java @@ -40,7 +40,7 @@ public class IdentifierParser implements ExternalConstructor<Identifier> { FACTORY = new DefaultIdentifierFactory(map); } - final Identifier id; + private final Identifier id; @Inject IdentifierParser(final String s) {
