Merge dev into main

.gitattributes

@@ -0,0 +1,24 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+*.java text
+*.scala text
+*.sbt text
+*.py text
+
+# Declare files that will always have CR line endings on checkout
+*.sh text eol=lf
+*.template text eol=lf
+*.yml text eol=lf
+*.sql text eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

.github/workflows/jempiUI.yml

@@ -1,14 +1,9 @@
 on:
   pull_request:
     branches:
-      - dev
+      - main
     paths:
       - "JeMPI_Apps/JeMPI_UI/**"
-  push:
-    branches:
-      - dev
-    paths:
-      - 'JeMPI_Apps/JeMPI_UI/**'
 jobs:
   common-setup:
     runs-on: ubuntu-latest

.gitignore

@@ -9,3 +9,7 @@
 sandbox
 my-notes
 .Rproj.user
+.settings
+.classpath
+.project
+.metals

JeMPI_Apps/.scalafmt.conf

@@ -0,0 +1,2 @@
+version = 3.7.17
+runner.dialect = scala213

JeMPI_Apps/JeMPI_API/docker/Dockerfile

@@ -6,7 +6,7 @@ ADD API-1.0-SNAPSHOT-spring-boot.jar /app/app.jar
 
 RUN printf "#!/bin/bash\n\
 cd /app\n\
-java -server --enable-preview -XX:MaxRAMPercentage=80 -XX:+UseZGC -jar /app/app.jar\n" > /entrypoint.sh
+java -server -XX:MaxRAMPercentage=80 -jar /app/app.jar\n" > /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 

JeMPI_Apps/JeMPI_API/pom.xml

@@ -216,15 +216,15 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-compiler-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <source>${java.version}</source>-->
+<!--                    <target>${java.version}</target>-->
+<!--                    <compilerArgs>&#45;&#45;enable-preview</compilerArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
 
         </plugins>
 

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

@@ -14,21 +14,21 @@ public final class AppConfig {
    private static final Logger LOGGER = LogManager.getLogger(AppConfig.class);
    private static final Config SYSTEM_PROPERTIES = ConfigFactory.systemProperties();
    private static final Config SYSTEM_ENVIRONMENT = ConfigFactory.systemEnvironment();
-   public static final Config CONFIG = new Builder()
-         .withSystemEnvironment()
-         .withSystemProperties()
-         .withOptionalRelativeFile("/conf/server.production.conf")
-         .withOptionalRelativeFile("/conf/server.staging.conf")
-         .withOptionalRelativeFile("/conf/server.test.conf")
-         .withResource("application.local.conf")
-         .withResource("application.conf")
-         .build();
+   public static final Config CONFIG = new Builder().withSystemEnvironment()
+                                                    .withSystemProperties()
+                                                    .withOptionalRelativeFile("/conf/server.production.conf")
+                                                    .withOptionalRelativeFile("/conf/server.staging.conf")
+                                                    .withOptionalRelativeFile("/conf/server.test.conf")
+                                                    .withResource("application.local.conf")
+                                                    .withResource("application.conf")
+                                                    .build();
    public static final String POSTGRESQL_IP = CONFIG.getString("POSTGRESQL_IP");
    public static final Integer POSTGRESQL_PORT = CONFIG.getInt("POSTGRESQL_PORT");
 
    public static final String POSTGRESQL_USER = CONFIG.getString("POSTGRESQL_USER");
    public static final String POSTGRESQL_PASSWORD = CONFIG.getString("POSTGRESQL_PASSWORD");
-   public static final String POSTGRESQL_DATABASE = CONFIG.getString("POSTGRESQL_DATABASE");
+   public static final String POSTGRESQL_NOTIFICATIONS_DB = CONFIG.getString("POSTGRESQL_NOTIFICATIONS_DB");
+   public static final String POSTGRESQL_AUDIT_DB = CONFIG.getString("POSTGRESQL_AUDIT_DB");
    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(",");
@@ -42,18 +42,23 @@ public final class AppConfig {
 
    public static final String LINKER_IP = CONFIG.getString("LINKER_IP");
    public static final Integer LINKER_HTTP_PORT = CONFIG.getInt("LINKER_HTTP_PORT");
+
+   public static final String CONTROLLER_IP = CONFIG.getString("CONTROLLER_IP");
+   public static final Integer CONTROLLER_HTTP_PORT = CONFIG.getInt("CONTROLLER_HTTP_PORT");
    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"));
+
+   private AppConfig() {
+   }
+
    public static String[] getDGraphHosts() {
       return DGRAPH_ALPHA_HOSTS;
    }
+
    public static int[] getDGraphPorts() {
       return DGRAPH_ALPHA_PORTS;
    }
 
-   private AppConfig() {
-   }
-
    private static class Builder {
       private Config conf = ConfigFactory.empty();
 
@@ -80,7 +85,9 @@ Builder withSystemEnvironment() {
 
       Builder withResource(final String resource) {
          Config resourceConfig = ConfigFactory.parseResources(resource);
-         String empty = resourceConfig.entrySet().isEmpty() ? " contains no values" : "";
+         String empty = resourceConfig.entrySet().isEmpty()
+               ? " contains no values"
+               : "";
          conf = conf.withFallback(resourceConfig);
          LOGGER.info("Loaded config file from resource ({}){}", resource, empty);
          return this;

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

@@ -16,7 +16,7 @@
 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 static final String CONFIG_RESOURCE_FILE_NAME = "config-api.json";
    private final JsonFieldsConfig jsonFieldsConfig = new JsonFieldsConfig(CONFIG_RESOURCE_FILE_NAME);
    private HttpServer httpServer;
 
@@ -35,25 +35,20 @@ public static void main(final String[] args) {
 
    public Behavior<Void> create() {
       return Behaviors.setup(context -> {
-         ActorRef<BackEnd.Event> backEnd =
-               context.spawn(BackEnd.create(AppConfig.GET_LOG_LEVEL,
-                                            AppConfig.getDGraphHosts(),
-                                            AppConfig.getDGraphPorts(),
-                                            AppConfig.POSTGRESQL_IP,
-                                            AppConfig.POSTGRESQL_PORT,
-                                            AppConfig.POSTGRESQL_USER,
-                                            AppConfig.POSTGRESQL_PASSWORD,
-                                            AppConfig.POSTGRESQL_DATABASE,
-                                            AppConfig.KAFKA_BOOTSTRAP_SERVERS,
-                                            "CLIENT_ID_API-" + UUID.randomUUID()),
-                             "BackEnd");
+         ActorRef<BackEnd.Event> backEnd = context.spawn(BackEnd.create(AppConfig.GET_LOG_LEVEL,
+                                                                        AppConfig.getDGraphHosts(),
+                                                                        AppConfig.getDGraphPorts(),
+                                                                        AppConfig.POSTGRESQL_IP,
+                                                                        AppConfig.POSTGRESQL_PORT,
+                                                                        AppConfig.POSTGRESQL_USER,
+                                                                        AppConfig.POSTGRESQL_PASSWORD,
+                                                                        AppConfig.POSTGRESQL_NOTIFICATIONS_DB,
+                                                                        AppConfig.POSTGRESQL_AUDIT_DB,
+                                                                        AppConfig.KAFKA_BOOTSTRAP_SERVERS,
+                                                                        "CLIENT_ID_API-" + UUID.randomUUID()), "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, jsonFieldsConfig.jsonFields);
          return Behaviors.receive(Void.class).onSignal(Terminated.class, sig -> {
             httpServer.close(context.getSystem());
             return Behaviors.stopped();