You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2016/09/02 22:46:21 UTC
apex-core git commit: Fix trailing whitespace.
Repository: apex-core
Updated Branches:
refs/heads/master 5f06c7feb -> 3c503a91f
Fix trailing whitespace.
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/3c503a91
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/3c503a91
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/3c503a91
Branch: refs/heads/master
Commit: 3c503a91f07ac076d5168f270cf783ef63aff008
Parents: 5f06c7f
Author: CI Support <je...@datatorrent.com>
Authored: Thu Sep 1 19:27:39 2016 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Sep 2 15:28:13 2016 -0700
----------------------------------------------------------------------
.../com/datatorrent/api/AffinityRulesSet.java | 2 +-
.../java/com/datatorrent/api/StorageAgent.java | 5 +-
.../api/annotation/ApplicationAnnotation.java | 8 +--
.../common/security/SecurityContext.java | 6 +--
.../common/util/ScheduledExecutorService.java | 8 +--
.../BlacklistBasedResourceRequestHandler.java | 6 ++-
.../java/com/datatorrent/stram/StramClient.java | 2 +-
.../stram/StreamingContainerAgent.java | 2 +-
.../com/datatorrent/stram/api/StramEvent.java | 2 +-
.../api/StramToNodeStartRecordingRequest.java | 2 +-
.../stram/client/DTConfiguration.java | 2 +-
.../stram/client/FSPartFileAgent.java | 5 +-
.../stram/plan/logical/LogicalPlan.java | 4 +-
.../stram/util/ObjectMapperFactory.java | 2 +-
.../stram/util/SharedPubSubWebSocketClient.java | 2 +-
.../datatorrent/stram/util/package-info.java | 4 +-
.../stram/webapp/OperatorDiscoverer.java | 2 +-
.../com/datatorrent/stram/webapp/TypeGraph.java | 2 +-
.../stram/webapp/TypeGraphFactory.java | 4 +-
.../stram/webapp/asm/BaseSignatureVisitor.java | 52 +++++++++-----------
.../stram/webapp/asm/CompactClassNode.java | 2 +-
.../stram/webapp/asm/CompactMethodNode.java | 4 +-
.../stram/webapp/asm/CompactUtil.java | 12 ++---
.../datatorrent/stram/webapp/asm/FieldNode.java | 6 +--
.../stram/webapp/asm/MethodNode.java | 10 ++--
.../webapp/asm/MethodSignatureVisitor.java | 30 +++++------
.../datatorrent/stram/AffinityRulesTest.java | 2 +-
.../com/datatorrent/stram/cli/ApexCliTest.java | 2 +-
.../stram/webapp/OperatorDiscoveryTest.java | 5 +-
pom.xml | 2 +-
30 files changed, 97 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/api/src/main/java/com/datatorrent/api/AffinityRulesSet.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/com/datatorrent/api/AffinityRulesSet.java b/api/src/main/java/com/datatorrent/api/AffinityRulesSet.java
index 31098af..cdc833d 100644
--- a/api/src/main/java/com/datatorrent/api/AffinityRulesSet.java
+++ b/api/src/main/java/com/datatorrent/api/AffinityRulesSet.java
@@ -29,7 +29,7 @@ import java.util.Collection;
public class AffinityRulesSet implements Serializable
{
private Collection<AffinityRule> affinityRules;
-
+
private static final long serialVersionUID = -8393974533796177171L;
public Collection<AffinityRule> getAffinityRules()
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/api/src/main/java/com/datatorrent/api/StorageAgent.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/com/datatorrent/api/StorageAgent.java b/api/src/main/java/com/datatorrent/api/StorageAgent.java
index b5dcf39..ed3681f 100644
--- a/api/src/main/java/com/datatorrent/api/StorageAgent.java
+++ b/api/src/main/java/com/datatorrent/api/StorageAgent.java
@@ -81,15 +81,14 @@ public interface StorageAgent
/**
* Interface to pass application attributes to storage agent
- *
*
*/
public interface ApplicationAwareStorageAgent extends StorageAgent
{
-
+
/**
* Passes attributes of application to storage agent
- *
+ *
* @param map attributes of application
*/
public void setApplicationAttributes(AttributeMap map);
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/api/src/main/java/com/datatorrent/api/annotation/ApplicationAnnotation.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/com/datatorrent/api/annotation/ApplicationAnnotation.java b/api/src/main/java/com/datatorrent/api/annotation/ApplicationAnnotation.java
index f81c15e..7393cd5 100644
--- a/api/src/main/java/com/datatorrent/api/annotation/ApplicationAnnotation.java
+++ b/api/src/main/java/com/datatorrent/api/annotation/ApplicationAnnotation.java
@@ -35,15 +35,15 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface ApplicationAnnotation
{
-
+
/**
- * <p>Compile time application alias.</p>
+ * <p>Compile time application alias.</p>
* <p>There are 3 ways to specify application name</p>
* <li>Compile time application alias -- specified in annotation</li>
* <li>Configuration time application alias -- specified in dt-site.xml</li>
* <li>Runtime application alias -- specified in application code</li>
- *
+ *
*/
public String name();
-
+
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/common/src/main/java/com/datatorrent/common/security/SecurityContext.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/com/datatorrent/common/security/SecurityContext.java b/common/src/main/java/com/datatorrent/common/security/SecurityContext.java
index b60097d..dccd7b7 100644
--- a/common/src/main/java/com/datatorrent/common/security/SecurityContext.java
+++ b/common/src/main/java/com/datatorrent/common/security/SecurityContext.java
@@ -30,12 +30,12 @@ public interface SecurityContext extends Context
{
/**
- * Attribute for the user name for login.
+ * Attribute for the user name for login.
*/
Attribute<String> USER_NAME = new Attribute<String>((String)null);
/**
- * Attribute for the password for login.
+ * Attribute for the password for login.
*/
Attribute<char[]> PASSWORD = new Attribute<char[]>((char[])null);
@@ -44,5 +44,5 @@ public interface SecurityContext extends Context
* Attribute for the realm for login.
*/
Attribute<String> REALM = new Attribute<String>((String)null);
-
+
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/common/src/main/java/com/datatorrent/common/util/ScheduledExecutorService.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/com/datatorrent/common/util/ScheduledExecutorService.java b/common/src/main/java/com/datatorrent/common/util/ScheduledExecutorService.java
index 0e2aff0..961dbed 100644
--- a/common/src/main/java/com/datatorrent/common/util/ScheduledExecutorService.java
+++ b/common/src/main/java/com/datatorrent/common/util/ScheduledExecutorService.java
@@ -25,9 +25,9 @@ package com.datatorrent.common.util;
*/
public interface ScheduledExecutorService extends java.util.concurrent.ScheduledExecutorService
{
- /**
- *
- * @return long
- */
+ /**
+ *
+ * @return long
+ */
public long getCurrentTimeMillis();
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/BlacklistBasedResourceRequestHandler.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/BlacklistBasedResourceRequestHandler.java b/engine/src/main/java/com/datatorrent/stram/BlacklistBasedResourceRequestHandler.java
index 5bc2fad..412f535 100644
--- a/engine/src/main/java/com/datatorrent/stram/BlacklistBasedResourceRequestHandler.java
+++ b/engine/src/main/java/com/datatorrent/stram/BlacklistBasedResourceRequestHandler.java
@@ -37,9 +37,9 @@ import com.datatorrent.stram.StreamingContainerAgent.ContainerStartRequest;
/**
* Handles creating container requests and issuing node-specific container
* requests by blacklisting (specifically for cloudera)
- *
+ *
* Host specific container requests are not allocated on Cloudera as captured in
- * Jira Yarn-1412 (https://issues.apache.org/jira/browse/YARN-1412)
+ * Jira Yarn-1412 (https://issues.apache.org/jira/browse/YARN-1412)
* To handle such requests, we blacklist all the other nodes before issueing node request.
*
* @since 3.4.0
@@ -51,6 +51,7 @@ public class BlacklistBasedResourceRequestHandler extends ResourceRequestHandler
HashMap<String, List<ContainerRequest>> hostSpecificRequestsMap = new HashMap<>();
List<String> blacklistedNodesForHostSpecificRequests = null;
+ @Override
public void reissueContainerRequests(AMRMClient<ContainerRequest> amRmClient, Map<StreamingContainerAgent.ContainerStartRequest, MutablePair<Integer, ContainerRequest>> requestedResources, int loopCounter, ResourceRequestHandler resourceRequestor, List<ContainerRequest> containerRequests, List<ContainerRequest> removedContainerRequests)
{
// Issue all host specific requests first
@@ -113,6 +114,7 @@ public class BlacklistBasedResourceRequestHandler extends ResourceRequestHandler
}
}
+ @Override
public void addContainerRequest(Map<StreamingContainerAgent.ContainerStartRequest, MutablePair<Integer, ContainerRequest>> requestedResources, int loopCounter, List<ContainerRequest> containerRequests, StreamingContainerAgent.ContainerStartRequest csr, ContainerRequest cr)
{
if (cr.getNodes() != null && !cr.getNodes().isEmpty()) {
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/StramClient.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StramClient.java b/engine/src/main/java/com/datatorrent/stram/StramClient.java
index acda0d8..5094dee 100644
--- a/engine/src/main/java/com/datatorrent/stram/StramClient.java
+++ b/engine/src/main/java/com/datatorrent/stram/StramClient.java
@@ -468,7 +468,7 @@ public class StramClient
if (agent != null && agent instanceof StorageAgent.ApplicationAwareStorageAgent) {
((StorageAgent.ApplicationAwareStorageAgent)agent).setApplicationAttributes(dag.getAttributes());
}
-
+
if (dag.getAttributes().get(OperatorContext.STORAGE_AGENT) == null) { /* which would be the most likely case */
Path checkpointPath = new Path(appPath, LogicalPlan.SUBDIR_CHECKPOINTS);
// use conf client side to pickup any proxy settings from dt-site.xml
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java
index 598fea5..13a1000 100644
--- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java
+++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java
@@ -347,7 +347,7 @@ public class StreamingContainerAgent
if (inputPortMeta != null) {
StreamCodec<?> codec = inputPortMeta.getValue(PortContext.STREAM_CODEC);
if (codec == null) {
- // it cannot be this object that gets returned. Depending on this value is dangerous
+ // it cannot be this object that gets returned. Depending on this value is dangerous
codec = inputPortMeta.getPortObject().getStreamCodec();
if (codec != null) {
// don't create codec multiple times - it will assign a new identifier
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/api/StramEvent.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/api/StramEvent.java b/engine/src/main/java/com/datatorrent/stram/api/StramEvent.java
index c64ec60..ba9b55d 100644
--- a/engine/src/main/java/com/datatorrent/stram/api/StramEvent.java
+++ b/engine/src/main/java/com/datatorrent/stram/api/StramEvent.java
@@ -46,7 +46,7 @@ public abstract class StramEvent
{
return id;
}
-
+
public long getTimestamp()
{
return timestamp;
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/api/StramToNodeStartRecordingRequest.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/api/StramToNodeStartRecordingRequest.java b/engine/src/main/java/com/datatorrent/stram/api/StramToNodeStartRecordingRequest.java
index 841f7d3..ef6720f 100644
--- a/engine/src/main/java/com/datatorrent/stram/api/StramToNodeStartRecordingRequest.java
+++ b/engine/src/main/java/com/datatorrent/stram/api/StramToNodeStartRecordingRequest.java
@@ -54,7 +54,7 @@ public class StramToNodeStartRecordingRequest extends StreamingContainerUmbilica
{
this.id = id;
}
-
+
private static final long serialVersionUID = 201405271034L;
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/client/DTConfiguration.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/DTConfiguration.java b/engine/src/main/java/com/datatorrent/stram/client/DTConfiguration.java
index dfd4959..1f19d71 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/DTConfiguration.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/DTConfiguration.java
@@ -275,7 +275,7 @@ public class DTConfiguration implements Iterable<Map.Entry<String, String>>
map.remove(key);
}
- public ValueEntry setInternal(String key, String value)
+ public ValueEntry setInternal(String key, String value)
{
ValueEntry valueEntry;
if (map.containsKey(key)) {
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/client/FSPartFileAgent.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/FSPartFileAgent.java b/engine/src/main/java/com/datatorrent/stram/client/FSPartFileAgent.java
index dc662ad..d142adb 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/FSPartFileAgent.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/FSPartFileAgent.java
@@ -25,17 +25,14 @@ import java.util.HashMap;
import java.util.Map;
import org.codehaus.jettison.json.JSONException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* <p>Abstract FSPartFileAgent class.</p>
*
* @since 0.9.0
*/
-public abstract class FSPartFileAgent
+public abstract class FSPartFileAgent
{
- private static final Logger LOG = LoggerFactory.getLogger(FSPartFileAgent.class);
private final Map<String, String> lastIndexLines = new HashMap<>();
protected final StramAgent stramAgent;
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java b/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
index 580d1bc..d04005b 100644
--- a/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
+++ b/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java
@@ -1849,7 +1849,7 @@ public class LogicalPlan implements Serializable, DAG
* validation for affinity rules validates following:
* 1. The operator names specified in affinity rule are part of the dag
* 2. Affinity rules do not conflict with anti-affinity rules directly or indirectly
- * 3. Anti-affinity rules do not conflict with Stream Locality
+ * 3. Anti-affinity rules do not conflict with Stream Locality
* 4. Anti-affinity rules do not conflict with host-locality attribute
* 5. Affinity rule between non stream operators does not have Thread_Local locality
* 6. Affinity rules do not conflict with host-locality attribute
@@ -1927,7 +1927,7 @@ public class LogicalPlan implements Serializable, DAG
combineSets(nodeAffinities, pair);
}
}
-
+
for (StreamMeta stream : getAllStreams()) {
String source = stream.source.getOperatorMeta().getName();
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/util/ObjectMapperFactory.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/util/ObjectMapperFactory.java b/engine/src/main/java/com/datatorrent/stram/util/ObjectMapperFactory.java
index a5b2ede..b8e2c13 100644
--- a/engine/src/main/java/com/datatorrent/stram/util/ObjectMapperFactory.java
+++ b/engine/src/main/java/com/datatorrent/stram/util/ObjectMapperFactory.java
@@ -57,7 +57,7 @@ public class ObjectMapperFactory
}
public static ObjectMapper getOperatorValueDeserializer()
- {
+ {
ObjectMapper returnVal = new ObjectMapper();
returnVal.setVisibilityChecker(new VC());
returnVal.configure(org.codehaus.jackson.map.DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/util/SharedPubSubWebSocketClient.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/util/SharedPubSubWebSocketClient.java b/engine/src/main/java/com/datatorrent/stram/util/SharedPubSubWebSocketClient.java
index 692108e..ad5a423 100644
--- a/engine/src/main/java/com/datatorrent/stram/util/SharedPubSubWebSocketClient.java
+++ b/engine/src/main/java/com/datatorrent/stram/util/SharedPubSubWebSocketClient.java
@@ -57,7 +57,7 @@ public class SharedPubSubWebSocketClient extends PubSubWebSocketClient
}
- public SharedPubSubWebSocketClient(URI uri, long timeoutMillis)
+ public SharedPubSubWebSocketClient(URI uri, long timeoutMillis)
{
this.setUri(uri);
lastConnectTryTime = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/util/package-info.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/util/package-info.java b/engine/src/main/java/com/datatorrent/stram/util/package-info.java
index 200bf98..126304b 100644
--- a/engine/src/main/java/com/datatorrent/stram/util/package-info.java
+++ b/engine/src/main/java/com/datatorrent/stram/util/package-info.java
@@ -17,14 +17,14 @@
* under the License.
*/
/**
- *
+ *
* <b>com.datatorrent.util</b> package consists of utilities classes that Malhar provides<p>
* <br>
* The current utilities include<br>
* <b>{@link com.datatorrent.util.CircularBuffer}</b>: Takes a class T and provides a circular buffer<br>
* <b>{@link com.datatorrent.util.ScheduledExecutorService}</b>: <br>
* <b>{@link com.datatorrent.util.ScheduledThreadPoolExecutor}</b>: <br>
- * <b>{@link com.datatorrent.util.StablePriorityQueue}</b>: Implements a priority queue (Queue<E>) and is mainly used to queue tuples<br>
+ * <b>{@link com.datatorrent.util.StablePriorityQueue}</b>: Implements a priority queue (Queue<E>) and is mainly used to queue tuples<br>
* <br>
*/
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java b/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java
index 64d0b33..1857537 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/OperatorDiscoverer.java
@@ -133,7 +133,7 @@ public class OperatorDiscoverer
return type;
}
}
-
+
enum MethodTagType
{
USE_SCHEMA("@useSchema"),
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
index 557d685..5bab9f8 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraph.java
@@ -509,7 +509,7 @@ public class TypeGraph
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraphFactory.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraphFactory.java b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraphFactory.java
index d7cf087..980932c 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraphFactory.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/TypeGraphFactory.java
@@ -47,9 +47,9 @@ public class TypeGraphFactory
private static final byte[] preComputeGraph;
private static final Logger LOG = LoggerFactory.getLogger(TypeGraphFactory.class);
-
+
private static TypeGraph tg = null;
-
+
// statically initialize the precomputed type graph out of classes in jdk and jars in current classpath
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/BaseSignatureVisitor.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/BaseSignatureVisitor.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/BaseSignatureVisitor.java
index 1b3be74..a7581d4 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/BaseSignatureVisitor.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/BaseSignatureVisitor.java
@@ -43,13 +43,13 @@ import com.datatorrent.stram.webapp.asm.Type.WildcardTypeNode;
*/
public abstract class BaseSignatureVisitor extends SignatureVisitor
{
-
+
protected List<TypeVariableNode> typeV = new LinkedList<>();
-
+
protected int stage = -1;
-
+
public static final int VISIT_FORMAL_TYPE = 0;
-
+
protected Stack<Type> visitingStack = new Stack<>();
public BaseSignatureVisitor()
@@ -57,10 +57,6 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
super(Opcodes.ASM5);
}
-// protected transient String signature = "";
-
-
-
@Override
public SignatureVisitor visitArrayType()
{
@@ -72,12 +68,12 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
@Override
public void visitBaseType(char baseType)
{
-
+
Type.TypeNode tn = new Type.TypeNode();
tn.setObjByteCode(baseType + "");
visitingStack.push(tn);
resolveStack();
- // base type could only appear in method parameter list or return type
+ // base type could only appear in method parameter list or return type
// if(stage == VISIT_PARAM) {
// visitingStack.push(tn);
// }
@@ -89,12 +85,12 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
@Override
public void visitClassType(String classType)
- {
+ {
Type.TypeNode tn = new Type.TypeNode();
tn.setObjByteCode("L" + classType + ";");
visitingStack.push(tn);
- // base type could only appear in method parameter list or return type
+ // base type could only appear in method parameter list or return type
// if(stage == VISIT_PARAM) {
// visitingStack.push(tn);
// }
@@ -102,9 +98,9 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
// returnType = tn;
// } if(stage == VISIT_EXCEPTION) {
// exceptionType = tn;
-// }
+// }
}
-
+
private void resolveStack()
{
if (visitingStack.isEmpty() || visitingStack.size() == 1) {
@@ -129,7 +125,7 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
visitingStack.push(top);
return;
}
-
+
}
@Override
@@ -137,17 +133,17 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
{
resolveStack();
}
-
+
@Override
public void visitInnerClassType(String classType)
{
- visitClassType(classType);
+ visitClassType(classType);
}
@Override
public void visitTypeArgument()
- {
+ {
// For unbounded wild card entries, add wild card entry upper bound: extends Object
visitTypeArgument(SignatureVisitor.EXTENDS);
visitClassType(Object.class.getName());
@@ -165,18 +161,18 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
pt.setObjByteCode(t.getObjByteCode());
visitingStack.push(pt);
}
-
+
if (typeArg == SignatureVisitor.INSTANCEOF) {
return this;
- }
+ }
WildcardTypeNode wtn = new WildcardTypeNode();
wtn.boundChar = typeArg;
visitingStack.push(wtn);
-
+
return this;
}
-
-
+
+
@Override
public void visitTypeVariable(String typeVariable)
@@ -193,11 +189,11 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
TypeNode tn = new TypeNode();
tn.setObjByteCode("T" + typeVariable + ";");
visitingStack.push(tn);
-
+
}
resolveStack();
}
-
+
@Override
public SignatureVisitor visitInterface()
{
@@ -215,7 +211,7 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
{
return this;
}
-
+
@Override
public void visitFormalTypeParameter(String typeVariable)
{
@@ -234,11 +230,11 @@ public abstract class BaseSignatureVisitor extends SignatureVisitor
{
return this;
}
-
+
public List<TypeVariableNode> getTypeV()
{
return typeV;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactClassNode.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactClassNode.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactClassNode.java
index 551b20b..fb29315 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactClassNode.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactClassNode.java
@@ -29,7 +29,7 @@ import org.apache.xbean.asm5.Opcodes;
*/
public class CompactClassNode
{
-
+
private int access;
private String name;
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactMethodNode.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactMethodNode.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactMethodNode.java
index bddda6f..3d249cf 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactMethodNode.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactMethodNode.java
@@ -26,7 +26,7 @@ package com.datatorrent.stram.webapp.asm;
public class CompactMethodNode
{
private MethodSignatureVisitor methodSignatureNode;
-
+
private String name;
public String getName()
@@ -48,6 +48,6 @@ public class CompactMethodNode
{
this.methodSignatureNode = methodSignatureNode;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactUtil.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactUtil.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactUtil.java
index 17872cc..dd75857 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactUtil.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/CompactUtil.java
@@ -46,13 +46,13 @@ public class CompactUtil
CompactClassNode ccn = new CompactClassNode();
ccn.setAccess(cn.access);
ccn.setDefaultConstructor(compactMethodNode(ASMUtil.getPublicDefaultConstructor(cn)));
-
+
List<CompactMethodNode> cmns = new LinkedList<>();
for (MethodNode mn : ASMUtil.getPublicGetter(cn)) {
cmns.add(compactMethodNode(mn));
}
ccn.setGetterMethods(cmns);
-
+
cmns = new LinkedList<>();
for (MethodNode mn : ASMUtil.getPublicSetter(cn)) {
cmns.add(compactMethodNode(mn));
@@ -61,7 +61,7 @@ public class CompactUtil
ccn.setPorts(new LinkedList<CompactFieldNode>());
ccn.setName(cn.name);
-
+
List<CompactClassNode> ccns = new LinkedList<>();
for (Object icn : cn.innerClasses) {
CompactClassNode inner = new CompactClassNode();
@@ -76,8 +76,8 @@ public class CompactUtil
if (cn instanceof ClassNodeType) {
ccn.setCsv(((ClassNodeType)cn).csv);
}
-
-
+
+
// if(!CollectionUtils.isEmpty(cn.innerClasses)){
// ccn.setInnerClasses(Lists.transform(cn.innerClasses, new Function<InnerClassNode, CompactClassNode>(){
//
@@ -87,7 +87,7 @@ public class CompactUtil
// input.
// return null;
// }
-//
+//
// }));
// }
return ccn;
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/FieldNode.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/FieldNode.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/FieldNode.java
index ae183cc..06308dc 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/FieldNode.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/FieldNode.java
@@ -30,14 +30,14 @@ import org.apache.xbean.asm5.signature.SignatureReader;
public class FieldNode extends org.apache.xbean.asm5.tree.FieldNode
{
public ClassSignatureVisitor typeVariableSignatureNode;
-
+
public FieldSignatureVisitor signatureNode;
public FieldNode(int access, String name, String desc, String signature, Object value)
{
super(Opcodes.ASM5, access, name, desc, signature, value);
}
-
+
@Override
public void visitEnd()
{
@@ -48,5 +48,5 @@ public class FieldNode extends org.apache.xbean.asm5.tree.FieldNode
signatureNode.typeV.addAll(typeVariableSignatureNode.typeV);
reader.accept(signatureNode);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodNode.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodNode.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodNode.java
index a505260..080dfc9 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodNode.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodNode.java
@@ -31,7 +31,7 @@ public class MethodNode extends org.apache.xbean.asm5.tree.MethodNode
{
public ClassSignatureVisitor typeVariableSignatureNode;
-
+
public MethodSignatureVisitor signatureNode;
@@ -39,7 +39,7 @@ public class MethodNode extends org.apache.xbean.asm5.tree.MethodNode
{
super(Opcodes.ASM5, access, name, desc, signature, exceptions);
}
-
+
@Override
public void visitEnd()
{
@@ -51,8 +51,8 @@ public class MethodNode extends org.apache.xbean.asm5.tree.MethodNode
signatureNode.typeV.addAll(typeVariableSignatureNode.typeV);
reader.accept(signatureNode);
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodSignatureVisitor.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodSignatureVisitor.java b/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodSignatureVisitor.java
index 3aa6d38..26ba051 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodSignatureVisitor.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/asm/MethodSignatureVisitor.java
@@ -30,21 +30,21 @@ import org.apache.xbean.asm5.signature.SignatureVisitor;
*/
public class MethodSignatureVisitor extends BaseSignatureVisitor
{
-
+
// There is at most 1 parameter for setter and getter method
private List<Type> parameters = new LinkedList<>();
-
+
private Type returnType;
-
+
private List<Type> exceptionType = new LinkedList<>();
-
+
public static final int VISIT_PARAM = 1;
-
+
public static final int VISIT_RETURN = 2;
-
+
public static final int VISIT_EXCEPTION = 3;
-
-
+
+
@Override
public SignatureVisitor visitExceptionType()
{
@@ -55,10 +55,10 @@ public class MethodSignatureVisitor extends BaseSignatureVisitor
exceptionType.add(visitingStack.pop());
}
stage = VISIT_EXCEPTION;
-
+
return this;
}
-
+
@Override
public SignatureVisitor visitParameterType()
{
@@ -75,8 +75,8 @@ public class MethodSignatureVisitor extends BaseSignatureVisitor
}
return this;
}
-
-
+
+
@Override
public SignatureVisitor visitReturnType()
{
@@ -87,8 +87,8 @@ public class MethodSignatureVisitor extends BaseSignatureVisitor
stage = VISIT_RETURN;
return this;
}
-
-
+
+
public Type getReturnType()
{
if (returnType == null && !visitingStack.isEmpty()) {
@@ -96,7 +96,7 @@ public class MethodSignatureVisitor extends BaseSignatureVisitor
}
return returnType;
}
-
+
public List<Type> getParameters()
{
return parameters;
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/test/java/com/datatorrent/stram/AffinityRulesTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/AffinityRulesTest.java b/engine/src/test/java/com/datatorrent/stram/AffinityRulesTest.java
index 23e3a97..a15ef78 100644
--- a/engine/src/test/java/com/datatorrent/stram/AffinityRulesTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/AffinityRulesTest.java
@@ -59,7 +59,7 @@ public class AffinityRulesTest
@Rule
public TestMeta testMeta = new TestMeta();
-
+
@Test
public void testOperatorPartitionsAntiAffinity()
{
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java b/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
index aaf801d..6db389c 100644
--- a/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/cli/ApexCliTest.java
@@ -88,7 +88,7 @@ public class ApexCliTest
public static void finished()
{
try {
-
+
StramTestSupport.removeAppPackageFile();
FileUtils.forceDelete(configFile);
testFolder.delete();
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/engine/src/test/java/com/datatorrent/stram/webapp/OperatorDiscoveryTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/webapp/OperatorDiscoveryTest.java b/engine/src/test/java/com/datatorrent/stram/webapp/OperatorDiscoveryTest.java
index 1a81719..6552015 100644
--- a/engine/src/test/java/com/datatorrent/stram/webapp/OperatorDiscoveryTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/webapp/OperatorDiscoveryTest.java
@@ -92,6 +92,7 @@ public class OperatorDiscoveryTest
public final transient DefaultInputPort<T> input1 = new DefaultInputPort<T>()
{
+ @Override
public void process(T tuple)
{
// Do nothing
@@ -100,6 +101,7 @@ public class OperatorDiscoveryTest
public final transient DefaultInputPort<Map<?, ? extends String>> input2 = new DefaultInputPort<Map<?, ? extends String>>()
{
+ @Override
public void process(Map<?, ? extends String> tuple)
{
// Do nothing
@@ -111,6 +113,7 @@ public class OperatorDiscoveryTest
public final transient DefaultOutputPort<Double> output1 = new DefaultOutputPort<Double>();
+ @Override
public String getName()
{
return "abc";
@@ -519,7 +522,7 @@ public class OperatorDiscoveryTest
StramTestSupport.createAppPackageFile();
-
+
String[] classFilePath = getClassFileInClasspath();
String[]cPaths = Lists.asList("src/test/resources/testAppPackage/mydtapp/target/mydtapp-1.0-SNAPSHOT.jar", classFilePath).toArray(new String[]{});
http://git-wip-us.apache.org/repos/asf/apex-core/blob/3c503a91/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba64906..a26d960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,7 +337,7 @@
<dependency>
<groupId>org.apache.apex</groupId>
<artifactId>apex-codestyle-config</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>