Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
relocate packages - imports/checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@tweise
Apex Dev authored and tweise committed Aug 14, 2017
1 parent a214f8c commit d44076a
Show file tree
Hide file tree
Showing 1,505 changed files with 3,993 additions and 3,680 deletions.
4 changes: 2 additions & 2 deletions apps/filecopy/src/main/java/com/datatorrent/apps/copy/HDFSFileCopyApp.java
View file
Expand Up @@ -19,14 +19,14 @@

package com.datatorrent.apps.copy;

import org.apache.apex.malhar.lib.io.fs.FSInputModule;
import org.apache.apex.malhar.lib.io.fs.HDFSFileCopyModule;
import org.apache.hadoop.conf.Configuration;

import com.datatorrent.api.DAG;
import com.datatorrent.api.DAG.Locality;
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.api.annotation.ApplicationAnnotation;
import com.datatorrent.lib.io.fs.FSInputModule;
import com.datatorrent.lib.io.fs.HDFSFileCopyModule;

/**
* Application for HDFS to HDFS file copy
Expand Down
4 changes: 2 additions & 2 deletions apps/logstream/src/main/java/com/datatorrent/apps/logstream/AggregationsToRedisOperator.java
View file
Expand Up @@ -22,8 +22,8 @@
import java.util.HashMap;
import java.util.Map;

import com.datatorrent.lib.logs.DimensionObject;
import com.datatorrent.lib.util.KeyValPair;
import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.apex.malhar.lib.util.KeyValPair;

import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.api.DefaultInputPort;
Expand Down
30 changes: 14 additions & 16 deletions apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
View file
Expand Up @@ -27,28 +27,26 @@

import org.apache.apex.malhar.contrib.misc.streamquery.SelectOperator;
import org.apache.apex.malhar.contrib.misc.streamquery.condition.EqualValueCondition;

import org.apache.apex.malhar.contrib.redis.RedisKeyValPairOutputOperator;
import org.apache.apex.malhar.contrib.redis.RedisMapOutputOperator;
import org.apache.apex.malhar.contrib.redis.RedisNumberSummationMapOutputOperator;
import org.apache.apex.malhar.lib.algo.TopN;
import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
import org.apache.apex.malhar.lib.io.PubSubWebSocketOutputOperator;
import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.apex.malhar.lib.logs.MultiWindowDimensionAggregation;
import org.apache.apex.malhar.lib.logs.MultiWindowDimensionAggregation.AggregateOperation;
import org.apache.apex.malhar.lib.stream.Counter;
import org.apache.apex.malhar.lib.stream.JsonByteArrayOperator;
import org.apache.apex.malhar.lib.streamquery.index.ColumnIndex;
import org.apache.apex.malhar.lib.util.AbstractDimensionTimeBucketOperator;
import org.apache.apex.malhar.lib.util.DimensionTimeBucketSumOperator;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;

import com.datatorrent.lib.algo.TopN;
import com.datatorrent.lib.io.ConsoleOutputOperator;
import com.datatorrent.lib.io.PubSubWebSocketOutputOperator;
import com.datatorrent.lib.logs.DimensionObject;
import com.datatorrent.lib.logs.MultiWindowDimensionAggregation;
import com.datatorrent.lib.logs.MultiWindowDimensionAggregation.AggregateOperation;
import com.datatorrent.lib.stream.Counter;
import com.datatorrent.lib.stream.JsonByteArrayOperator;
import com.datatorrent.lib.streamquery.index.ColumnIndex;
import com.datatorrent.lib.util.AbstractDimensionTimeBucketOperator;
import com.datatorrent.lib.util.DimensionTimeBucketSumOperator;

import com.datatorrent.api.DAG;
import com.datatorrent.api.Operator.InputPort;
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.contrib.redis.RedisKeyValPairOutputOperator;
import com.datatorrent.contrib.redis.RedisMapOutputOperator;
import com.datatorrent.contrib.redis.RedisNumberSummationMapOutputOperator;

/**
* Log stream processing application based on Apex platform.<br>
Expand Down
5 changes: 2 additions & 3 deletions apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application1.java
View file
Expand Up @@ -18,11 +18,10 @@
*/
package com.datatorrent.apps.logstream;

