GH-548 Remove slf4j logging api (Resolve #546)

panda-lang · Aug 19, 2020 · a8a87c7 · a8a87c7
1 parent 184a080
commit a8a87c7
Show file tree

Hide file tree

Showing 42 changed files with 200 additions and 491 deletions.
diff --git a/panda-framework/src/main/java/org/panda_lang/language/FrameworkController.java b/panda-framework/src/main/java/org/panda_lang/language/FrameworkController.java
@@ -16,10 +16,10 @@
 
 package org.panda_lang.language;
 
-import org.panda_lang.language.interpreter.messenger.LoggerHolder;
+import org.panda_lang.language.interpreter.logging.Logger;
+import org.panda_lang.language.interpreter.logging.LoggerHolder;
 import org.panda_lang.language.resource.Language;
 import org.panda_lang.language.resource.Resources;
-import org.slf4j.Logger;
 
 /**
  * Panda Framework controller

diff --git a/panda-framework/src/main/java/org/panda_lang/language/PandaFramework.java b/panda-framework/src/main/java/org/panda_lang/language/PandaFramework.java
@@ -16,9 +16,9 @@
 
 package org.panda_lang.language;
 
+import org.panda_lang.language.interpreter.logging.Logger;
 import org.panda_lang.language.resource.Language;
 import org.panda_lang.language.resource.Resources;
-import org.slf4j.Logger;
 
 public abstract class PandaFramework implements FrameworkController {
 

diff --git a/panda-framework/src/main/java/org/panda_lang/language/architecture/Application.java b/panda-framework/src/main/java/org/panda_lang/language/architecture/Application.java
@@ -17,8 +17,8 @@
 package org.panda_lang.language.architecture;
 
 import org.jetbrains.annotations.Nullable;
-import org.panda_lang.language.interpreter.messenger.LoggerHolder;
-import org.slf4j.Logger;
+import org.panda_lang.language.interpreter.logging.Logger;
+import org.panda_lang.language.interpreter.logging.LoggerHolder;
 
 /**
  * Application is a group of bundled scripts

diff --git a/panda-framework/src/main/java/org/panda_lang/language/architecture/Environment.java b/panda-framework/src/main/java/org/panda_lang/language/architecture/Environment.java
@@ -20,8 +20,7 @@
 import org.panda_lang.language.architecture.module.ModulePath;
 import org.panda_lang.language.architecture.module.TypeLoader;
 import org.panda_lang.language.interpreter.Interpreter;
-import org.panda_lang.language.interpreter.messenger.LoggerHolder;
-import org.panda_lang.language.interpreter.messenger.Messenger;
+import org.panda_lang.language.interpreter.logging.LoggerHolder;
 
 import java.io.File;
 
@@ -51,13 +50,6 @@ public interface Environment extends LoggerHolder {
      */
     TypeLoader getTypeLoader();
 
-    /**
-     * Get the environment messenger
-     *
-     * @return the messenger
-     */
-    Messenger getMessenger();
-
     /**
      * Get working directory
      *

diff --git a/panda-framework/src/main/java/org/panda_lang/language/interpreter/Interpretation.java b/panda-framework/src/main/java/org/panda_lang/language/interpreter/Interpretation.java
@@ -16,7 +16,7 @@
 
 package org.panda_lang.language.interpreter;
 
-import org.panda_lang.language.interpreter.messenger.LoggerHolder;
+import org.panda_lang.language.interpreter.logging.LoggerHolder;
 import org.panda_lang.utilities.commons.function.ThrowingRunnable;
 import org.panda_lang.utilities.commons.function.ThrowingSupplier;
 

diff --git a/panda-framework/src/main/java/org/panda_lang/language/interpreter/PandaInterpretation.java b/panda-framework/src/main/java/org/panda_lang/language/interpreter/PandaInterpretation.java
@@ -17,9 +17,9 @@
 package org.panda_lang.language.interpreter;
 
 import org.jetbrains.annotations.Nullable;
+import org.panda_lang.language.interpreter.logging.Logger;
 import org.panda_lang.utilities.commons.function.ThrowingRunnable;
 import org.panda_lang.utilities.commons.function.ThrowingSupplier;
-import org.slf4j.Logger;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -50,7 +50,6 @@ public <E extends Exception> Interpretation execute(ThrowingRunnable<E> task) {
             return isHealthy() ? task.get() : null;
         } catch (Exception exception) {
             failures.add(exception);
-            this.healthy = !interpreter.getEnvironment().getMessenger().send(exception);
             return null;
         }
     }

diff --git a/panda-framework/src/main/java/org/panda_lang/language/resource/PandaResources.java b/panda-framework/src/main/java/org/panda_lang/language/resource/PandaResources.java
@@ -16,12 +16,9 @@
 
 package org.panda_lang.language.resource;
 
-import org.panda_lang.utilities.commons.function.Option;
-import org.panda_lang.language.interpreter.messenger.MessengerInitializer;
-import org.panda_lang.language.interpreter.messenger.MessengerOutputListener;
 import org.panda_lang.language.interpreter.parser.expression.ExpressionSubparsers;
-import org.panda_lang.language.interpreter.parser.pipeline.PipelinePath;
 import org.panda_lang.language.interpreter.parser.pipeline.PandaPipelinePath;
+import org.panda_lang.language.interpreter.parser.pipeline.PipelinePath;
 
 public final class PandaResources implements Resources {
 
@@ -41,39 +38,17 @@ public PipelinePath getPipelinePath() {
         return builder.pipelinePath;
     }
 
-    @Override
-    public Option<MessengerInitializer> getMessengerInitializer() {
-        return Option.of(builder.messengerInitializer);
-    }
-
-    @Override
-    public Option<MessengerOutputListener> getOutputListener() {
-        return Option.of(builder.outputListener);
-    }
-
     public static PandaResourcesBuilder builder() {
         return new PandaResourcesBuilder();
     }
 
     public static final class PandaResourcesBuilder {
 
-        public MessengerOutputListener outputListener;
-        public MessengerInitializer messengerInitializer;
         public PipelinePath pipelinePath;
         public ExpressionSubparsers expressionSubparsers;
 
         private PandaResourcesBuilder() { }
 
-        public PandaResourcesBuilder withOutputListener(MessengerOutputListener outputListener) {
-            this.outputListener = outputListener;
-            return this;
-        }
-
-        public PandaResourcesBuilder withMessengerInitializer(MessengerInitializer messengerInitializer) {
-            this.messengerInitializer = messengerInitializer;
-            return this;
-        }
-
         public PandaResourcesBuilder withPipelinePath(PipelinePath pipelinePath) {
             this.pipelinePath = pipelinePath;
             return this;

diff --git a/panda-framework/src/main/java/org/panda_lang/language/resource/Resources.java b/panda-framework/src/main/java/org/panda_lang/language/resource/Resources.java
@@ -16,13 +16,9 @@
 
 package org.panda_lang.language.resource;
 
-import org.panda_lang.language.interpreter.messenger.MessengerInitializer;
-import org.panda_lang.language.interpreter.messenger.MessengerOutputListener;
 import org.panda_lang.language.interpreter.parser.expression.ExpressionSubparsers;
 import org.panda_lang.language.interpreter.parser.pipeline.PipelinePath;
 
-import org.panda_lang.utilities.commons.function.Option;
-
 /**
  * Set of resources used by the language
  */
@@ -42,18 +38,4 @@ public interface Resources {
      */
     PipelinePath getPipelinePath();
 
-    /**
-     * Get initializer for {@link org.panda_lang.language.interpreter.messenger.Messenger}
-     *
-     * @return the messenger initializer
-     */
-    Option<MessengerInitializer> getMessengerInitializer();
-
-    /**
-     * Get output listener for {@link org.panda_lang.language.interpreter.messenger.Messenger}
-     *
-     * @return the output listener to use by messenger
-     */
-    Option<MessengerOutputListener> getOutputListener();
-
 }
diff --git a/panda-framework/src/main/java/org/panda_lang/language/runtime/PandaProcess.java b/panda-framework/src/main/java/org/panda_lang/language/runtime/PandaProcess.java
@@ -43,8 +43,7 @@ public PandaProcess(Application application, StandardizedFramedScope mainScope,
             Result<?> result = stack.callFrame(instance, instance);
             return result != null ? result.getResult() : null;
         } catch (Exception e) {
-            application.getEnvironment().getMessenger().send(new PandaProcessFailure(stack, e));
-            return -1;
+            throw new PandaProcessFailure(stack, e);
         }
     }
 

