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

MP-CP 1.1 #228

Merged
merged 3 commits into from
Nov 2, 2020
Merged

MP-CP 1.1 #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9668605
Reset to the system CL in Application ThreadContext instead of null
FroMage Oct 27, 2020
44f25e8
Bump to MP-CP 1.1, whose TCK requires application context
FroMage Oct 27, 2020
5f39e38
New SR-Config
FroMage Oct 27, 2020
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
26 changes: 25 additions & 1 deletion .../java/io/smallrye/context/application/context/propagation/ApplicationContextProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.smallrye.context.application.context.propagation;

import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Map;

import org.eclipse.microprofile.context.ThreadContext;
Expand All @@ -8,6 +10,28 @@

public class ApplicationContextProvider implements ThreadContextProvider {

static final ClassLoader SYSTEM_CL;

static {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
SYSTEM_CL = AccessController
.doPrivileged((PrivilegedAction<ClassLoader>) ApplicationContextProvider::calculateSystemClassLoader);
manovotn marked this conversation as resolved.
Show resolved Hide resolved
} else {
SYSTEM_CL = calculateSystemClassLoader();
}
}

private static ClassLoader calculateSystemClassLoader() {
ClassLoader cl = ClassLoader.getSystemClassLoader();
if (cl == null) {
// non-null ref that delegates to the system
cl = new ClassLoader(null) {
};
}
return cl;
}

@Override
public ThreadContextSnapshot currentContext(Map<String, String> props) {
ClassLoader capturedTCCL = Thread.currentThread().getContextClassLoader();
Expand All @@ -24,7 +48,7 @@ public ThreadContextSnapshot currentContext(Map<String, String> props) {

@Override
public ThreadContextSnapshot clearedContext(Map<String, String> props) {
ClassLoader capturedTCCL = null;
ClassLoader capturedTCCL = SYSTEM_CL;
return () -> {
ClassLoader movedTCCL = Thread.currentThread().getContextClassLoader();
if (capturedTCCL != movedTCCL)
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,17 @@
</scm>

<properties>
<version.microprofile.context-propagation>1.0.2</version.microprofile.context-propagation>
<version.microprofile.context-propagation>1.1</version.microprofile.context-propagation>
<version.microprofile.config>1.4</version.microprofile.config>
<version.smallrye.config>1.7.0</version.smallrye.config>
<version.smallrye.config>1.9.2</version.smallrye.config>
<version.jboss.threads>3.1.1.Final</version.jboss.threads>
<version.jta>1.3</version.jta>
<version.narayana>5.10.4.Final</version.narayana>
<version.rxjava2>2.2.19</version.rxjava2>
<version.rxjava1>1.3.8</version.rxjava1>

<!-- Testing versions -->
<version.smallrye.common>1.4.1</version.smallrye.common>
<version.jnpserver>5.0.5.Final</version.jnpserver>
<version.resteasy>4.5.3.Final</version.resteasy>
<version.hibernate>5.4.15.Final</version.hibernate>
Expand Down
7 changes: 7 additions & 0 deletions tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>smallrye-context-propagation-application</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
6 changes: 6 additions & 0 deletions tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.smallrye.common</groupId>
<artifactId>smallrye-common-function</artifactId>
<version>${version.smallrye.common}</version>
</dependency>

<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions tests/src/test/java/io/smallrye/context/test/classloading/MultiClassloadingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Map;
import java.util.function.BiConsumer;

import javax.annotation.Priority;
import javax.enterprise.util.AnnotationLiteral;

import org.eclipse.microprofile.config.ConfigProvider;
Expand All @@ -38,6 +39,7 @@
import org.junit.Assert;
import org.junit.Test;

import io.smallrye.common.function.Functions;
import io.smallrye.config.SmallRyeConfig;
import io.smallrye.config.SmallRyeConfigProviderResolver;
import io.smallrye.context.SmallRyeContextManagerProvider;
Expand Down Expand Up @@ -118,7 +120,10 @@ public void test() throws InstantiationException, IllegalAccessException, ClassN
.addPackages(true, ConfigProvider.class.getPackage().getName())
.addPackages(true, SmallRyeConfig.class.getPackage().getName())
.addPackages(true, Logger.class.getPackage().getName())
.addPackages(true, Functions.class.getPackage().getName())
.addPackage(AnnotationLiteral.class.getPackage().getName())
.addPackage(Priority.class.getPackage().getName())
.addPackage(io.smallrye.common.constraint.Assert.class.getPackage().getName())
// dont use addPackages for Smallrye-Context because it
// would include test packages
.addPackage(SmallRyeContextManagerProvider.class.getPackage().getName())
Expand Down