import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
import org.apache.apex.malhar.lib.stream.JsonByteArrayOperator;
import org.apache.hadoop.conf.Configuration;

import com.datatorrent.lib.io.ConsoleOutputOperator;
import com.datatorrent.lib.stream.JsonByteArrayOperator;

import com.datatorrent.api.Context.PortContext;
import com.datatorrent.api.DAG;
import com.datatorrent.api.StreamingApplication;
Expand Down
5 changes: 3 additions & 2 deletions apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperator.java
View file
Expand Up @@ -28,10 +28,11 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.apex.malhar.lib.codec.KryoSerializableStreamCodec;
import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.commons.lang.mutable.MutableDouble;

import com.datatorrent.lib.codec.KryoSerializableStreamCodec;
import com.datatorrent.lib.logs.DimensionObject;
import com.datatorrent.api.*;
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.Partitioner.PartitioningContext;
Expand Down
3 changes: 1 addition & 2 deletions apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperatorUnifier.java
View file
Expand Up @@ -26,10 +26,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.commons.lang.mutable.MutableDouble;

import com.datatorrent.lib.logs.DimensionObject;

import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultOutputPort;
import com.datatorrent.api.Operator.Unifier;
Expand Down
4 changes: 3 additions & 1 deletion apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogScoreOperator.java
View file
Expand Up @@ -20,10 +20,12 @@

import com.datatorrent.common.util.BaseOperator;
import com.datatorrent.api.DefaultInputPort;
import com.datatorrent.lib.logs.DimensionObject;

import java.util.HashMap;
import java.util.Map;

import org.apache.apex.malhar.lib.logs.DimensionObject;

