From 8b59c0bfb5122f9aea340e86f13d71daa611356a Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Wed, 14 Dec 2022 20:04:19 -0500 Subject: [PATCH 1/3] Sample Push for Docker confirmation --- .../main/java/org/out/socket/SocketManager.java | 15 +++++++-------- .../src/main/java/org/properties/Config.java | 4 ++-- .../src/main/java/org/properties/Config.java | 4 ++-- .../src/test/connection/socket/LocalTest.java | 10 ++++++---- 4 files changed, 17 insertions(+), 16 deletions(-) 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(); } From e6058408ad8c36e272341fed9a13480a218cbd5d Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Wed, 14 Dec 2022 20:09:35 -0500 Subject: [PATCH 2/3] Fix Configuration --- .../src/main/java/org/properties/Config.java | 7 +------ .../src/main/java/org/properties/Config.java | 10 ++-------- 2 files changed, 3 insertions(+), 14 deletions(-) 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 d7ba8960..b29ae1ba 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,13 +44,8 @@ public class Config { stream_properties.put("rest.socket.address", "DataEngine"); stream_properties.put("rest.socket.port", "61100"); stream_properties.put("rest.socket.key", "rest-key-reserved"); -<<<<<<< HEAD - //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.address", "RestApp"); ->>>>>>> branch 'main' of https://github.rpi.edu/DataINCITE/IDEA-DeFi-CRAFT stream_properties.put("output.socket.port", "61200"); stream_properties.put("local.stream.type", "mongo_db"); stream_properties.put("mongodb.properties.uri", "mongodb://MONGO: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 3b2872cd..2e43aef2 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,15 +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"); -<<<<<<< HEAD - 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("spring.server.address", "localhost"); app_properties.put("rest.socket.address", "DataEngine"); ->>>>>>> branch 'main' of https://github.rpi.edu/DataINCITE/IDEA-DeFi-CRAFT + app_properties.put("spring.server.address", "RestApp"); app_properties.put("rest.socket.port", "61100"); app_properties.put("rest.socket.key", "rest-key-reserved"); properties.put("app", app_properties); From 268939eae591a2137d685c62ad6e3544497ecbc5 Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Wed, 14 Dec 2022 20:15:38 -0500 Subject: [PATCH 3/3] Config reversion --- .../src/main/java/org/properties/Config.java | 20 +---------------- .../src/main/java/org/properties/Config.java | 22 ++----------------- .../src/test/connection/socket/LocalTest.java | 2 +- 3 files changed, 4 insertions(+), 40 deletions(-) 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 b29ae1ba..0ddad2b8 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 @@ -8,24 +8,6 @@ public class Config { private static final HashMap properties; static { -// properties = new HashMap(); -// -// String[] files = new File("src/main/resources/config").list(); -// -// for(String file : files) { -// if(file.lastIndexOf(".properties") == file.length() - 11) { -// String name = file.substring(0, file.length() - 11); -// properties.put(name, new Properties()); -// -// try (FileInputStream in = new FileInputStream("src/main/resources/config/" + file)) { -// properties.get(name).load(in); -// } catch(Exception e) { -// e.printStackTrace(); -// System.exit(1); -// } -// } -// } - properties = new HashMap(); Properties app_properties = new Properties(); @@ -44,7 +26,7 @@ public class Config { 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", "localhost"); + // stream_properties.put("output.socket.address", "defi-de.idea.rpi.edu"); stream_properties.put("output.socket.address", "RestApp"); stream_properties.put("output.socket.port", "61200"); stream_properties.put("local.stream.type", "mongo_db"); 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 2e43aef2..91ec6a33 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 @@ -8,24 +8,6 @@ public class Config { private static final HashMap properties; static { -// properties = new HashMap(); -// -// String[] files = new File("config").list(); -// -// for(String file : files) { -// if(file.lastIndexOf(".properties") == file.length() - 11) { -// String name = file.substring(0, file.length() - 11); -// properties.put(name, new Properties()); -// -// try (FileInputStream in = new FileInputStream("config/" + file)) { -// properties.get(name).load(in); -// } catch(Exception e) { -// e.printStackTrace(); -// System.exit(1); -// } -// } -// } - properties = new HashMap(); Properties app_properties = new Properties(); @@ -36,9 +18,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("rest.socket.address", "DataEngine"); 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/Testing Environment/src/test/connection/socket/LocalTest.java b/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/LocalTest.java index 276a8ed3..8b1558eb 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 @@ -1,7 +1,6 @@ package test.connection.socket; import java.io.BufferedReader; -import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStreamReader; @@ -80,6 +79,7 @@ public static void main(String[] args) throws UnknownHostException, IOException } public static String request(String str) throws IOException { + System.out.println(str); URL obj = new URL(str); HttpURLConnection con = (HttpURLConnection) obj.openConnection(); con.setRequestMethod("GET");