Skip to content

Commit a95c009

Browse files
committed
Rework CDI Java agent to use ResourceTransformer; extract shared Java Agent code; Move ContinuableClassInfo / ContinuableClassInfoResolver to provider-specific artefacts (remove from SPI); fix RewritingUtils to keep hard-reference on URLClassloader.
1 parent 5d4c1c4 commit a95c009

File tree

66 files changed

+825
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+825
-432
lines changed

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/Asm3ResourceTransformationFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.commons.javaflow.spi.Cache;
2121
import org.apache.commons.javaflow.spi.ClassMatcher;
2222
import org.apache.commons.javaflow.spi.ClassMatchers;
23-
import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
2423
import org.apache.commons.javaflow.spi.ResourceLoader;
2524
import org.apache.commons.javaflow.spi.ResourceTransformationFactory;
2625
import org.apache.commons.javaflow.spi.ResourceTransformer;

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/ContinuableClassInfo.java renamed to net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.apache.commons.javaflow.spi;
16+
package org.apache.commons.javaflow.providers.asm3;
1717

1818
public interface ContinuableClassInfo {
1919
boolean isContinuableMethod(int access, String name, String desc, String signature);

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/ContinuableClassInfoResolver.java renamed to net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassInfoResolver.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.apache.commons.javaflow.spi;
16+
package org.apache.commons.javaflow.providers.asm3;
1717

1818
import java.io.IOException;
19+
import java.util.Collection;
1920

2021
public interface ContinuableClassInfoResolver {
2122
ContinuableClassInfo resolve(String className) throws IOException;
@@ -24,5 +25,7 @@ public interface ContinuableClassInfoResolver {
2425

2526
boolean isContinuableAnnotation(String annotationClassDescriptor);
2627

28+
void reset(Collection<String> classNames);
29+
2730
void release();
2831
}

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodNode.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
import org.objectweb.asm.tree.analysis.SourceInterpreter;
5050
import org.objectweb.asm.tree.analysis.SourceValue;
5151

52-
import org.apache.commons.javaflow.spi.ContinuableClassInfo;
53-
import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
54-
5552
class ContinuableMethodNode extends MethodNode implements Opcodes {
5653
private final ClassHierarchy classHierarchy;
5754
private final ContinuableClassInfoResolver cciResolver;

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/IContinuableClassInfo.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import java.util.Set;
1919

20-
import org.apache.commons.javaflow.spi.ContinuableClassInfo;
21-
2220
class IContinuableClassInfo implements ContinuableClassInfo {
2321
private boolean processed;
2422
private final Set<String> methods;

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/IContinuableClassInfoResolver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.objectweb.asm.Type;
2929

3030
import org.apache.commons.javaflow.spi.ClassMatcher;
31-
import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
3231
import org.apache.commons.javaflow.spi.ResourceLoader;
3332

3433
class IContinuableClassInfoResolver implements ContinuableClassInfoResolver {
@@ -100,7 +99,7 @@ public void release() {
10099
cciShared.mergeWith(visitedClasses, processedAnnotations, continuableAnnotations);
101100
}
102101

103-
void reset(Collection<String> classNames) {
102+
public void reset(Collection<String> classNames) {
104103
visitedClasses.keySet().removeAll(classNames);
105104
refreshClasses.addAll(classNames);
106105
}

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/MaybeContinuableAnnotationVisitor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.apache.commons.javaflow.providers.asm3;
1717

18-
import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
19-
2018
import org.objectweb.asm.AnnotationVisitor;
2119
import org.objectweb.asm.ClassAdapter;
2220
import org.objectweb.asm.Opcodes;

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/MaybeContinuableClassVisitor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import java.util.Map;
2222
import java.util.Set;
2323

24-
import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
25-
2624
import org.objectweb.asm.AnnotationVisitor;
2725
import org.objectweb.asm.ClassAdapter;
2826
import org.objectweb.asm.MethodAdapter;

net.tascalate.javaflow.providers.asm4/src/main/java/org/apache/commons/javaflow/providers/asm4/Asm4ResourceTransformationFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.commons.javaflow.spi.Cache;
2121
import org.apache.commons.javaflow.spi.ClassMatcher;
2222
import org.apache.commons.javaflow.spi.ClassMatchers;
23-
import org.apache.commons.javaflow.spi.ContinuableClassInfoResolver;
2423
import org.apache.commons.javaflow.spi.ResourceLoader;
2524
import org.apache.commons.javaflow.spi.ResourceTransformationFactory;
2625
import org.apache.commons.javaflow.spi.ResourceTransformer;
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.apache.commons.javaflow.providers.asm4;
17+
18+
public interface ContinuableClassInfo {
19+
boolean isContinuableMethod(int access, String name, String desc, String signature);
20+
}

0 commit comments

Comments
 (0)