You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by st...@apache.org on 2017/04/20 20:25:58 UTC

svn commit: r1792146 - in /geronimo/specs/trunk/geronimo-jsonb_1.0_spec: pom.xml src/main/java/javax/json/bind/spi/JsonbProvider.java

Author: struberg
Date: Thu Apr 20 20:25:58 2017
New Revision: 1792146

URL: http://svn.apache.org/viewvc?rev=1792146&view=rev
Log:
GERONIMO-6564 add OSGi lookup

Modified:
    geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsonb_1.0_spec/src/main/java/javax/json/bind/spi/JsonbProvider.java

Modified: geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml?rev=1792146&r1=1792145&r2=1792146&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml Thu Apr 20 20:25:58 2017
@@ -92,8 +92,11 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            javax.json*;version=1.1
+                            javax.json.bind*;version=1.0
                         </Export-Package>
+                        <Import-Package>
+                            javax.json.*;version=1.1
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jsonb_1.0_spec/src/main/java/javax/json/bind/spi/JsonbProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsonb_1.0_spec/src/main/java/javax/json/bind/spi/JsonbProvider.java?rev=1792146&r1=1792145&r2=1792146&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsonb_1.0_spec/src/main/java/javax/json/bind/spi/JsonbProvider.java (original)
+++ geronimo/specs/trunk/geronimo-jsonb_1.0_spec/src/main/java/javax/json/bind/spi/JsonbProvider.java Thu Apr 20 20:25:58 2017
@@ -20,40 +20,70 @@ package javax.json.bind.spi;
 
 import javax.json.bind.JsonbBuilder;
 import javax.json.bind.JsonbException;
-import java.util.Iterator;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.List;
 import java.util.ServiceLoader;
 
 public abstract class JsonbProvider {
     private static final String DEFAULT_PROVIDER = "org.apache.johnzon.jsonb.JohnzonProvider";
 
     public static JsonbProvider provider() {
-        final Iterator<JsonbProvider> it = ServiceLoader.load(JsonbProvider.class).iterator();
-        if (it.hasNext()) {
-            return it.next();
-        }
-
-        try {
-            return JsonbProvider.class.cast(Thread.currentThread().getContextClassLoader().loadClass(DEFAULT_PROVIDER).newInstance());
-        } catch (final ClassNotFoundException cnfe) {
-            throw new JsonbException(DEFAULT_PROVIDER + " not found", cnfe);
-        } catch (final Exception x) {
-            throw new JsonbException(DEFAULT_PROVIDER + " couldn't be instantiated: " + x, x);
+        if (System.getSecurityManager() != null) {
+            return AccessController.doPrivileged((PrivilegedAction<JsonbProvider>) () -> doLoadProvider(null));
         }
+        return doLoadProvider(null);
     }
 
     public static JsonbProvider provider(final String providerFqn) {
         if (providerFqn == null) {
             throw new IllegalArgumentException();
         }
+
+        if (System.getSecurityManager() != null) {
+            return AccessController.doPrivileged((PrivilegedAction<JsonbProvider>) () -> doLoadProvider(providerFqn));
+        }
+        return doLoadProvider(providerFqn);
+    }
+
+    private static JsonbProvider doLoadProvider(final String providerFqn) {
+
+        final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+        try {
+            final Class<?> clazz = Class.forName("org.apache.geronimo.osgi.locator.ProviderLocator");
+            final Method getServices = clazz.getDeclaredMethod("getServices", String.class, Class.class, ClassLoader.class);
+            final List<JsonbProvider> osgiProviders = (List<JsonbProvider>) getServices.invoke(null, JsonbProvider.class.getName(), JsonbProvider.class, tccl);
+            if (osgiProviders != null && !osgiProviders.isEmpty()) {
+                return osgiProviders.iterator().next();
+            }
+        } catch (final Throwable e) {
+            // locator not available, try normal mode
+        }
+
         for (final JsonbProvider provider : ServiceLoader.load(JsonbProvider.class)) {
-            if (providerFqn.equals(provider.getClass().getName())) {
+            if (providerFqn == null) {
+                return provider;
+            }
+            else if (providerFqn.equals(provider.getClass().getName())) {
                 return provider;
             }
         }
 
-        final String msg = providerFqn + " not found";
-        throw new JsonbException(msg, new ClassNotFoundException(msg));
+        if (providerFqn != null) {
+            final String msg = providerFqn + " not found";
+            throw new JsonbException(msg, new ClassNotFoundException(msg));
+        }
+
+        try {
+            return JsonbProvider.class.cast(Thread.currentThread().getContextClassLoader().loadClass(DEFAULT_PROVIDER).newInstance());
+        } catch (final ClassNotFoundException cnfe) {
+            throw new JsonbException(DEFAULT_PROVIDER + " not found", cnfe);
+        } catch (final Exception x) {
+            throw new JsonbException(DEFAULT_PROVIDER + " couldn't be instantiated: " + x, x);
+        }
     }
 
+
     public abstract JsonbBuilder create();
 }