Merge branch 'fix/applicationNameCrash' into 'master'

fix not setting application name in the use case applications

See merge request !21

uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java

@@ -46,6 +46,8 @@ public class AggregationService {
 
     // Configuration of the stream application
     final KafkaStreams kafkaStreams = uc2KafkaStreamsBuilder
+        .applicationName(this.config.getString(ConfigurationKeys.APPLICATION_NAME))
+        .applicationVersion(this.config.getString(ConfigurationKeys.APPLICATION_VERSION))
         .bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
         .numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
         .commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))

uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java

@@ -4,6 +4,9 @@ package theodolite.uc2.application;
  * Keys to access configuration parameters.
  */
 public final class ConfigurationKeys {
+  public static final String APPLICATION_NAME = "application.name";
+
+  public static final String APPLICATION_VERSION = "application.version";
 
   public static final String CONFIGURATION_KAFKA_TOPIC = "configuration.kafka.topic";
 

uc2-application/src/main/resources/META-INF/application.properties

+application.name="uc2-application"
+application.version="0.0.1"
+
 configuration.host=localhost
 configuration.port=8082
 configuration.kafka.topic=configuration

uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java

@@ -5,21 +5,25 @@ package theodolite.uc3.application;
  */
 public final class ConfigurationKeys {
 
-	public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
+  public static final String APPLICATION_NAME = "application.name";
 
-	public static final String KAFKA_OUTPUT_TOPIC = "kafka.output.topic";
+  public static final String APPLICATION_VERSION = "application.version";
 
-	public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
+  public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
 
-	public static final String NUM_THREADS = "num.threads";
+  public static final String KAFKA_OUTPUT_TOPIC = "kafka.output.topic";
 
-	public static final String COMMIT_INTERVAL_MS = "commit.interval.ms";
+  public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
 
-	public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
+  public static final String NUM_THREADS = "num.threads";
 
-	public static final String KAFKA_WINDOW_DURATION_MINUTES = "kafka.window.duration.minutes";
+  public static final String COMMIT_INTERVAL_MS = "commit.interval.ms";
 
-	private ConfigurationKeys() {
-	}
+  public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
+
+  public static final String KAFKA_WINDOW_DURATION_MINUTES = "kafka.window.duration.minutes";
+
+  private ConfigurationKeys() {
+  }
 
 }

uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java

@@ -42,6 +42,8 @@ public class HistoryService {
 
     // Configuration of the stream application
     final KafkaStreams kafkaStreams = uc3KafkaStreamsBuilder
+        .applicationName(this.config.getString(ConfigurationKeys.APPLICATION_NAME))
+        .applicationVersion(this.config.getString(ConfigurationKeys.APPLICATION_VERSION))
         .bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
         .numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
         .commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))

uc3-application/src/main/resources/META-INF/application.properties

+application.name="uc3-application"
+application.version="0.0.1"
+
 kafka.bootstrap.servers=localhost:9092
 kafka.input.topic=input
 kafka.output.topic=output

uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java

@@ -5,6 +5,10 @@ package theodolite.uc4.application;
  */
 public final class ConfigurationKeys {
 
+  public static final String APPLICATION_NAME = "application.name";
+
+  public static final String APPLICATION_VERSION = "application.version";
+
   public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
 
   public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";

uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java

@@ -42,6 +42,8 @@ public class HistoryService {
 
     // Configuration of the stream application
     final KafkaStreams kafkaStreams = uc4KafkaStreamsBuilder
+        .applicationName(this.config.getString(ConfigurationKeys.APPLICATION_NAME))
+        .applicationVersion(this.config.getString(ConfigurationKeys.APPLICATION_VERSION))
         .bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
         .numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
         .commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))

uc4-application/src/main/resources/META-INF/application.properties

+application.name="uc4-application"
+application.version="0.0.1"
+
 kafka.bootstrap.servers=localhost:9092
 kafka.input.topic=input
 kafka.output.topic=output