Skip to content

Commit 4013d00

Browse files
committed
Extract reusable classes to Tascalate ASMX project; actualize maven plugins
1 parent 1f16640 commit 4013d00

File tree

36 files changed

+173
-681
lines changed

36 files changed

+173
-681
lines changed

net.tascalate.javaflow.api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>net.tascalate.javaflow</groupId>
66
<artifactId>net.tascalate.javaflow.parent</artifactId>
7-
<version>2.6.4</version>
7+
<version>2.7.0</version>
88
<relativePath>../</relativePath>
99
</parent>
1010

net.tascalate.javaflow.providers.asm3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>net.tascalate.javaflow</groupId>
66
<artifactId>net.tascalate.javaflow.parent</artifactId>
7-
<version>2.6.4</version>
7+
<version>2.7.0</version>
88
<relativePath>../</relativePath>
99
</parent>
1010

net.tascalate.javaflow.providers.asm4/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>net.tascalate.javaflow</groupId>
66
<artifactId>net.tascalate.javaflow.parent</artifactId>
7-
<version>2.6.4</version>
7+
<version>2.7.0</version>
88
<relativePath>../</relativePath>
99
</parent>
1010

net.tascalate.javaflow.providers.asm5/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>net.tascalate.javaflow</groupId>
66
<artifactId>net.tascalate.javaflow.parent</artifactId>
7-
<version>2.6.4</version>
7+
<version>2.7.0</version>
88
<relativePath>../</relativePath>
99
</parent>
1010

net.tascalate.javaflow.providers.asmx/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>net.tascalate.javaflow</groupId>
66
<artifactId>net.tascalate.javaflow.parent</artifactId>
7-
<version>2.6.4</version>
7+
<version>2.7.0</version>
88
<relativePath>../</relativePath>
99
</parent>
1010

@@ -23,6 +23,11 @@
2323
<artifactId>net.tascalate.javaflow.spi</artifactId>
2424
<version>${project.version}</version>
2525
</dependency>
26+
<dependency>
27+
<groupId>net.tascalate</groupId>
28+
<artifactId>net.tascalate.asmx.plus</artifactId>
29+
<version>${asmx.version}</version>
30+
</dependency>
2631
<dependency>
2732
<groupId>net.tascalate</groupId>
2833
<artifactId>net.tascalate.asmx.analysis</artifactId>

net.tascalate.javaflow.providers.asmx/src/main/java/module-info.java

Lines changed: 2 additions & 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.
@@ -15,6 +15,7 @@
1515
*/
1616
module net.tascalate.javaflow.providers.asmx {
1717
requires net.tascalate.asmx;
18+
requires net.tascalate.asmx.plus;
1819
requires net.tascalate.asmx.tree;
1920
requires net.tascalate.asmx.tree.analysis;
2021

net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/AsmVersion.java

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**
2+
* Copyright 2013-2021 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.asmx;
17+
18+
import java.io.IOException;
19+
import java.io.InputStream;
20+
21+
import org.apache.commons.javaflow.spi.ResourceLoader;
22+
23+
class AsmxResourceLoader implements net.tascalate.asmx.plus.ResourceLoader {
24+
25+
final ResourceLoader resourceLoader;
26+
27+
AsmxResourceLoader(ResourceLoader resourceLoader) {
28+
this.resourceLoader = resourceLoader;
29+
}
30+
31+
@Override
32+
public boolean hasResource(String name) {
33+
return resourceLoader.hasResource(name);
34+
}
35+
36+
@Override
37+
public InputStream getResourceAsStream(String name) throws IOException {
38+
return resourceLoader.getResourceAsStream(name);
39+
}
40+
41+
}

net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/AsmxResourceTransformationFactory.java

Lines changed: 4 additions & 2 deletions
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.
@@ -24,9 +24,11 @@ public ResourceTransformer createTransformer(ResourceLoader resourceLoader) {
2424
SharedContinuableClassInfos sharedState = getCached(resourceLoader);
2525
return new ContinuableClassTransformer(
2626
// Actualize ClassHierarchy per resource loader
27-
sharedState.hierarchy().shareWith(resourceLoader),
27+
shareHierarchy(sharedState.hierarchy(), resourceLoader),
2828
new IContinuableClassInfoResolver(resourceLoader, sharedState)
2929
);
3030
}
31+
32+
3133

3234
}

0 commit comments

Comments
 (0)