diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java index 0d923738..2444deab 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java +++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/out/socket/SocketManager.java @@ -84,14 +84,13 @@ public void run() { // execute valid response to engine Response response = producer.send(tag, sub_tag, data); - out.writeUTF(new JSONObject() - .put("response", "200") - .put("code", response.code()) - .put("message", response.message()) - .put("data", response.data()) - .toString()); - out.flush(); - System.out.println("<<>>"); +// out.writeUTF(new JSONObject() +// .put("response", "200") +// .put("code", response.code()) +// .put("message", response.message()) +// .put("data", response.data()) +// .toString()); +// out.flush(); } catch(Exception e) { break; 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..c0587a74 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 @@ -44,8 +44,8 @@ public class Config { 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", "localhost"); + //stream_properties.put("output.socket.address", "defi-de.idea.rpi.edu"); + 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("mongodb.properties.uri", "mongodb://localhost:27017"); 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..3cfee27f 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,8 +36,8 @@ 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("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("rest.socket.port", "61100"); app_properties.put("rest.socket.key", "rest-key-reserved"); diff --git a/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/LocalTest.java b/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/LocalTest.java index 6d7c931f..276a8ed3 100644 --- a/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/LocalTest.java +++ b/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/LocalTest.java @@ -16,7 +16,8 @@ public class LocalTest { - private static final String host = "localhost"; + //private static final String host = "localhost"; + private static final String host = "defi-de.idea.rpi.edu"; public static void main(String[] args) throws UnknownHostException, IOException { final Socket socket = SocketFactory.getDefault().createSocket(host, 61200); @@ -38,14 +39,14 @@ public static void main(String[] args) throws UnknownHostException, IOException + "destination&&&%s&&&" + "key&&&%s&&&" + "start_date&&&2022-08-01&&&" - + "end_date&&&2022-08-02&&&" + + "end_date&&&2022-09-01&&&" + "query&&&aave-protocol-dated&&&" + "request&&&aave-protocol-dated\n", destination, key)); while(true) { - System.out.print(readLine(in)); + System.out.println(readLine(in)); } // String rqst_protocol_dated = String.format("http://%s:8080/defi/v1/rest/request_dated?" @@ -105,8 +106,9 @@ public static String request(String str) throws IOException { public static final String readLine(BufferedReader in) throws IOException { StringBuilder out = new StringBuilder(); char c = 0; - while((c = (char)in.read()) != 10) + while((c = (char)in.read()) != 10) { out.append(c); + } return out.toString(); }