From 07b877b3a02440754dfecdbf9f79cc6ac7402825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Thu, 14 May 2020 12:50:42 +0200
Subject: [PATCH] Change top level java package to spesb and adopt main class
in gradle
Add the spesb prefix to all self implemented java packages of the
project. Because this changes the fully qualified class name of
the main classes the build.gradle files need to adopt to this.
---
uc1-application/build.gradle | 6 +++---
.../{ => spesb}/uc1/application/ConfigurationKeys.java | 2 +-
.../java/{ => spesb}/uc1/application/HistoryService.java | 4 ++--
.../uc1/streamprocessing/KafkaStreamsBuilder.java | 2 +-
.../{ => spesb}/uc1/streamprocessing/TopologyBuilder.java | 2 +-
uc1-workload-generator/build.gradle | 6 +++---
.../kafkasender}/KafkaRecordSender.java | 2 +-
.../uc1/workloadgenerator}/LoadGenerator.java | 4 ++--
uc2-application/build.gradle | 6 +++---
.../{ => spesb}/uc2/application/AggregationService.java | 4 ++--
.../{ => spesb}/uc2/application/ConfigurationKeys.java | 2 +-
.../uc2/streamprocessing/ChildParentsTransformer.java | 2 +-
.../streamprocessing/ChildParentsTransformerFactory.java | 2 +-
.../uc2/streamprocessing/JointFlatTransformer.java | 2 +-
.../uc2/streamprocessing/JointFlatTransformerFactory.java | 2 +-
.../uc2/streamprocessing/JointRecordParents.java | 2 +-
.../uc2/streamprocessing/KafkaStreamsBuilder.java | 2 +-
.../uc2/streamprocessing/OptionalParentsSerde.java | 2 +-
.../{ => spesb}/uc2/streamprocessing/ParentsSerde.java | 2 +-
.../uc2/streamprocessing/RecordAggregator.java | 2 +-
.../{ => spesb}/uc2/streamprocessing/SensorParentKey.java | 2 +-
.../uc2/streamprocessing/SensorParentKeySerde.java | 2 +-
.../{ => spesb}/uc2/streamprocessing/TopologyBuilder.java | 2 +-
.../uc2}/streamprocessing/OptionalParentsSerdeTest.java | 4 ++--
.../uc2}/streamprocessing/ParentsSerdeTest.java | 4 ++--
.../uc2}/streamprocessing/SensorParentKeySerdeTest.java | 6 +++---
.../uc2}/streamprocessing/SerdeTester.java | 2 +-
.../uc2}/streamprocessing/SerdeTesterFactory.java | 2 +-
uc2-workload-generator/build.gradle | 6 +++---
.../main/java/spesb/kafkasender}/KafkaRecordSender.java | 2 +-
.../uc2/workloadgenerator}/ConfigPublisher.java | 2 +-
.../uc2/workloadgenerator}/LoadGenerator.java | 4 ++--
.../uc2/workloadgenerator}/LoadGeneratorExtrem.java | 4 ++--
uc3-application/build.gradle | 8 ++++----
.../{ => spesb}/uc3/application/ConfigurationKeys.java | 2 +-
.../java/{ => spesb}/uc3/application/HistoryService.java | 4 ++--
.../uc3/streamprocessing/KafkaStreamsBuilder.java | 2 +-
.../{ => spesb}/uc3/streamprocessing/TopologyBuilder.java | 4 ++--
.../spesb/uc3}/streamprocessing/util/StatsFactory.java | 2 +-
uc3-workload-generator/build.gradle | 6 +++---
.../main/java/spesb/kafkasender}/KafkaRecordSender.java | 2 +-
.../uc3/workloadgenerator}/LoadGenerator.java | 4 ++--
uc4-application/build.gradle | 6 +++---
.../{ => spesb}/uc4/application/ConfigurationKeys.java | 2 +-
.../java/{ => spesb}/uc4/application/HistoryService.java | 4 ++--
.../{ => spesb}/uc4/streamprocessing/DayOfWeekKey.java | 2 +-
.../uc4/streamprocessing/DayOfWeekKeyFactory.java | 2 +-
.../uc4/streamprocessing/DayOfWeekKeySerde.java | 2 +-
.../uc4/streamprocessing/DayOfWeekRecordFactory.java | 2 +-
.../{ => spesb}/uc4/streamprocessing/HourOfDayKey.java | 2 +-
.../uc4/streamprocessing/HourOfDayKeyFactory.java | 2 +-
.../uc4/streamprocessing/HourOfDayKeySerde.java | 2 +-
.../uc4/streamprocessing/HourOfDayRecordFactory.java | 2 +-
.../{ => spesb}/uc4/streamprocessing/HourOfWeekKey.java | 2 +-
.../uc4/streamprocessing/HourOfWeekKeyFactory.java | 2 +-
.../uc4/streamprocessing/HourOfWeekKeySerde.java | 2 +-
.../uc4/streamprocessing/HourOfWeekRecordFactory.java | 2 +-
.../uc4/streamprocessing/KafkaStreamsBuilder.java | 2 +-
.../uc4/streamprocessing/RecordDatabaseAdapter.java | 2 +-
.../{ => spesb}/uc4/streamprocessing/StatsKeyFactory.java | 2 +-
.../uc4/streamprocessing/StatsRecordFactory.java | 2 +-
.../{ => spesb}/uc4/streamprocessing/TopologyBuilder.java | 4 ++--
.../spesb/uc4}/streamprocessing/util/StatsFactory.java | 2 +-
uc4-workload-generator/build.gradle | 6 +++---
.../kafkasender}/KafkaRecordSender.java | 2 +-
.../uc4/workloadgenerator}/LoadGenerator.java | 4 ++--
66 files changed, 98 insertions(+), 98 deletions(-)
rename uc1-application/src/main/java/{ => spesb}/uc1/application/ConfigurationKeys.java (94%)
rename uc1-application/src/main/java/{ => spesb}/uc1/application/HistoryService.java (94%)
rename uc1-application/src/main/java/{ => spesb}/uc1/streamprocessing/KafkaStreamsBuilder.java (98%)
rename uc1-application/src/main/java/{ => spesb}/uc1/streamprocessing/TopologyBuilder.java (97%)
rename uc1-workload-generator/src/main/java/{kafkaSender => spesb/kafkasender}/KafkaRecordSender.java (99%)
rename uc1-workload-generator/src/main/java/{uc1/workloadGenerator => spesb/uc1/workloadgenerator}/LoadGenerator.java (97%)
rename uc2-application/src/main/java/{ => spesb}/uc2/application/AggregationService.java (95%)
rename uc2-application/src/main/java/{ => spesb}/uc2/application/ConfigurationKeys.java (96%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/ChildParentsTransformer.java (99%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/ChildParentsTransformerFactory.java (97%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/JointFlatTransformer.java (98%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/JointFlatTransformerFactory.java (97%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/JointRecordParents.java (94%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/KafkaStreamsBuilder.java (99%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/OptionalParentsSerde.java (97%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/ParentsSerde.java (96%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/RecordAggregator.java (97%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/SensorParentKey.java (94%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/SensorParentKeySerde.java (96%)
rename uc2-application/src/main/java/{ => spesb}/uc2/streamprocessing/TopologyBuilder.java (99%)
rename uc2-application/src/test/java/{titan/ccp/aggregation => spesb/uc2}/streamprocessing/OptionalParentsSerdeTest.java (89%)
rename uc2-application/src/test/java/{titan/ccp/aggregation => spesb/uc2}/streamprocessing/ParentsSerdeTest.java (82%)
rename uc2-application/src/test/java/{titan/ccp/aggregation => spesb/uc2}/streamprocessing/SensorParentKeySerdeTest.java (77%)
rename uc2-application/src/test/java/{titan/ccp/aggregation => spesb/uc2}/streamprocessing/SerdeTester.java (93%)
rename uc2-application/src/test/java/{titan/ccp/aggregation => spesb/uc2}/streamprocessing/SerdeTesterFactory.java (93%)
rename {uc3-workload-generator/src/main/java/kafkaSender => uc2-workload-generator/src/main/java/spesb/kafkasender}/KafkaRecordSender.java (99%)
rename uc2-workload-generator/src/main/java/{uc2/workloadGenerator => spesb/uc2/workloadgenerator}/ConfigPublisher.java (97%)
rename uc2-workload-generator/src/main/java/{uc2/workloadGenerator => spesb/uc2/workloadgenerator}/LoadGenerator.java (98%)
rename uc2-workload-generator/src/main/java/{uc2/workloadGenerator => spesb/uc2/workloadgenerator}/LoadGeneratorExtrem.java (98%)
rename uc3-application/src/main/java/{ => spesb}/uc3/application/ConfigurationKeys.java (95%)
rename uc3-application/src/main/java/{ => spesb}/uc3/application/HistoryService.java (95%)
rename uc3-application/src/main/java/{ => spesb}/uc3/streamprocessing/KafkaStreamsBuilder.java (99%)
rename uc3-application/src/main/java/{ => spesb}/uc3/streamprocessing/TopologyBuilder.java (96%)
rename {uc4-application/src/main/java/uc4 => uc3-application/src/main/java/spesb/uc3}/streamprocessing/util/StatsFactory.java (92%)
rename {uc2-workload-generator/src/main/java/kafkaSender => uc3-workload-generator/src/main/java/spesb/kafkasender}/KafkaRecordSender.java (99%)
rename uc3-workload-generator/src/main/java/{uc3/workloadGenerator => spesb/uc3/workloadgenerator}/LoadGenerator.java (97%)
rename uc4-application/src/main/java/{ => spesb}/uc4/application/ConfigurationKeys.java (96%)
rename uc4-application/src/main/java/{ => spesb}/uc4/application/HistoryService.java (95%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/DayOfWeekKey.java (94%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/DayOfWeekKeyFactory.java (93%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/DayOfWeekKeySerde.java (96%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/DayOfWeekRecordFactory.java (95%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfDayKey.java (93%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfDayKeyFactory.java (92%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfDayKeySerde.java (96%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfDayRecordFactory.java (95%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfWeekKey.java (95%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfWeekKeyFactory.java (94%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfWeekKeySerde.java (96%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/HourOfWeekRecordFactory.java (95%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/KafkaStreamsBuilder.java (99%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/RecordDatabaseAdapter.java (98%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/StatsKeyFactory.java (89%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/StatsRecordFactory.java (95%)
rename uc4-application/src/main/java/{ => spesb}/uc4/streamprocessing/TopologyBuilder.java (97%)
rename {uc3-application/src/main/java/uc3 => uc4-application/src/main/java/spesb/uc4}/streamprocessing/util/StatsFactory.java (92%)
rename uc4-workload-generator/src/main/java/{kafkaSender => spesb/kafkasender}/KafkaRecordSender.java (99%)
rename uc4-workload-generator/src/main/java/{uc4/workloadGenerator => spesb/uc4/workloadgenerator}/LoadGenerator.java (97%)
diff --git a/uc1-application/build.gradle b/uc1-application/build.gradle
index 3fe880374..2341e1d8c 100644
--- a/uc1-application/build.gradle
+++ b/uc1-application/build.gradle
@@ -14,18 +14,18 @@ targetCompatibility = "1.11"
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
// Use JUnit test framework
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc1.application.HistoryService"
+mainClassName = "spesb.uc1.application.HistoryService"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc1-application/src/main/java/uc1/application/ConfigurationKeys.java b/uc1-application/src/main/java/spesb/uc1/application/ConfigurationKeys.java
similarity index 94%
rename from uc1-application/src/main/java/uc1/application/ConfigurationKeys.java
rename to uc1-application/src/main/java/spesb/uc1/application/ConfigurationKeys.java
index 27bf70b96..7a275cb33 100644
--- a/uc1-application/src/main/java/uc1/application/ConfigurationKeys.java
+++ b/uc1-application/src/main/java/spesb/uc1/application/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package uc1.application;
+package spesb.uc1.application;
/**
* Keys to access configuration parameters.
diff --git a/uc1-application/src/main/java/uc1/application/HistoryService.java b/uc1-application/src/main/java/spesb/uc1/application/HistoryService.java
similarity index 94%
rename from uc1-application/src/main/java/uc1/application/HistoryService.java
rename to uc1-application/src/main/java/spesb/uc1/application/HistoryService.java
index 2c7504ad4..18a39da72 100644
--- a/uc1-application/src/main/java/uc1/application/HistoryService.java
+++ b/uc1-application/src/main/java/spesb/uc1/application/HistoryService.java
@@ -1,10 +1,10 @@
-package uc1.application;
+package spesb.uc1.application;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import spesb.uc1.streamprocessing.KafkaStreamsBuilder;
import titan.ccp.common.configuration.Configurations;
-import uc1.streamprocessing.KafkaStreamsBuilder;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java b/uc1-application/src/main/java/spesb/uc1/streamprocessing/KafkaStreamsBuilder.java
similarity index 98%
rename from uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java
rename to uc1-application/src/main/java/spesb/uc1/streamprocessing/KafkaStreamsBuilder.java
index 22048d6fa..4b7f487c8 100644
--- a/uc1-application/src/main/java/uc1/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc1-application/src/main/java/spesb/uc1/streamprocessing/KafkaStreamsBuilder.java
@@ -1,4 +1,4 @@
-package uc1.streamprocessing;
+package spesb.uc1.streamprocessing;
import java.util.Objects;
import java.util.Properties;
diff --git a/uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java b/uc1-application/src/main/java/spesb/uc1/streamprocessing/TopologyBuilder.java
similarity index 97%
rename from uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java
rename to uc1-application/src/main/java/spesb/uc1/streamprocessing/TopologyBuilder.java
index 1f112858a..279b70d0b 100644
--- a/uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java
+++ b/uc1-application/src/main/java/spesb/uc1/streamprocessing/TopologyBuilder.java
@@ -1,4 +1,4 @@
-package uc1.streamprocessing;
+package spesb.uc1.streamprocessing;
import com.google.gson.Gson;
import org.apache.kafka.common.serialization.Serdes;
diff --git a/uc1-workload-generator/build.gradle b/uc1-workload-generator/build.gradle
index 824566a24..7739f8747 100644
--- a/uc1-workload-generator/build.gradle
+++ b/uc1-workload-generator/build.gradle
@@ -14,18 +14,18 @@ targetCompatibility = "1.11"
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
// Use JUnit test framework
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc1.workloadGenerator.LoadGenerator"
+mainClassName = "spesb.uc1.workloadgenerator.LoadGenerator"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc1-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java b/uc1-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
similarity index 99%
rename from uc1-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
rename to uc1-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
index 6c67cf722..034201411 100644
--- a/uc1-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
+++ b/uc1-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
@@ -1,4 +1,4 @@
-package kafkaSender;
+package spesb.kafkasender;
import java.util.Properties;
import java.util.function.Function;
diff --git a/uc1-workload-generator/src/main/java/uc1/workloadGenerator/LoadGenerator.java b/uc1-workload-generator/src/main/java/spesb/uc1/workloadgenerator/LoadGenerator.java
similarity index 97%
rename from uc1-workload-generator/src/main/java/uc1/workloadGenerator/LoadGenerator.java
rename to uc1-workload-generator/src/main/java/spesb/uc1/workloadgenerator/LoadGenerator.java
index 305212b04..9eb95f0c1 100644
--- a/uc1-workload-generator/src/main/java/uc1/workloadGenerator/LoadGenerator.java
+++ b/uc1-workload-generator/src/main/java/spesb/uc1/workloadgenerator/LoadGenerator.java
@@ -1,4 +1,4 @@
-package uc1.workloadGenerator;
+package spesb.uc1.workloadgenerator;
import java.io.IOException;
import java.util.List;
@@ -11,10 +11,10 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import kafkaSender.KafkaRecordSender;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import spesb.kafkasender.KafkaRecordSender;
import titan.ccp.models.records.ActivePowerRecord;
public class LoadGenerator {
diff --git a/uc2-application/build.gradle b/uc2-application/build.gradle
index 42bc3e077..4503bb94d 100644
--- a/uc2-application/build.gradle
+++ b/uc2-application/build.gradle
@@ -14,18 +14,18 @@ targetCompatibility = "1.11"
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
// Use JUnit test framework
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc2.application.AggregationService"
+mainClassName = "spesb.uc2.application.AggregationService"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc2-application/src/main/java/uc2/application/AggregationService.java b/uc2-application/src/main/java/spesb/uc2/application/AggregationService.java
similarity index 95%
rename from uc2-application/src/main/java/uc2/application/AggregationService.java
rename to uc2-application/src/main/java/spesb/uc2/application/AggregationService.java
index 696b13f48..79d8c94c7 100644
--- a/uc2-application/src/main/java/uc2/application/AggregationService.java
+++ b/uc2-application/src/main/java/spesb/uc2/application/AggregationService.java
@@ -1,11 +1,11 @@
-package uc2.application;
+package spesb.uc2.application;
import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import spesb.uc2.streamprocessing.KafkaStreamsBuilder;
import titan.ccp.common.configuration.Configurations;
-import uc2.streamprocessing.KafkaStreamsBuilder;
/**
* A microservice that manages the history and, therefore, stores and aggregates
diff --git a/uc2-application/src/main/java/uc2/application/ConfigurationKeys.java b/uc2-application/src/main/java/spesb/uc2/application/ConfigurationKeys.java
similarity index 96%
rename from uc2-application/src/main/java/uc2/application/ConfigurationKeys.java
rename to uc2-application/src/main/java/spesb/uc2/application/ConfigurationKeys.java
index 08d5e1eb2..ec3bb14be 100644
--- a/uc2-application/src/main/java/uc2/application/ConfigurationKeys.java
+++ b/uc2-application/src/main/java/spesb/uc2/application/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package uc2.application;
+package spesb.uc2.application;
/**
* Keys to access configuration parameters.
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/ChildParentsTransformer.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/ChildParentsTransformer.java
similarity index 99%
rename from uc2-application/src/main/java/uc2/streamprocessing/ChildParentsTransformer.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/ChildParentsTransformer.java
index 4315aad5b..82217b30a 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/ChildParentsTransformer.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/ChildParentsTransformer.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.Map;
import java.util.Optional;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/ChildParentsTransformerFactory.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/ChildParentsTransformerFactory.java
similarity index 97%
rename from uc2-application/src/main/java/uc2/streamprocessing/ChildParentsTransformerFactory.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/ChildParentsTransformerFactory.java
index 5029c0244..6cf2d2c6f 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/ChildParentsTransformerFactory.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/ChildParentsTransformerFactory.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.Map;
import java.util.Optional;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/JointFlatTransformer.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/JointFlatTransformer.java
similarity index 98%
rename from uc2-application/src/main/java/uc2/streamprocessing/JointFlatTransformer.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/JointFlatTransformer.java
index 87a1d9967..27857fa45 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/JointFlatTransformer.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/JointFlatTransformer.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import com.google.common.base.MoreObjects;
import java.util.ArrayList;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/JointFlatTransformerFactory.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/JointFlatTransformerFactory.java
similarity index 97%
rename from uc2-application/src/main/java/uc2/streamprocessing/JointFlatTransformerFactory.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/JointFlatTransformerFactory.java
index 5ddb07850..44c99b1f5 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/JointFlatTransformerFactory.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/JointFlatTransformerFactory.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.Map;
import java.util.Set;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/JointRecordParents.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/JointRecordParents.java
similarity index 94%
rename from uc2-application/src/main/java/uc2/streamprocessing/JointRecordParents.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/JointRecordParents.java
index 74fb5441f..64de26d99 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/JointRecordParents.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/JointRecordParents.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.Set;
import titan.ccp.models.records.ActivePowerRecord;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/KafkaStreamsBuilder.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/KafkaStreamsBuilder.java
similarity index 99%
rename from uc2-application/src/main/java/uc2/streamprocessing/KafkaStreamsBuilder.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/KafkaStreamsBuilder.java
index eb0643d63..9b43f5e66 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/KafkaStreamsBuilder.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.time.Duration;
import java.util.Objects;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/OptionalParentsSerde.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/OptionalParentsSerde.java
similarity index 97%
rename from uc2-application/src/main/java/uc2/streamprocessing/OptionalParentsSerde.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/OptionalParentsSerde.java
index e4624d953..5e31a5540 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/OptionalParentsSerde.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/OptionalParentsSerde.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.HashSet;
import java.util.Optional;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/ParentsSerde.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/ParentsSerde.java
similarity index 96%
rename from uc2-application/src/main/java/uc2/streamprocessing/ParentsSerde.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/ParentsSerde.java
index 327f33a10..4385d3bfb 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/ParentsSerde.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/ParentsSerde.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.HashSet;
import java.util.Set;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/RecordAggregator.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/RecordAggregator.java
similarity index 97%
rename from uc2-application/src/main/java/uc2/streamprocessing/RecordAggregator.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/RecordAggregator.java
index 0b3e23462..6951d49c9 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/RecordAggregator.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/RecordAggregator.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import org.apache.kafka.streams.kstream.Windowed;
import titan.ccp.models.records.ActivePowerRecord;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/SensorParentKey.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/SensorParentKey.java
similarity index 94%
rename from uc2-application/src/main/java/uc2/streamprocessing/SensorParentKey.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/SensorParentKey.java
index 4cb3bc9c6..390ecf0e3 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/SensorParentKey.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/SensorParentKey.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
/**
* A key consisting of the identifier of a sensor and an identifier of parent sensor.
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/SensorParentKeySerde.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/SensorParentKeySerde.java
similarity index 96%
rename from uc2-application/src/main/java/uc2/streamprocessing/SensorParentKeySerde.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/SensorParentKeySerde.java
index 1a2688c2b..7021c0832 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/SensorParentKeySerde.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/SensorParentKeySerde.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import org.apache.kafka.common.serialization.Serde;
import titan.ccp.common.kafka.simpleserdes.BufferSerde;
diff --git a/uc2-application/src/main/java/uc2/streamprocessing/TopologyBuilder.java b/uc2-application/src/main/java/spesb/uc2/streamprocessing/TopologyBuilder.java
similarity index 99%
rename from uc2-application/src/main/java/uc2/streamprocessing/TopologyBuilder.java
rename to uc2-application/src/main/java/spesb/uc2/streamprocessing/TopologyBuilder.java
index a6b377b0e..c83de4efd 100644
--- a/uc2-application/src/main/java/uc2/streamprocessing/TopologyBuilder.java
+++ b/uc2-application/src/main/java/spesb/uc2/streamprocessing/TopologyBuilder.java
@@ -1,4 +1,4 @@
-package uc2.streamprocessing;
+package spesb.uc2.streamprocessing;
import com.google.common.math.StatsAccumulator;
import java.time.Duration;
diff --git a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/OptionalParentsSerdeTest.java b/uc2-application/src/test/java/spesb/uc2/streamprocessing/OptionalParentsSerdeTest.java
similarity index 89%
rename from uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/OptionalParentsSerdeTest.java
rename to uc2-application/src/test/java/spesb/uc2/streamprocessing/OptionalParentsSerdeTest.java
index f92af2b5a..dc9f7e20e 100644
--- a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/OptionalParentsSerdeTest.java
+++ b/uc2-application/src/test/java/spesb/uc2/streamprocessing/OptionalParentsSerdeTest.java
@@ -1,9 +1,9 @@
-package titan.ccp.aggregation.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.Optional;
import java.util.Set;
import org.junit.Test;
-import uc2.streamprocessing.OptionalParentsSerde;
+import spesb.uc2.streamprocessing.OptionalParentsSerde;
public class OptionalParentsSerdeTest {
diff --git a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/ParentsSerdeTest.java b/uc2-application/src/test/java/spesb/uc2/streamprocessing/ParentsSerdeTest.java
similarity index 82%
rename from uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/ParentsSerdeTest.java
rename to uc2-application/src/test/java/spesb/uc2/streamprocessing/ParentsSerdeTest.java
index 715a14f47..7f166669b 100644
--- a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/ParentsSerdeTest.java
+++ b/uc2-application/src/test/java/spesb/uc2/streamprocessing/ParentsSerdeTest.java
@@ -1,8 +1,8 @@
-package titan.ccp.aggregation.streamprocessing;
+package spesb.uc2.streamprocessing;
import java.util.Set;
import org.junit.Test;
-import uc2.streamprocessing.ParentsSerde;
+import spesb.uc2.streamprocessing.ParentsSerde;
public class ParentsSerdeTest {
diff --git a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SensorParentKeySerdeTest.java b/uc2-application/src/test/java/spesb/uc2/streamprocessing/SensorParentKeySerdeTest.java
similarity index 77%
rename from uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SensorParentKeySerdeTest.java
rename to uc2-application/src/test/java/spesb/uc2/streamprocessing/SensorParentKeySerdeTest.java
index 3090c9efb..5e0495f85 100644
--- a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SensorParentKeySerdeTest.java
+++ b/uc2-application/src/test/java/spesb/uc2/streamprocessing/SensorParentKeySerdeTest.java
@@ -1,8 +1,8 @@
-package titan.ccp.aggregation.streamprocessing;
+package spesb.uc2.streamprocessing;
import org.junit.Test;
-import uc2.streamprocessing.SensorParentKey;
-import uc2.streamprocessing.SensorParentKeySerde;
+import spesb.uc2.streamprocessing.SensorParentKey;
+import spesb.uc2.streamprocessing.SensorParentKeySerde;
public class SensorParentKeySerdeTest {
diff --git a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SerdeTester.java b/uc2-application/src/test/java/spesb/uc2/streamprocessing/SerdeTester.java
similarity index 93%
rename from uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SerdeTester.java
rename to uc2-application/src/test/java/spesb/uc2/streamprocessing/SerdeTester.java
index 47c34a23f..443d8b845 100644
--- a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SerdeTester.java
+++ b/uc2-application/src/test/java/spesb/uc2/streamprocessing/SerdeTester.java
@@ -1,4 +1,4 @@
-package titan.ccp.aggregation.streamprocessing;
+package spesb.uc2.streamprocessing;
import static org.junit.Assert.assertEquals;
import java.util.function.Function;
diff --git a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SerdeTesterFactory.java b/uc2-application/src/test/java/spesb/uc2/streamprocessing/SerdeTesterFactory.java
similarity index 93%
rename from uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SerdeTesterFactory.java
rename to uc2-application/src/test/java/spesb/uc2/streamprocessing/SerdeTesterFactory.java
index ce45272c0..9e5549fc1 100644
--- a/uc2-application/src/test/java/titan/ccp/aggregation/streamprocessing/SerdeTesterFactory.java
+++ b/uc2-application/src/test/java/spesb/uc2/streamprocessing/SerdeTesterFactory.java
@@ -1,4 +1,4 @@
-package titan.ccp.aggregation.streamprocessing;
+package spesb.uc2.streamprocessing;
import org.apache.kafka.common.serialization.Serde;
diff --git a/uc2-workload-generator/build.gradle b/uc2-workload-generator/build.gradle
index 833291011..bf670e8ab 100644
--- a/uc2-workload-generator/build.gradle
+++ b/uc2-workload-generator/build.gradle
@@ -14,18 +14,18 @@ targetCompatibility = "1.11"
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
// Use JUnit test framework
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc2.workloadGenerator.LoadGenerator"
+mainClassName = "spesb.uc2.workloadgenerator.LoadGenerator"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc3-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java b/uc2-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
similarity index 99%
rename from uc3-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
rename to uc2-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
index 6c67cf722..034201411 100644
--- a/uc3-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
+++ b/uc2-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
@@ -1,4 +1,4 @@
-package kafkaSender;
+package spesb.kafkasender;
import java.util.Properties;
import java.util.function.Function;
diff --git a/uc2-workload-generator/src/main/java/uc2/workloadGenerator/ConfigPublisher.java b/uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/ConfigPublisher.java
similarity index 97%
rename from uc2-workload-generator/src/main/java/uc2/workloadGenerator/ConfigPublisher.java
rename to uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/ConfigPublisher.java
index 56625e454..8cc3095ff 100644
--- a/uc2-workload-generator/src/main/java/uc2/workloadGenerator/ConfigPublisher.java
+++ b/uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/ConfigPublisher.java
@@ -1,4 +1,4 @@
-package uc2.workloadGenerator;
+package spesb.uc2.workloadgenerator;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
diff --git a/uc2-workload-generator/src/main/java/uc2/workloadGenerator/LoadGenerator.java b/uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/LoadGenerator.java
similarity index 98%
rename from uc2-workload-generator/src/main/java/uc2/workloadGenerator/LoadGenerator.java
rename to uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/LoadGenerator.java
index 1f6b581a3..c2b05be3f 100644
--- a/uc2-workload-generator/src/main/java/uc2/workloadGenerator/LoadGenerator.java
+++ b/uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/LoadGenerator.java
@@ -1,4 +1,4 @@
-package uc2.workloadGenerator;
+package spesb.uc2.workloadgenerator;
import java.io.IOException;
import java.util.List;
@@ -9,10 +9,10 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import kafkaSender.KafkaRecordSender;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import spesb.kafkasender.KafkaRecordSender;
import titan.ccp.configuration.events.Event;
import titan.ccp.model.sensorregistry.MutableAggregatedSensor;
import titan.ccp.model.sensorregistry.MutableSensorRegistry;
diff --git a/uc2-workload-generator/src/main/java/uc2/workloadGenerator/LoadGeneratorExtrem.java b/uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/LoadGeneratorExtrem.java
similarity index 98%
rename from uc2-workload-generator/src/main/java/uc2/workloadGenerator/LoadGeneratorExtrem.java
rename to uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/LoadGeneratorExtrem.java
index e13030e23..c78647edb 100644
--- a/uc2-workload-generator/src/main/java/uc2/workloadGenerator/LoadGeneratorExtrem.java
+++ b/uc2-workload-generator/src/main/java/spesb/uc2/workloadgenerator/LoadGeneratorExtrem.java
@@ -1,4 +1,4 @@
-package uc2.workloadGenerator;
+package spesb.uc2.workloadgenerator;
import java.io.IOException;
import java.lang.management.ManagementFactory;
@@ -9,8 +9,8 @@ import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import kafkaSender.KafkaRecordSender;
import org.apache.kafka.clients.producer.ProducerConfig;
+import spesb.kafkasender.KafkaRecordSender;
import titan.ccp.configuration.events.Event;
import titan.ccp.model.sensorregistry.MutableAggregatedSensor;
import titan.ccp.model.sensorregistry.MutableSensorRegistry;
diff --git a/uc3-application/build.gradle b/uc3-application/build.gradle
index 01f47ffbc..6f6e5fb21 100644
--- a/uc3-application/build.gradle
+++ b/uc3-application/build.gradle
@@ -12,7 +12,7 @@ buildscript {
sourceCompatibility = "1.11"
targetCompatibility = "1.11"
-allprojects {
+allprojects {
repositories {
jcenter()
maven {
@@ -26,7 +26,7 @@ allprojects {
dependencies {
compile project(':')
-
+
compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT')
compile 'org.slf4j:slf4j-simple:1.6.1'
@@ -34,11 +34,11 @@ dependencies {
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc3.application.HistoryService"
+mainClassName = "spesb.uc3.application.HistoryService"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc3-application/src/main/java/uc3/application/ConfigurationKeys.java b/uc3-application/src/main/java/spesb/uc3/application/ConfigurationKeys.java
similarity index 95%
rename from uc3-application/src/main/java/uc3/application/ConfigurationKeys.java
rename to uc3-application/src/main/java/spesb/uc3/application/ConfigurationKeys.java
index 884927979..df51385a6 100644
--- a/uc3-application/src/main/java/uc3/application/ConfigurationKeys.java
+++ b/uc3-application/src/main/java/spesb/uc3/application/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package uc3.application;
+package spesb.uc3.application;
/**
* Keys to access configuration parameters.
diff --git a/uc3-application/src/main/java/uc3/application/HistoryService.java b/uc3-application/src/main/java/spesb/uc3/application/HistoryService.java
similarity index 95%
rename from uc3-application/src/main/java/uc3/application/HistoryService.java
rename to uc3-application/src/main/java/spesb/uc3/application/HistoryService.java
index 932b9559c..2b6c40e51 100644
--- a/uc3-application/src/main/java/uc3/application/HistoryService.java
+++ b/uc3-application/src/main/java/spesb/uc3/application/HistoryService.java
@@ -1,12 +1,12 @@
-package uc3.application;
+package spesb.uc3.application;
import java.time.Duration;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import spesb.uc3.streamprocessing.KafkaStreamsBuilder;
import titan.ccp.common.configuration.Configurations;
-import uc3.streamprocessing.KafkaStreamsBuilder;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java b/uc3-application/src/main/java/spesb/uc3/streamprocessing/KafkaStreamsBuilder.java
similarity index 99%
rename from uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java
rename to uc3-application/src/main/java/spesb/uc3/streamprocessing/KafkaStreamsBuilder.java
index 02d0953a3..28382bedd 100644
--- a/uc3-application/src/main/java/uc3/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc3-application/src/main/java/spesb/uc3/streamprocessing/KafkaStreamsBuilder.java
@@ -1,4 +1,4 @@
-package uc3.streamprocessing;
+package spesb.uc3.streamprocessing;
import java.time.Duration;
import java.util.Objects;
diff --git a/uc3-application/src/main/java/uc3/streamprocessing/TopologyBuilder.java b/uc3-application/src/main/java/spesb/uc3/streamprocessing/TopologyBuilder.java
similarity index 96%
rename from uc3-application/src/main/java/uc3/streamprocessing/TopologyBuilder.java
rename to uc3-application/src/main/java/spesb/uc3/streamprocessing/TopologyBuilder.java
index fe20b3ab0..d79451088 100644
--- a/uc3-application/src/main/java/uc3/streamprocessing/TopologyBuilder.java
+++ b/uc3-application/src/main/java/spesb/uc3/streamprocessing/TopologyBuilder.java
@@ -1,4 +1,4 @@
-package uc3.streamprocessing;
+package spesb.uc3.streamprocessing;
import com.google.common.math.Stats;
import java.time.Duration;
@@ -12,10 +12,10 @@ import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.streams.kstream.TimeWindows;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import spesb.uc3.streamprocessing.util.StatsFactory;
import titan.ccp.common.kafka.GenericSerde;
import titan.ccp.common.kieker.kafka.IMonitoringRecordSerde;
import titan.ccp.models.records.ActivePowerRecordFactory;
-import uc3.streamprocessing.util.StatsFactory;
/**
* Builds Kafka Stream Topology for the History microservice.
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/util/StatsFactory.java b/uc3-application/src/main/java/spesb/uc3/streamprocessing/util/StatsFactory.java
similarity index 92%
rename from uc4-application/src/main/java/uc4/streamprocessing/util/StatsFactory.java
rename to uc3-application/src/main/java/spesb/uc3/streamprocessing/util/StatsFactory.java
index 60035ea7f..964199c00 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/util/StatsFactory.java
+++ b/uc3-application/src/main/java/spesb/uc3/streamprocessing/util/StatsFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing.util;
+package spesb.uc3.streamprocessing.util;
import com.google.common.math.Stats;
import com.google.common.math.StatsAccumulator;
diff --git a/uc3-workload-generator/build.gradle b/uc3-workload-generator/build.gradle
index 5cb1fdfcc..a288378c8 100644
--- a/uc3-workload-generator/build.gradle
+++ b/uc3-workload-generator/build.gradle
@@ -14,18 +14,18 @@ targetCompatibility = "1.11"
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
// Use JUnit test framework
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc3.workloadGenerator.LoadGenerator"
+mainClassName = "spesb.uc3.workloadgenerator.LoadGenerator"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc2-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java b/uc3-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
similarity index 99%
rename from uc2-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
rename to uc3-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
index 6c67cf722..034201411 100644
--- a/uc2-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
+++ b/uc3-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
@@ -1,4 +1,4 @@
-package kafkaSender;
+package spesb.kafkasender;
import java.util.Properties;
import java.util.function.Function;
diff --git a/uc3-workload-generator/src/main/java/uc3/workloadGenerator/LoadGenerator.java b/uc3-workload-generator/src/main/java/spesb/uc3/workloadgenerator/LoadGenerator.java
similarity index 97%
rename from uc3-workload-generator/src/main/java/uc3/workloadGenerator/LoadGenerator.java
rename to uc3-workload-generator/src/main/java/spesb/uc3/workloadgenerator/LoadGenerator.java
index d14d53f6c..9ab8a5530 100644
--- a/uc3-workload-generator/src/main/java/uc3/workloadGenerator/LoadGenerator.java
+++ b/uc3-workload-generator/src/main/java/spesb/uc3/workloadgenerator/LoadGenerator.java
@@ -1,4 +1,4 @@
-package uc3.workloadGenerator;
+package spesb.uc3.workloadgenerator;
import java.io.IOException;
import java.util.List;
@@ -11,10 +11,10 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import kafkaSender.KafkaRecordSender;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import spesb.kafkasender.KafkaRecordSender;
import titan.ccp.models.records.ActivePowerRecord;
public class LoadGenerator {
diff --git a/uc4-application/build.gradle b/uc4-application/build.gradle
index 009c083e1..b39d11bdb 100644
--- a/uc4-application/build.gradle
+++ b/uc4-application/build.gradle
@@ -12,7 +12,7 @@ buildscript {
sourceCompatibility = "1.11"
targetCompatibility = "1.11"
-allprojects {
+allprojects {
repositories {
jcenter()
maven {
@@ -26,7 +26,7 @@ allprojects {
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT')
@@ -34,7 +34,7 @@ dependencies {
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc4.application.HistoryService"
+mainClassName = "spesb.uc4.application.HistoryService"
eclipse {
classpath {
diff --git a/uc4-application/src/main/java/uc4/application/ConfigurationKeys.java b/uc4-application/src/main/java/spesb/uc4/application/ConfigurationKeys.java
similarity index 96%
rename from uc4-application/src/main/java/uc4/application/ConfigurationKeys.java
rename to uc4-application/src/main/java/spesb/uc4/application/ConfigurationKeys.java
index 1ded012e7..236601a46 100644
--- a/uc4-application/src/main/java/uc4/application/ConfigurationKeys.java
+++ b/uc4-application/src/main/java/spesb/uc4/application/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package uc4.application;
+package spesb.uc4.application;
/**
* Keys to access configuration parameters.
diff --git a/uc4-application/src/main/java/uc4/application/HistoryService.java b/uc4-application/src/main/java/spesb/uc4/application/HistoryService.java
similarity index 95%
rename from uc4-application/src/main/java/uc4/application/HistoryService.java
rename to uc4-application/src/main/java/spesb/uc4/application/HistoryService.java
index b6f9c13e0..f86f0cb7e 100644
--- a/uc4-application/src/main/java/uc4/application/HistoryService.java
+++ b/uc4-application/src/main/java/spesb/uc4/application/HistoryService.java
@@ -1,11 +1,11 @@
-package uc4.application;
+package spesb.uc4.application;
import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import spesb.uc4.streamprocessing.KafkaStreamsBuilder;
import titan.ccp.common.configuration.Configurations;
-import uc4.streamprocessing.KafkaStreamsBuilder;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKey.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKey.java
similarity index 94%
rename from uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKey.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKey.java
index 2b9cc8596..a3ae3461d 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKey.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKey.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.DayOfWeek;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKeyFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKeyFactory.java
similarity index 93%
rename from uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKeyFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKeyFactory.java
index 2d3f44589..222785ca8 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKeyFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKeyFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKeySerde.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKeySerde.java
similarity index 96%
rename from uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKeySerde.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKeySerde.java
index 282a9f579..9c246f912 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekKeySerde.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekKeySerde.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.DayOfWeek;
import org.apache.kafka.common.serialization.Serde;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekRecordFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekRecordFactory.java
similarity index 95%
rename from uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekRecordFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekRecordFactory.java
index da984eace..bdfecdbc4 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/DayOfWeekRecordFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/DayOfWeekRecordFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import com.google.common.math.Stats;
import org.apache.kafka.streams.kstream.Windowed;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKey.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKey.java
similarity index 93%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKey.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKey.java
index 2bf346064..b07a54d6f 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKey.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKey.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
/**
* Composed key of an hour of the day and a sensor id.
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKeyFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKeyFactory.java
similarity index 92%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKeyFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKeyFactory.java
index 641a314e7..a13de1422 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKeyFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKeyFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.LocalDateTime;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKeySerde.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKeySerde.java
similarity index 96%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKeySerde.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKeySerde.java
index 93965b3e8..a938813c6 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayKeySerde.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayKeySerde.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import org.apache.kafka.common.serialization.Serde;
import titan.ccp.common.kafka.simpleserdes.BufferSerde;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayRecordFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayRecordFactory.java
similarity index 95%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfDayRecordFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayRecordFactory.java
index 15710bfa7..25fb9193d 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfDayRecordFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfDayRecordFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import com.google.common.math.Stats;
import org.apache.kafka.streams.kstream.Windowed;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKey.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKey.java
similarity index 95%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKey.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKey.java
index b007514a8..81d33f304 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKey.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKey.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.DayOfWeek;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKeyFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKeyFactory.java
similarity index 94%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKeyFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKeyFactory.java
index 59c044139..980549309 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKeyFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKeyFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKeySerde.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKeySerde.java
similarity index 96%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKeySerde.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKeySerde.java
index 2dbe18b93..63a6a445b 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekKeySerde.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekKeySerde.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.DayOfWeek;
import org.apache.kafka.common.serialization.Serde;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekRecordFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekRecordFactory.java
similarity index 95%
rename from uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekRecordFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekRecordFactory.java
index 7f3b66344..358e3d1a5 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/HourOfWeekRecordFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/HourOfWeekRecordFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import com.google.common.math.Stats;
import org.apache.kafka.streams.kstream.Windowed;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/KafkaStreamsBuilder.java
similarity index 99%
rename from uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/KafkaStreamsBuilder.java
index c351eac68..9cbff4f61 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/KafkaStreamsBuilder.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/KafkaStreamsBuilder.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.Duration;
import java.util.Objects;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/RecordDatabaseAdapter.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/RecordDatabaseAdapter.java
similarity index 98%
rename from uc4-application/src/main/java/uc4/streamprocessing/RecordDatabaseAdapter.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/RecordDatabaseAdapter.java
index d2230abd2..9c286cb49 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/RecordDatabaseAdapter.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/RecordDatabaseAdapter.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.util.Collection;
import java.util.List;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/StatsKeyFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/StatsKeyFactory.java
similarity index 89%
rename from uc4-application/src/main/java/uc4/streamprocessing/StatsKeyFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/StatsKeyFactory.java
index ab614e32a..7e4ac46e4 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/StatsKeyFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/StatsKeyFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import java.time.LocalDateTime;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/StatsRecordFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/StatsRecordFactory.java
similarity index 95%
rename from uc4-application/src/main/java/uc4/streamprocessing/StatsRecordFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/StatsRecordFactory.java
index bd63a26fd..045b512d0 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/StatsRecordFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/StatsRecordFactory.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import com.google.common.math.Stats;
import org.apache.avro.specific.SpecificRecord;
diff --git a/uc4-application/src/main/java/uc4/streamprocessing/TopologyBuilder.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/TopologyBuilder.java
similarity index 97%
rename from uc4-application/src/main/java/uc4/streamprocessing/TopologyBuilder.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/TopologyBuilder.java
index 4a76ed883..66bb46003 100644
--- a/uc4-application/src/main/java/uc4/streamprocessing/TopologyBuilder.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/TopologyBuilder.java
@@ -1,4 +1,4 @@
-package uc4.streamprocessing;
+package spesb.uc4.streamprocessing;
import com.google.common.math.Stats;
import java.time.Duration;
@@ -15,10 +15,10 @@ import org.apache.kafka.streams.kstream.Grouped;
import org.apache.kafka.streams.kstream.Materialized;
import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.streams.kstream.TimeWindows;
+import spesb.uc4.streamprocessing.util.StatsFactory;
import titan.ccp.common.kafka.GenericSerde;
import titan.ccp.common.kieker.kafka.IMonitoringRecordSerde;
import titan.ccp.models.records.ActivePowerRecordFactory;
-import uc4.streamprocessing.util.StatsFactory;
/**
* Builds Kafka Stream Topology for the History microservice.
diff --git a/uc3-application/src/main/java/uc3/streamprocessing/util/StatsFactory.java b/uc4-application/src/main/java/spesb/uc4/streamprocessing/util/StatsFactory.java
similarity index 92%
rename from uc3-application/src/main/java/uc3/streamprocessing/util/StatsFactory.java
rename to uc4-application/src/main/java/spesb/uc4/streamprocessing/util/StatsFactory.java
index 030a1d8ae..39fe57344 100644
--- a/uc3-application/src/main/java/uc3/streamprocessing/util/StatsFactory.java
+++ b/uc4-application/src/main/java/spesb/uc4/streamprocessing/util/StatsFactory.java
@@ -1,4 +1,4 @@
-package uc3.streamprocessing.util;
+package spesb.uc4.streamprocessing.util;
import com.google.common.math.Stats;
import com.google.common.math.StatsAccumulator;
diff --git a/uc4-workload-generator/build.gradle b/uc4-workload-generator/build.gradle
index 5902b6307..779a890b4 100644
--- a/uc4-workload-generator/build.gradle
+++ b/uc4-workload-generator/build.gradle
@@ -14,18 +14,18 @@ targetCompatibility = "1.11"
dependencies {
compile project(':')
-
+
compile 'org.slf4j:slf4j-simple:1.6.1'
// Use JUnit test framework
testCompile 'junit:junit:4.12'
}
-mainClassName = "uc4.workloadGenerator.LoadGenerator"
+mainClassName = "spesb.uc4.workloadgenerator.LoadGenerator"
eclipse {
classpath {
downloadSources=true
downloadJavadoc=true
}
-}
\ No newline at end of file
+}
diff --git a/uc4-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java b/uc4-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
similarity index 99%
rename from uc4-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
rename to uc4-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
index 6c67cf722..034201411 100644
--- a/uc4-workload-generator/src/main/java/kafkaSender/KafkaRecordSender.java
+++ b/uc4-workload-generator/src/main/java/spesb/kafkasender/KafkaRecordSender.java
@@ -1,4 +1,4 @@
-package kafkaSender;
+package spesb.kafkasender;
import java.util.Properties;
import java.util.function.Function;
diff --git a/uc4-workload-generator/src/main/java/uc4/workloadGenerator/LoadGenerator.java b/uc4-workload-generator/src/main/java/spesb/uc4/workloadgenerator/LoadGenerator.java
similarity index 97%
rename from uc4-workload-generator/src/main/java/uc4/workloadGenerator/LoadGenerator.java
rename to uc4-workload-generator/src/main/java/spesb/uc4/workloadgenerator/LoadGenerator.java
index eb38464c9..bcf4f6d2c 100644
--- a/uc4-workload-generator/src/main/java/uc4/workloadGenerator/LoadGenerator.java
+++ b/uc4-workload-generator/src/main/java/spesb/uc4/workloadgenerator/LoadGenerator.java
@@ -1,4 +1,4 @@
-package uc4.workloadGenerator;
+package spesb.uc4.workloadgenerator;
import java.io.IOException;
import java.util.List;
@@ -10,10 +10,10 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import kafkaSender.KafkaRecordSender;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import spesb.kafkasender.KafkaRecordSender;
import titan.ccp.models.records.ActivePowerRecord;
public class LoadGenerator {
--
GitLab