Skip to content

Commit 8b74088

Browse files
committed
Rename ContinuableClassLoader -> ResourceTransformingClassLoader; preparing release
1 parent 8d0c912 commit 8b74088

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate.javaflow/net.tascalate.javaflow.parent.svg)](https://search.maven.org/artifact/net.tascalate.javaflow/net.tascalate.javaflow.parent/2.7.0/pom) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-javaflow.svg)](https://github.com/vsilaev/tascalate-javaflow/releases/tag/2.7.0) [![license](https://img.shields.io/github/license/vsilaev/tascalate-javaflow.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
22

3+
# IMPORTANT NOTICE FOR RELEASE 2.7.0!!!
4+
- Agents & Tools projects were refactored to follow consisntent naming of classes and to avoid package name clashes
5+
- Separate provider was extracted from `CdiProxy` to allow reuse in mutliple scenarious (not only in Java Agent)
6+
- `net.tascalate.javaflow.provider.asm[VERSION]` artifacts are deprecated now and scheduled for removal in next release
7+
38
# IMPORTANT NOTICE FOR RELEASE 2.5.0!!!
4-
Java 9+ is fully supported now, all artefacts are modular multi-release JAR-s that works correctly with Java versions 1.6 to 17. The library code was tested with JDK 17, and all features of the Java 17 bytecode (including nest of inner classes) works correctly.
9+
Java 9+ is fully supported now, all artefacts are modular multi-release JAR-s that works correctly with Java versions 1.6 to 17. The library code was tested with JDK 17, and all features of the Java 17 bytecode (including nest of inner classes, sealed classes, records) works correctly.
510

611
# IMPORTANT NOTICE FOR RELEASE 2.3.0!!!
712
- `net.tascalate.javaflow.extras` artifact is withdrawn, its code serves as a basis for the project [Tascalate JavaFlow Util](https://github.com/vsilaev/tascalate-javaflow-util)

net.tascalate.javaflow.tools.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ApplicationWeaver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
142142
}
143143
}
144144

145-
if ((originalLoader instanceof ContinuableClassLoader) &&
145+
if ((originalLoader instanceof ResourceTransformingClassLoader) &&
146146
isProcessed(originalClass)) {
147147
// Correct loader and annotations applied
148148
return false;
@@ -154,7 +154,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
154154
}
155155

156156
try {
157-
ContinuableClassLoader.Builder builder = new ContinuableClassLoader.Builder(factory);
157+
ResourceTransformingClassLoader.Builder builder = new ResourceTransformingClassLoader.Builder(factory);
158158
if (null == continuablePackageRoots || continuablePackageRoots.isEmpty()) {
159159
builder.parentFirst(false);
160160
} else {
@@ -166,7 +166,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
166166
builder.addLoaderPackageRoot(s);
167167
}
168168
}
169-
ContinuableClassLoader loader = builder.parent(originalLoader).create();
169+
ResourceTransformingClassLoader loader = builder.parent(originalLoader).create();
170170

171171
CURRENT_INITIATOR.set(loader);
172172
try {
@@ -184,7 +184,7 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
184184
return true;
185185
}
186186

187-
private static void run(ContinuableClassLoader classLoader, String className, String method, String... args) throws Exception {
187+
private static void run(ResourceTransformingClassLoader classLoader, String className, String method, String... args) throws Exception {
188188
Class<?> mainClass = classLoader.forceLoadClass(className);
189189
if (!isProcessed(mainClass)) {
190190
throw new IllegalStateException("Class " + className + " has no continuable methods");
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
* the continuation-enabled portion of your application into a separate jar
5858
* file.
5959
*/
60-
public class ContinuableClassLoader extends ClassLoader {
60+
public class ResourceTransformingClassLoader extends ClassLoader {
6161

62-
private final static Logger log = LoggerFactory.getLogger(ContinuableClassLoader.class);
62+
private final static Logger log = LoggerFactory.getLogger(ResourceTransformingClassLoader.class);
6363

64-
public static abstract class AbstractBuilder<L extends ContinuableClassLoader, B extends AbstractBuilder<L, B>> {
64+
public static abstract class AbstractBuilder<L extends ResourceTransformingClassLoader, B extends AbstractBuilder<L, B>> {
6565
protected final ResourceTransformationFactory transformationFactory;
6666

6767
protected ClassLoader parent;
@@ -173,7 +173,7 @@ final private B self() {
173173
}
174174
}
175175

176-
public static class Builder extends AbstractBuilder<ContinuableClassLoader, Builder> {
176+
public static class Builder extends AbstractBuilder<ResourceTransformingClassLoader, Builder> {
177177
/**
178178
* Creates a classloader builder.
179179
*
@@ -187,8 +187,8 @@ public Builder(ResourceTransformationFactory transformationFactory) {
187187
}
188188

189189
@Override
190-
public ContinuableClassLoader create() {
191-
return new ContinuableClassLoader(
190+
public ResourceTransformingClassLoader create() {
191+
return new ResourceTransformingClassLoader(
192192
parent, transformationFactory,
193193
parentFirst, isolated, systemPackages, loaderPackages
194194
);
@@ -240,7 +240,7 @@ public ContinuableClassLoader create() {
240240
* This factory is used to create necessary resolver/transformer
241241
* to perform the byte-code enhancement. May not be null.
242242
*/
243-
public ContinuableClassLoader(ClassLoader parent, ResourceTransformationFactory transformationFactory) {
243+
public ResourceTransformingClassLoader(ClassLoader parent, ResourceTransformationFactory transformationFactory) {
244244
this(parent, transformationFactory, true, false, null, null);
245245
}
246246

@@ -270,7 +270,7 @@ public ContinuableClassLoader(ClassLoader parent, ResourceTransformationFactory
270270
* regardless of whether the parent class loader is being
271271
* searched first or not.
272272
*/
273-
public ContinuableClassLoader(ClassLoader parent,
273+
public ResourceTransformingClassLoader(ClassLoader parent,
274274
ResourceTransformationFactory transformationFactory,
275275
boolean parentFirst,
276276
boolean isolated,
@@ -602,7 +602,7 @@ private Object safeGetClassLoadingLock(String name) {
602602
private static Method getClassLoaderMethodOrNull(String name, Class<?>... args) {
603603
try {
604604
//Method method = ClassLoader.class.getDeclaredMethod(name, args);
605-
return ContinuableClassLoader.class.getMethod(name, args);
605+
return ResourceTransformingClassLoader.class.getMethod(name, args);
606606
} catch (NoSuchMethodException ex) {
607607
// OK, JDK version is less then 1.7
608608
return null;
@@ -663,7 +663,7 @@ private static boolean findInPackages(String resourceName, Collection<String> su
663663

664664
private static Collection<String> OWN_PACKAGES = Collections.unmodifiableSet(
665665
InstrumentationUtils.packagePrefixesOf(
666-
ContinuableClassLoader.class,
666+
ResourceTransformingClassLoader.class,
667667
ResourceTransformer.class,
668668
Logger.class
669669
)

0 commit comments

Comments
 (0)