Skip to content
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

Fixes #4191 - Add ability to disable Herring #4234

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Fixes #4191 - Add ability to disable Herring #4234

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
1bce957
Fixes #4191 - Add ability to disable Herring
mnriem Nov 20, 2024
f49b80d
Merge branch 'current' into issue-4191
mnriem Nov 20, 2024
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
59 changes: 31 additions & 28 deletions extension/herring/src/main/java/cloud/piranha/extension/herring/HerringExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,23 @@ public class HerringExtension implements WebApplicationExtension {
*/
@Override
public void configure(WebApplication webApplication) {
LOGGER.log(DEBUG, "Configuring HerringExtension");
if (System.getProperty(INITIAL_CONTEXT_FACTORY) == null) {
LOGGER.log(DEBUG, "Setting " + INITIAL_CONTEXT_FACTORY + " to " + HerringInitialContextFactory.class.getName());
System.setProperty(INITIAL_CONTEXT_FACTORY, HerringInitialContextFactory.class.getName());
}
if (!System.getProperty(INITIAL_CONTEXT_FACTORY).equals(HerringInitialContextFactory.class.getName())) {
LOGGER.log(WARNING, INITIAL_CONTEXT_FACTORY + " is not set to " + HerringInitialContextFactory.class.getName());
}

Context context = new DefaultInitialContext();

Context proxyContext = (Context) Proxy.newProxyInstance(
Thread.currentThread().getContextClassLoader(),
new Class[] { Context.class },
new InvocationHandler() {
LOGGER.log(DEBUG, "Configuring the HerringExtension");
if (Boolean.parseBoolean(System.getProperty("cloud.piranha.extension.herring.HerringExtension.enabled", "true"))) {

if (System.getProperty(INITIAL_CONTEXT_FACTORY) == null) {
LOGGER.log(DEBUG, "Setting " + INITIAL_CONTEXT_FACTORY + " to " + HerringInitialContextFactory.class.getName());
System.setProperty(INITIAL_CONTEXT_FACTORY, HerringInitialContextFactory.class.getName());
}
if (!System.getProperty(INITIAL_CONTEXT_FACTORY).equals(HerringInitialContextFactory.class.getName())) {
LOGGER.log(WARNING, INITIAL_CONTEXT_FACTORY + " is not set to " + HerringInitialContextFactory.class.getName());
}

Context context = new DefaultInitialContext();

Context proxyContext = (Context) Proxy.newProxyInstance(
Thread.currentThread().getContextClassLoader(),
new Class[]{Context.class},
new InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
try {
Expand All @@ -98,7 +100,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl

if (jndiName.startsWith("java:comp/env/")) {
String classNameWithField = jndiName.substring("java:comp/env/".length());
String[] classNameAndField = classNameWithField.split("/");
String[] classNameAndField = classNameWithField.split("/");
if (classNameAndField.length == 2) {
String className = classNameAndField[0];
String fieldName = classNameAndField[1];
Expand All @@ -118,10 +120,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
String methodName = "set" + new String(chars);

Optional<Method> optionalMethod = Arrays.stream(beanClass.getDeclaredMethods())
.filter(m -> m.getName().equals(methodName))
.filter(m -> m.getParameterCount() == 1)
.filter(m -> m.getAnnotationsByType(Resource.class) != null)
.findFirst(); // ignore overloaded for now
.filter(m -> m.getName().equals(methodName))
.filter(m -> m.getParameterCount() == 1)
.filter(m -> m.getAnnotationsByType(Resource.class) != null)
.findFirst(); // ignore overloaded for now

if (optionalMethod.isPresent()) {
resources = optionalMethod.get().getAnnotationsByType(Resource.class);
Expand All @@ -134,8 +136,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl

String lookup = resourceAnnnotation.lookup();
if (!"".equals(lookup)) {
returnValue = method.invoke(context, new Object[] {lookup});
args = new Object[] {lookup};
returnValue = method.invoke(context, new Object[]{lookup});
args = new Object[]{lookup};
invoked = true;
} else {
throw new IllegalStateException("Cannot find " + type);
Expand All @@ -145,9 +147,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
}
}
} catch (Throwable t) {
if (t instanceof InvocationTargetException invocationException &&
invocationException.getTargetException() instanceof NamingException namingException) {
throw namingException;
if (t instanceof InvocationTargetException invocationException
&& invocationException.getTargetException() instanceof NamingException namingException) {
throw namingException;
}
e.addSuppressed(t);
}
Expand All @@ -160,7 +162,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
// De-referencing can eventually be moved to DefaultInitialContext
if (method.getName().equals("lookup") && returnValue instanceof Reference) {
returnValue = NamingManager.getObjectInstance(
returnValue, new CompositeName(args[0].toString()), null, null);
returnValue, new CompositeName(args[0].toString()), null, null);
}

return returnValue;
Expand All @@ -170,7 +172,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
}
});

HerringInitialContextFactory.setInitialContext(proxyContext);
webApplication.setAttribute(Context.class.getName(), proxyContext);
HerringInitialContextFactory.setInitialContext(proxyContext);
webApplication.setAttribute(Context.class.getName(), proxyContext);
}
}
}
17 changes: 16 additions & 1 deletion extension/herring/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,22 @@

/**
* This module integrates Manorrock Herring into Piranha.
*
*
* <p>
* The following property can be used to influence the workings of this module.
* </p>
* <table>
* <tr>
* <th>Property</th>
* <th>Notes</th>
* </tr>
* <tr>
* <td>cloud.piranha.extension.herring.HerringExtension.enabled</td>
* <td>true to enable (default), false to disable</td>
* </tr>
* <caption>Configurable properties</caption>
* </table>
*
* @author Manfred Riem ([email protected])
*/
module cloud.piranha.extension.herring {
Expand Down
Loading