diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 680f78f688871c5a60ecbb4338316d416d078ea4..90effd8588932aca1b1ff6591ccceeda1854908e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,65 +30,45 @@ test:
stage: test
tags:
- exec-docker
- script: ./gradlew test
+ script: ./gradlew test --continue
+ artifacts:
+ reports:
+ junit:
+ - "**/build/test-results/test/TEST-*.xml"
checkstyle:
stage: check
tags:
- exec-docker
- script: ./gradlew checkstyle
+ script: ./gradlew checkstyle --continue
allow_failure: true
artifacts:
paths:
- - build/reports/checkstyle/main.html
- - uc1-application/build/reports/checkstyle/main.html
- - uc1-workload-generator/build/reports/checkstyle/main.html
- - uc2-application/build/reports/checkstyle/main.html
- - uc2-workload-generator/build/reports/checkstyle/main.html
- - uc3-application/build/reports/checkstyle/main.html
- - uc3-workload-generator/build/reports/checkstyle/main.html
- - uc4-application/build/reports/checkstyle/main.html
- - uc4-workload-generator/build/reports/checkstyle/main.html
+ - "*/build/reports/checkstyle/main.html"
when: on_failure
expire_in: 1 day
-
+
pmd:
stage: check
tags:
- exec-docker
- script: ./gradlew pmd
+ script: ./gradlew pmd --continue
allow_failure: true
artifacts:
paths:
- - build/reports/pmd/*.html
- - uc1-application/build/reports/pmd/*.html
- - uc1-workload-generator/build/reports/pmd/*.html
- - uc2-application/build/reports/pmd/*.html
- - uc2-workload-generator/build/reports/pmd/*.html
- - uc3-application/build/reports/pmd/*.html
- - uc3-workload-generator/build/reports/pmd/*.html
- - uc4-application/build/reports/pmd/*.html
- - uc4-workload-generator/build/reports/pmd/*.html
+ - "*/build/reports/pmd/*.html"
when: on_failure
expire_in: 1 day
-
+
spotbugs:
stage: check
tags:
- exec-docker
- script: ./gradlew spotbugs
+ script: ./gradlew spotbugs --continue
allow_failure: true
artifacts:
paths:
- - build/reports/spotbugs/*.html
- - uc1-application/build/reports/spotbugs/*.html
- - uc1-workload-generator/build/reports/spotbugs/*.html
- - uc2-application/build/reports/spotbugs/*.html
- - uc2-workload-generator/build/reports/spotbugs/*.html
- - uc3-application/build/reports/spotbugs/*.html
- - uc3-workload-generator/build/reports/spotbugs/*.html
- - uc4-application/build/reports/spotbugs/*.html
- - uc4-workload-generator/build/reports/spotbugs/*.html
+ - "*/build/reports/spotbugs/*.html"
when: on_failure
expire_in: 1 day
@@ -116,4 +96,4 @@ spotbugs:
variables:
- $DOCKERHUB_ORG
- $DOCKERHUB_ID
- - $DOCKERHUB_PW
\ No newline at end of file
+ - $DOCKERHUB_PW
diff --git a/build.gradle b/build.gradle
index c73a8582d8b08b21bb5667ebcc047933c890855b..6827860869614f2d0ff575cfb5e6229e6d4a3806 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,4 @@
-apply plugin: 'java-library'
-apply plugin: 'pmd'
-apply plugin: 'checkstyle'
-apply plugin: 'com.github.spotbugs'
-apply plugin: 'eclipse'
-
+// Inherited to all subprojects
buildscript {
repositories {
maven {
@@ -15,15 +10,35 @@ buildscript {
}
}
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
+// Plugins for all projects
+allprojects {
+ apply plugin: 'eclipse'
+}
+
+// Plugins for subprojects
+subprojects {
+ apply plugin: 'application'
+ apply plugin: 'checkstyle'
+ apply plugin: 'pmd'
+ apply plugin: 'com.github.spotbugs'
+ apply plugin: 'java-library'
+}
+
+// Java version for all subprojects
+subprojects {
+ java {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+}
+// Check for updates every build
configurations.all {
- // Check for updates every build
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}
-allprojects {
+// Repositories for all projects
+allprojects {
repositories {
jcenter()
maven {
@@ -32,42 +47,23 @@ allprojects {
}
}
-dependencies {
- // These dependencies is exported to consumers, that is to say found on their compile classpath.
- api('org.industrial-devops:titan-ccp-common:0.0.3-SNAPSHOT') { changing = true }
- api 'net.kieker-monitoring:kieker:1.14-SNAPSHOT'
- api 'net.sourceforge.teetime:teetime:3.0'
-
- // These dependencies are used internally, and not exposed to consumers on their own compile classpath.
- implementation 'org.apache.kafka:kafka-clients:2.1.0'
- implementation 'com.google.guava:guava:24.1-jre'
- implementation 'org.jctools:jctools-core:2.1.1'
-
- // Use JUnit test framework
- testImplementation 'junit:junit:4.12'
-}
-
-pmd {
- ruleSets = [] // Gradle requires to clean the rule sets first
- ruleSetFiles = files("config/pmd.xml")
- ignoreFailures = false
- toolVersion = "6.7.0"
-}
-
-checkstyle {
- configDir = file("config")
- configFile = file("config/checkstyle.xml")
- maxWarnings = 0
- ignoreFailures = false
- toolVersion = "8.12"
-}
-
-spotbugs {
- excludeFilter = file("config/spotbugs-exclude-filter.xml")
- reportLevel = "low"
- effort = "max"
- ignoreFailures = false
- toolVersion = '3.1.7'
+// Dependencies
+subprojects {
+ dependencies {
+ // These dependencies is exported to consumers, that is to say found on their compile classpath.
+ api('org.industrial-devops:titan-ccp-common:0.0.3-SNAPSHOT') { changing = true }
+ api 'net.kieker-monitoring:kieker:1.14-SNAPSHOT'
+ api 'net.sourceforge.teetime:teetime:3.0'
+
+ // These dependencies are used internally, and not exposed to consumers on their own compile classpath.
+ implementation 'org.apache.kafka:kafka-clients:2.1.0'
+ implementation 'com.google.guava:guava:24.1-jre'
+ implementation 'org.jctools:jctools-core:2.1.1'
+ implementation 'org.slf4j:slf4j-simple:1.6.1'
+
+ // Use JUnit test framework
+ testImplementation 'junit:junit:4.12'
+ }
}
// Per default XML reports for SpotBugs are generated
@@ -80,33 +76,64 @@ tasks.withType(com.github.spotbugs.SpotBugsTask) {
}
}
-task checkstyle {
- group 'Quality Assurance'
- description 'Run Checkstyle'
-
- dependsOn 'checkstyleMain'
- dependsOn 'checkstyleTest'
-}
+// Subprojects quality tools tasks
+subprojects {
+ task pmd {
+ group 'Quality Assurance'
+ description 'Run PMD'
+
+ dependsOn 'pmdMain'
+ dependsOn 'pmdTest'
+ }
-task pmd {
- group 'Quality Assurance'
- description 'Run PMD'
+ task checkstyle {
+ group 'Quality Assurance'
+ description 'Run Checkstyle'
- dependsOn 'pmdMain'
- dependsOn 'pmdTest'
+ dependsOn 'checkstyleMain'
+ dependsOn 'checkstyleTest'
+ }
+
+ task spotbugs {
+ group 'Quality Assurance'
+ description 'Run SpotBugs'
+
+ dependsOn 'spotbugsMain'
+ dependsOn 'spotbugsTest'
+ }
}
-task spotbugs {
- group 'Quality Assurance'
- description 'Run SpotBugs'
-
- dependsOn 'spotbugsMain'
- dependsOn 'spotbugsTest'
+// Subprojects quality tools configuration
+subprojects {
+ pmd {
+ ruleSets = [] // Gradle requires to clean the rule sets first
+ ruleSetFiles = files("$rootProject.projectDir/config/pmd.xml")
+ ignoreFailures = false
+ toolVersion = "6.7.0"
+ }
+
+ checkstyle {
+ configDirectory = file("$rootProject.projectDir/config")
+ configFile = file("$rootProject.projectDir/config/checkstyle.xml")
+ maxWarnings = 0
+ ignoreFailures = false
+ toolVersion = "8.12"
+ }
+
+ spotbugs {
+ excludeFilter = file("$rootProject.projectDir/config/spotbugs-exclude-filter.xml")
+ reportLevel = "low"
+ effort = "max"
+ ignoreFailures = false
+ toolVersion = '3.1.7'
+ }
}
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+allprojects {
+ eclipse {
+ classpath {
+ downloadSources=true
+ downloadJavadoc=true
+ }
+ }
+}
diff --git a/execution/README.md b/execution/README.md
index b328a3529735f52e6ff3b493fb470430098ffa59..c099beddffe6661a11a13f117cb80e9b09140e0e 100644
--- a/execution/README.md
+++ b/execution/README.md
@@ -117,6 +117,7 @@ Depending on your setup, some additional adjustments may be necessary:
* Change Kafka and Zookeeper servers in the Kubernetes deployments (uc1-application etc.) and `run_XX.sh` scripts
* Change Prometheus' URL in `lag_analysis.py`
* Change the path to your Python 3.7 virtual environment in the `run_XX.sh` schripts (to find the venv's `bin/activate`)
+* Change the name of your Kubernetes namespace for [Prometheus' ClusterRoleBinding](infrastructure/prometheus/cluster-role-binding.yaml)
* *Please let us know if there are further adjustments necessary*
diff --git a/uc1-application/build.gradle b/uc1-application/build.gradle
index 3fe8803745e42682cf43d068779e63183d62c792..ec18bbebfae085ea227cd94dd19ed5fe06cfc80d 100644
--- a/uc1-application/build.gradle
+++ b/uc1-application/build.gradle
@@ -1,31 +1 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-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"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc1.application.HistoryService"
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 27bf70b96364fd58bd8a8df59af6e8f38fcc9b29..7a275cb33a4cd35d228d8ca33ebb7303b251271b 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 2c7504ad44cf19a513302f222b53ec69d572c54a..18a39da7229d961249be900eeeff679e267a1eef 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 22048d6fa337ac3016e8a65502285169018911c4..4b7f487c8e848f0b1d6d652b7d86a8c50c202af1 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 1f112858a2153cfb0130379abe763c393520c271..279b70d0b7311f2b45b986e54cdf5b6c81c28263 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 824566a24158d5f535e0dec8ef948903738c9100..d934bd09de1d64cadac982669d7cab5b564f0dd5 100644
--- a/uc1-workload-generator/build.gradle
+++ b/uc1-workload-generator/build.gradle
@@ -1,31 +1 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-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"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc1.workloadgenerator.LoadGenerator"
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 6c67cf722b4dce87f0bc197ba80f8f117f82198e..034201411a84d3769dbe8c02a210098c62dca881 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 305212b0416c644c9c23af461637b6fd0f549cf8..9eb95f0c104ee3a5cd497f735f839cdb474af6a9 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 42bc3e0770db50e93bf2a08d5c039677489c4492..90f54fc6110ac88ef7d0d80ae8ec60c6087ce808 100644
--- a/uc2-application/build.gradle
+++ b/uc2-application/build.gradle
@@ -1,31 +1 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-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"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc2.application.AggregationService"
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 696b13f4889a988282467aca3e4241938e636d7c..79d8c94c75ede32d92485d4b3c49d716ae19ccf8 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 08d5e1eb26535b91462a2954e57037f20e3d62e9..ec3bb14be72a1032fa2dfd49cdd6d3c0cb0b18e6 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 4315aad5bc211d9342ee1703ead357d0786a2e0e..82217b30a539a9f722c3f27777000fb1d7d6e97c 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 5029c02446b0b191edf0cc498165465d30516504..6cf2d2c6f3facc96f76148e874244cbe895a8596 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 87a1d9967295995ce5dc46e0f1a9f5f52ffae469..27857fa4505d679f841d2bae639506cb8eeb0845 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 5ddb07850e4c14418b9014c8a240c677cb548259..44c99b1f50475c3bd1051322001877e98bca9b68 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 74fb5441f9a716af4ddd279b4b5fff0466697a23..64de26d996d4b87b3942491a36607a2b09bf43f0 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 eb0643d63f934e7966bca74a7ff7356b2aefb259..9b43f5e66fb4336602c026df8941d5545f39bfb4 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 e4624d9531fc476d707d1b712dddb553a69b3823..5e31a55406a321d393098633856d9b2776768676 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 327f33a10b6450c6d16d155314bff76aa18913d9..4385d3bfb9360755fbfa13217abcb95f786ebd39 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 0b3e23462ccd61bdd71b485de62c28e89168374a..6951d49c94c8b14d4463fcfdd6274a0b1cf965f7 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 4cb3bc9c6ec31a6ee086adffb4db188e348c040f..390ecf0e381435197cf7e741a0e306f3dcca3f2c 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 1a2688c2bac2dc3e69d786c6ff395106f0a0f58c..7021c0832db2af6836f53ee6ba70851514443759 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 a6b377b0ead972c89c58d405279a571f545ae91b..c83de4efd43688a8b9669f5d0f3dea3bbf70f48b 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 f92af2b5a908f8c4efb8ec02a00c62b9925cb41f..dc9f7e20e60564df7b982d8c3635cf2678c829c4 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 715a14f47ee1d8243070344ea40edba37ee595fd..7f166669bc34ea6d5482504f2d5ada4c26f64fc8 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 3090c9efb7e1fa846f5dc10fae0e917802853c39..5e0495f85423c582a17aefc1fda1a7c937ce14f7 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 47c34a23f791d961dacb6ea530462c8e0ed94946..443d8b845b89a595f4280c4d0b0ae845c542b338 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 ce45272c00d82c8600dd11485d2e2c307ada9de5..9e5549fc1ced4ff4012ae699a8e6cdf65726f9a3 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 833291011bb60bf84fcec323f2f0f63f9915d245..d165ab24e81b56d85f8183b41d5ec4f254be43b8 100644
--- a/uc2-workload-generator/build.gradle
+++ b/uc2-workload-generator/build.gradle
@@ -1,31 +1 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-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"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc2.workloadgenerator.LoadGenerator"
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 6c67cf722b4dce87f0bc197ba80f8f117f82198e..034201411a84d3769dbe8c02a210098c62dca881 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 56625e454b42b6620b21261e7a57969f83707dfe..8cc3095fff902336273bf1145270a22044fad97e 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 1f6b581a303f625dedf23758c2c1d5fd4f93b866..c2b05be3f525af95a8995704ab49a48343cb4f93 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 e13030e23d9dd945553abd9f919d0873e4b23bda..c78647edbb4f829237c25237d9edc9d11beeffc5 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 01f47ffbcde8beb2e02f40ff498516742b3ed49f..89d122ba69512548a011505c71f636c0bd3b0b47 100644
--- a/uc3-application/build.gradle
+++ b/uc3-application/build.gradle
@@ -1,23 +1,5 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-allprojects {
+allprojects {
repositories {
- jcenter()
- maven {
- url "https://oss.sonatype.org/content/repositories/snapshots/"
- }
maven {
url 'https://packages.confluent.io/maven/'
}
@@ -25,20 +7,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'
-
- // Use JUnit test framework
- testCompile 'junit:junit:4.12'
}
-mainClassName = "uc3.application.HistoryService"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc3.application.HistoryService"
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 8849279792e5192c003fa6d82257e3a162cbaac0..df51385a6f61cf25028f1d45552fa9687f40dc15 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 932b9559c69309100c79c4cbc093bd91a503e5cd..2b6c40e51a09e179778209d0626da6f6718bc07a 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 02d0953a38b610887ceaa6bd4fa698df718bc597..28382bedd3b02ceb2c48925212087c28ed371aad 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 fe20b3ab0347d5714061cc8c30735b3fb49d7ea7..d79451088e78e07f003dc076933f20489f594523 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 60035ea7f04dc0f9f36963c6ecea2b020fc48874..964199c0083dc9d096b59227c181dba732ca72b4 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 5cb1fdfccc5677b64447b3e644e7fca47c2cd571..e27cf26d28ba0d3f85a4c2a11e4eae2b85f29e4c 100644
--- a/uc3-workload-generator/build.gradle
+++ b/uc3-workload-generator/build.gradle
@@ -1,31 +1 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-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"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc3.workloadgenerator.LoadGenerator"
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 6c67cf722b4dce87f0bc197ba80f8f117f82198e..034201411a84d3769dbe8c02a210098c62dca881 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 d14d53f6cdbe81d9cddedeba8f484dea26571654..9ab8a553013c7d6de1eba6a2a9676fc152f86b5d 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 009c083e1fcd3dffcbb358098e2e0e0900f98e07..c89b18b1bfd5a131e58e512e79934e498f182adb 100644
--- a/uc4-application/build.gradle
+++ b/uc4-application/build.gradle
@@ -1,23 +1,5 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-allprojects {
+allprojects {
repositories {
- jcenter()
- maven {
- url "https://oss.sonatype.org/content/repositories/snapshots/"
- }
maven {
url 'https://packages.confluent.io/maven/'
}
@@ -25,20 +7,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')
-
- // Use JUnit test framework
- testCompile 'junit:junit:4.12'
}
-mainClassName = "uc4.application.HistoryService"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
+mainClassName = "spesb.uc4.application.HistoryService"
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 1ded012e70ec01ea6f3a7af12d16e6dcedaa7e1f..236601a46447f5c38b6548d2e0762bbb670747e1 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 b6f9c13e018aead3dcb41ad93b88de0dc8b96743..f86f0cb7e3bc6840db52ce7bdbbac054cdd05e13 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 2b9cc8596639bd90be7c6526cd5487195355d30e..a3ae3461d055694669e4d874930d5ade9dd83658 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 2d3f4458923e65c994aec3d315c2d3e39ba7c7b8..222785ca8a2d8db72c81929a216fc53b43d06ec0 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 282a9f579547de704414f54739df01a74421296e..9c246f912ffc67ff6fb8d211a99d478cb58c2898 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 da984eacea0ad5c048836d23f363197315b04bb2..bdfecdbc4857b4d7a630b4afa07de39618435544 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 2bf346064ad14f7a3a2758ea7348e77ea15db9d7..b07a54d6f22ebbacb77e53a7733f3a16d539fde2 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 641a314e7c52fdd4856b22b5d8e40ae3f5f0895d..a13de14229dfbb5a201dc282d05a8c4f97394250 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 93965b3e81ce4e8adb4450da7e270fc30866ec3c..a938813c6e1239b8af81c49ef7d83800bfef9b9d 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 15710bfa70083ab2c262f992b8819cdb9a9cccdb..25fb9193d1f343a246451ef2a5309198fc39ffde 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 b007514a86a6e337cef4eb27938733de941eb7c3..81d33f3042796ecb3c890e73a82e879ab2d0ac6e 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 59c0441395d3181e3fe4c4958437c7e9cbdbed08..980549309ce94b2e4a4c6da0835b8adfe47bb61e 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 2dbe18b93d456394c124c6e202427f971a097d37..63a6a445bf46f521a220816896529a081a15bca0 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 7f3b66344c634c39911ffddc27353f2b11a1b3bb..358e3d1a5acf8bfd9f4fca7c95b84bd5b13bea53 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 c351eac687431b87f20e4b8ab6fc90fa57558778..9cbff4f61ec5975e3dcdfc5c4e4a9f900e6707ec 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 d2230abd223bc2588e00e91f6a17a5e555ed2c4d..9c286cb49206d1eb1f0efbd2e98e3b44bc9a1e22 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 ab614e32aed415d2d74f2c89e111747fd0826a6a..7e4ac46e461c9083c7929f5dd313fea0526c3d50 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 bd63a26fd837db274a5b7a67a5f7bff89db693eb..045b512d0561c25889a0a0f8ef05663824412c60 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 4a76ed883d80449d25ace7bb243846e009e8894c..66bb460031f09f1cae77d5e93e3f130aa66f6e90 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 030a1d8aefa617eb0cadd804b09fa2f10ba5a696..39fe573445984f237d600753c8c828eb2869913b 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 5902b630740148b0cfe0a387d76d16e9e19468e1..8bbdedf4f7c41da73dd2d591b8fd56830d7060b7 100644
--- a/uc4-workload-generator/build.gradle
+++ b/uc4-workload-generator/build.gradle
@@ -1,31 +1 @@
-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
- repositories {
- maven {
- url "https://plugins.gradle.org/m2/"
- }
- }
-}
-
-sourceCompatibility = "1.11"
-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"
-
-eclipse {
- classpath {
- downloadSources=true
- downloadJavadoc=true
- }
-}
\ No newline at end of file
+mainClassName = "spesb.uc4.workloadgenerator.LoadGenerator"
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 6c67cf722b4dce87f0bc197ba80f8f117f82198e..034201411a84d3769dbe8c02a210098c62dca881 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 eb38464c9829d2ec69ea626221648aba69b5812d..bcf4f6d2cc20485f1e361a9fb0e638726f5ed79a 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 {