remove jsonFields request

Author: MatthewErispe

JeMPI_Apps/JeMPI_BackupRestoreAPI/src/main/java/org/jembi/jempi/backuprestoreapi/AppConfig.java

@@ -30,7 +30,6 @@ public final class AppConfig {
    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(",");
    private static final int[] DGRAPH_ALPHA_PORTS = Arrays.stream(CONFIG.getString("DGRAPH_PORTS").split(",")).mapToInt(s -> {
       try {
@@ -40,12 +39,6 @@ public final class AppConfig {
       }
    }).toArray();
 
-   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 Integer BACKUP_RESTORE_API_HTTP_PORT = CONFIG.getInt("BACKUP_RESTORE_API_HTTP_PORT");
    public static final Level GET_LOG_LEVEL = Level.toLevel(CONFIG.getString("LOG4J2_LEVEL"));
 

JeMPI_Apps/JeMPI_BackupRestoreAPI/src/main/java/org/jembi/jempi/backuprestoreapi/JsonFieldsConfig.java

@@ -9,15 +9,12 @@
 import org.apache.logging.log4j.Logger;
 import org.jembi.jempi.backuprestoreapi.AppConfig;
 import org.jembi.jempi.backuprestoreapi.BackEnd;
-import org.jembi.jempi.backuprestoreapi.JsonFieldsConfig;
 
 import java.util.UUID;
 
 public final class BackupRestoreAPI {
 
    private static final Logger LOGGER = LogManager.getLogger(BackupRestoreAPI.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;
 
 
@@ -48,7 +45,7 @@ public Behavior<Void> create() {
                                                                         "CLIENT_ID_API-" + UUID.randomUUID()), "BackEnd");
          context.watch(backEnd);
          httpServer = HttpServer.create();
-         httpServer.open("0.0.0.0", AppConfig.BACKUP_RESTORE_API_HTTP_PORT, context.getSystem(), backEnd, jsonFieldsConfig.jsonFields);
+         httpServer.open("0.0.0.0", AppConfig.BACKUP_RESTORE_API_HTTP_PORT, context.getSystem(), backEnd);
          return Behaviors.receive(Void.class).onSignal(Terminated.class, sig -> {
             httpServer.close(context.getSystem());
             return Behaviors.stopped();
@@ -59,9 +56,6 @@ public Behavior<Void> create() {
    private void run() {
       LOGGER.info("interface:port {}:{}", "0.0.0.0", AppConfig.BACKUP_RESTORE_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(), "BackupRestoreAPI-App");
       } catch (Exception e) {
          LOGGER.error("Unable to start the BackupRestoreAPI", e);

JeMPI_Apps/JeMPI_BackupRestoreAPI/src/main/java/org/jembi/jempi/backuprestoreapi/api/BackupRestoreAPI.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,8 +13,6 @@
 import org.jembi.jempi.backuprestoreapi.AppConfig;
 import org.jembi.jempi.backuprestoreapi.BackEnd;
 import org.jembi.jempi.backuprestoreapi.Routes;
-import org.jembi.jempi.shared.models.GlobalConstants;
-
 import java.util.concurrent.CompletionStage;
 
 import static ch.megard.akka.http.cors.javadsl.CorsDirectives.cors;
@@ -43,10 +37,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("BackupRestoreAPI Server online at http://{}:{}", httpServerHost, httpPort);
    }
 
@@ -57,31 +50,13 @@ 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(String.format("Request was rejected. Reason: %s", 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),
-                                                path(GlobalConstants.SEGMENT_POST_FIELDS_CONFIG,
-                                                     () -> complete(StatusCodes.OK, jsonFields))))).seal(rejectionHandler,
-                                                                                                         exceptionHandler);
+                                                                           backEnd))));
    }
 
 }