Skip to content

GERONIMO-6560 JSON spec jar is not able to load provider in an OSGi environment #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefanseifert wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

GERONIMO-6560 JSON spec jar is not able to load provider in an OSGi environment #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5b9c4
GERONIMO-6560 add Require-Capability header for OSGi ServiceLoader su…
stefanseifert Mar 13, 2017
04aef91
GERONIMO-6560 switch to ServiceLoader implementation instead of parsi…
stefanseifert Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions geronimo-json_1.0_spec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
<Export-Package>
javax.json*;version=1.0
</Export-Package>
<Require-Capability>
osgi.serviceloader;filter:="(osgi.serviceloader=javax.json.spi.JsonProvider)";cardinality:=multiple,
osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)"
</Require-Capability>
</instructions>
</configuration>
</plugin>
Expand Down
65 changes: 8 additions & 57 deletions geronimo-json_1.0_spec/src/main/java/javax/json/spi/JsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,16 @@
import javax.json.stream.JsonGeneratorFactory;
import javax.json.stream.JsonParser;
import javax.json.stream.JsonParserFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Enumeration;
import java.util.List;
import java.util.Iterator;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.WeakHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
Expand Down Expand Up @@ -155,17 +150,8 @@ private static JsonProvider doLoadProvider() throws JsonException {
if (tccl == null) {
tccl = ClassLoader.getSystemClassLoader();
}
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<JsonProvider> osgiProviders = (List<JsonProvider>) getServices.invoke(null, JsonProvider.class.getName(), JsonProvider.class, tccl);
if (osgiProviders != null && !osgiProviders.isEmpty()) {
return osgiProviders.iterator().next();
}
} catch (final Throwable e) {
// locator not available, try normal mode
}

// try to load provider specified via system property
final String className = System.getProperty(JsonProvider.class.getName());
if (className != null) {
try {
Expand All @@ -175,47 +161,13 @@ private static JsonProvider doLoadProvider() throws JsonException {
}
}

// don't use Class.forName() to avoid to bind class to tccl if thats a classloader facade
// so implementing a simple SPI when ProviderLocator is not here
final String name = "META-INF/services/" + JsonProvider.class.getName();
try {
final Enumeration<URL> configs = tccl.getResources(name);
if (configs.hasMoreElements()) {
InputStream in = null;
BufferedReader r = null;
try {
in = configs.nextElement().openStream();
r = new BufferedReader(new InputStreamReader(in, "utf-8"));
String l;
while ((l = r.readLine()) != null) {
if (l.startsWith("#")) {
continue;
}
return JsonProvider.class.cast(tccl.loadClass(l).newInstance());
}
} catch (final IOException x) {
// no-op
} finally {
try {
if (r != null) {
r.close();
}
} catch (final IOException y) {
// no-op
}
try {
if (in != null) {
in.close();
}
} catch (final IOException y) {
// no-op
}
}
}
} catch (final Exception ex) {
// no-op
// try to load via ServiceLoader (as registered in META-INF/services)
Iterator<JsonProvider> providers = ServiceLoader.load(JsonProvider.class).iterator();
if (providers.hasNext()) {
return providers.next();
}

// try to load to default provider
try {
return JsonProvider.class.cast(tccl.loadClass(DEFAULT_PROVIDER).newInstance());
} catch (final Throwable cnfe) {
Expand All @@ -224,4 +176,3 @@ private static JsonProvider doLoadProvider() throws JsonException {
}
}
}