From 201e74186e973d5836fd04af3085439cf666a302 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 31 Mar 2025 08:06:55 -0400 Subject: [PATCH 1/2] not static --- .../apache/maven/AbstractCoreMavenComponentTestCase.java | 2 +- .../apache/maven/impl/model/DefaultInterpolatorTest.java | 7 +++---- .../org/apache/maven/api/di/testing/MavenDIExtension.java | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index e5808efe9f65..33e155a266a5 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java @@ -216,7 +216,7 @@ protected List getRemoteRepositories() throws InvalidReposit repository.setReleases(policy); repository.setSnapshots(policy); - return Arrays.asList(mavenRepositorySystem.buildArtifactRepository(repository)); + return Arrays.asList(MavenRepositorySystem.buildArtifactRepository(repository)); } protected List getPluginArtifactRepositories() throws InvalidRepositoryException { diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java index 867bd7decfe5..2995900e152a 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java @@ -215,15 +215,14 @@ private String substVars( Map configProps, UnaryOperator callback, boolean defaultsToEmptyString) { - return new DefaultInterpolator() - .substVars(val, currentKey, null, configProps, callback, null, defaultsToEmptyString); + return DefaultInterpolator.substVars(val, currentKey, null, configProps, callback, null, defaultsToEmptyString); } private String substVars(String val, String currentKey) { - return new DefaultInterpolator().substVars(val, currentKey, null, null, null, null, true); + return DefaultInterpolator.substVars(val, currentKey, null, null, null, null, true); } private String substVars(String val, String currentKey, Map configProps) { - return new DefaultInterpolator().substVars(val, currentKey, null, configProps); + return DefaultInterpolator.substVars(val, currentKey, null, configProps); } } diff --git a/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java b/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java index 7d97c7628f22..40603619e201 100644 --- a/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java +++ b/impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java @@ -77,7 +77,7 @@ public void beforeEach(ExtensionContext context) throws Exception { * @param context The extension context to store */ protected void setContext(ExtensionContext context) { - this.context = context; + MavenDIExtension.context = context; } /** @@ -90,10 +90,10 @@ protected void setContext(ExtensionContext context) { protected void setupContainer() { try { injector = Injector.create(); - injector.bindInstance(ExtensionContext.class, this.context); - injector.discover(this.context.getRequiredTestClass().getClassLoader()); + injector.bindInstance(ExtensionContext.class, context); + injector.discover(context.getRequiredTestClass().getClassLoader()); injector.bindInstance(Injector.class, injector); - injector.bindInstance((Class) this.context.getRequiredTestClass(), this.context.getRequiredTestInstance()); + injector.bindInstance((Class) context.getRequiredTestClass(), context.getRequiredTestInstance()); } catch (Exception e) { throw new IllegalArgumentException("Failed to create DI injector.", e); } From 5feb1a54db6ea5ee64fafa9495c449d03f0439f3 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 31 Mar 2025 08:47:20 -0400 Subject: [PATCH 2/2] fix --- .../org/apache/maven/impl/model/DefaultInterpolatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java index 2995900e152a..c0c06a271f0b 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java @@ -223,6 +223,6 @@ private String substVars(String val, String currentKey) { } private String substVars(String val, String currentKey, Map configProps) { - return DefaultInterpolator.substVars(val, currentKey, null, configProps); + return new DefaultInterpolator().substVars(val, currentKey, null, configProps); } }