You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ch...@apache.org on 2015/09/10 00:32:16 UTC
[28/50] [abbrv] incubator-apex-malhar git commit: Removed references
to name property in BaseOperator
Removed references to name property in BaseOperator
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a0280691
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a0280691
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a0280691
Branch: refs/heads/master
Commit: a0280691b82f54dd6e33f7cc01772a94373aa1da
Parents: 0a4250e
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Mon Aug 3 14:17:02 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Thu Aug 6 15:20:44 2015 -0700
----------------------------------------------------------------------
.../test/java/com/datatorrent/demos/mobile/ApplicationTest.java | 2 --
.../com/datatorrent/lib/io/SimpleSinglePortInputOperator.java | 3 ++-
.../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 3 ++-
.../java/com/datatorrent/lib/io/WebSocketOutputOperator.java | 5 ++---
.../com/datatorrent/lib/multiwindow/SortedMovingWindow.java | 3 ++-
.../com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java | 1 -
.../java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java | 1 -
.../com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java | 2 --
8 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java b/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
index d58e8ff..3494417 100644
--- a/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
+++ b/demos/mobile/src/test/java/com/datatorrent/demos/mobile/ApplicationTest.java
@@ -67,12 +67,10 @@ public class ApplicationTest
URI uri = URI.create("ws://localhost:" + connector[0].getLocalPort() + "/pubsub");
PubSubWebSocketOutputOperator<Object> outputOperator = new PubSubWebSocketOutputOperator<Object>();
- outputOperator.setName("testOutputOperator");
outputOperator.setUri(uri);
outputOperator.setTopic(conf.get("dt.application.MobileDemo.operator.QueryLocation.topic"));
PubSubWebSocketInputOperator<Map<String, String>> inputOperator = new PubSubWebSocketInputOperator<Map<String, String>>();
- inputOperator.setName("testInputOperator");
inputOperator.setUri(uri);
inputOperator.setTopic(conf.get("dt.application.MobileDemo.operator.LocationResults.topic"));
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
index 07bcaf5..1fbd45f 100644
--- a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
@@ -21,6 +21,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import com.datatorrent.api.*;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.common.util.BaseOperator;
+import org.apache.commons.lang3.ClassUtils;
/**
* This an input operator which passes data from an asynchronous data source to a port processing thread.
@@ -60,7 +61,7 @@ public abstract class SimpleSinglePortInputOperator<T> extends BaseOperator impl
{
isActive = true;
if (this instanceof Runnable) {
- ioThread = new Thread((Runnable)this, "io-" + this.getName());
+ ioThread = new Thread((Runnable)this, "io-" + ClassUtils.getShortClassName(this.getClass()));
ioThread.start();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index a8cfa6e..69ebfa3 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -28,6 +28,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import javax.validation.constraints.NotNull;
+import org.apache.commons.lang3.ClassUtils;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
@@ -178,7 +179,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
public Thread newThread(Runnable r)
{
Thread t = new Thread(r);
- t.setName(WebSocketInputOperator.this.getName() + "-AsyncHttpClient-" + count++);
+ t.setName(ClassUtils.getShortClassName(this.getClass()) + "-AsyncHttpClient-" + count++);
return t;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
index a7ab3bd..f46ccb8 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
@@ -19,8 +19,6 @@ import java.io.IOException;
import java.net.URI;
import java.util.concurrent.*;
-import javax.validation.constraints.NotNull;
-
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfigBean;
import com.ning.http.client.websocket.WebSocket;
@@ -32,6 +30,7 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.ClassUtils;
import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultInputPort;
@@ -193,7 +192,7 @@ public class WebSocketOutputOperator<T> extends BaseOperator
public Thread newThread(Runnable r)
{
Thread t = new Thread(r);
- t.setName(WebSocketOutputOperator.this.getName() + "-AsyncHttpClient-" + count++);
+ t.setName(ClassUtils.getShortClassName(this.getClass()) + "-AsyncHttpClient-" + count++);
return t;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java b/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
index 84388e4..df4d482 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
@@ -28,6 +28,7 @@ import javax.validation.constraints.NotNull;
import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
import com.google.common.base.Function;
+import org.apache.commons.lang.ClassUtils;
/**
*
@@ -114,7 +115,7 @@ public class SortedMovingWindow<T, K> extends AbstractSlidingWindow<T, List<T>>
k = ((Comparable<T>) expiredTuple).compareTo(minElemInSortedList);
} else {
errorOutput.emit(expiredTuple);
- throw new IllegalArgumentException("Operator \"" + getName() + "\" encounters an invalid tuple " + expiredTuple + "\nNeither the tuple is comparable Nor Comparator is specified!");
+ throw new IllegalArgumentException("Operator \"" + ClassUtils.getShortClassName(this.getClass()) + "\" encounters an invalid tuple " + expiredTuple + "\nNeither the tuple is comparable Nor Comparator is specified!");
}
} else {
k = comparator.compare(expiredTuple, minElemInSortedList);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
index 3adf90b..a3f5dc0 100644
--- a/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
@@ -92,7 +92,6 @@ public class HttpJsonChunksInputOperatorTest
CollectorTestSink sink = new CollectorTestSink();
operator.outputPort.setSink(sink);
- operator.setName("testHttpInputNode");
operator.setUrl(new URI(url));
operator.setup(null);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
index 538b6b4..d8b3778 100644
--- a/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
@@ -80,7 +80,6 @@ public class HttpLinesInputOperatorTest
final HttpLinesInputOperator operator = new HttpLinesInputOperator();
CollectorTestSink<String> sink = TestUtils.setSink(operator.outputPort, new CollectorTestSink<String>());
- operator.setName("testHttpInputNode");
operator.setUrl(new URI(url));
operator.setup(null);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/a0280691/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
index 4bfcf45..778524b 100644
--- a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
@@ -51,12 +51,10 @@ public class PubSubWebSocketOperatorTest
URI uri = URI.create("ws://localhost:" + connector[0].getLocalPort() + "/pubsub");
PubSubWebSocketOutputOperator<Object> outputOperator = new PubSubWebSocketOutputOperator<Object>();
- outputOperator.setName("testOutputOperator");
outputOperator.setUri(uri);
outputOperator.setTopic("testTopic");
PubSubWebSocketInputOperator<Object> inputOperator = new PubSubWebSocketInputOperator<Object>();
- inputOperator.setName("testInputOperator");
inputOperator.setUri(uri);
inputOperator.setTopic("testTopic");