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/06/23 01:22:16 UTC
incubator-reef git commit: [REEF-398]: Fix violations of
ArrayTypeStyle checkstyle
Repository: incubator-reef
Updated Branches:
refs/heads/master 2b374dfa5 -> 35b099caf
[REEF-398]: Fix violations of ArrayTypeStyle checkstyle
This addressed the issue by converting C-style arrays (String args[])
to Java-style (String[] args).
JIRA:
[REEF-398](https://issues.apache.org/jira/browse/REEF-398)
Pull Request:
This closes #238
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/35b099ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/35b099ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/35b099ca
Branch: refs/heads/master
Commit: 35b099caf1ee74f43d624372d8d41db2705343e8
Parents: 2b374df
Author: Mariia Mykhailova <mi...@gmail.com>
Authored: Mon Jun 22 14:57:49 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Mon Jun 22 16:21:03 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/reef/util/logging/LogParser.java | 4 ++--
.../org/apache/reef/util/logging/LoggingScopeFactory.java | 2 +-
.../java/org/apache/reef/util/logging/LoggingScopeImpl.java | 2 +-
.../reef/tang/implementation/ConfigurationBuilderImpl.java | 2 +-
.../apache/reef/tang/implementation/java/InjectorImpl.java | 2 +-
.../implementation/protobuf/ProtocolBufferInjectionPlan.java | 8 ++++----
.../tang/src/main/java/org/apache/reef/tang/util/Tint.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/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 c9400cf..4ab23f4 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 class LogParser {
- public static String endIndicators[] = {
+ public static String[] endIndicators = {
LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.BRIDGE_SETUP,
LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.EVALUATOR_SUBMIT,
LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.EVALUATOR_BRIDGE_SUBMIT,
@@ -41,7 +41,7 @@ public class LogParser {
LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.TASK_COMPLETE
};
- public static String startIndicators[] = {
+ public static String[] startIndicators = {
LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.DRIVER_START,
LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.BRIDGE_SETUP,
LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.EVALUATOR_BRIDGE_SUBMIT,
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java
index ba5ce1f..7f12db1 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java
@@ -98,7 +98,7 @@ public class LoggingScopeFactory {
* @param params
* @return
*/
- public LoggingScope getNewLoggingScope(final String msg, final Object params[]) {
+ public LoggingScope getNewLoggingScope(final String msg, final Object[] params) {
return new LoggingScopeImpl(LOG, logLevel, msg, params);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java
index 0bdd495..a882ce5 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeImpl.java
@@ -53,7 +53,7 @@ public class LoggingScopeImpl implements LoggingScope {
* @param msg
* @param params
*/
- LoggingScopeImpl(final Logger logger, final Level logLevel, final String msg, final Object params[]) {
+ LoggingScopeImpl(final Logger logger, final Level logLevel, final String msg, final Object[] params) {
this.logger = logger;
this.logLevel = logLevel;
this.msg = msg;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/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 6a5ad70..3f0cdcc 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
@@ -143,7 +143,7 @@ public class ConfigurationBuilderImpl implements ConfigurationBuilder {
@Override
public void registerLegacyConstructor(ClassNode<?> c,
final ConstructorArg... args) throws BindException {
- String cn[] = new String[args.length];
+ String[] cn = new String[args.length];
for (int i = 0; i < args.length; i++) {
cn[i] = args[i].getType();
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/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 b7c12b4..8887cb1 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
@@ -556,7 +556,7 @@ public class InjectorImpl implements Injector {
Class<T> clazz = (Class<T>) javaNamespace.classForName(constructor
.getClassName());
ConstructorArg[] args = constructor.getArgs();
- Class<?> parameterTypes[] = new Class[args.length];
+ Class<?>[] parameterTypes = new Class[args.length];
for (int i = 0; i < args.length; i++) {
if (args[i].isInjectionFuture()) {
parameterTypes[i] = InjectionFuture.class;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
index c243a05..4caf3f5 100644
--- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
+++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/implementation/protobuf/ProtocolBufferInjectionPlan.java
@@ -109,7 +109,7 @@ public class ProtocolBufferInjectionPlan {
final ClassNode<T> cn = (ClassNode<T>) ch.getNode(fullName);
- final InjectionPlanProto.InjectionPlan protoBufArgs[] = cons
+ final InjectionPlanProto.InjectionPlan[] protoBufArgs = cons
.getArgsList().toArray(new InjectionPlanProto.InjectionPlan[0]);
final ClassNode<?>[] cnArgs = new ClassNode[protoBufArgs.length];
@@ -117,7 +117,7 @@ public class ProtocolBufferInjectionPlan {
cnArgs[i] = (ClassNode<?>) ch.getNode(protoBufArgs[i].getName());
}
- final InjectionPlan<?> ipArgs[] = new InjectionPlan[protoBufArgs.length];
+ final InjectionPlan<?>[] ipArgs = new InjectionPlan[protoBufArgs.length];
for (int i = 0; i < protoBufArgs.length; i++) {
ipArgs[i] = (InjectionPlan<?>) deserialize(ch, protoBufArgs[i]);
@@ -131,10 +131,10 @@ public class ProtocolBufferInjectionPlan {
return new JavaInstance<T>(ch.getNode(ip.getName()), instance);
} else if (ip.hasSubplan()) {
final InjectionPlanProto.Subplan subplan = ip.getSubplan();
- final InjectionPlanProto.InjectionPlan protoBufPlans[] = subplan
+ final InjectionPlanProto.InjectionPlan[] protoBufPlans = subplan
.getPlansList().toArray(new InjectionPlanProto.InjectionPlan[0]);
- final InjectionPlan<T> subPlans[] = new InjectionPlan[protoBufPlans.length];
+ final InjectionPlan<T>[] subPlans = new InjectionPlan[protoBufPlans.length];
for (int i = 0; i < protoBufPlans.length; i++) {
subPlans[i] = (InjectionPlan<T>) deserialize(ch, protoBufPlans[i]);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35b099ca/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 30e0589..5870d1d 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
@@ -334,7 +334,7 @@ public class Tint {
// int numcols = 0;
for (final Node n : t.getNamesUsedAndSet()) {
String fullName = n.getFullName();
- String tok[] = fullName.split("\\.");
+ String[] tok = fullName.split("\\.");
StringBuffer sb = new StringBuffer(tok[0]);
for (int j = 1; j < tok.length; j++) {
if (tok[j].matches("^[A-Z].*") || j > 4) {