Skip to content

Commit c1e6e7a

Browse files
committed
Fix Nullable of return value
1 parent 35a6388 commit c1e6e7a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
open module org.my.app.test {
1+
open module org.my.lib.test {
22
requires org.my.lib;
33
requires org.junit.jupiter.api;
44
}

src/main/java/de/jjohannes/gradle/moduledependencies/JavaModuleDependenciesExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import javax.annotation.Nullable;
1111
import java.io.IOException;
1212
import java.io.InputStream;
13+
import java.util.Collections;
1314
import java.util.HashMap;
1415
import java.util.Map;
1516
import java.util.Properties;
@@ -51,12 +52,11 @@ public String ga(String moduleName) {
5152
*
5253
* If no version is defined, the version entry will be missing.
5354
*/
54-
@Nullable
5555
public Map<String, Object> gav(String moduleName) {
5656
Map<String, Object> gav = new HashMap<>();
5757
String ga = ga(moduleName);
5858
if (ga == null) {
59-
return null;
59+
return Collections.emptyMap();
6060
}
6161

6262
VersionConstraint version = null;

src/main/java/de/jjohannes/gradle/moduledependencies/JavaModuleDependenciesPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void declareDependency(String moduleName, @Nullable String ownModuleName
104104
Map<String, Object> gav = javaModuleDependencies.gav(moduleName);
105105
String projectName = ownModuleNamesPrefix == null ? null : moduleName.startsWith(ownModuleNamesPrefix + ".") ? moduleName.substring(ownModuleNamesPrefix.length() + 1) : null;
106106

107-
if (gav != null) {
107+
if (!gav.isEmpty()) {
108108
project.getDependencies().add(configuration.getName(), gav);
109109
if (!gav.containsKey(GAV.VERSION)) {
110110
warnVersionMissing(moduleName, gav, moduleInfoFile, project, javaModuleDependencies);

0 commit comments

Comments
 (0)