Updating System logger

dansiviter · Jul 21, 2023 · bca5ca5 · bca5ca5
1 parent c7daa79
commit bca5ca5
Show file tree

Hide file tree

Showing 22 changed files with 196 additions and 405 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout project
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '11'
@@ -23,4 +23,4 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: >
-        mvn -B -ntp verify sonar:sonar "-Dsonar.coverage.jacoco.xmlReportPaths=**/target/site/jacoco.xml"
+        mvn -B -ntp verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar "-Dsonar.coverage.jacoco.xmlReportPaths=**/target/site/jacoco.xml"
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout project
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '11'
@@ -26,7 +26,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: mvn -B -ntp verify sonar:sonar "-Dsonar.coverage.jacoco.xmlReportPaths=**/target/site/jacoco.xml"
+      run: mvn -B -ntp verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar "-Dsonar.coverage.jacoco.xmlReportPaths=**/target/site/jacoco.xml"
 
     - name: Publish to Apache Maven Central Snapshot Repo
       env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout project
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '11'

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/dansiviter/jule/Build?style=flat-square)](https://github.com/dansiviter/jule/actions/workflows/build.yaml) [![Known Vulnerabilities](https://snyk.io/test/github/dansiviter/jule/badge.svg?style=flat-square)](https://snyk.io/test/github/dansiviter/jule) [![Sonar Coverage](https://img.shields.io/sonar/coverage/dansiviter_jule?server=https%3A%2F%2Fsonarcloud.io&style=flat-square)](https://sonarcloud.io/dashboard?id=dansiviter_jule) [![Maven Central](https://img.shields.io/maven-central/v/uk.dansiviter.jule/jule-project?style=flat-square)](https://search.maven.org/artifact/uk.dansiviter.jule/jule-project) ![Java 11+](https://img.shields.io/badge/-Java%2011%2B-informational?style=flat-square)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/dansiviter/jule/deploy.yaml)](https://github.com/dansiviter/jule/actions/workflows/build.yaml) [![Known Vulnerabilities](https://snyk.io/test/github/dansiviter/jule/badge.svg?style=flat-square)](https://snyk.io/test/github/dansiviter/jule) [![Sonar Coverage](https://img.shields.io/sonar/coverage/dansiviter_jule?server=https%3A%2F%2Fsonarcloud.io&style=flat-square)](https://sonarcloud.io/dashboard?id=dansiviter_jule) [![Maven Central](https://img.shields.io/maven-central/v/uk.dansiviter.jule/jule-project?style=flat-square)](https://search.maven.org/artifact/uk.dansiviter.jule/jule-project) ![Java 11+](https://img.shields.io/badge/-Java%2011%2B-informational?style=flat-square)
 
 
 # Java Util Logging Enhancer (JULE) #
@@ -44,10 +44,10 @@ package com.foo;
 
 @Log
 public interface MyLog {
-  @Message("Hello %s")  // <- defaults to `Info` level
+  @Message("Hello %s")  // Uses java.util.Formatter and defaults to `INFO` level
   void hello(String name);
 
-  @Message(value = "Oh no! %s", level = Level.ERROR)  // <- 'Error' level
+  @Message(value = "Oh no! %s", level =.ERROR)  // <- 'ERROR' level
   void error(String name, Throwable t);  // <- Throwables must be last parameter
 
   @Message("Hello %s")
@@ -79,16 +79,19 @@ public class MyClass {
 
 ## CDI ##
 
-This can perform automatic injection of dependencies via CDI:
+Simply create your own factory:
 
-```xml
-<dependency>
-  <groupId>uk.dansiviter.jule</groupId>
-  <artifactId>cdi</artifactId>
-  <version>${jule.version}</version>
-</dependency>
+```java
+@ApplicationScoped
+public class MyLogFactory {
+  @Produces @Dependent  // Always use dependent scope to prevent proxying
+  public static MyLog myLog(InjectionPoint ip) {
+    return LogProducer.log(MyLog.class, ip.getMember().getDeclaringClass());
+  }
+}
 ```
 
+Then just inject:
 ```java
 @ApplicationScoped
 public class MyClass {

diff --git a/cdi/pom.xml b/cdi/pom.xml
diff --git a/cdi/src/main/java/uk/dansiviter/jule/cdi/LogExtension.java b/cdi/src/main/java/uk/dansiviter/jule/cdi/LogExtension.java
diff --git a/cdi/src/main/resources/META-INF/beans.xml b/cdi/src/main/resources/META-INF/beans.xml
diff --git a/cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/cdi/src/test/java/uk/dansiviter/jule/cdi/Log0.java b/cdi/src/test/java/uk/dansiviter/jule/cdi/Log0.java
diff --git a/cdi/src/test/java/uk/dansiviter/jule/cdi/Log1.java b/cdi/src/test/java/uk/dansiviter/jule/cdi/Log1.java