(tomee) branch tomee-9.x updated: TOMEE-4350 add qualifier for produced Jsonb

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-9.x by this push:
     new f235c68b83 TOMEE-4350 add qualifier for produced Jsonb
f235c68b83 is described below

commit f235c68b836901a8f0b6dac268e516d75c005af7
Author: Markus Jung <ju...@apache.org>
AuthorDate: Thu Jun 6 07:14:26 2024 +0200

    TOMEE-4350 add qualifier for produced Jsonb
---
 .../tomee/microprofile/jwt/cdi/ClaimBean.java      |  1 +
 .../tomee/microprofile/jwt/cdi/JsonbProducer.java  |  2 +-
 .../cdi/{JsonbProducer.java => TomeeMpJwt.java}    | 34 ++++++----------------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git 
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java 
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java
index 77d106a620..e574ccd097 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java
@@ -67,6 +67,7 @@ public class ClaimBean<T> implements Bean<T>, 
PassivationCapable {
     }
 
     @Inject
+    @TomeeMpJwt
     private Jsonb jsonb;
 
     private final BeanManager bm;
diff --git 
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java 
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java
index fc16202c59..c905b4fc6a 100644
--- 
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java
+++ 
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java
@@ -25,12 +25,12 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 @ApplicationScoped
-// todo add a qualifier here so we isolate our instance from what applications 
would do
 public class JsonbProducer {
 
     private static final Logger log = 
Logger.getLogger(MPJWTCDIExtension.class.getName());
 
     @Produces
+    @TomeeMpJwt
     public Jsonb create() {
         return JsonbProvider.provider().create().build();
     }
diff --git 
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java 
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/TomeeMpJwt.java
similarity index 52%
copy from 
mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java
copy to 
mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/TomeeMpJwt.java
index fc16202c59..59e113b5b1 100644
--- 
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/JsonbProducer.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/TomeeMpJwt.java
@@ -16,31 +16,15 @@
  */
 package org.apache.tomee.microprofile.jwt.cdi;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Disposes;
-import jakarta.enterprise.inject.Produces;
-import jakarta.json.bind.Jsonb;
-import jakarta.json.bind.spi.JsonbProvider;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import jakarta.inject.Qualifier;
 
-@ApplicationScoped
-// todo add a qualifier here so we isolate our instance from what applications 
would do
-public class JsonbProducer {
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-    private static final Logger log = 
Logger.getLogger(MPJWTCDIExtension.class.getName());
-
-    @Produces
-    public Jsonb create() {
-        return JsonbProvider.provider().create().build();
-    }
-
-    public void close(@Disposes final Jsonb jsonb) {
-        try {
-            jsonb.close();
-
-        } catch (final Exception e) {
-            log.log(Level.WARNING, e.getMessage(), e);
-        }
-    }
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD })
+public @interface TomeeMpJwt {
 }
\ No newline at end of file