Remove the internal logging library

axel-op · axel-op · commit 0f1aff6ebe9a · 2022-12-04T03:57:15.000+01:00
diff --git a/aws-adapter/pom.xml b/aws-adapter/pom.xml
@@ -31,12 +31,6 @@
             <version>${agnosticserverlessfunctions.interfaces.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>fr.axelop.agnosticserverlessfunctions</groupId>
-            <artifactId>agnostic-serverless-functions-logging</artifactId>
-            <version>${agnosticserverlessfunctions.logging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
@@ -66,7 +60,6 @@
                             <artifactSet>
                                 <includes>
                                     <include>fr.axelop.agnosticserverlessfunctions:agnostic-serverless-functions-handler-loader</include>
-                                    <include>fr.axelop.agnosticserverlessfunctions:agnostic-serverless-functions-logging</include>
                                     <include>com.amazonaws:aws-lambda-java-core</include>
                                     <include>com.amazonaws:aws-lambda-java-events</include>
                                 </includes>
diff --git a/aws-adapter/src/main/java/fr/axelop/agnosticserverlessfunctions/FunctionInvoker.java b/aws-adapter/src/main/java/fr/axelop/agnosticserverlessfunctions/FunctionInvoker.java
@@ -16,8 +16,7 @@ public class FunctionInvoker implements RequestHandler<APIGatewayV2HTTPEvent, AP
     public APIGatewayV2HTTPResponse handleRequest(APIGatewayV2HTTPEvent request, Context context) {
         final Logger logger = Logger.getAnonymousLogger();
         logger.addHandler(new LambdaLoggerHandler(context.getLogger()));
-        final LoggingRethrower rethrower = new LoggingRethrower(logger);
-        final Handler handler = rethrower.logAndRethrow(HANDLER_LOADER::loadOrThrow);
+        final Handler handler = HANDLER_LOADER.loadOrThrow();
         final HttpResponse handlerResponse = handler.handle(REQUEST_MAPPER.map(request), logger);
         return RESPONSE_MAPPER.map(handlerResponse);
     }
diff --git a/azure-adapter/pom.xml b/azure-adapter/pom.xml
@@ -30,12 +30,6 @@
             <version>${agnosticserverlessfunctions.interfaces.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>fr.axelop.agnosticserverlessfunctions</groupId>
-            <artifactId>agnostic-serverless-functions-logging</artifactId>
-            <version>${agnosticserverlessfunctions.logging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.microsoft.azure.functions</groupId>
             <artifactId>azure-functions-java-library</artifactId>
@@ -59,7 +53,6 @@
                             <artifactSet>
                                 <includes>
                                     <include>fr.axelop.agnosticserverlessfunctions:agnostic-serverless-functions-handler-loader</include>
-                                    <include>fr.axelop.agnosticserverlessfunctions:agnostic-serverless-functions-logging</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
diff --git a/azure-adapter/src/main/java/fr/axelop/agnosticserverlessfunctions/FunctionInvoker.java b/azure-adapter/src/main/java/fr/axelop/agnosticserverlessfunctions/FunctionInvoker.java
@@ -38,8 +38,7 @@ public HttpResponseMessage run(
         ExecutionContext context
     ) throws Exception {
         final Logger logger = context.getLogger();
-        final LoggingRethrower rethrower = new LoggingRethrower(logger);
-        final Handler handler = rethrower.logAndRethrow(HANDLER_LOADER::loadOrThrow);
+        final Handler handler = HANDLER_LOADER.loadOrThrow();
         final HttpResponse handlerResponse = handler.handle(REQUEST_MAPPER.map(request), logger);
         return RESPONSE_MAPPER.map(handlerResponse, request);
     }
diff --git a/gcloud-adapter/pom.xml b/gcloud-adapter/pom.xml
@@ -30,12 +30,6 @@
             <version>${agnosticserverlessfunctions.interfaces.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>fr.axelop.agnosticserverlessfunctions</groupId>
-            <artifactId>agnostic-serverless-functions-logging</artifactId>
-            <version>${agnosticserverlessfunctions.logging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.cloud.functions</groupId>
             <artifactId>functions-framework-api</artifactId>
@@ -59,7 +53,6 @@
                             <artifactSet>
                                 <includes>
                                     <include>fr.axelop.agnosticserverlessfunctions:agnostic-serverless-functions-handler-loader</include>
-                                    <include>fr.axelop.agnosticserverlessfunctions:agnostic-serverless-functions-logging</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
diff --git a/gcloud-adapter/src/main/java/fr/axelop/agnosticserverlessfunctions/FunctionInvoker.java b/gcloud-adapter/src/main/java/fr/axelop/agnosticserverlessfunctions/FunctionInvoker.java
@@ -9,15 +9,14 @@ public class FunctionInvoker implements HttpFunction {
     private static final HttpRequestMapper REQUEST_MAPPER = new HttpRequestMapper();
     private static final HttpResponseMapper RESPONSE_MAPPER = new HttpResponseMapper();
     private static final Logger LOGGER = Logger.getLogger(FunctionInvoker.class.getName());
-    private static final LoggingRethrower RETHROWER = new LoggingRethrower(LOGGER);
     private static final HandlerLoader HANDLER_LOADER = new HandlerLoader();
 
     @Override
     public void service(
         com.google.cloud.functions.HttpRequest request,
         com.google.cloud.functions.HttpResponse response
     ) throws Exception {
-        final Handler handler = RETHROWER.logAndRethrow(HANDLER_LOADER::loadOrThrow);
+        final Handler handler = HANDLER_LOADER.loadOrThrow();
         final HttpResponse handlerResponse = handler.handle(REQUEST_MAPPER.map(request), LOGGER);
         RESPONSE_MAPPER.map(handlerResponse, response);
     }
diff --git a/handler-loader/src/main/java/fr/axelop/agnosticserverlessfunctions/HandlerLoader.java b/handler-loader/src/main/java/fr/axelop/agnosticserverlessfunctions/HandlerLoader.java
@@ -8,11 +8,7 @@ public class HandlerLoader {
     private static final Class<Handler> HANDLER_CLASS = Handler.class;
     
     public Handler loadOrThrow() throws HandlerNotFoundException {
-        final Optional<Handler> handler = load();
-        if (handler.isPresent()) {
-            return handler.get();
-        }
-        throw new HandlerNotFoundException();
+        return load().orElseThrow(HandlerNotFoundException::new);
     }
     
     public Optional<Handler> load() {
diff --git a/logging/pom.xml b/logging/pom.xml
diff --git a/logging/src/main/java/fr/axelop/agnosticserverlessfunctions/LoggingRethrower.java b/logging/src/main/java/fr/axelop/agnosticserverlessfunctions/LoggingRethrower.java
diff --git a/logging/src/main/java/fr/axelop/agnosticserverlessfunctions/SupplierWithThrowable.java b/logging/src/main/java/fr/axelop/agnosticserverlessfunctions/SupplierWithThrowable.java
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,6 @@
     <modules>
         <module>interfaces</module>
         <module>handler-loader</module>
-        <module>logging</module>
         <module>gcloud-adapter</module>
         <module>azure-adapter</module>
         <module>aws-adapter</module>
@@ -24,7 +23,6 @@
         <maven.jar.plugin.version>3.2.2</maven.jar.plugin.version>
         <maven.shade.plugin.version>3.4.0</maven.shade.plugin.version>
         <agnosticserverlessfunctions.interfaces.version>0.0.1-SNAPSHOT</agnosticserverlessfunctions.interfaces.version>
-        <agnosticserverlessfunctions.logging.version>0.0.1-SNAPSHOT</agnosticserverlessfunctions.logging.version>
     </properties>
 
     <url>${github.url}</url>
