From 561c90be1251e73923ab1fe58f49c27330b162de Mon Sep 17 00:00:00 2001
From: Alfredo Chissotti <20033498@studenti.uniupo.it>
Date: Sat, 17 Sep 2022 13:03:42 +0200
Subject: [PATCH] non mi piaceva il conf.json
---
WebServer/src/code/Helper.java | 1 -
domainManager/Domain/res/conf.json | 10 ---
domainManager/Domain/src/code/Domain.java | 1 -
domainManager/Domain/src/code/Helper.java | 99 +++++------------------
4 files changed, 20 insertions(+), 91 deletions(-)
delete mode 100644 domainManager/Domain/res/conf.json
diff --git a/WebServer/src/code/Helper.java b/WebServer/src/code/Helper.java
index 2d1d155..ccd449e 100644
--- a/WebServer/src/code/Helper.java
+++ b/WebServer/src/code/Helper.java
@@ -10,7 +10,6 @@ import java.io.OutputStream;
import org.json.JSONException;
import org.json.JSONObject;
-// import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpsExchange;
public class Helper {
diff --git a/domainManager/Domain/res/conf.json b/domainManager/Domain/res/conf.json
deleted file mode 100644
index 39c39cf..0000000
--- a/domainManager/Domain/res/conf.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "base-self-url": "http://localhost:3001",
- "keycloak": {
- "realm": "test00",
- "base-server-url": "http://localhost:8080/"
- },
- "cloudapp": {
- "base-server-url": "http://localhost:3002/"
- }
-}
\ No newline at end of file
diff --git a/domainManager/Domain/src/code/Domain.java b/domainManager/Domain/src/code/Domain.java
index 1de147e..81678cc 100644
--- a/domainManager/Domain/src/code/Domain.java
+++ b/domainManager/Domain/src/code/Domain.java
@@ -130,7 +130,6 @@ public class Domain {
server.createContext("/secured/priviledges", new PriviledgesHandler());
server.start();
- Helper.getInstance();//to let the helper load the configuration
System.out.println("Domain in ascolto su "+Helper.getSelfURL());
}
diff --git a/domainManager/Domain/src/code/Helper.java b/domainManager/Domain/src/code/Helper.java
index 50b6a48..6f05eac 100644
--- a/domainManager/Domain/src/code/Helper.java
+++ b/domainManager/Domain/src/code/Helper.java
@@ -2,8 +2,6 @@ package code;
import java.io.BufferedReader;
import java.io.DataOutputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -19,89 +17,16 @@ import java.util.List;
import java.util.Map;
import org.json.JSONException;
-import org.json.JSONObject;
import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;
public class Helper {
- private static Helper instance = null;
- private static JSONObject keycloak = null;
- private static JSONObject cloudapp = null;
- private static String selfURL = null;
-
- private Helper(){
- // read config file
- try {
- JSONObject conf = new JSONObject(leggiFile("../res/conf.json"));
- Helper.keycloak = conf.getJSONObject("keycloak");
- Helper.cloudapp = conf.getJSONObject("cloudapp");
- Helper.selfURL = conf.getString("base-self-url");
- } catch (JSONException | IOException e) {
- e.printStackTrace();
- }
- }
-
- public static Helper getInstance(){
- if(instance==null){
- instance=new Helper();
- }
- return instance;
- }
-
- private static String leggiFile(String path) throws IOException {
- String line;
- StringBuffer answer = new StringBuffer();
- BufferedReader bufferedReader = null;
- try {
- bufferedReader = new BufferedReader(new FileReader(path));
- while((line = bufferedReader.readLine()) != null) {
- answer.append(line).append("\n");
- }
- } catch (FileNotFoundException ex) {
- ex.printStackTrace();
- } finally {
- if(bufferedReader != null)
- bufferedReader.close();
- }
- return answer.toString();
- }
-
- // public static JSONObject getKeycloak() {
- // return keycloak;
- // }
-
- public static String getKeycloakRealm(){
- try {
- return keycloak.getString("realm");
- } catch (JSONException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static String getKeycloakURL(){
- try {
- return keycloak.getString("base-server-url");
- } catch (JSONException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static String getCloudappURL(){
- try {
- return cloudapp.getString("base-server-url");
- } catch (JSONException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static String getSelfURL(){
- return selfURL;
- }
+ private static String keycloakRealm = "test00";
+ private static String keycloakURL = "http://localhost:8080/";
+ private static String cloudappURL = "http://localhost:3002/";
+ private static String selfURL = "http://localhost:3001";
public static void sendCors(HttpExchange exchange, int stato, String response) throws IOException {
Headers headers = exchange.getResponseHeaders();
@@ -217,5 +142,21 @@ public class Helper {
reader.close();
return content.toString();
}
+
+ public static String getKeycloakRealm(){
+ return keycloakRealm;
+ }
+
+ public static String getKeycloakURL(){
+ return keycloakURL;
+ }
+
+ public static String getCloudappURL(){
+ return cloudappURL;
+ }
+
+ public static String getSelfURL(){
+ return selfURL;
+ }
}
--
GitLab