JeMPI UI configuration

JeMPI_Apps/JeMPI_API/pom.xml

@@ -153,29 +153,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-        </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.junit.jupiter</groupId>-->
-<!--            <artifactId>junit-jupiter</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.mockito</groupId>-->
-<!--            <artifactId>mockito-core</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.typesafe.akka</groupId>-->
-<!--            <artifactId>akka-actor-testkit-typed_${scala.tools.version}</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
     </dependencies>
 
     <build>

JeMPI_Apps/JeMPI_API/src/main/java/org/jembi/jempi/AppConfig.java

@@ -32,13 +32,14 @@ public final class AppConfig {
    public static final String KAFKA_BOOTSTRAP_SERVERS = CONFIG.getString("KAFKA_BOOTSTRAP_SERVERS");
    public static final String KAFKA_APPLICATION_ID = CONFIG.getString("KAFKA_APPLICATION_ID");
    private static final String[] DGRAPH_ALPHA_HOSTS = CONFIG.getString("DGRAPH_HOSTS").split(",");
-   private static final int[] DGRAPH_ALPHA_PORTS = Arrays.stream(CONFIG.getString("DGRAPH_PORTS").split(",")).mapToInt(s -> {
-      try {
-         return Integer.parseInt(s);
-      } catch (NumberFormatException ex) {
-         return Integer.MIN_VALUE;
-      }
-   }).toArray();
+   private static final int[] DGRAPH_ALPHA_PORTS = Arrays.stream(CONFIG.getString("DGRAPH_PORTS").split(","))
+                                                         .mapToInt(s -> {
+                                                            try {
+                                                               return Integer.parseInt(s);
+                                                            } catch (NumberFormatException ex) {
+                                                               return Integer.MIN_VALUE;
+                                                            }
+                                                         }).toArray();
 
    public static final String LINKER_IP = CONFIG.getString("LINKER_IP");
    public static final Integer LINKER_HTTP_PORT = CONFIG.getInt("LINKER_HTTP_PORT");
@@ -48,6 +49,11 @@ public final class AppConfig {
    public static final Integer API_HTTP_PORT = CONFIG.getInt("API_HTTP_PORT");
    public static final Level GET_LOG_LEVEL = Level.toLevel(CONFIG.getString("LOG4J2_LEVEL"));
 
+   public static final String SYSTEM_CONFIG_DIR = CONFIG.getString("SYSTEM_CONFIG_DIR");
+   public static final String API_CONFIG_REFERENCE_FILENAME = CONFIG.getString("API_CONFIG_REFERENCE_FILENAME");
+   public static final String API_CONFIG_MASTER_FILENAME = CONFIG.getString("API_CONFIG_MASTER_FILENAME");
+   public static final String API_FIELDS_CONFIG_FILENAME = CONFIG.getString("API_FIELDS_CONFIG_FILENAME");
+
    private AppConfig() {
    }
 

JeMPI_Apps/JeMPI_API/src/main/java/org/jembi/jempi/api/API.java

@@ -9,18 +9,14 @@
 import org.apache.logging.log4j.Logger;
 import org.jembi.jempi.AppConfig;
 import org.jembi.jempi.libapi.BackEnd;
-import org.jembi.jempi.libapi.JsonFieldsConfig;
 
 import java.util.UUID;
 
 public final class API {
 
    private static final Logger LOGGER = LogManager.getLogger(API.class);
-   private static final String CONFIG_RESOURCE_FILE_NAME = "config-api.json";
-   private final JsonFieldsConfig jsonFieldsConfig = new JsonFieldsConfig(CONFIG_RESOURCE_FILE_NAME);
    private HttpServer httpServer;
 
-
    private API() {
       LOGGER.info("API started.");
    }
@@ -45,10 +41,14 @@ public Behavior<Void> create() {
                                                                         AppConfig.POSTGRESQL_NOTIFICATIONS_DB,
                                                                         AppConfig.POSTGRESQL_AUDIT_DB,
                                                                         AppConfig.KAFKA_BOOTSTRAP_SERVERS,
-                                                                        "CLIENT_ID_API-" + UUID.randomUUID()), "BackEnd");
+                                                                        "CLIENT_ID_API-" + UUID.randomUUID(),
+                                                                        AppConfig.SYSTEM_CONFIG_DIR,
+                                                                        AppConfig.API_CONFIG_REFERENCE_FILENAME,
+                                                                        AppConfig.API_CONFIG_MASTER_FILENAME,
+                                                                        AppConfig.API_FIELDS_CONFIG_FILENAME), "BackEnd");
          context.watch(backEnd);
          httpServer = HttpServer.create();
