Skip to content

Access static fields in a static way #2209

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
elharo merged 2 commits into from
Mar 31, 2025
Merged

Access static fields in a static way #2209

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
201e741
not static
elharo Mar 31, 2025
5feb1a5
fix
elharo Mar 31, 2025
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 impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ protected List<ArtifactRepository> getRemoteRepositories() throws InvalidReposit
repository.setReleases(policy);
repository.setSnapshots(policy);

return Arrays.asList(mavenRepositorySystem.buildArtifactRepository(repository));
return Arrays.asList(MavenRepositorySystem.buildArtifactRepository(repository));
}

protected List<ArtifactRepository> getPluginArtifactRepositories() throws InvalidRepositoryException {
Expand Down
5 changes: 2 additions & 3 deletions impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,11 @@ private String substVars(
Map<String, String> configProps,
UnaryOperator<String> 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<String, String> configProps) {
Expand Down
8 changes: 4 additions & 4 deletions impl/maven-testing/src/main/java/org/apache/maven/api/di/testing/MavenDIExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand All @@ -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);
}
Expand Down