You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by br...@apache.org on 2015/11/19 21:35:05 UTC
[2/4] incubator-apex-malhar git commit: MLHR-1912 #resolve #comment
fixed style violations
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b9aa203d/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java
index efa9a4c..1202511 100644
--- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java
@@ -18,7 +18,12 @@
*/
package com.datatorrent.lib.db.jdbc;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
import javax.annotation.Nonnull;
@@ -32,7 +37,6 @@ import com.google.common.collect.Lists;
import com.datatorrent.api.Attribute;
import com.datatorrent.api.Context;
import com.datatorrent.api.DAG;
-
import com.datatorrent.lib.helper.OperatorContextTestHelper;
import com.datatorrent.lib.helper.TestPortContext;
import com.datatorrent.lib.testbench.CollectorTestSink;
@@ -109,16 +113,18 @@ public class JdbcOperatorTest
Statement stmt = con.createStatement();
String createMetaTable = "CREATE TABLE IF NOT EXISTS " + JdbcTransactionalStore.DEFAULT_META_TABLE + " ( "
- + JdbcTransactionalStore.DEFAULT_APP_ID_COL + " VARCHAR(100) NOT NULL, "
- + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + " INT NOT NULL, "
- + JdbcTransactionalStore.DEFAULT_WINDOW_COL + " BIGINT NOT NULL, "
- + "UNIQUE (" + JdbcTransactionalStore.DEFAULT_APP_ID_COL + ", " + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + ", " + JdbcTransactionalStore.DEFAULT_WINDOW_COL + ") "
- + ")";
+ + JdbcTransactionalStore.DEFAULT_APP_ID_COL + " VARCHAR(100) NOT NULL, "
+ + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + " INT NOT NULL, "
+ + JdbcTransactionalStore.DEFAULT_WINDOW_COL + " BIGINT NOT NULL, "
+ + "UNIQUE (" + JdbcTransactionalStore.DEFAULT_APP_ID_COL + ", "
+ + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + ", " + JdbcTransactionalStore.DEFAULT_WINDOW_COL + ") "
+ + ")";
stmt.executeUpdate(createMetaTable);
String createTable = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (ID INTEGER)";
stmt.executeUpdate(createTable);
- String createPOJOTable = "CREATE TABLE IF NOT EXISTS " + TABLE_POJO_NAME + "(id INTEGER not NULL,name VARCHAR(255), PRIMARY KEY ( id ))";
+ String createPOJOTable = "CREATE TABLE IF NOT EXISTS " + TABLE_POJO_NAME
+ + "(id INTEGER not NULL,name VARCHAR(255), PRIMARY KEY ( id ))";
stmt.executeUpdate(createPOJOTable);
} catch (Throwable e) {
DTThrowable.rethrow(e);
@@ -255,9 +261,11 @@ public class JdbcOperatorTest
transactionalStore.setDatabaseDriver(DB_DRIVER);
transactionalStore.setDatabaseUrl(URL);
- com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
+ com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap =
+ new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
attributeMap.put(DAG.APPLICATION_ID, APP_ID);
- OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap);
+ OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(
+ OPERATOR_ID, attributeMap);
TestOutputOperator outputOperator = new TestOutputOperator();
outputOperator.setBatchSize(3);
@@ -287,9 +295,11 @@ public class JdbcOperatorTest
transactionalStore.setDatabaseDriver(DB_DRIVER);
transactionalStore.setDatabaseUrl(URL);
- com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
+ com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap =
+ new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
attributeMap.put(DAG.APPLICATION_ID, APP_ID);
- OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap);
+ OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(
+ OPERATOR_ID, attributeMap);
TestPOJOOutputOperator outputOperator = new TestPOJOOutputOperator();
outputOperator.setBatchSize(3);
@@ -332,9 +342,11 @@ public class JdbcOperatorTest
store.setDatabaseDriver(DB_DRIVER);
store.setDatabaseUrl(URL);
- com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap = new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
+ com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap attributeMap =
+ new com.datatorrent.api.Attribute.AttributeMap.DefaultAttributeMap();
attributeMap.put(DAG.APPLICATION_ID, APP_ID);
- OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap);
+ OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(
+ OPERATOR_ID, attributeMap);
TestInputOperator inputOperator = new TestInputOperator();
inputOperator.setStore(store);
@@ -360,7 +372,8 @@ public class JdbcOperatorTest
Attribute.AttributeMap.DefaultAttributeMap attributeMap = new Attribute.AttributeMap.DefaultAttributeMap();
attributeMap.put(DAG.APPLICATION_ID, APP_ID);
- OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(OPERATOR_ID, attributeMap);
+ OperatorContextTestHelper.TestIdOperatorContext context = new OperatorContextTestHelper.TestIdOperatorContext(
+ OPERATOR_ID, attributeMap);
insertEventsInTable(10);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b9aa203d/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java
index 4048296..97e3e57 100644
--- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java
+++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java
@@ -55,7 +55,8 @@ public class JdbcStoreTest
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
Input input = new Input(bais);
- JdbcStore deserializedStrore = (JdbcStore) kryo.readClassAndObject(input);
- Assert.assertEquals("connection properties", store.getConnectionProperties(), deserializedStrore.getConnectionProperties());
+ JdbcStore deserializedStrore = (JdbcStore)kryo.readClassAndObject(input);
+ Assert.assertEquals("connection properties", store.getConnectionProperties(),
+ deserializedStrore.getConnectionProperties());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b9aa203d/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java
index 05c7689..867d309 100644
--- a/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java
@@ -70,9 +70,10 @@ public class FTPStringInputOperatorTest
ftpOperator.setPassword("test");
ftpOperator.setDirectory(homeDirectory.getPath());
- ftpOperator.setup(new OperatorContextTestHelper.TestIdOperatorContext(11, new Attribute.AttributeMap.DefaultAttributeMap()));
+ ftpOperator.setup(
+ new OperatorContextTestHelper.TestIdOperatorContext(11, new Attribute.AttributeMap.DefaultAttributeMap()));
- sink = new CollectorTestSink<Object>();
+ sink = new CollectorTestSink<>();
ftpOperator.output.setSink(sink);
}
@@ -101,4 +102,4 @@ public class FTPStringInputOperatorTest
Assert.assertTrue("2", testMeta.sink.collectedTuples.contains("2"));
Assert.assertTrue("20", testMeta.sink.collectedTuples.contains("20"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b9aa203d/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java
index cbcc8b4..94c587b 100644
--- a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java
@@ -310,7 +310,8 @@ public class AbstractFileOutputOperatorTest
}
@Test
- public void testSingleFileCompletedWriteTmp() {
+ public void testSingleFileCompletedWriteTmp()
+ {
testMeta.writeToTmp = true;
testSingleFileCompletedWrite();
}
@@ -420,6 +421,7 @@ public class AbstractFileOutputOperatorTest
singleFileName,
correctContents);
}
+
@Test
public void testSingleFileFailedWriteOverwriteInitiaTmp() throws IOException
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b9aa203d/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java
----------------------------------------------------------------------
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java b/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java
index 10ca242..b8c916d 100644
--- a/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java
@@ -19,12 +19,15 @@
package com.datatorrent.lib.io.jms;
import java.io.File;
-import java.io.IOException;
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.io.FileUtils;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -33,10 +36,12 @@ import org.junit.runner.Description;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.commons.io.FileUtils;
+
import com.datatorrent.api.Attribute;
import com.datatorrent.api.Context;
import com.datatorrent.api.annotation.Stateless;
-
import com.datatorrent.lib.helper.OperatorContextTestHelper;
import com.datatorrent.lib.testbench.CollectorTestSink;
@@ -59,8 +64,7 @@ public class JMSStringInputOperatorTest
testBase = new JMSTestBase();
try {
testBase.beforTest();
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException(e);
}
String methodName = description.getMethodName();
@@ -75,7 +79,7 @@ public class JMSStringInputOperatorTest
operator = new JMSStringInputOperator();
operator.getConnectionFactoryProperties().put(JMSTestBase.AMQ_BROKER_URL, "vm://localhost");
- sink = new CollectorTestSink<Object>();
+ sink = new CollectorTestSink<>();
operator.output.setSink(sink);
operator.setup(context);
operator.activate(context);
@@ -87,13 +91,9 @@ public class JMSStringInputOperatorTest
operator.deactivate();
operator.teardown();
try {
- FileUtils.deleteDirectory(new File("target/"+ description.getClassName()));
+ FileUtils.deleteDirectory(new File("target/" + description.getClassName()));
testBase.afterTest();
- }
- catch (IOException e) {
- throw new RuntimeException(e);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException(e);
}
}
@@ -125,7 +125,8 @@ public class JMSStringInputOperatorTest
testMeta.operator.setup(testMeta.context);
testMeta.operator.activate(testMeta.context);
- Assert.assertEquals("largest recovery window", 1, testMeta.operator.getIdempotentStorageManager().getLargestRecoveryWindow());
+ Assert.assertEquals("largest recovery window", 1,
+ testMeta.operator.getIdempotentStorageManager().getLargestRecoveryWindow());
testMeta.operator.beginWindow(1);
testMeta.operator.endWindow();
@@ -155,14 +156,14 @@ public class JMSStringInputOperatorTest
testMeta.operator.emitTuples();
try {
testMeta.operator.endWindow();
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
LOG.debug("ack failed");
}
testMeta.operator.setup(testMeta.context);
testMeta.operator.activate(testMeta.context);
- Assert.assertEquals("window 1 should not exist", Stateless.WINDOW_ID, testMeta.operator.getIdempotentStorageManager().getLargestRecoveryWindow());
+ Assert.assertEquals("window 1 should not exist", Stateless.WINDOW_ID,
+ testMeta.operator.getIdempotentStorageManager().getLargestRecoveryWindow());
}
private void produceMsg(int numMessages) throws Exception
@@ -197,5 +198,5 @@ public class JMSStringInputOperatorTest
}
- private static transient final Logger LOG = LoggerFactory.getLogger(JMSStringInputOperatorTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JMSStringInputOperatorTest.class);
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b9aa203d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3a22fa..92466ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>8938</maxAllowedViolations>
+ <maxAllowedViolations>8768</maxAllowedViolations>
</configuration>
</plugin>
</plugins>