Merge master into current, resolve issues

wuespace · Mar 2, 2021 · a67b0ab · a67b0ab
1 parent 77a3782
commit a67b0ab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 49 deletions.
diff --git a/modules/telestion-application/src/main/java/org/telestion/application/RocketSound.java b/modules/telestion-application/src/main/java/org/telestion/application/RocketSound.java
@@ -40,12 +40,12 @@ public static void main(String[] args) {
 				new MongoDatabaseService("raketenpraktikum", "raketenpraktikumPool"),
 				new DataService(dataTypeMap, Collections.emptyMap())
 		);*/
-				new DataService(Collections.emptyMap()),
+				/*new DataService(Collections.emptyMap()),
 				new DataListener(
 						List.of(
 								Address.outgoing(MockRocketPublisher.class, "pub")
 						)
 				)
-		);
+		);*/
 	}
 }
diff --git a/modules/telestion-core/src/main/java/org/telestion/core/database/DataListener.java b/modules/telestion-core/src/main/java/org/telestion/core/database/DataListener.java
@@ -8,7 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.telestion.api.message.JsonMessage;
-import org.telestion.core.config.Config;
+import org.telestion.api.config.Config;
 import org.telestion.core.message.Address;
 
 public final class DataListener extends AbstractVerticle {

diff --git a/modules/telestion-core/src/main/java/org/telestion/core/util/Offset.java b/modules/telestion-core/src/main/java/org/telestion/core/util/Offset.java