From 2b3577a36c588cdc86c709ab41319b55604cc808 Mon Sep 17 00:00:00 2001 From: Conor Flynn Date: Thu, 29 Sep 2022 00:41:43 -0400 Subject: [PATCH] Update Configuration File Storage --- .../Internal Manual/Packet Spreadsheet.xlsx | Bin 19070 -> 19043 bytes .../src/main/java/org/properties/Config.java | 4 ++-- .../connections/AmberDataConnection.java | 2 +- .../main/resources}/config/app.properties | 0 .../main/resources}/config/stream.properties | 7 ++++++- .../main/resources}/config/testing.properties | 0 .../src/main/java/org/properties/Config.java | 13 +++++++++---- .../main/resources}/config/app.properties | 0 .../socket/SocketConnectionTest.java | 1 + 9 files changed, 19 insertions(+), 8 deletions(-) rename DeFi-Data-Engine/DeFi Data Engine/{ => src/main/resources}/config/app.properties (100%) rename DeFi-Data-Engine/DeFi Data Engine/{ => src/main/resources}/config/stream.properties (91%) rename DeFi-Data-Engine/DeFi Data Engine/{ => src/main/resources}/config/testing.properties (100%) rename DeFi-Data-Engine/Rest Application/{ => src/main/resources}/config/app.properties (100%) diff --git a/Data Engine/Documents/Internal Manual/Packet Spreadsheet.xlsx b/Data Engine/Documents/Internal Manual/Packet Spreadsheet.xlsx index d2af62abecfb60a4bbf50f469431c0c00e91e132..bdbad7c0ef407c77706f1f3eb02999759635d123 100644 GIT binary patch delta 2576 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 delta 2602 zcmV+_3f1-FlmY&f0kGW$e{zNWF$@F%0H_H701p5F0C;RKcW-iQVsCG2E_iKhtW|Aq zqc{-$e$xF1i|-W7TN2cC1tI7nwX0q?+kS~uIbebnz??B{s%roHjUgmyyISSCSEV+7 znVDy1o*7?$*_8!)qM~8EnrisM)DW!_p0a8))xIxdeXOBIk}4$yf3N6Nd!dc?jK=~VHfQLfBZc7$0iKcUQfS4iBh=_eoUVL6>(_hRxsBhJjigS9}QGC$+f;Y?gL)nX!W2_tZtCuD_B}Wvb9n zK^i$vnWX7d8^Mx4(>EKUt;3cTaB8`pi8bTuK<8V5Qks#re~?Qc@}M3n!}BJVt8M}@ zfHuf8|n z{t8fVv5IK3mAr;kQP2%t-O+{;k>smIG!OKdAernxBN{V(b{E9URYW8~^J>E?x*CeA zSuMaRaIZi&f23+ju{vQo`B+x}f$Jnu0W=_jy_fy>`)Go*!XNm2D+Pk@MRW~0{YIW3 z!@#3--vAbnLTo=)iSY5`>u4T1-UJ8w*os`;v4T(!gUHgycr>xCQD{1`{R5m4o}X~i z%6v~ArFyD4z?2V1H)J=QVAF3|dW7+6?*DW(zZ-_Le;>+W)h6#5eQu64Q%kgaU{%VW zr`DQKn#DNBXyR7%lt zBfw0G2Fs_i_KB?hUiR;nikG7py5ZG^N8yQS2=u|U^IrTLPqtJ7+_G#dmUPbylxFY6 zDG298OV=fgA#e#P5@;%F>f$rOrZrJ^=uTcYf3lmQo*5(vJ7zF4Cys8;ZQ$>C0@QVE zOP@KBHFtsC^AHj=G|~Uz+3DJfKfL4$Wln@#3X*K${lBAGNE#@(E{_J_Jp~)ON2G&zk%AtlfVQ_5zW)0gKWNGWliHzil5ft;Sf(TC;74~wI*J68jE zf`rE9wD!Ku7;~Zq&E3ef(BMdAtmYm+?UuRL0x$a{tymm}e^aKpZ0JD9>^%%qRZ_s( zh`ol!4-gBAd-U&W*}4l&i+gaI+ugnmgwZV`Hd0A{?xB=ukv(l2WBEp5-KQwwf}AW~ zG2Y{gO#lBzNlRgkGnF49nGK$A%b&A3lf0V!ZxKmy1&34tG@% z3sp`ZqwH%kqinh88|bHmqk9t*&o@6nf$)GL5hdQVU!d|UPzsad2_;>}Zj9M=sZTg5 zL=o4gbRt}Md4T`ZldkK354sqmD7&h@jV}(0zRSN^NK!(@_sV}a$Il?QwMQ$c+&4*9 zp4Z?6b}dSe&=69EQHa1N(GrgzuDRx?{(Y3CuX8#{MoB!GrBPRa*gJ3ZuVEzWUG;!} z0JGi|Ed&Z5uP$w_2mk>1E|UQi8Ivv=2!D>7Fc60CEA<^L--EFOIiQeL4x4tRUQ|^N z*N!p43dYoS4y$V4y#plKl_IU8l>iTT=KDSP_w?bUD|C?7DN|>dh7m@x7A9BqHp9Pu zu7fc~&ht9wm8oThpQXbOv(KNVM`L%cl+q(0)GouN_f1NO6Q$JLg{F};%oN6I?tkIc zZi#EGAhhd6B3Ar+2uVw9fh?N!huzpvn#$9My+=J8H?)FU} zjBWt2QI+z~9TX!i(x+{0EZ&YX{?Z zYf0C@e*gdg|Nj600RR82TC*-35+wzg8&QKuvqeEO0e`fUO+(v(lRY^QoG8A9-Auz`?H}}CQe!T)`Xc( zai?s-2XS;CT{Rk;rb(JvA0y;X@!RI{xgRyIRJSV*sLTbY+ye93mMg8ajn;LmRE{V0 zZih89m~qQekB$~5b2^{`!|G9y_QlSMdNlF=EV+5EkG z{j9%>ITYk6!@tD4IGcCGo0O8pg!ls}bA0hN%5Sr*Lz4pqa)tdd43k7hQUM5)mq$kd zSd-sJD;&tr<}LFD001K!000;O000000000000000?Gux54Hc6+NEI9(uP$w_2mk>1 zE&u=+00000000000000002UgPa19lcfk-a_`jfFpMFKD; MN+Sl)MgRZ+03Ni>Q2+n{ 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 f5bf2d97..6d51c933 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 @@ -12,14 +12,14 @@ public class Config { static { properties = new HashMap(); - 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/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/stream/external/connected/connections/AmberDataConnection.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/stream/external/connected/connections/AmberDataConnection.java index d420729f..e248a87c 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/stream/external/connected/connections/AmberDataConnection.java +++ b/DeFi-Data-Engine/DeFi Data 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/DeFi-Data-Engine/DeFi Data Engine/config/app.properties b/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/app.properties similarity index 100% rename from DeFi-Data-Engine/DeFi Data Engine/config/app.properties rename to DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/app.properties diff --git a/DeFi-Data-Engine/DeFi Data Engine/config/stream.properties b/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties similarity index 91% rename from DeFi-Data-Engine/DeFi Data Engine/config/stream.properties rename to DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties index b8f5bc7c..4bb2109a 100644 --- a/DeFi-Data-Engine/DeFi Data Engine/config/stream.properties +++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/stream.properties @@ -45,4 +45,9 @@ mongodb.database.main=main-db mongodb.auth.collection=auth-collection # query delim -mongodb.query.delim=, \ No newline at end of file +mongodb.query.delim=, + +# === POLYGON PROPERTIES === + +# request delim +polygon.request.delim=- \ No newline at end of file diff --git a/DeFi-Data-Engine/DeFi Data Engine/config/testing.properties b/DeFi-Data-Engine/DeFi Data Engine/src/main/resources/config/testing.properties similarity index 100% rename from DeFi-Data-Engine/DeFi Data Engine/config/testing.properties rename to DeFi-Data-Engine/DeFi Data Engine/src/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 index a72ccec2..6d51c933 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 @@ -12,14 +12,14 @@ public class Config { static { properties = new HashMap(); - 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/DeFi-Data-Engine/Rest Application/config/app.properties b/DeFi-Data-Engine/Rest Application/src/main/resources/config/app.properties similarity index 100% rename from DeFi-Data-Engine/Rest Application/config/app.properties rename to DeFi-Data-Engine/Rest Application/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 index 3007daee..1b139929 100644 --- 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"