Skip to content

Simplify SimpleRelocator new instances #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 2 commits into from
Nov 26, 2024
Merged

Simplify SimpleRelocator new instances #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30de466
Simplify SimpleRelocator new instances
Goooler Nov 26, 2024
89c7781
More
Goooler Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorParameterTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class SimpleRelocatorParameterTest {

private static void constructThenFailOnNullPointerException(String pattern, String shadedPattern) {
try {
new SimpleRelocator(pattern, shadedPattern, Collections.<String> emptyList(), Collections.<String> emptyList())
new SimpleRelocator(pattern, shadedPattern)
}
catch (NullPointerException ignored) {
fail("Constructor should not throw null pointer exceptions")
Expand Down
28 changes: 14 additions & 14 deletions ...t/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class SimpleRelocatorTest {
void testCanRelocatePath() {
SimpleRelocator relocator

relocator = new SimpleRelocator("org.foo", null, null, null)
relocator = new SimpleRelocator("org.foo", null)
assertEquals(true, relocator.canRelocatePath("org/foo/Class"))
assertEquals(true, relocator.canRelocatePath("org/foo/Class.class"))
assertEquals(true, relocator.canRelocatePath("org/foo/bar/Class"))
Expand All @@ -63,8 +63,8 @@ class SimpleRelocatorTest {
assertEquals(false, relocator.canRelocatePath("/org/Foo/Class"))
assertEquals(false, relocator.canRelocatePath("/org/Foo/Class.class"))

relocator = new SimpleRelocator("org.foo", null, null, Arrays.asList(
["org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"] as String[]))
relocator = new SimpleRelocator("org.foo", null, null,
List.of("org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"))
assertEquals(true, relocator.canRelocatePath("org/foo/Class"))
assertEquals(true, relocator.canRelocatePath("org/foo/Class.class"))
assertEquals(true, relocator.canRelocatePath("org/foo/excluded"))
Expand All @@ -90,7 +90,7 @@ class SimpleRelocatorTest {
assertEquals(false, relocator.canRelocatePath("org/foo/recurse/sub/Class.class"))

// Verify edge cases
relocator = new SimpleRelocator("org.f", null, null, null)
relocator = new SimpleRelocator("org.f", null)
assertEquals(false, relocator.canRelocatePath("")) // Empty path
assertEquals(false, relocator.canRelocatePath(".class")) // only .class
assertEquals(false, relocator.canRelocatePath("te")) // shorter than path pattern
Expand All @@ -115,7 +115,7 @@ class SimpleRelocatorTest {
assertEquals(false, relocator.canRelocatePath("org/R\$string.class"))

// Exclude with Regex
relocator = new SimpleRelocator("org.foo", null, null, null)
relocator = new SimpleRelocator("org.foo", null)
relocator.exclude("%regex[org/foo/.*Factory[0-9].*]")
assertEquals(true, relocator.canRelocatePath("org/foo/Factory.class"))
assertEquals(true, relocator.canRelocatePath("org/foo/FooFactoryMain.class"))
Expand All @@ -126,7 +126,7 @@ class SimpleRelocatorTest {

// Include with Regex and normal pattern
relocator = new SimpleRelocator("org.foo", null,
Arrays.asList("%regex[org/foo/.*Factory[0-9].*]", "org.foo.public.*"), null)
List.of("%regex[org/foo/.*Factory[0-9].*]", "org.foo.public.*"))
assertEquals(true, relocator.canRelocatePath("org/foo/Factory1.class"))
assertEquals(true, relocator.canRelocatePath("org/foo/public/Bar.class"))
assertEquals(false, relocator.canRelocatePath("org/foo/Factory.class"))
Expand All @@ -137,14 +137,14 @@ class SimpleRelocatorTest {
void testCanRelocateClass() {
SimpleRelocator relocator

relocator = new SimpleRelocator("org.foo", null, null, null)
relocator = new SimpleRelocator("org.foo", null)
assertEquals(true, relocator.canRelocateClass("org.foo.Class"))
assertEquals(true, relocator.canRelocateClass("org.foo.bar.Class"))
assertEquals(false, relocator.canRelocateClass("com.foo.bar.Class"))
assertEquals(false, relocator.canRelocateClass("org.Foo.Class"))

relocator = new SimpleRelocator("org.foo", null, null, Arrays.asList(
["org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"] as String[]))
relocator = new SimpleRelocator("org.foo", null, null,
List.of("org.foo.Excluded", "org.foo.public.*", "org.foo.recurse.**", "org.foo.Public*Stuff"))
assertEquals(true, relocator.canRelocateClass("org.foo.Class"))
assertEquals(true, relocator.canRelocateClass("org.foo.excluded"))
assertEquals(false, relocator.canRelocateClass("org.foo.Excluded"))
Expand Down Expand Up @@ -176,7 +176,7 @@ class SimpleRelocatorTest {
//MSHADE-119, make sure that the easy part of this works.
@Test
void testCanRelocateAbsClassPath() {
SimpleRelocator relocator = new SimpleRelocator("org.apache.velocity", "org.apache.momentum", null, null)
SimpleRelocator relocator = new SimpleRelocator("org.apache.velocity", "org.apache.momentum")
assertEquals("/org/apache/momentum/mass.properties", relocator.relocatePath(pathContext("/org/apache/velocity/mass.properties")))

}
Expand All @@ -185,21 +185,21 @@ class SimpleRelocatorTest {
void testRelocatePath() {
SimpleRelocator relocator

relocator = new SimpleRelocator("org.foo", null, null, null)
relocator = new SimpleRelocator("org.foo", null)
assertEquals("hidden/org/foo/bar/Class.class", relocator.relocatePath(pathContext("org/foo/bar/Class.class")))

relocator = new SimpleRelocator("org.foo", "private.stuff", null, null)
relocator = new SimpleRelocator("org.foo", "private.stuff")
assertEquals("private/stuff/bar/Class.class", relocator.relocatePath(pathContext("org/foo/bar/Class.class")))
}

@Test
void testRelocateClass() {
SimpleRelocator relocator

relocator = new SimpleRelocator("org.foo", null, null, null)
relocator = new SimpleRelocator("org.foo", null)
assertEquals("hidden.org.foo.bar.Class", relocator.relocateClass(classContext("org.foo.bar.Class")))

relocator = new SimpleRelocator("org.foo", "private.stuff", null, null)
relocator = new SimpleRelocator("org.foo", "private.stuff")
assertEquals("private.stuff.bar.Class", relocator.relocateClass(classContext("org.foo.bar.Class")))
}

Expand Down
4 changes: 2 additions & 2 deletions ...jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformerSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Log4j2PluginsCacheFileTransformerSpec extends Specification {
void "should transform"() {
given:
List<Relocator> relocators = new ArrayList<>()
relocators.add(new SimpleRelocator(null, null, null, null))
relocators.add(new SimpleRelocator(null, null))

when:
transformer.transform(new TransformerContext(PLUGIN_CACHE_FILE, getResourceStream(PLUGIN_CACHE_FILE), relocators))
Expand All @@ -49,7 +49,7 @@ class Log4j2PluginsCacheFileTransformerSpec extends Specification {
String pattern = "org.apache.logging"
String destination = "new.location.org.apache.logging"

List<Relocator> relocators = singletonList((Relocator) new SimpleRelocator(pattern, destination, null, null))
List<Relocator> relocators = singletonList((Relocator) new SimpleRelocator(pattern, destination))

when:
transformer.transform(new TransformerContext(PLUGIN_CACHE_FILE, getResourceStream(PLUGIN_CACHE_FILE), relocators, new ShadowStats()))
Expand Down