Skip to content

Commit a2dd946

Browse files
committed
rename: ModuleInfoValueSource -> ValueSourceModuleInfo
There seems to be some kind of name clash with other things called 'ModuleInfo'.
1 parent f41db48 commit a2dd946

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/main/java/org/gradlex/javamodule/dependencies/internal/utils/ModuleInfoCache.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ private boolean maybePutModuleInfo(File folder, ProviderFactory providers) {
122122
}
123123

124124
private Provider<ModuleInfo> provideModuleInfo(File folder, ProviderFactory providers) {
125-
return providers.of(ModuleInfoValueSource.class,
126-
moduleInfoSourcePValueSourceSpec -> moduleInfoSourcePValueSourceSpec.parameters(
127-
moduleInfoSourceP -> moduleInfoSourceP.getDir().set(folder)));
125+
return providers.of(ValueSourceModuleInfo.class, spec -> spec.parameters(param -> param.getDir().set(folder)));
128126
}
129127
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
import java.io.IOException;
2626
import java.util.Scanner;
2727

28-
public abstract class ModuleInfoValueSource implements ValueSource<ModuleInfo, ModuleInfoValueSource.ModuleInfoValueSourceParameter> {
28+
public abstract class ValueSourceModuleInfo implements ValueSource<ModuleInfo, ValueSourceModuleInfo.Parameter> {
2929

30-
interface ModuleInfoValueSourceParameter extends ValueSourceParameters {
30+
interface Parameter extends ValueSourceParameters {
3131
DirectoryProperty getDir();
3232
}
3333

3434
@Override
3535
public @Nullable ModuleInfo obtain() {
36-
ModuleInfoValueSourceParameter parameters = getParameters();
36+
Parameter parameters = getParameters();
3737
File file = new File(parameters.getDir().get().getAsFile(), "module-info.java");
3838
if (file.isFile()) {
3939
try {

0 commit comments

Comments
 (0)