Skip to content

Commit a3d830e

Browse files
slachiewiczslachiewicz
committed
Reformat code
1 parent 4fb7690 commit a3d830e

29 files changed

+1751
-2018
lines changed

‎plexus-java/pom.xml

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -16,53 +16,6 @@
1616
<maven.compiler.target>1.8</maven.compiler.target>
1717
</properties>
1818

19-
<build>
20-
<pluginManagement>
21-
<plugins>
22-
<plugin>
23-
<groupId>org.apache.maven.plugins</groupId>
24-
<artifactId>maven-surefire-plugin</artifactId>
25-
<version>3.0.0</version>
26-
</plugin>
27-
</plugins>
28-
</pluginManagement>
29-
<plugins>
30-
<plugin>
31-
<groupId>org.eclipse.sisu</groupId>
32-
<artifactId>sisu-maven-plugin</artifactId>
33-
<version>0.3.5</version>
34-
<executions>
35-
<execution>
36-
<id>index-project</id>
37-
<goals>
38-
<goal>main-index</goal>
39-
</goals>
40-
</execution>
41-
</executions>
42-
</plugin>
43-
<!-- Rerun unittests with the multirelease jar, cannot be done with exploded directory of classes -->
44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-failsafe-plugin</artifactId>
47-
<version>3.0.0</version>
48-
<executions>
49-
<execution>
50-
<goals>
51-
<goal>integration-test</goal>
52-
<goal>verify</goal>
53-
</goals>
54-
</execution>
55-
</executions>
56-
<configuration>
57-
<includes>
58-
<include>**/*Test.java</include>
59-
<include>**/*IT.java</include>
60-
</includes>
61-
</configuration>
62-
</plugin>
63-
</plugins>
64-
</build>
65-
6619
<dependencies>
6720
<dependency>
6821
<groupId>org.ow2.asm</groupId>
@@ -82,16 +35,16 @@
8235
</dependency>
8336

8437
<dependency>
85-
<groupId>org.hamcrest</groupId>
86-
<artifactId>hamcrest</artifactId>
87-
<version>2.2</version>
88-
<scope>test</scope>
38+
<groupId>org.hamcrest</groupId>
39+
<artifactId>hamcrest</artifactId>
40+
<version>2.2</version>
41+
<scope>test</scope>
8942
</dependency>
9043
<dependency>
91-
<groupId>org.hamcrest</groupId>
92-
<artifactId>hamcrest-library</artifactId>
93-
<version>2.2</version>
94-
<scope>test</scope>
44+
<groupId>org.hamcrest</groupId>
45+
<artifactId>hamcrest-library</artifactId>
46+
<version>2.2</version>
47+
<scope>test</scope>
9548
</dependency>
9649
<dependency>
9750
<groupId>junit</groupId>
@@ -113,6 +66,53 @@
11366
</dependency>
11467
</dependencies>
11568

69+
<build>
70+
<pluginManagement>
71+
<plugins>
72+
<plugin>
73+
<groupId>org.apache.maven.plugins</groupId>
74+
<artifactId>maven-surefire-plugin</artifactId>
75+
<version>3.0.0</version>
76+
</plugin>
77+
</plugins>
78+
</pluginManagement>
79+
<plugins>
80+
<plugin>
81+
<groupId>org.eclipse.sisu</groupId>
82+
<artifactId>sisu-maven-plugin</artifactId>
83+
<version>0.3.5</version>
84+
<executions>
85+
<execution>
86+
<id>index-project</id>
87+
<goals>
88+
<goal>main-index</goal>
89+
</goals>
90+
</execution>
91+
</executions>
92+
</plugin>
93+
<!-- Rerun unittests with the multirelease jar, cannot be done with exploded directory of classes -->
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-failsafe-plugin</artifactId>
97+
<version>3.0.0</version>
98+
<configuration>
99+
<includes>
100+
<include>**/*Test.java</include>
101+
<include>**/*IT.java</include>
102+
</includes>
103+
</configuration>
104+
<executions>
105+
<execution>
106+
<goals>
107+
<goal>integration-test</goal>
108+
<goal>verify</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
</plugins>
114+
</build>
115+
116116
<profiles>
117117
<profile>
118118
<id>jdk9</id>

‎plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/AbstractBinaryModuleInfoParser.java

Lines changed: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -29,54 +29,41 @@
2929

3030
import org.codehaus.plexus.languages.java.version.JavaVersion;
3131

