Merge pull request #4 from DataINCITE/flynnc3-temp

Flynnc3 temp
DataINCITE · Mar 14, 2023 · 6a5ea53 · 6a5ea53
2 parents 2dce03a + 61b6282
commit 6a5ea53
Show file tree

Hide file tree

Showing 24 changed files with 543 additions and 921 deletions.
diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/core/engine/Engine.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/core/engine/Engine.java
@@ -15,9 +15,10 @@ public Engine() {
 	// source: source of the local stream to initialize
 	public Response processSTRT(Packet packet) {
 		// start output processes:
-		Response out_response = send("OUT", "STRT");
-		if(out_response.code() != 200)
-			return out_response;
+		//TODO: RE-ENABLE
+//		Response out_response = send("OUT", "STRT");
+//		if(out_response.code() != 200)
+//			return out_response;
 
 		// start local stream handler processes:
 		String lsh_type = Config.getProperty("stream", "local.stream.type");

diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/framework/router/ResponseFactory.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/framework/router/ResponseFactory.java
@@ -85,8 +85,8 @@ public static Response response426(String hash, String subscription) {
 		return Response.create(426, String.format("Stream with hash <%s> does not contain a subscription request of type <%s>.", hash, subscription));
 	}
 
-	public static Response response427(String hash, String subscription, String response) {
-		return Response.create(427, String.format("Stream with hash <%s> returned an irregular response when attempting to subscribe to <%s>. Response returned is: <%s>", hash, subscription, response));
+	public static Response response427(String type, String response) {
+		return Response.create(427, String.format("Stream of type <%s> returned an irregular response when attempting to send request. Response returned is: <%s>", type, response));
 	}
 
 	public static Response response428(String hash, String request) {

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
@@ -23,15 +23,15 @@ 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", "DataEngine");
-	//stream_properties.put("rest.socket.address", "localhost");
+	//stream_properties.put("rest.socket.address", "DataEngine");
+	stream_properties.put("rest.socket.address", "localhost");
 	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", "RestApp");
-	// stream_properties.put("output.socket.address", "localhost");
+	//stream_properties.put("output.socket.address", "RestApp");
+	 stream_properties.put("output.socket.address", "localhost");
 	stream_properties.put("output.socket.port", "61200");
-	stream_properties.put("local.stream.type", "mongo_db");
+	//stream_properties.put("local.stream.type", "mongo_db");
+	stream_properties.put("local.stream.type", "null");
 	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");