Skip to content

Commit 82014e3

Browse files
raphwraphw
committed
Small cleanups.
1 parent 9495532 commit 82014e3

8 files changed

Lines changed: 26 additions & 16 deletions

File tree

‎byte-buddy-gradle-plugin/android-plugin-test/.gitignore‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/service/TargetServiceImplementation.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
public class TargetServiceImplementation implements ServiceDefinition {
2121

22-
@Override
2322
public String getValue() {
2423
return "Target service impl";
2524
}

‎byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@
1616
public class ByteBuddyInstrumentedTest {
1717

1818
@Test
19-
public void bytecodeInstrumentation() {
19+
public void testBytecodeInstrumentation() {
2020
assertEquals("instrumented local class from jar plugin", new SomeClass().method());
2121
assertEquals("instrumented local class from aar plugin", new AnotherClass().method());
2222
assertEquals("instrumented aar lib's class from jar plugin", new SomeAarClass().method());
2323
}
2424

2525
@Test
26-
public void verifySPIsAreNotMissing() {
26+
public void testVerifySPIsAreNotMissing() {
2727
List<String> values = new ArrayList<>();
2828
for (ServiceDefinition serviceDefinition : ServiceLoader.load(ServiceDefinition.class)) {
2929
values.add(serviceDefinition.getValue());
3030
}
31-
3231
assertEquals(3, values.size());
3332
assertTrue(values.contains("Target service impl"));
3433
assertTrue(values.contains("Service implementation"));

‎byte-buddy-gradle-plugin/android-plugin-test/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ buildscript {
99
}
1010
dependencies {
1111
classpath group: 'com.android.tools.build', name: 'gradle', version: '7.4.0'
12-
1312
def byteBuddyPlugin = new File("${rootDir}/../build/libs/byte-buddy-gradle-plugin-${byteBuddyVersion}.jar").canonicalFile
1413
def byteBuddyLib = new File("$rootDir/../../byte-buddy/target/byte-buddy-${byteBuddyVersion}.jar").canonicalFile
1514
classpath files(byteBuddyPlugin)

‎byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLibClass.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,26 @@
2727
* A sample plugin for instrumenting a jar file.
2828
*/
2929
public class PluginForLibClass implements Plugin {
30+
31+
/**
32+
* The Android descriptor.
33+
*/
3034
private final AndroidDescriptor androidDescriptor;
3135

36+
/**
37+
* Creates a new plugin.
38+
*
39+
* @param androidDescriptor The Android descriptor.
40+
*/
3241
public PluginForLibClass(AndroidDescriptor androidDescriptor) {
3342
this.androidDescriptor = androidDescriptor;
3443
}
3544

3645
/**
3746
* {@inheritDoc}
3847
*/
39-
public boolean matches(TypeDescription typeDefinitions) {
40-
return typeDefinitions.getSimpleName().contains("Some") && androidDescriptor.getTypeScope(typeDefinitions).equals(AndroidDescriptor.TypeScope.EXTERNAL);
48+
public boolean matches(TypeDescription typeDescription) {
49+
return typeDescription.getSimpleName().contains("Some") && androidDescriptor.getTypeScope(typeDescription).equals(AndroidDescriptor.TypeScope.EXTERNAL);
4150
}
4251

4352
/**

‎byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLocalClass.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,26 @@
2727
* A sample plugin for instrumenting a jar file.
2828
*/
2929
public class PluginForLocalClass implements Plugin {
30+
31+
/**
32+
* The Android descriptor.
33+
*/
3034
private final AndroidDescriptor androidDescriptor;
3135

36+
/**
37+
* Creates a new plugin.
38+
*
39+
* @param androidDescriptor The Android descriptor.
40+
*/
3241
public PluginForLocalClass(AndroidDescriptor androidDescriptor) {
3342
this.androidDescriptor = androidDescriptor;
3443
}
3544

3645
/**
3746
* {@inheritDoc}
3847
*/
39-
public boolean matches(TypeDescription typeDefinitions) {
40-
return typeDefinitions.getSimpleName().contains("Some") && androidDescriptor.getTypeScope(typeDefinitions).equals(AndroidDescriptor.TypeScope.LOCAL);
48+
public boolean matches(TypeDescription typeDescription) {
49+
return typeDescription.getSimpleName().contains("Some") && androidDescriptor.getTypeScope(typeDescription).equals(AndroidDescriptor.TypeScope.LOCAL);
4150
}
4251

4352
/**

‎byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/java/com/service/usage/ServiceImplementation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.service.definition.ServiceDefinition;
1919

2020
public class ServiceImplementation implements ServiceDefinition {
21-
@Override
21+
2222
public String getValue() {
2323
return "Service implementation";
2424
}

‎byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/java/com/service/usage2/ServiceImplementation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.service.definition.ServiceDefinition;
1919

2020
public class ServiceImplementation implements ServiceDefinition {
21-
@Override
21+
2222
public String getValue() {
2323
return "Service implementation2";
2424
}

0 commit comments

Comments
 (0)