Update Configuration File Storage

DataINCITE · Sep 29, 2022 · 2b3577a · 2b3577a
1 parent 6c940c2
commit 2b3577a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 8 deletions.
diff --git a/Data Engine/Documents/Internal Manual/Packet Spreadsheet.xlsx b/Data Engine/Documents/Internal Manual/Packet Spreadsheet.xlsx
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
@@ -12,14 +12,14 @@ public class Config {
 static {
 	properties = new HashMap<String, Properties>();
 
-	String[] files = new File("config").list();
+	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("config/" + file)) {
+			try (FileInputStream in = new FileInputStream("src/main/resources/config/" + file)) {
 				properties.get(name).load(in);
 			} catch(Exception e) {
 				e.printStackTrace();

diff --git a/...a Engine/src/main/java/org/stream/external/connected/connections/AmberDataConnection.java b/...a Engine/src/main/java/org/stream/external/connected/connections/AmberDataConnection.java
@@ -42,7 +42,7 @@ public void defineRequestTypes() {
 	public String getHash(String data) {
 		try {
 			MessageDigest md = MessageDigest.getInstance("SHA-512");
-			byte[] bytes = md.digest(("salt" + System.currentTimeMillis() + data).getBytes());
+			byte[] bytes = md.digest(("salt" + data).getBytes());
 			BigInteger signum = new BigInteger(1, bytes);
 			String hashed = signum.toString(16);
 			while(hashed.length() < 32)

diff --git a/...ne/DeFi Data Engine/config/app.properties → .../src/main/resources/config/app.properties b/...ne/DeFi Data Engine/config/app.properties → .../src/main/resources/config/app.properties
diff --git a/...DeFi Data Engine/config/stream.properties → ...c/main/resources/config/stream.properties b/...DeFi Data Engine/config/stream.properties → ...c/main/resources/config/stream.properties
@@ -45,4 +45,9 @@ mongodb.database.main=main-db
 mongodb.auth.collection=auth-collection
 
 # query delim
-mongodb.query.delim=,
+mongodb.query.delim=,
+
+# === POLYGON PROPERTIES ===
+
+# request delim
+polygon.request.delim=-
diff --git a/...eFi Data Engine/config/testing.properties → .../main/resources/config/testing.properties b/...eFi Data Engine/config/testing.properties → .../main/resources/config/testing.properties
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
@@ -12,14 +12,14 @@ public class Config {
 static {
 	properties = new HashMap<String, Properties>();
 
-	String[] files = new File("config").list();
+	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("config/" + file)) {
+			try (FileInputStream in = new FileInputStream("src/main/resources/config/" + file)) {
 				properties.get(name).load(in);
 			} catch(Exception e) {
 				e.printStackTrace();
@@ -39,15 +39,20 @@ public static final String getProperty(String name, String property) {
 		return properties.get(name).getProperty(property);
 	}
 
+	public static final void setProperty(String name, String property, String value) {
+		validate(name, property);
+		properties.get(name).setProperty(property, value);
+	}
+
 	public static final void validate(String name, String... keys) {
 		if(!properties.containsKey(name)) {
-			System.err.println(String.format("Property file <%s> does not exist. Program terminating.", name));
+			new IllegalArgumentException(String.format("Property file <%s> does not exist. Program terminating.", name)).printStackTrace();
 			System.exit(1);
 		}
 
 		for(String key : keys)
 			if(!properties.get(name).containsKey(key)) {
-				System.err.println(String.format("Missing property <%s> in file <%s>. Program terminating.", key, name));
+				new IllegalArgumentException(String.format("Missing property <%s> in file <%s>. Program terminating.", key, name)).printStackTrace();
 				System.exit(1);
 			}
 	}

diff --git a/...ne/Rest Application/config/app.properties → .../src/main/resources/config/app.properties b/...ne/Rest Application/config/app.properties → .../src/main/resources/config/app.properties
diff --git a/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/SocketConnectionTest.java b/DeFi-Data-Engine/Testing Environment/src/test/connection/socket/SocketConnectionTest.java
@@ -37,6 +37,7 @@ public void run() {
 		System.out.println("INIT RESPONSE: " + request("http://localhost:8080/defi/v1/rest/initialize?source=external_template&auth_data=key"));
 		System.out.println("STREAM_EXISTS RESPONSE: " + request("http://localhost:8080/defi/v1/rest/stream_exists?key=key"));
 		System.out.println("IS_AUTHORIZED RESPONSE: " + request("http://localhost:8080/defi/v1/rest/is_authorized?key=key"));
+
 		System.out.println("RQST RESPONSE: " + request(
 				String.format("http://localhost:8080/defi/v1/rest/request_dated?destination=%s"
 						+ "&key=key"