diff --git a/DeFi-Data-Engine/DeFi Data Engine/.classpath b/DeFi-Data-Engine/DeFi Data Engine/.classpath
index 4d455a8c..b2e8bc05 100644
--- a/DeFi-Data-Engine/DeFi Data Engine/.classpath
+++ b/DeFi-Data-Engine/DeFi Data Engine/.classpath
@@ -25,12 +25,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.apt.core.prefs b/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 00000000..d4313d4b
--- /dev/null
+++ b/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.core.prefs b/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.core.prefs
index ecb498c8..b5e07ce6 100644
--- a/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.core.prefs
+++ b/DeFi-Data-Engine/DeFi Data Engine/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,5 +12,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java
index 5b90b025..250e572b 100644
--- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java
+++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java
@@ -41,14 +41,14 @@ public class Config {
Properties stream_properties = new Properties();
stream_properties.put("general.consumer.types", "socket_consumer");
stream_properties.put("general.producer.types", "socket_producer");
- stream_properties.put("rest.socket.address", "localhost");
+ stream_properties.put("rest.socket.address", "DataEngine");
stream_properties.put("rest.socket.port", "61100");
stream_properties.put("rest.socket.key", "rest-key-reserved");
- stream_properties.put("output.socket.address", "defi-de.idea.rpi.edu");
- //stream_properties.put("output.socket.address", "localhost");
+ // stream_properties.put("output.socket.address", "defi-de.idea.rpi.edu");
+ stream_properties.put("output.socket.address", "DataEngine");
stream_properties.put("output.socket.port", "61200");
stream_properties.put("local.stream.type", "mongo_db");
- stream_properties.put("mongodb.properties.uri", "mongodb://localhost:27017");
+ stream_properties.put("mongodb.properties.uri", "mongodb://MONGO:27017");
stream_properties.put("mongodb.database.state", "main-state-db");
stream_properties.put("mongodb.database.main", "main-db");
stream_properties.put("mongodb.auth.collection", "auth-collection");
diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties b/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties
index 4bb2109a..3bd10e99 100644
--- a/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties
+++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties
@@ -9,7 +9,7 @@ general.producer.types=socket_producer
# === REST SOCKET PROPERTIES ===
# Rest socket address
-rest.socket.address=localhost
+rest.socket.address=DataEngine
# Rest socket port
rest.socket.port=61100
@@ -20,7 +20,7 @@ rest.socket.key=rest-key-reserved
# === OUTPUT SOCKET PROPERTIES ===
# Output socket address
-output.socket.address=localhost
+output.socket.address=DataEngine
# Output socket port
output.socket.port=61200
@@ -33,7 +33,7 @@ local.stream.type=mongo_db
# === MONGO DB PROPERTIES ===
# local MongoDB client URI
-mongodb.properties.uri=mongodb://localhost:27017
+mongodb.properties.uri=mongodb://MONGO:27017
# local MongoDB state database name
mongodb.database.state=main-state-db
diff --git a/DeFi-Data-Engine/Rest Application/.classpath b/DeFi-Data-Engine/Rest Application/.classpath
index d118e897..e90905c2 100644
--- a/DeFi-Data-Engine/Rest Application/.classpath
+++ b/DeFi-Data-Engine/Rest Application/.classpath
@@ -18,21 +18,31 @@
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.core.resources.prefs b/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.core.resources.prefs
index 609d3cab..29abf999 100644
--- a/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.core.resources.prefs
+++ b/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,6 @@
eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/=UTF-8
diff --git a/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.apt.core.prefs b/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 00000000..d4313d4b
--- /dev/null
+++ b/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.core.prefs b/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.core.prefs
index b041b83d..23731ecc 100644
--- a/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.core.prefs
+++ b/DeFi-Data-Engine/Rest Application/.settings/org.eclipse.jdt.core.prefs
@@ -12,5 +12,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=17
diff --git a/DeFi-Data-Engine/Rest Application/Dockerfile b/DeFi-Data-Engine/Rest Application/Dockerfile
index bdbe8984..c87bd6cf 100644
--- a/DeFi-Data-Engine/Rest Application/Dockerfile
+++ b/DeFi-Data-Engine/Rest Application/Dockerfile
@@ -1,9 +1,4 @@
FROM maven:3.8.6-eclipse-temurin-17
-
COPY ./ ./
-
-# package our application code
RUN mvn clean package -Dmaven.test.skip
-EXPOSE 8080
-# set the startup command to execute the jar
CMD ["java", "-jar", "target/rest-connection-4.3.3.jar"]
\ No newline at end of file
diff --git a/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java b/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java
index 7bb68a6b..c6210aef 100644
--- a/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java
+++ b/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java
@@ -36,9 +36,9 @@ public class Config {
app_properties.put("general.transfer.delim", "&&&");
app_properties.put("general.data.dateformat", "yyyy-MM-dd");
app_properties.put("spring.server.port", "8080");
- //app_properties.put("spring.server.address", "localhost");
- app_properties.put("spring.server.address", "defi-de.idea.rpi.edu");
- app_properties.put("rest.socket.address", "localhost");
+ app_properties.put("spring.server.address", "RestApp");
+ // app_properties.put("spring.server.address", "defi-de.idea.rpi.edu");
+ app_properties.put("rest.socket.address", "DataEngine");
app_properties.put("rest.socket.port", "61100");
app_properties.put("rest.socket.key", "rest-key-reserved");
properties.put("app", app_properties);
diff --git a/DeFi-Data-Engine/Rest Application/src/main/resources/config/app.properties b/DeFi-Data-Engine/Rest Application/src/main/resources/config/app.properties
index 11c5215b..049af529 100644
--- a/DeFi-Data-Engine/Rest Application/src/main/resources/config/app.properties
+++ b/DeFi-Data-Engine/Rest Application/src/main/resources/config/app.properties
@@ -23,7 +23,7 @@ spring.server.port=8080
# === SOCKET PROPERTIES ===
# Rest socket address
-rest.socket.address=localhost
+rest.socket.address=DataEngine
# Rest socket port
rest.socket.port=61100
diff --git a/DeFi-Data-Engine/Testing Environment/.classpath b/DeFi-Data-Engine/Testing Environment/.classpath
index cddbf79a..58cbceb6 100644
--- a/DeFi-Data-Engine/Testing Environment/.classpath
+++ b/DeFi-Data-Engine/Testing Environment/.classpath
@@ -6,9 +6,8 @@
-
+
-
@@ -17,5 +16,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.apt.core.prefs b/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 00000000..d4313d4b
--- /dev/null
+++ b/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.core.prefs b/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.core.prefs
index 43c8d716..b2ef4d6e 100644
--- a/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.core.prefs
+++ b/DeFi-Data-Engine/Testing Environment/.settings/org.eclipse.jdt.core.prefs
@@ -11,5 +11,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
diff --git a/DeFi-Data-Engine/docker-compose.yml b/DeFi-Data-Engine/docker-compose.yml
new file mode 100644
index 00000000..8b679ae4
--- /dev/null
+++ b/DeFi-Data-Engine/docker-compose.yml
@@ -0,0 +1,31 @@
+version: "3.9"
+services:
+ mongodb_container:
+ image: mongo:latest
+ ports:
+ - 27017:27017
+ volumes:
+ - mongodb_data_container:/data/db
+ hostname: MONGO
+ dataengine:
+ build:
+ context: "DeFi Data Engine"
+ depends_on:
+ - mongodb_container
+ ports:
+ - 61100:61100
+ - 61200:61200
+ hostname: DataEngine
+ restapp:
+ build:
+ context: "Rest Application"
+ depends_on:
+ - dataengine
+ ports:
+ - 8080:8080
+ hostname: RestApp
+
+
+
+volumes:
+ mongodb_data_container: