Skip to content

Commit 87fa47a

Browse files
vsilaevvsilaev
committed
Refactor Proxies agent (extract functionality in separate reusable artifact); update copyright years
1 parent 6cbc02a commit 87fa47a

File tree

129 files changed

+3230
-185
lines changed

Some content is hidden

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

129 files changed

+3230
-185
lines changed

‎net.tascalate.javaflow.agent.core/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<classpath>
33
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
44
<attributes>
5+
<attribute name="test" value="true"/>
56
<attribute name="optional" value="true"/>
67
<attribute name="maven.pomderived" value="true"/>
7-
<attribute name="test" value="true"/>
88
</attributes>
99
</classpathentry>
1010
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
1111
<attributes>
12-
<attribute name="maven.pomderived" value="true"/>
1312
<attribute name="test" value="true"/>
13+
<attribute name="maven.pomderived" value="true"/>
1414
</attributes>
1515
</classpathentry>
1616
<classpathentry excluding="module-info.java" kind="src" output="target/classes" path="src/main/java">

‎net.tascalate.javaflow.agent.core/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
24
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
36
org.eclipse.jdt.core.compiler.compliance=1.6
7+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
411
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
12+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
513
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
6-
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
715
org.eclipse.jdt.core.compiler.release=disabled
816
org.eclipse.jdt.core.compiler.source=1.6

‎net.tascalate.javaflow.agent.core/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>net.tascalate.javaflow</groupId>
38-
<artifactId>net.tascalate.javaflow.providers.asmx</artifactId>
38+
<artifactId>net.tascalate.javaflow.agent.common</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>net.tascalate.javaflow</groupId>
43-
<artifactId>net.tascalate.javaflow.agent.common</artifactId>
43+
<artifactId>net.tascalate.javaflow.providers.core</artifactId>
4444
<version>${project.version}</version>
45-
</dependency>
45+
</dependency>
4646
<dependency>
4747
<groupId>junit</groupId>
4848
<artifactId>junit</artifactId>

‎net.tascalate.javaflow.agent.core/src/main/java/module-info.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@
1616
module net.tascalate.javaflow.agent.core {
1717
requires transitive java.instrument;
1818

19-
requires org.slf4j;
20-
2119
requires net.tascalate.instrument.agent;
22-
23-
requires net.tascalate.javaflow.spi;
24-
requires net.tascalate.javaflow.providers.asmx;
2520

26-
requires transitive net.tascalate.javaflow.agent.common;
27-
28-
exports org.apache.commons.javaflow.agent.core;
21+
requires net.tascalate.javaflow.agent.common;
22+
requires net.tascalate.javaflow.providers.core;
23+
24+
exports org.apache.commons.javaflow.agent.core;
2925
}

‎net.tascalate.javaflow.agent.core/src/main/java/org/apache/commons/javaflow/agent/core/ContinuableClassBytecodeTransformer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package org.apache.commons.javaflow.agent.core;
1717

1818
import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;
19-
import org.apache.commons.javaflow.providers.asmx.AsmxResourceTransformationFactory;
19+
import org.apache.commons.javaflow.providers.core.ContinuableClassTransformationFactory;
2020

2121
class ContinuableClassBytecodeTransformer extends ConfigurableClassFileTransformer {
2222
public ContinuableClassBytecodeTransformer() {
23-
super(new AsmxResourceTransformationFactory());
23+
super(new ContinuableClassTransformationFactory());
2424
}
2525
}

‎net.tascalate.javaflow.agent.proxy/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
14-
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1515
org.eclipse.jdt.core.compiler.release=disabled
1616
org.eclipse.jdt.core.compiler.source=1.6

‎net.tascalate.javaflow.agent.proxy/pom.xml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,25 @@
1919
</properties>
2020

2121
<dependencies>
22-
<dependency>
23-
<groupId>org.slf4j</groupId>
24-
<artifactId>slf4j-api</artifactId>
25-
</dependency>
2622
<dependency>
2723
<groupId>org.slf4j</groupId>
2824
<artifactId>slf4j-simple</artifactId>
2925
<scope>runtime</scope>
3026
<optional>true</optional>
3127
</dependency>
32-
<dependency>
33-
<groupId>net.tascalate</groupId>
34-
<artifactId>net.tascalate.asmx.plus</artifactId>
35-
<version>${tascalate.asmx.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>net.tascalate</groupId>
39-
<artifactId>net.tascalate.asmx.commons</artifactId>
40-
<version>${tascalate.asmx.version}</version>
41-
</dependency>
4228
<dependency>
4329
<groupId>net.tascalate.instrument</groupId>
4430
<artifactId>net.tascalate.instrument.agent</artifactId>
4531
<version>${tascalate.instrument.version}</version>
4632
</dependency>
4733
<dependency>
4834
<groupId>net.tascalate.javaflow</groupId>
49-
<artifactId>net.tascalate.javaflow.providers.asmx</artifactId>
35+
<artifactId>net.tascalate.javaflow.agent.common</artifactId>
5036
<version>${project.version}</version>
5137
</dependency>
5238
<dependency>
5339
<groupId>net.tascalate.javaflow</groupId>
54-
<artifactId>net.tascalate.javaflow.agent.common</artifactId>
40+
<artifactId>net.tascalate.javaflow.providers.proxy</artifactId>
5541
<version>${project.version}</version>
5642
</dependency>
5743
<dependency>

‎net.tascalate.javaflow.agent.proxy/src/main/java/module-info.java‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,10 @@
1616
module net.tascalate.javaflow.agent.proxy {
1717
requires transitive java.instrument;
1818

19-
requires org.slf4j;
20-
21-
requires net.tascalate.asmx;
22-
requires net.tascalate.asmx.commons;
23-
requires net.tascalate.asmx.plus;
24-
requires net.tascalate.asmx.tree;
25-
requires net.tascalate.asmx.tree.analysis;
26-
2719
requires net.tascalate.instrument.agent;
28-
29-
requires transitive net.tascalate.javaflow.spi;
30-
requires transitive net.tascalate.javaflow.providers.asmx;
3120

32-
requires transitive net.tascalate.javaflow.agent.common;
33-
21+
requires net.tascalate.javaflow.agent.common;
22+
requires net.tascalate.javaflow.providers.proxy;
23+
3424
exports org.apache.commons.javaflow.agent.proxy;
3525
}

‎net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyBytecodeTransformer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.apache.commons.javaflow.agent.proxy;
1717

1818
import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;
19+
import org.apache.commons.javaflow.providers.proxy.ContinuableProxyTransformationFactory;
1920

2021
class ContinuableProxyBytecodeTransformer extends ConfigurableClassFileTransformer {
2122

‎net.tascalate.javaflow.api/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)