Skip to content

Commit 4f914a8

Browse files
jjohannesjjohannes
committed
Renames and tweaks
1 parent f3d7796 commit 4f914a8

File tree

5 files changed

+39
-31
lines changed

5 files changed

+39
-31
lines changed

‎src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public Provider<Dependency> create(String moduleName, SourceSet sourceSetWithMod
220220
}
221221
}
222222

223-
public Provider<Dependency> createPrecise(String moduleName, SourceSet sourceSetWithModuleInfo) {
223+
private Provider<Dependency> createPrecise(String moduleName, SourceSet sourceSetWithModuleInfo) {
224224
return getProviders().provider(() -> {
225225
String projectPath = getModuleInfoCache().get().getProjectPath(moduleName);
226226
String capability = getModuleInfoCache().get().getCapability(moduleName);
@@ -239,7 +239,7 @@ public Provider<Dependency> createPrecise(String moduleName, SourceSet sourceSet
239239
});
240240
}
241241

242-
public Provider<Dependency> createWithGuessing(String moduleName, SourceSet sourceSetWithModuleInfo) {
242+
private Provider<Dependency> createWithGuessing(String moduleName, SourceSet sourceSetWithModuleInfo) {
243243
return getProviders().provider(() -> {
244244
Map<String, String> allProjectNamesAndGroups = getProject().getRootProject().getSubprojects().stream().collect(
245245
Collectors.toMap(Project::getName, p -> (String) p.getGroup(), (a, b) -> a));

src/main/java/org/gradlex/javamodule/dependencies/initialization/Modules.java renamed to src/main/java/org/gradlex/javamodule/dependencies/initialization/Directory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.LinkedHashMap;
2727
import java.util.Map;
2828

29-
public abstract class Modules {
29+
public abstract class Directory {
3030

3131
private final File root;
3232
final Map<String, Module> customizedModules = new LinkedHashMap<>();
@@ -38,7 +38,7 @@ public abstract class Modules {
3838
public abstract ObjectFactory getObjects();
3939

4040
@Inject
41-
public Modules(File root) {
41+
public Directory(File root) {
4242
this.root = root;
4343
}
4444

@@ -54,7 +54,7 @@ public void module(String moduleFolder, Action<Module> action) {
5454

5555
Module addModule(String moduleFolder) {
5656
Module module = getObjects().newInstance(Module.class, root);
57-
module.getFolder().convention(moduleFolder);
57+
module.getDirectory().convention(moduleFolder);
5858
module.getGroup().convention(getGroup());
5959
module.getPlugins().addAll(getPlugins());
6060
return module;

‎src/main/java/org/gradlex/javamodule/dependencies/initialization/JavaModulesExtension.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,43 +56,43 @@ public JavaModulesExtension(Settings settings) {
5656
this.moduleInfoCache = getObjects().newInstance(ModuleInfoCache.class, true);
5757
}
5858

59-
public void module(String folder) {
60-
module(folder, m -> {});
59+
public void module(String path) {
60+
module(path, m -> {});
6161
}
6262

63-
public void module(String folder, Action<Module> action) {
63+
public void module(String path, Action<Module> action) {
6464
Module module = getObjects().newInstance(Module.class, settings.getRootDir());
65-
module.getFolder().set(folder);
65+
module.getDirectory().set(path);
6666
action.execute(module);
67-
includeModule(module, new File(settings.getRootDir(), module.getFolder().get()));
67+
includeModule(module, new File(settings.getRootDir(), module.getDirectory().get()));
6868
}
6969

70-
public void modules(String folder) {
71-
modules(folder, m -> {});
70+
public void directory(String path) {
71+
directory(path, m -> {});
7272
}
7373

74-
public void modules(String folder, Action<Modules> action) {
75-
Modules moduleGroup = getObjects().newInstance(Modules.class, new File(settings.getRootDir(), folder));
76-
action.execute(moduleGroup);
74+
public void directory(String path, Action<Directory> action) {
75+
Directory directory = getObjects().newInstance(Directory.class, new File(settings.getRootDir(), path));
76+
action.execute(directory);
7777

78-
File[] projectFolders = new File(settings.getRootDir(), folder).listFiles();
79-
if (projectFolders == null) {
80-
throw new RuntimeException("Failed to inspect: " + new File(settings.getRootDir(), folder));
78+
File[] projectDirs = new File(settings.getRootDir(), path).listFiles();
79+
if (projectDirs == null) {
80+
throw new RuntimeException("Failed to inspect: " + new File(settings.getRootDir(), path));
8181
}
8282

83-
for (File projectFolder : projectFolders) {
84-
if (moduleGroup.customizedModules.containsKey(projectFolder.getName())) {
85-
includeModule(moduleGroup.customizedModules.get(projectFolder.getName()), projectFolder);
83+
for (File projectDir : projectDirs) {
84+
if (directory.customizedModules.containsKey(projectDir.getName())) {
85+
includeModule(directory.customizedModules.get(projectDir.getName()), projectDir);
8686
} else {
87-
includeModule(moduleGroup.addModule(projectFolder.getName()), projectFolder);
87+
includeModule(directory.addModule(projectDir.getName()), projectDir);
8888
}
8989
}
9090
}
9191

92-
public void versions(String folder) {
93-
String projectName = Paths.get(folder).getFileName().toString();
92+
public void versions(String directory) {
93+
String projectName = Paths.get(directory).getFileName().toString();
9494
settings.include(projectName);
95-
settings.project(":" + projectName).setProjectDir(new File(settings.getRootDir(), folder));
95+
settings.project(":" + projectName).setProjectDir(new File(settings.getRootDir(), directory));
9696
if (SUPPORT_PROJECT_ISOLATION) {
9797
settings.getGradle().getLifecycle().beforeProject(new ApplyJavaModuleVersionsPluginAction(projectName));
9898
} else {

‎src/main/java/org/gradlex/javamodule/dependencies/initialization/Module.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
import java.util.stream.Stream;
2828

2929
public abstract class Module {
30-
public abstract Property<String> getFolder();
30+
public abstract Property<String> getDirectory();
3131
public abstract Property<String> getArtifact();
3232
public abstract Property<String> getGroup();
3333
public abstract ListProperty<String> getModuleInfoPaths();
3434
public abstract ListProperty<String> getPlugins();
3535

3636
@Inject
3737
public Module(File root) {
38-
getArtifact().convention(getFolder().map(f -> Paths.get(f).getFileName().toString()));
39-
getModuleInfoPaths().convention(getFolder().map(projectDir -> listChildren(root, projectDir + "/src")
38+
getArtifact().convention(getDirectory().map(f -> Paths.get(f).getFileName().toString()));
39+
getModuleInfoPaths().convention(getDirectory().map(projectDir -> listChildren(root, projectDir + "/src")
4040
.map(srcDir -> new File(srcDir, "java/module-info.java"))
4141
.filter(File::exists)
4242
.map(moduleInfo -> "src/" + moduleInfo.getParentFile().getParentFile().getName() + "/java")

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
package org.gradlex.javamodule.dependencies.internal.utils;
1818

1919
import org.gradle.api.file.RegularFileProperty;
20+
import org.gradle.api.logging.Logger;
2021
import org.gradle.api.model.ObjectFactory;
2122
import org.gradle.api.provider.Provider;
2223
import org.gradle.api.provider.ProviderFactory;
2324
import org.gradle.api.tasks.SourceSet;
25+
import org.slf4j.LoggerFactory;
2426

2527
import javax.inject.Inject;
2628
import java.io.File;
@@ -31,6 +33,7 @@
3133
import static org.gradlex.javamodule.dependencies.internal.utils.ModuleNamingUtil.sourceSetToCapabilitySuffix;
3234

3335
public abstract class ModuleInfoCache {
36+
private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(ModuleInfoCache.class);
3437

3538
private final boolean initializedInSettings;
3639
private final Map<File, ModuleInfo> moduleInfo = new HashMap<>();
@@ -74,9 +77,14 @@ public ModuleInfo put(File projectRoot, String moduleInfoPath, String artifact,
7477
if (maybePutModuleInfo(folder, providers)) {
7578
ModuleInfo thisModuleInfo = moduleInfo.get(folder);
7679
moduleNameToProjectPath.put(thisModuleInfo.getModuleName(), ":" + artifact);
77-
String capabilitySuffix = sourceSetToCapabilitySuffix(Paths.get(moduleInfoPath).getFileName().toString());
78-
if (group.isPresent() && capabilitySuffix != null) {
79-
moduleNameToCapability.put(thisModuleInfo.getModuleName(), group.get() + ":" + artifact + "-" + capabilitySuffix);
80+
String capabilitySuffix = sourceSetToCapabilitySuffix(Paths.get(moduleInfoPath).getParent().getFileName().toString());
81+
if (capabilitySuffix != null) {
82+
if (group.isPresent()) {
83+
moduleNameToCapability.put(thisModuleInfo.getModuleName(), group.get() + ":" + artifact + "-" + capabilitySuffix);
84+
} else {
85+
LOGGER.lifecycle(
86+
"[WARN] [Java Module Dependencies] " + thisModuleInfo.getModuleName() + " - 'group' not defined!");
87+
}
8088
}
8189
return thisModuleInfo;
8290
}

0 commit comments

Comments
 (0)