32-
abstract class AbstractBinaryModuleInfoParser implements ModuleInfoParser
33-
{
32+
abstract class AbstractBinaryModuleInfoParser implements ModuleInfoParser {
3433
@Override
35-
public JavaModuleDescriptor getModuleDescriptor( Path modulePath )
36-
throws IOException
37-
{
38-
return getModuleDescriptor( modulePath, JavaVersion.JAVA_SPECIFICATION_VERSION );
34+
public JavaModuleDescriptor getModuleDescriptor(Path modulePath) throws IOException {
35+
return getModuleDescriptor(modulePath, JavaVersion.JAVA_SPECIFICATION_VERSION);
3936
}
40-
37+
4138
@Override
42-
public JavaModuleDescriptor getModuleDescriptor( Path modulePath, JavaVersion jdkVersion )
43-
throws IOException
44-
{
39+
public JavaModuleDescriptor getModuleDescriptor(Path modulePath, JavaVersion jdkVersion) throws IOException {
4540
JavaModuleDescriptor descriptor;
46-
if ( Files.isDirectory( modulePath ) )
47-
{
48-
try ( InputStream in = Files.newInputStream( modulePath.resolve( "module-info.class" ) ) )
49-
{
50-
descriptor = parse( in );
41+
if (Files.isDirectory(modulePath)) {
42+
try (InputStream in = Files.newInputStream(modulePath.resolve("module-info.class"))) {
43+
descriptor = parse(in);
5144
}
52-
}
53-
else
54-
{
55-
try ( JarFile jarFile = new JarFile( modulePath.toFile() ) )
56-
{
45+
} else {
46+
try (JarFile jarFile = new JarFile(modulePath.toFile())) {
5747
JarEntry moduleInfo;
58-
if ( modulePath.toString().toLowerCase().endsWith( ".jmod" ) )
59-
{
60-
moduleInfo = jarFile.getJarEntry( "classes/module-info.class" );
61-
}
62-
else
63-
{
64-
moduleInfo = jarFile.getJarEntry( "module-info.class" );
48+
if (modulePath.toString().toLowerCase().endsWith(".jmod")) {
49+
moduleInfo = jarFile.getJarEntry("classes/module-info.class");
50+
} else {
51+
moduleInfo = jarFile.getJarEntry("module-info.class");
6552

66-
if ( moduleInfo == null )
67-
{
68-
Manifest manifest = jarFile.getManifest();
53+
if (moduleInfo == null) {
54+
Manifest manifest = jarFile.getManifest();
6955

70-
if ( manifest != null && "true".equalsIgnoreCase( manifest.getMainAttributes().getValue( "Multi-Release" ) ) )
71-
{
72-
int javaVersion = Integer.valueOf( jdkVersion.asMajor().getValue( 1 ) );
73-
74-
for ( int version = javaVersion; version >= 9; version-- )
75-
{
56+
if (manifest != null
57+
&& "true"
58+
.equalsIgnoreCase(
59+
manifest.getMainAttributes().getValue("Multi-Release"))) {
60+
int javaVersion =
61+
Integer.valueOf(jdkVersion.asMajor().getValue(1));
62+
63+
for (int version = javaVersion; version >= 9; version--) {
7664
String resource = "META-INF/versions/" + version + "/module-info.class";
77-
JarEntry entry = jarFile.getJarEntry( resource );
78-
if ( entry != null )
79-
{
65+
JarEntry entry = jarFile.getJarEntry(resource);
66+
if (entry != null) {
8067
moduleInfo = entry;
8168
break;
8269
}
@@ -85,18 +72,15 @@ public JavaModuleDescriptor getModuleDescriptor( Path modulePath, JavaVersion jd
8572
}
8673
}
8774

88-
if ( moduleInfo != null )
89-
{
90-
descriptor = parse( jarFile.getInputStream( moduleInfo ) );
91-
}
92-
else
93-
{
75+
if (moduleInfo != null) {
76+
descriptor = parse(jarFile.getInputStream(moduleInfo));
77+
} else {
9478
descriptor = null;
9579
}
9680
}
9781
}
9882
return descriptor;
9983
}
10084

101-
abstract JavaModuleDescriptor parse( InputStream in ) throws IOException;
85+
abstract JavaModuleDescriptor parse(InputStream in) throws IOException;
10286
}

‎plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/AsmModuleInfoParser.java

Lines changed: 52 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -35,89 +35,73 @@
3535

3636
/**
3737
* Extract information from module with ASM
38-
*
39-
*
38+
*
39+
*
4040
* @author Robert Scholte
4141
* @since 1.0.0
4242
*/
43-
class AsmModuleInfoParser extends AbstractBinaryModuleInfoParser
44-
{
43+
class AsmModuleInfoParser extends AbstractBinaryModuleInfoParser {
4544
@Override
46-
JavaModuleDescriptor parse( InputStream in )
47-
throws IOException
48-
{
45+
JavaModuleDescriptor parse(InputStream in) throws IOException {
4946
final JavaModuleDescriptorWrapper wrapper = new JavaModuleDescriptorWrapper();
5047

51-
ClassReader reader = new ClassReader( in );
52-
reader.accept( new ClassVisitor( Opcodes.ASM9 )
53-
{
54-
@Override
55-
public ModuleVisitor visitModule( String name, int arg1, String arg2 )
56-
{
57-
wrapper.builder = JavaModuleDescriptor.newModule( name );
58-
59-
return new ModuleVisitor( Opcodes.ASM9 )
60-
{
48+
ClassReader reader = new ClassReader(in);
49+
reader.accept(
50+
new ClassVisitor(Opcodes.ASM9) {
6151
@Override
62-
public void visitRequire( String module, int access, String version )
63-
{
64-
if ( ( access & ( Opcodes.ACC_STATIC_PHASE | Opcodes.ACC_TRANSITIVE ) ) != 0 )
65-
{
66-
Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers = new LinkedHashSet<>();
67-
if ( ( access & Opcodes.ACC_STATIC_PHASE ) != 0 )
68-
{
69-
modifiers.add( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC );
52+
public ModuleVisitor visitModule(String name, int arg1, String arg2) {
53+
wrapper.builder = JavaModuleDescriptor.newModule(name);
54+
55+
return new ModuleVisitor(Opcodes.ASM9) {
56+
@Override
57+
public void visitRequire(String module, int access, String version) {
58+
if ((access & (Opcodes.ACC_STATIC_PHASE | Opcodes.ACC_TRANSITIVE)) != 0) {
59+
Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers =
60+
new LinkedHashSet<>();
61+
if ((access & Opcodes.ACC_STATIC_PHASE) != 0) {
62+
modifiers.add(JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC);
63+
}
64+
if ((access & Opcodes.ACC_TRANSITIVE) != 0) {
65+
modifiers.add(JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE);
66+
}
67+
68+
wrapper.builder.requires(modifiers, module);
69+
} else {
70+
wrapper.builder.requires(module);
71+
}
7072
}
71-
if ( ( access & Opcodes.ACC_TRANSITIVE ) != 0 )
72-
{
73-
modifiers.add( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
73+
74+
@Override
75+
public void visitExport(String pn, int ms, String... targets) {
76+
if (targets == null || targets.length == 0) {
77+
wrapper.builder.exports(pn.replace('/', '.'));
78+
} else {
79+
wrapper.builder.exports(
80+
pn.replace('/', '.'), new HashSet<>(Arrays.asList(targets)));
81+
}
7482
}
7583

76-
wrapper.builder.requires( modifiers, module );
77-
}
78-
else
79-
{
80-
wrapper.builder.requires( module );
81-
}
82-
}
84+
@Override
85+
public void visitUse(String service) {
86+
wrapper.builder.uses(service.replace('/', '.'));
87+
}
8388

84-
@Override
85-
public void visitExport( String pn, int ms, String... targets )
86-
{
87-
if ( targets == null || targets.length == 0 )
88-
{
89-
wrapper.builder.exports( pn.replace( '/', '.' ) );
90-
}
91-
else
92-
{
93-
wrapper.builder.exports( pn.replace( '/', '.' ), new HashSet<>( Arrays.asList( targets ) ) );
94-
}
95-
}
96-
97-
@Override
98-
public void visitUse( String service )
99-
{
100-
wrapper.builder.uses( service.replace( '/', '.' ) );
101-
}
102-
103-
@Override
104-
public void visitProvide( String service, String... providers )
105-
{
106-
List<String> renamedProvides = new ArrayList<>( providers.length );
107-
for ( String provider : providers )
108-
{
109-
renamedProvides.add( provider.replace( '/', '.' ) );
110-
}
111-
wrapper.builder.provides( service.replace( '/', '.' ), renamedProvides );
89+
@Override
90+
public void visitProvide(String service, String... providers) {
91+
List<String> renamedProvides = new ArrayList<>(providers.length);
92+
for (String provider : providers) {
93+
renamedProvides.add(provider.replace('/', '.'));
94+
}
95+
wrapper.builder.provides(service.replace('/', '.'), renamedProvides);
96+
}
97+
};
11298
}
113-
};
114-
}
115-
}, 0 );
99+
},
100+
0);
116101
return wrapper.builder.build();
117102
}
118103

119-
private static class JavaModuleDescriptorWrapper
120-
{
104+
private static class JavaModuleDescriptorWrapper {
121105
private JavaModuleDescriptor.Builder builder;
122106
}
123107
}

‎plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParser.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,4 @@
1818
* specific language governing permissions and limitations
1919
* under the License.
2020
*/
21-
class BinaryModuleInfoParser extends AsmModuleInfoParser
22-
{
23-
24-
}
21+
class BinaryModuleInfoParser extends AsmModuleInfoParser {}

0 commit comments

Comments
 (0)