Skip to content

Commit

Permalink
Revert "[JBEE-169] Use org.jboss.resteasy.resteasy-jaxrs-api module f…
Browse files Browse the repository at this point in the history 
…or container resolution of RESTEasy JAX-RS API impl"

This reverts commit dc89191.
  • Loading branch information
@jamezp
jamezp committed Aug 2, 2021
1 parent 8aed901 commit 76c0dbe
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 157 deletions.
79 changes: 0 additions & 79 deletions jaxrs-api/src/main/java/javax/ws/rs/client/FactoryFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,11 @@

package javax.ws.rs.client;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Iterator;
import java.util.Properties;
import java.util.ServiceConfigurationError;
Expand All @@ -44,7 +39,6 @@
final class FactoryFinder {

private static final Logger LOGGER = Logger.getLogger(FactoryFinder.class.getName());
private static final String RESTEASY_JAXRS_API_MODULE = "org.jboss.resteasy.resteasy-jaxrs-api";

private FactoryFinder() {
// prevents instantiation
Expand Down Expand Up @@ -183,84 +177,11 @@ static <T> Object find(final String factoryId, final String fallbackClassName, C
+ " from a system property", se);
}

ClassLoader moduleClassLoader = getModuleClassLoader();
if (moduleClassLoader != null) {
String serviceId = "META-INF/services/" + factoryId;
try (InputStream is = moduleClassLoader.getResourceAsStream(serviceId)) {
if( is!=null ) {
try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {

String factoryClassName = rd.readLine();

if (factoryClassName != null &&
! "".equals(factoryClassName)) {
return newInstance(factoryClassName, moduleClassLoader);
}
}
}
} catch( Exception ex ) {
}
}

if (fallbackClassName == null) {
throw new ClassNotFoundException(
"Provider for " + factoryId + " cannot be found", null);
}

return newInstance(fallbackClassName, classLoader);
}

private static ClassLoader getModuleClassLoader() {
try {
final Class<?> moduleClass = Class.forName("org.jboss.modules.Module");
final Class<?> moduleIdentifierClass = Class.forName("org.jboss.modules.ModuleIdentifier");
final Class<?> moduleLoaderClass = Class.forName("org.jboss.modules.ModuleLoader");
final Object moduleLoader;
final SecurityManager sm = System.getSecurityManager();
if (sm == null) {
moduleLoader = moduleClass.getMethod("getBootModuleLoader").invoke(null);
} else {
try {
moduleLoader = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws Exception {
return moduleClass.getMethod("getBootModuleLoader").invoke(null);
}
});
} catch (PrivilegedActionException pae) {
throw pae.getException();
}
}
Object module;
try {
Object moduleIdentifier = moduleIdentifierClass.getMethod("create", String.class).invoke(null, RESTEASY_JAXRS_API_MODULE);
module = moduleLoaderClass.getMethod("loadModule", moduleIdentifierClass).invoke(moduleLoader, moduleIdentifier);
} catch (Exception e) {
//ignore, module not found
return null;
}

if (sm == null)
{
return (ClassLoader) moduleClass.getMethod("getClassLoader").invoke(module);
} else {
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>() {
@Override
public ClassLoader run() throws Exception {
return (ClassLoader) moduleClass.getMethod("getClassLoader").invoke(module);
}
});
} catch (PrivilegedActionException pae) {
throw pae.getException();
}
}
} catch (ClassNotFoundException e) {
//ignore, JBoss Modules might not be available at all
return null;
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
78 changes: 0 additions & 78 deletions jaxrs-api/src/main/java/javax/ws/rs/ext/FactoryFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,11 @@

package javax.ws.rs.ext;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Iterator;
import java.util.Properties;
import java.util.ServiceConfigurationError;
Expand All @@ -44,7 +39,6 @@
final class FactoryFinder {

private static final Logger LOGGER = Logger.getLogger(FactoryFinder.class.getName());
private static final String RESTEASY_JAXRS_API_MODULE = "org.jboss.resteasy.resteasy-jaxrs-api";

private FactoryFinder() {
// prevents instantiation
Expand Down Expand Up @@ -183,83 +177,11 @@ static <T> Object find(final String factoryId, final String fallbackClassName, C
+ " from a system property", se);
}

ClassLoader moduleClassLoader = getModuleClassLoader();
if (moduleClassLoader != null) {
String serviceId = "META-INF/services/" + factoryId;
try (InputStream is = moduleClassLoader.getResourceAsStream(serviceId)) {
if( is!=null ) {
try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {

String factoryClassName = rd.readLine();

if (factoryClassName != null &&
! "".equals(factoryClassName)) {
return newInstance(factoryClassName, moduleClassLoader);
}
}
}
} catch( Exception ex ) {
}
}

if (fallbackClassName == null) {
throw new ClassNotFoundException(
"Provider for " + factoryId + " cannot be found", null);
}

return newInstance(fallbackClassName, classLoader);
}

private static ClassLoader getModuleClassLoader() {
try {
final Class<?> moduleClass = Class.forName("org.jboss.modules.Module");
final Class<?> moduleIdentifierClass = Class.forName("org.jboss.modules.ModuleIdentifier");
final Class<?> moduleLoaderClass = Class.forName("org.jboss.modules.ModuleLoader");
final Object moduleLoader;
final SecurityManager sm = System.getSecurityManager();
if (sm == null) {
moduleLoader = moduleClass.getMethod("getBootModuleLoader").invoke(null);
} else {
try {
moduleLoader = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws Exception {
return moduleClass.getMethod("getBootModuleLoader").invoke(null);
}
});
} catch (PrivilegedActionException pae) {
throw pae.getException();
}
}

Object module;
try {
Object moduleIdentifier = moduleIdentifierClass.getMethod("create", String.class).invoke(null, RESTEASY_JAXRS_API_MODULE);
module = moduleLoaderClass.getMethod("loadModule", moduleIdentifierClass).invoke(moduleLoader, moduleIdentifier);
} catch (Exception e) {
//ignore, module not found
return null;
}

if (sm == null) {
return (ClassLoader)moduleClass.getMethod("getClassLoader").invoke(module);
}
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>() {
@Override
public ClassLoader run() throws Exception {
return (ClassLoader) moduleClass.getMethod("getClassLoader").invoke(module);
}
});
} catch (PrivilegedActionException pae) {
throw pae.getException();
}
} catch (ClassNotFoundException e) {
//ignore, JBoss Modules might not be available at all
return null;
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}

0 comments on commit 76c0dbe

Please sign in to comment.