diff --git a/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java b/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java index 2f37bf757aaa4d745a7f3a6416b359da73e2babc..06a6d9ccbf6750290335cd7389391eb613b1569a 100644 --- a/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java +++ b/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)) diff --git a/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java b/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java index b57f5c38e79f04098bb6fc2a8c861c4655daa8a6..78d72af1d3eb3585606d349166f6bafdf1048b48 100644 --- a/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java +++ b/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"; diff --git a/uc2-application/src/main/resources/META-INF/application.properties b/uc2-application/src/main/resources/META-INF/application.properties index 3aa519c50f5a4be124600e9ad0c13dc27277092a..80e88e9273bebe0fc4df1439507dbdcb9dfc5649 100644 --- a/uc2-application/src/main/resources/META-INF/application.properties +++ b/uc2-application/src/main/resources/META-INF/application.properties @@ -1,3 +1,6 @@ +application.name="uc2-application" +application.version="0.0.1" + configuration.host=localhost configuration.port=8082 configuration.kafka.topic=configuration diff --git a/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java b/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java index d95d245e0b354f11abfc40277e088f1a3f205c95..ab6f08c017bb78a72c4896d766b38f7b8485c7fb 100644 --- a/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java +++ b/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() { + } } diff --git a/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java b/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java index 916d64f011a742d497a3512dd09da9db080576e5..18aae8c3499643c29901c3ca7461ec707d59c280 100644 --- a/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java +++ b/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)) diff --git a/uc3-application/src/main/resources/META-INF/application.properties b/uc3-application/src/main/resources/META-INF/application.properties index ef279332f911108fa8ca42d840d4a147460e8e35..1383f35f8031344fd22c6dfec4374c5e23648bba 100644 --- a/uc3-application/src/main/resources/META-INF/application.properties +++ b/uc3-application/src/main/resources/META-INF/application.properties @@ -1,3 +1,6 @@ +application.name="uc3-application" +application.version="0.0.1" + kafka.bootstrap.servers=localhost:9092 kafka.input.topic=input kafka.output.topic=output diff --git a/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java b/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java index aa74e1552cb4c3c020f511dfb6b53a3f1fd886d7..bc5fee1f2cb4367284e9db60f575f2652b1bd05b 100644 --- a/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java +++ b/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"; diff --git a/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java b/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java index 4d686d8f7f244b9e6dd28b4c39abcb83d9a108b8..3e3073fdeed682ae09e345d9f315585e960a3440 100644 --- a/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java +++ b/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)) diff --git a/uc4-application/src/main/resources/META-INF/application.properties b/uc4-application/src/main/resources/META-INF/application.properties index da99d5a623b71b6896eaff17b478285f7d501512..94e77fc5ae11b65bbe233bde47e824becd6039a7 100644 --- a/uc4-application/src/main/resources/META-INF/application.properties +++ b/uc4-application/src/main/resources/META-INF/application.properties @@ -1,3 +1,6 @@ +application.name="uc4-application" +application.version="0.0.1" + kafka.bootstrap.servers=localhost:9092 kafka.input.topic=input kafka.output.topic=output