Add forgotten things to uc4-beam

settings.gradle + build.gradle + Changes to KafkaReader

theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaActivePowerRecordReader.java

 package theodolite.commons.beam.kafka;
 
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;
-import java.util.Properties;
+
+import java.util.HashMap;
+
 import org.apache.beam.sdk.coders.AvroCoder;
 import org.apache.beam.sdk.io.kafka.KafkaIO;
 import org.apache.beam.sdk.transforms.PTransform;
@@ -26,7 +28,7 @@ public class KafkaActivePowerRecordReader extends
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
   public KafkaActivePowerRecordReader(final String bootstrapServer, final String inputTopic,
-                                      final Properties consumerConfig) {
+                                      final HashMap consumerConfig) {
     super();
 
     // Check if boostrap server and inputTopic are defined

theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaActivePowerTimestampReader.java

@@ -10,6 +10,7 @@ import org.apache.beam.sdk.values.PCollection;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import titan.ccp.model.records.ActivePowerRecord;
 
+import java.util.HashMap;
 import java.util.Properties;
 
 /**
@@ -28,7 +29,7 @@ public class KafkaActivePowerTimestampReader extends
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
   public KafkaActivePowerTimestampReader(final String bootstrapServer, final String inputTopic,
-                                         final Properties consumerConfig) {
+                                         final HashMap consumerConfig) {
     super();
 
     // Check if boostrap server and inputTopic are defined

theodolite-benchmarks/settings.gradle

@@ -8,6 +8,7 @@ include 'beam-commons'
 include 'uc1-beam'
 include 'uc2-beam'
 include 'uc3-beam'
+include 'uc4-beam'
 
 include 'uc1-load-generator'
 include 'uc1-kstreams'

theodolite-benchmarks/uc4-beam-samza/build.gradle

 plugins {
-  id 'theodolite.kstreams'
+  id 'theodolite.beam'
 }
 
-allprojects {
-  repositories {
-    maven {
-      url 'https://packages.confluent.io/maven/'
-    }
-    mavenCentral()
-  }
-}
-
-
 dependencies {
-  compile group: 'org.apache.beam', name: 'beam-sdks-java-core', version: '2.22.0'
   compile group: 'org.apache.beam', name: 'beam-runners-samza', version: '2.22.0'
-
-  compile('org.apache.beam:beam-sdks-java-io-kafka:2.22.0'){
-    exclude group: 'org.apache.kafka', module: 'kafka-clients'
-  }
-  compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
-
-  runtime 'org.apache.beam:beam-runners-direct-java:2.22.0'
-  runtime 'org.slf4j:slf4j-api:1.7.32'
-  runtime 'org.slf4j:slf4j-jdk14:1.7.32'
+  compile project(':uc4-beam')
 }
 
 
-mainClassName = "application.Uc4ApplicationBeam"
+mainClassName = "application.Uc4BeamSamza"