/**
* Log Score
*
Expand Down
6 changes: 3 additions & 3 deletions apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamTopN.java
View file
Expand Up @@ -28,9 +28,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.datatorrent.lib.algo.TopN;
import com.datatorrent.lib.codec.KryoSerializableStreamCodec;
import com.datatorrent.lib.logs.DimensionObject;
import org.apache.apex.malhar.lib.algo.TopN;
import org.apache.apex.malhar.lib.codec.KryoSerializableStreamCodec;
import org.apache.apex.malhar.lib.logs.DimensionObject;

import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultPartition;
Expand Down
5 changes: 2 additions & 3 deletions ...logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamWidgetOutputOperator.java
View file
Expand Up @@ -26,11 +26,10 @@

import javax.validation.constraints.NotNull;

import org.apache.apex.malhar.lib.io.WidgetOutputOperator;
import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.commons.lang3.tuple.MutablePair;

import com.datatorrent.lib.io.WidgetOutputOperator;
import com.datatorrent.lib.logs.DimensionObject;

import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DefaultInputPort;

Expand Down
3 changes: 2 additions & 1 deletion apps/logstream/src/main/java/com/datatorrent/apps/logstream/RabbitMQLogsInputOperator.java
View file
Expand Up @@ -24,13 +24,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.apex.malhar.contrib.rabbitmq.AbstractSinglePortRabbitMQInputOperator;

import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.Partitioner.PartitioningContext;
import com.datatorrent.api.DefaultPartition;
import com.datatorrent.api.Partitioner;
import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;
import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.contrib.rabbitmq.AbstractSinglePortRabbitMQInputOperator;

/**
*
Expand Down
5 changes: 2 additions & 3 deletions apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorTest.java
View file
Expand Up @@ -26,11 +26,10 @@
import org.junit.Assert;
import org.junit.Test;

import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
import org.apache.commons.lang.mutable.MutableDouble;

import com.datatorrent.lib.logs.DimensionObject;
import com.datatorrent.lib.testbench.CollectorTestSink;

import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;
import com.datatorrent.netlet.util.DTThrowable;

Expand Down
5 changes: 2 additions & 3 deletions .../logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorUnifierTest.java
View file
Expand Up @@ -26,11 +26,10 @@

import org.junit.Test;

import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
import org.apache.commons.lang.mutable.MutableDouble;

import com.datatorrent.lib.logs.DimensionObject;
import com.datatorrent.lib.testbench.CollectorTestSink;

/**
*
* Tests logstream dimension operator unifier.
Expand Down
2 changes: 1 addition & 1 deletion apps/logstream/src/test/java/com/datatorrent/apps/logstream/FilterOperatorTest.java
View file
Expand Up @@ -23,7 +23,7 @@

import org.junit.Test;

import com.datatorrent.lib.testbench.CollectorTestSink;
import org.apache.apex.malhar.lib.testbench.CollectorTestSink;

import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;

Expand Down
5 changes: 2 additions & 3 deletions apps/logstream/src/test/java/com/datatorrent/apps/logstream/LogstreamTopNTest.java
View file
Expand Up @@ -26,11 +26,10 @@
import org.junit.Assert;
import org.junit.Test;

import org.apache.apex.malhar.lib.logs.DimensionObject;
import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
import org.apache.commons.lang.mutable.MutableDouble;

import com.datatorrent.lib.logs.DimensionObject;
import com.datatorrent.lib.testbench.CollectorTestSink;

import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;

/**
Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import org.apache.hadoop.conf.Configuration;

Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import org.apache.hadoop.conf.Configuration;

Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import org.apache.hadoop.conf.Configuration;

Expand Down
4 changes: 2 additions & 2 deletions benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
View file
Expand Up @@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
import org.apache.hadoop.conf.Configuration;

import com.datatorrent.api.DAG;
import com.datatorrent.api.DAG.Locality;

import com.datatorrent.api.StreamingApplication;
import com.datatorrent.api.annotation.ApplicationAnnotation;
import com.datatorrent.lib.testbench.RandomEventGenerator;

/**
*
Expand Down
6 changes: 3 additions & 3 deletions benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
View file
Expand Up @@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import java.util.ArrayList;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.datatorrent.contrib.couchbase.AbstractCouchBaseInputOperator;
import com.datatorrent.contrib.couchbase.CouchBaseWindowStore;
import org.apache.apex.malhar.contrib.couchbase.AbstractCouchBaseInputOperator;
import org.apache.apex.malhar.contrib.couchbase.CouchBaseWindowStore;

/**
* <p>CouchBaseInputOperator class.</p>
Expand Down
4 changes: 2 additions & 2 deletions benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
View file
Expand Up @@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import com.datatorrent.contrib.couchbase.AbstractCouchBaseSetOperator;
import org.apache.apex.malhar.contrib.couchbase.AbstractCouchBaseSetOperator;

/**
* <p>CouchBaseOutputOperator class.</p>
Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import java.util.ArrayList;

Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import java.util.HashMap;

Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

import javax.validation.constraints.Min;

Expand Down
2 changes: 1 addition & 1 deletion benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
View file
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark;
package org.apache.apex.benchmark;

/*
* To change this template, choose Tools | Templates and open the template in the editor.
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
View file
Expand Up @@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark.aerospike;
package org.apache.apex.benchmark.aerospike;

import org.apache.apex.malhar.contrib.aerospike.AerospikeTransactionalStore;
import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
import org.apache.hadoop.conf.Configuration;

import com.datatorrent.api.DAG;
import com.datatorrent.api.DAG.Locality;
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.api.annotation.ApplicationAnnotation;
import com.datatorrent.contrib.aerospike.AerospikeTransactionalStore;
import com.datatorrent.lib.testbench.RandomEventGenerator;

/**
* Application to benchmark the performance of aerospike output operator.
Expand Down
6 changes: 3 additions & 3 deletions benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
View file
Expand Up @@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.datatorrent.benchmark.aerospike;
package org.apache.apex.benchmark.aerospike;

import java.util.List;

import org.apache.apex.malhar.contrib.aerospike.AbstractAerospikeTransactionalPutOperator;

import com.aerospike.client.AerospikeException;
import com.aerospike.client.Bin;
import com.aerospike.client.Key;

import com.datatorrent.contrib.aerospike.AbstractAerospikeTransactionalPutOperator;

/**
* <p>AerospikeOutputOperator class.</p>
*
Expand Down

0 comments on commit d44076a

Please sign in to comment.