-         httpServer.open("0.0.0.0", AppConfig.API_HTTP_PORT, context.getSystem(), backEnd, jsonFieldsConfig.jsonFields);
+         httpServer.open("0.0.0.0", AppConfig.API_HTTP_PORT, context.getSystem(), backEnd);
          return Behaviors.receive(Void.class).onSignal(Terminated.class, sig -> {
             httpServer.close(context.getSystem());
             return Behaviors.stopped();
@@ -59,9 +59,6 @@ public Behavior<Void> create() {
    private void run() {
       LOGGER.info("interface:port {}:{}", "0.0.0.0", AppConfig.API_HTTP_PORT);
       try {
-         LOGGER.info("Loading fields configuration file ");
-         jsonFieldsConfig.load(CONFIG_RESOURCE_FILE_NAME);
-         LOGGER.info("Fields configuration file successfully loaded");
          ActorSystem.create(this.create(), "API-App");
       } catch (Exception e) {
          LOGGER.error("Unable to start the API", e);

JeMPI_Apps/JeMPI_API/src/main/java/org/jembi/jempi/api/HttpServer.java

@@ -4,11 +4,7 @@
 import akka.actor.typed.ActorSystem;
 import akka.http.javadsl.Http;
 import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpEntity;
-import akka.http.javadsl.model.StatusCodes;
 import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.ExceptionHandler;
-import akka.http.javadsl.server.RejectionHandler;
 import akka.http.javadsl.server.Route;
 import ch.megard.akka.http.cors.javadsl.settings.CorsSettings;
 import org.apache.logging.log4j.LogManager;
@@ -17,7 +13,6 @@
 import org.jembi.jempi.AppConfig;
 import org.jembi.jempi.libapi.BackEnd;
 import org.jembi.jempi.libapi.Routes;
-import org.jembi.jempi.shared.models.GlobalConstants;
 
 import java.util.concurrent.CompletionStage;
 
@@ -43,10 +38,9 @@ public void open(
          final String httpServerHost,
          final int httpPort,
          final ActorSystem<Void> actorSystem,
-         final ActorRef<BackEnd.Event> backEnd,
-         final String jsonFields) {
+         final ActorRef<BackEnd.Event> backEnd) {
       http = Http.get(actorSystem);
-      binding = http.newServerAt(httpServerHost, httpPort).bind(this.createCorsRoutes(actorSystem, backEnd, jsonFields));
+      binding = http.newServerAt(httpServerHost, httpPort).bind(this.createCorsRoutes(actorSystem, backEnd));
       LOGGER.info("Server online at http://{}:{}", httpServerHost, httpPort);
    }
 
@@ -57,37 +51,18 @@ public void close(final ActorSystem<Void> actorSystem) {
 
    public Route createCorsRoutes(
          final ActorSystem<Void> actorSystem,
-         final ActorRef<BackEnd.Event> backEnd,
-         final String jsonFields) {
+         final ActorRef<BackEnd.Event> backEnd) {
       final var settings = CorsSettings.create(AppConfig.CONFIG);
 
-      final RejectionHandler rejectionHandler = RejectionHandler.defaultHandler().mapRejectionResponse(response -> {
-         if (response.entity() instanceof HttpEntity.Strict) {
-            String message = ((HttpEntity.Strict) response.entity()).getData().utf8String();
-            LOGGER.warn("Request was rejected. Reason: %s".formatted(message));
-         }
-
-         return response;
-      });
-
-      final ExceptionHandler exceptionHandler = ExceptionHandler.newBuilder().match(Exception.class, x -> {
-         LOGGER.error("An exception occurred while executing the Route", x);
-         return complete(StatusCodes.INTERNAL_SERVER_ERROR, "An exception occurred, see server logs for details");
-      }).build();
-
       return cors(settings,
                   () -> pathPrefix("JeMPI",
                                    () -> concat(Routes.createCoreAPIRoutes(actorSystem,
                                                                            backEnd,
-                                                                           jsonFields,
                                                                            AppConfig.LINKER_IP,
                                                                            AppConfig.LINKER_HTTP_PORT,
                                                                            AppConfig.CONTROLLER_IP,
                                                                            AppConfig.CONTROLLER_HTTP_PORT,
-                                                                           http),
-                                                path(GlobalConstants.SEGMENT_POST_FIELDS_CONFIG,
-                                                     () -> complete(StatusCodes.OK, jsonFields))))).seal(rejectionHandler,
-                                                                                                         exceptionHandler);
+                                                                           http))));
    }
 
 }

JeMPI_Apps/JeMPI_API_KC/pom.xml

@@ -163,29 +163,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-        </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.junit.jupiter</groupId>-->
-<!--            <artifactId>junit-jupiter</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>org.mockito</groupId>-->
-<!--            <artifactId>mockito-core</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.typesafe.akka</groupId>-->
-<!--            <artifactId>akka-actor-testkit-typed_${scala.tools.version}</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
     </dependencies>
 
     <build>

JeMPI_Apps/JeMPI_API_KC/src/main/java/org/jembi/jempi/AppConfig.java

@@ -47,6 +47,10 @@ public final class AppConfig {
    public static final Integer CONTROLLER_HTTP_PORT = CONFIG.getInt("CONTROLLER_HTTP_PORT");
    public static final String SESSION_SECRET = CONFIG.getString("JEMPI_SESSION_SECRET");
    public static final Level GET_LOG_LEVEL = Level.toLevel(CONFIG.getString("LOG4J2_LEVEL"));
+   public static final String SYSTEM_CONFIG_DIR = CONFIG.getString("SYSTEM_CONFIG_DIR");
+   public static final String API_CONFIG_REFERENCE_FILENAME = CONFIG.getString("API_CONFIG_REFERENCE_FILENAME");
+   public static final String API_CONFIG_MASTER_FILENAME = CONFIG.getString("API_CONFIG_MASTER_FILENAME");
+   public static final String API_FIELDS_CONFIG_FILENAME = CONFIG.getString("API_FIELDS_CONFIG_FILENAME");
 
    private AppConfig() {
    }

JeMPI_Apps/JeMPI_API_KC/src/main/java/org/jembi/jempi/api/APIKC.java

@@ -8,18 +8,14 @@
 import org.jembi.jempi.AppConfig;
 import org.jembi.jempi.api.httpServer.HttpServer;
 import org.jembi.jempi.libapi.BackEnd;
-import org.jembi.jempi.libapi.JsonFieldsConfig;
 
 import java.util.UUID;
 
 public final class APIKC {
 
    private static final Logger LOGGER = LogManager.getLogger(APIKC.class);
-   private static final String CONFIG_RESOURCE_FILE_NAME = "config-api.json";
-   private final JsonFieldsConfig jsonFieldsConfig = new JsonFieldsConfig(CONFIG_RESOURCE_FILE_NAME);
    private HttpServer httpServer;
 
-
    private APIKC() {
       LOGGER.info("API started.");
    }
@@ -45,18 +41,17 @@ public Behavior<Void> create() {
                                                                               AppConfig.POSTGRESQL_NOTIFICATIONS_DB,
                                                                               AppConfig.POSTGRESQL_AUDIT_DB,
                                                                               AppConfig.KAFKA_BOOTSTRAP_SERVERS,
-                                                                              "CLIENT_ID_API_KC-" + UUID.randomUUID()),
+                                                                              "CLIENT_ID_API_KC-" + UUID.randomUUID(),
+                                                                              AppConfig.SYSTEM_CONFIG_DIR,
+                                                                              AppConfig.API_CONFIG_REFERENCE_FILENAME,
+                                                                              AppConfig.API_CONFIG_MASTER_FILENAME,
+                                                                              AppConfig.API_FIELDS_CONFIG_FILENAME),
                                                                "BackEnd");
          context.watch(backEnd);
-//         final var notificationsSteam = new NotificationStreamProcessor();
-//         notificationsSteam.open(AppConfig.POSTGRESQL_DATABASE,
-//                                 AppConfig.POSTGRESQL_PASSWORD,
-//                                 AppConfig.KAFKA_APPLICATION_ID,
-//                                 AppConfig.KAFKA_BOOTSTRAP_SERVERS);
          final DispatcherSelector selector = DispatcherSelector.fromConfig("akka.actor.default-dispatcher");
          final MessageDispatcher dispatcher = (MessageDispatcher) system.dispatchers().lookup(selector);
          httpServer = new HttpServer(dispatcher);
-         httpServer.open("0.0.0.0", AppConfig.API_KC_HTTP_PORT, context.getSystem(), backEnd, jsonFieldsConfig.jsonFields);
+         httpServer.open("0.0.0.0", AppConfig.API_KC_HTTP_PORT, context.getSystem(), backEnd);
          return Behaviors.receive(Void.class).onSignal(Terminated.class, sig -> {
             LOGGER.info("API Server Terminated. Reason {}", sig);
             httpServer.close(context.getSystem());
@@ -68,9 +63,6 @@ public Behavior<Void> create() {
    private void run() {
       LOGGER.info("interface:port {}:{}", "0.0.0.0", AppConfig.API_KC_HTTP_PORT);
       try {
-         LOGGER.info("Loading fields configuration file ");
-         jsonFieldsConfig.load(CONFIG_RESOURCE_FILE_NAME);
-         LOGGER.info("Fields configuration file successfully loaded");
          ActorSystem.create(this.create(), "API-App");
       } catch (Exception e) {
          LOGGER.error("Unable to start the API", e);

JeMPI_Apps/JeMPI_API_KC/src/main/java/org/jembi/jempi/api/httpServer/HttpServer.java

@@ -27,10 +27,8 @@
 public final class HttpServer extends HttpSessionAwareDirectives<UserSession> {
    private static final Logger LOGGER = LogManager.getLogger(HttpServer.class);
    private CompletionStage<ServerBinding> binding = null;
-
    private ActorSystem<Void> actorSystem;
    private ActorRef<BackEnd.Event> backEnd;
-   private String jsonFields;
    private Http akkaHttpServer = null;
 
    public HttpServer(final MessageDispatcher dispatcher) {
@@ -46,12 +44,10 @@ public void open(
          final String httpServerHost,
          final int httpPort,
          final ActorSystem<Void> actorSystem,
-         final ActorRef<BackEnd.Event> backEnd,
-         final String jsonFields) {
+         final ActorRef<BackEnd.Event> backEnd) {
 
       this.actorSystem = actorSystem;
       this.backEnd = backEnd;
-      this.jsonFields = jsonFields;
       Configurator.setLevel(this.getClass(), AppConfig.GET_LOG_LEVEL);
 
       akkaHttpServer = Http.get(actorSystem);
@@ -67,10 +63,6 @@ public Http getAkkaHttpServer() {
       return akkaHttpServer;
    }
 
-   public String getJsonFields() {
-      return jsonFields;
-   }
-
    public ActorRef<BackEnd.Event> getBackEnd() {
       return backEnd;
    }

JeMPI_Apps/JeMPI_API_KC/src/main/java/org/jembi/jempi/api/httpServer/httpServerRoutes/RoutesEntries.java

@@ -19,7 +19,6 @@ public Route getRouteEntries() {
       return concat(new UserRoutes(this.httpServer).getRouteEntries(),
                     requireSession(Routes.createCoreAPIRoutes(this.httpServer.getActorSystem(),
                                                               this.httpServer.getBackEnd(),
-                                                              this.httpServer.getJsonFields(),
                                                               AppConfig.LINKER_IP,
                                                               AppConfig.LINKER_HTTP_PORT,
                                                               AppConfig.CONTROLLER_IP,

JeMPI_Apps/JeMPI_API_KC/src/main/java/org/jembi/jempi/api/httpServer/httpServerRoutes/routes/UserRoutes.java

@@ -81,11 +81,7 @@ private Route routeLogout() {
    @Override
    public Route getRouteEntries() {
       return concat(post(() -> path(GlobalConstants.SEGMENT_VALIDATE_OAUTH, () -> routeLoginWithKeycloakRequest(checkHeader))),
-                    get(() -> concat(path(GlobalConstants.SEGMENT_POST_FIELDS_CONFIG,
-                                          () -> httpServer.setNewCsrfToken(checkHeader,
-                                                                           () -> complete(StatusCodes.OK,
-                                                                                          httpServer.getJsonFields()))),
-                                     path(GlobalConstants.SEGMENT_CURRENT_USER, this::routeCurrentUser),
+                    get(() -> concat(path(GlobalConstants.SEGMENT_CURRENT_USER, this::routeCurrentUser),
                                      path(GlobalConstants.SEGMENT_LOGOUT, this::routeLogout)))
 
                    );

JeMPI_Apps/JeMPI_LibAPI/pom.xml

@@ -145,35 +145,11 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <!--
-                <dependency>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter</artifactId>
-                    <scope>test</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-core</artifactId>
-                    <scope>test</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>com.typesafe.akka</groupId>
-                    <artifactId>akka-actor-testkit-typed_${scala.tools.version}</artifactId>
-                    <scope>test</scope>
-                </dependency>
-        -->
-
     </dependencies>
 
     <build>