SPOI-10583 use apex 3.5.0 & malhar 3.6.0; fix code so tests run succe…

…ssfully
dtpublic · Feb 12, 2017 · 018db27 · 018db27
1 parent 1f24754
commit 018db27
Show file tree

Hide file tree

Showing 38 changed files with 72 additions and 70 deletions.
diff --git a/tutorials/cassandraInput/README.md b/tutorials/cassandraInput/README.md
@@ -3,6 +3,7 @@
 This application reads data from cassandra database using [CassandraPOJOInputOperator](https://github.com/apache/apex-malhar/blob/master/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java) 
 and writes the records to a file using [GenericFileOutputOperator](https://github.com/apache/apex-malhar/blob/master/library/src/main/java/org/apache/apex/malhar/lib/fs/GenericFileOutputOperator.java) from [Apex Malhar](https://github.com/apache/apex-malhar).
 
+NOTE: Running cassandra service necessary. Set up local cassandra service if needed.
 
 Follow these steps to run this application:
 

diff --git a/tutorials/cassandraInput/pom.xml b/tutorials/cassandraInput/pom.xml
@@ -11,8 +11,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <apex.version>3.4.0</apex.version>
-    <malhar.version>3.5.0</malhar.version>
+    <apex.version>3.5.0</apex.version>
+    <malhar.version>3.6.0</malhar.version>
     <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/cassandraOutput/README.md b/tutorials/cassandraOutput/README.md
@@ -3,6 +3,7 @@
 This application generates tests data pojo and uses [CassandraPojoOputputOperator](https://github.com/apache/apex-malhar/blob/master/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java) 
 from [Apex Malhar](https://github.com/apache/apex-malhar) library to write pojo input data to tables in cassandra database.
 
+NOTE: Running cassandra service necessary. Set up local cassandra service if needed.
 
 Follow these steps to run this application:
 

diff --git a/tutorials/cassandraOutput/pom.xml b/tutorials/cassandraOutput/pom.xml
@@ -11,8 +11,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <apex.version>3.4.0</apex.version>
-    <malhar.version>3.5.0</malhar.version>
+    <apex.version>3.5.0</apex.version>
+    <malhar.version>3.6.0</malhar.version>
     <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/csvformatter/pom.xml b/tutorials/csvformatter/pom.xml
@@ -13,9 +13,9 @@
 
     <properties>
         <!-- change this if you desire to use a different version of Apex Core -->
-        <apex.version>3.4.0</apex.version>
+        <apex.version>3.5.0</apex.version>
         <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-        <malhar.version>3.5.0-SNAPSHOT</malhar.version>
+        <malhar.version>3.6.0</malhar.version>
     </properties>
 
     <build>

diff --git a/tutorials/csvformatter/src/main/java/com/demo/myapexapp/PojoEvent.java b/tutorials/csvformatter/src/main/java/com/demo/myapexapp/PojoEvent.java
@@ -11,7 +11,7 @@ public class PojoEvent
   private double campaignBudget;
   private Date startDate;
   private Date endDate;
-  private int securityCode;
+  private String securityCode;
   private boolean weatherTargeting;
   private boolean optimized;
   private String parentCampaign;
@@ -78,12 +78,12 @@ public void setEndDate(Date endDate)
     this.endDate = endDate;
   }
 
-  public int getSecurityCode()
+  public String getSecurityCode()
   {
     return securityCode;
   }
 
-  public void setSecurityCode(int securityCode)
+  public void setSecurityCode(String securityCode)
   {
     this.securityCode = securityCode;
   }

diff --git a/tutorials/csvformatter/src/main/resources/schema.json b/tutorials/csvformatter/src/main/resources/schema.json
@@ -38,7 +38,7 @@
     },
     {
       "name": "securityCode",
-      "type": "Integer"
+      "type": "String"
     },
     {
       "name": "weatherTargeting",

diff --git a/tutorials/csvformatter/src/test/java/com/demo/myapexapp/ApplicationTest.java b/tutorials/csvformatter/src/test/java/com/demo/myapexapp/ApplicationTest.java
@@ -54,7 +54,8 @@ public void testApplication() throws Exception
 
       for (File file : list) {
         for (String line : FileUtils.readLines(file)) {
-          Assert.assertEquals("Delimiter in record", true, (line.equals("1234|SimpleCsvFormatterExample|10000.0|false|APEX")));
+          Assert.assertEquals("Delimiter in record", true, (line.equals(
+            "1234|0|SimpleCsvFormatterExample|10000.0|||APEX|false|false||")));
         }
       }
 

diff --git a/tutorials/dedup/pom.xml b/tutorials/dedup/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
-    <malhar.version>3.5.0</malhar.version>
+    <apex.version>3.5.0</apex.version>
+    <malhar.version>3.6.0</malhar.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/dynamic-partition/pom.xml b/tutorials/dynamic-partition/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 
@@ -237,7 +237,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.4.0</version>
+      <version>3.6.0</version>
       <!-- 
            If you know that your application does not need transitive dependencies pulled in by malhar-library,
            uncomment the following to reduce the size of your app package.

diff --git a/tutorials/enricher/pom.xml b/tutorials/enricher/pom.xml
@@ -13,9 +13,9 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-    <malhar.version>3.4.0</malhar.version>
+    <malhar.version>3.6.0</malhar.version>
   </properties>
 
   <build>

diff --git a/tutorials/enricher/src/main/java/com/example/myapexapp/EnricherAppWithJSONFile.java b/tutorials/enricher/src/main/java/com/example/myapexapp/EnricherAppWithJSONFile.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-import com.datatorrent.contrib.enrich.FSLoader;
+import com.datatorrent.contrib.enrich.JsonFSLoader;
 import com.datatorrent.contrib.enrich.POJOEnricher;
 import com.datatorrent.contrib.parser.JsonParser;
 import com.datatorrent.lib.io.ConsoleOutputOperator;
@@ -26,7 +26,7 @@ public void populateDAG(DAG dag, Configuration conf)
      * properties.xml file.
      * The format that is used to read the file is present as an example in resources/circleMapping.txt file.
      */
-    FSLoader fsLoader = new FSLoader();
+    JsonFSLoader fsLoader = new JsonFSLoader();
     POJOEnricher enrich = dag.addOperator("Enrich", POJOEnricher.class);
     enrich.setStore(fsLoader);
 

diff --git a/tutorials/exactly-once/pom.xml b/tutorials/exactly-once/pom.xml
@@ -13,9 +13,9 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-    <malhar.version>3.4.0</malhar.version>
+    <malhar.version>3.6.0</malhar.version>
   </properties>
 
   <build>
@@ -288,7 +288,7 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka_2.10</artifactId>
-      <version>0.8.1.1</version>
+      <version>0.8.2.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>

diff --git a/tutorials/fileIO-multiDir/pom.xml b/tutorials/fileIO-multiDir/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/fileIO-simple/pom.xml b/tutorials/fileIO-simple/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 
@@ -237,7 +237,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.4.0</version>
+      <version>3.6.0</version>
       <!-- 
            If you know that your application does not need transitive dependencies pulled in by malhar-library,
            uncomment the following to reduce the size of your app package.

diff --git a/tutorials/fileIO/pom.xml b/tutorials/fileIO/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 
@@ -237,7 +237,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.4.0</version>
+      <version>3.6.0</version>
       <!-- 
            If you know that your application does not need transitive dependencies pulled in by malhar-library,
            uncomment the following to reduce the size of your app package.

diff --git a/tutorials/fileOutput/pom.xml b/tutorials/fileOutput/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 
@@ -237,7 +237,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.4.0</version>
+      <version>3.6.0</version>
       <!-- 
            If you know that your application does not need transitive dependencies pulled in by malhar-library,
            uncomment the following to reduce the size of your app package.

diff --git a/tutorials/fileToJdbc/pom.xml b/tutorials/fileToJdbc/pom.xml
@@ -13,9 +13,9 @@
 
   <properties>
       <!-- change this if you desire to use a different version of Apex Core -->
-      <apex.version>3.4.0</apex.version>
+      <apex.version>3.5.0</apex.version>
       <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-      <malhar.version>3.5.0-SNAPSHOT</malhar.version>
+      <malhar.version>3.6.0</malhar.version>
   </properties>
 
   <build>

diff --git a/tutorials/filter/pom.xml b/tutorials/filter/pom.xml
@@ -13,9 +13,9 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-    <malhar.version>3.5.0</malhar.version>
+    <malhar.version>3.6.0</malhar.version>
   </properties>
 
   <build>

diff --git a/tutorials/filter/src/test/java/com/datatorrent/tutorial/filter/ApplicationTest.java b/tutorials/filter/src/test/java/com/datatorrent/tutorial/filter/ApplicationTest.java
@@ -73,13 +73,12 @@ public void testApplication() throws IOException, Exception
       conf.addResource(this.getClass().getResourceAsStream("/META-INF/properties.xml"));
       conf.set("dt.application.FilterExample.operator.selectedOutput.prop.filePath", outputDir);
       conf.set("dt.application.FilterExample.operator.rejectedOutput.prop.filePath", outputDir);
-      final File selectedfile = FileUtils.getFile(outputDir, "selected.txt_6.0");
-      final File rejectedfile = FileUtils.getFile(outputDir, "rejected.txt_8.0");
+      final File selectedfile = FileUtils.getFile(outputDir, "selected.txt_8.0");
+      final File rejectedfile = FileUtils.getFile(outputDir, "rejected.txt_6.0");
 
       lma.prepareDAG(new Application(), conf);
       LocalMode.Controller lc = lma.getController();
-
-      lc.setHeartbeatMonitoringEnabled(false);
+
       ((StramLocalCluster)lc).setExitCondition(new Callable<Boolean>()
       {
         @Override

diff --git a/tutorials/hdfs-sync/pom.xml b/tutorials/hdfs-sync/pom.xml
@@ -29,8 +29,8 @@
 
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <apex.version>3.4.0</apex.version>
-    <malhar.version>3.6.0-SNAPSHOT</malhar.version>
+    <apex.version>3.5.0</apex.version>
+    <malhar.version>3.6.0</malhar.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
     <skipTests>false</skipTests>
     <semver.plugin.skip>true</semver.plugin.skip>

diff --git a/tutorials/hdfs2kafka/pom.xml b/tutorials/hdfs2kafka/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
-    <malhar.version>3.4.0</malhar.version>
+    <apex.version>3.5.0</apex.version>
+    <malhar.version>3.6.0</malhar.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/hdht/pom.xml b/tutorials/hdht/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/innerjoin/pom.xml b/tutorials/innerjoin/pom.xml
@@ -12,8 +12,8 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
-    <malhar.version>3.5.0-SNAPSHOT</malhar.version>
+    <apex.version>3.5.0</apex.version>
+    <malhar.version>3.6.0</malhar.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 

diff --git a/tutorials/jdbcIngest/pom.xml b/tutorials/jdbcIngest/pom.xml
@@ -14,9 +14,9 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-    <malhar.version>3.5.0</malhar.version>
+    <malhar.version>3.6.0</malhar.version>
   </properties>
 
   <build>

diff --git a/tutorials/jdbcToJdbc/pom.xml b/tutorials/jdbcToJdbc/pom.xml
@@ -14,9 +14,9 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-    <malhar.version>3.5.0-SNAPSHOT</malhar.version>
+    <malhar.version>3.6.0</malhar.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
     <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
   </properties>

diff --git a/tutorials/jmsActiveMQ/pom.xml b/tutorials/jmsActiveMQ/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 
@@ -236,7 +236,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.5.0</version>
+      <version>3.6.0</version>
       <!-- 
            If you know that your application does not need transitive dependencies pulled in by malhar-library,
            uncomment the following to reduce the size of your app package.

diff --git a/tutorials/jmsSqs/pom.xml b/tutorials/jmsSqs/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
   </properties>
 
@@ -236,7 +236,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.5.0</version>
+      <version>3.6.0</version>
       <!-- 
            If you know that your application does not need transitive dependencies pulled in by malhar-library,
            uncomment the following to reduce the size of your app package.

diff --git a/tutorials/kafka/pom.xml b/tutorials/kafka/pom.xml
@@ -13,9 +13,9 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
-    <malhar.version>3.4.0</malhar.version>
+    <malhar.version>3.6.0</malhar.version>
   </properties>
 
   <build>

diff --git a/tutorials/parser/pom.xml b/tutorials/parser/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <!-- change this if you desire to use a different version of Apex Core -->
-    <apex.version>3.4.0</apex.version>
+    <apex.version>3.5.0</apex.version>
     <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath>
     <malhar.version>3.7.0-SNAPSHOT</malhar.version>
   </properties>