diff --git a/panda-framework/src/main/java/org/panda_lang/language/runtime/PandaProcessFailure.java b/panda-framework/src/main/java/org/panda_lang/language/runtime/PandaProcessFailure.java
@@ -16,16 +16,36 @@
 
 package org.panda_lang.language.runtime;
 
-public final class PandaProcessFailure {
+import java.io.PrintWriter;
+
+public final class PandaProcessFailure extends PandaRuntimeException {
 
     private final ProcessStack stack;
     private final Exception exception;
 
     public PandaProcessFailure(ProcessStack stack, Exception exception) {
+        super(exception);
         this.stack = stack;
         this.exception = exception;
     }
 
+    @Override
+    public void printStackTrace(PrintWriter s) {
+        /*
+        &b- - ~ ~< Runtime Exception >~ ~ - -&r
+
+        {{message}}
+        {{stacktrace}}
+
+        {{exception.short}}
+
+        Environment: {{environment}}
+
+        End of Exception
+         */
+        super.printStackTrace(s);
+    }
+
     public Exception getException() {
         return exception;
     }

diff --git a/panda-framework/src/main/java/org/panda_lang/language/runtime/PandaRuntimeException.java b/panda-framework/src/main/java/org/panda_lang/language/runtime/PandaRuntimeException.java
@@ -28,4 +28,8 @@ public PandaRuntimeException(String message, Throwable cause) {
         super(message, cause);
     }
 
+    public PandaRuntimeException(Throwable cause) {
+        super(cause);
+    }
+
 }
diff --git a/panda-utilities/pom.xml b/panda-utilities/pom.xml
@@ -40,24 +40,6 @@
             <artifactId>annotations</artifactId>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.tinylog</groupId>
-            <artifactId>tinylog-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.tinylog</groupId>
-            <artifactId>tinylog-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.tinylog</groupId>
-            <artifactId>slf4j-tinylog</artifactId>
-        </dependency>
-
         <!-- Benchmarks -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>

diff --git a/panda-utilities/src/main/java/org/panda_lang/utilities/commons/function/Lazy.java b/panda-utilities/src/main/java/org/panda_lang/utilities/commons/function/Lazy.java
@@ -30,6 +30,13 @@ public Lazy(Supplier<T> supplier) {
         this.supplier = supplier;
     }
 
+    public Lazy(Runnable runnable) {
+        this.supplier = () -> {
+            runnable.run();
+            return null;
+        };
+    }
+
     @Override
     public synchronized T get() {
         if (initialized) {

diff --git a/panda-utilities/src/main/resources/tinylog.properties b/panda-utilities/src/main/resources/tinylog.properties
diff --git a/panda/pom.xml b/panda/pom.xml
@@ -25,10 +25,6 @@
 
     <artifactId>panda</artifactId>
 
-    <properties>
-        <!--<maven.test.skip>true</maven.test.skip>-->
-    </properties>
-
     <dependencies>
         <!-- Panda Framework -->
         <dependency>

diff --git a/panda/src/main/java/org/panda_lang/panda/Panda.java b/panda/src/main/java/org/panda_lang/panda/Panda.java
@@ -19,10 +19,10 @@
 import org.panda_lang.language.FrameworkController;
 import org.panda_lang.language.PandaClassLoader;
 import org.panda_lang.language.PandaFramework;
+import org.panda_lang.language.interpreter.logging.Logger;
 import org.panda_lang.language.resource.Language;
 import org.panda_lang.language.resource.Resources;
 import org.panda_lang.panda.language.interpreter.PandaFileLoader;
-import org.slf4j.Logger;
 
 /**
  * The framework controller of Panda language.

diff --git a/panda/src/main/java/org/panda_lang/panda/PandaFactory.java b/panda/src/main/java/org/panda_lang/panda/PandaFactory.java
@@ -16,20 +16,22 @@
 
 package org.panda_lang.panda;
 
+import org.panda_lang.language.interpreter.logging.Logger;
+import org.panda_lang.language.interpreter.logging.SystemLogger;
 import org.panda_lang.language.resource.syntax.PandaSyntax;
 import org.panda_lang.panda.bootstrap.PandaBootstrap;
-import org.panda_lang.panda.language.interpreter.messenger.formatters.Formatters;
-import org.panda_lang.panda.language.interpreter.messenger.layouts.TranslatorLayouts;
-import org.panda_lang.panda.language.interpreter.messenger.mappers.StacktraceMapper;
 import org.panda_lang.panda.language.resource.syntax.PandaParsers;
 import org.panda_lang.panda.language.resource.syntax.expressions.subparsers.assignation.AssignationParsers;
-import org.slf4j.Logger;
 
 /**
  * Simplify creation of Panda instance
  */
 public final class PandaFactory {
 
+    public Panda createPanda() {
+        return createPanda(new SystemLogger());
+    }
+
     /**
      * Create default instance of Panda
      *
@@ -41,13 +43,6 @@ public Panda createPanda(Logger logger) {
                 // load syntax
                 .withSyntax(new PandaSyntax())
 
-                // initialize messenger
-                .initializeMessenger()
-                    .addLayouts(TranslatorLayouts.LAYOUTS)
-                    .addDataFormatters(Formatters.FORMATTERS)
-                    .addDataMapper(new StacktraceMapper())
-                    .collect()
-
                 // load pipelines
                 .initializePipelines()
                     .collect()

diff --git a/panda/src/main/java/org/panda_lang/panda/PandaLauncher.java b/panda/src/main/java/org/panda_lang/panda/PandaLauncher.java
@@ -16,9 +16,9 @@
 
 package org.panda_lang.panda;
 
+import org.panda_lang.language.interpreter.logging.SystemLogger;
 import org.panda_lang.panda.shell.PandaShell;
 import org.panda_lang.utilities.commons.ArrayUtils;
-import org.slf4j.LoggerFactory;
 
 /**
  * Default launcher of Panda
@@ -34,7 +34,7 @@ private PandaLauncher() { }
      * @throws Exception if something happen
      */
     public static void main(String... args) throws Exception {
-        PandaShell shell = new PandaShell(() -> LoggerFactory.getLogger(PandaLauncher.class), System.in);
+        PandaShell shell = new PandaShell(SystemLogger::new, System.in);
 
         if (ArrayUtils.isEmpty(args)) {
             args = new String[] { "--help" };