From 6422432196f03ce230506d76558ecba34862e370 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Aug 2019 14:12:58 +0200 Subject: [PATCH] Improve exception if mandatory compatibility range is no set --- .../java/io/spring/initializr/metadata/BillOfMaterials.java | 4 ++++ .../main/java/io/spring/initializr/metadata/Dependency.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java index 19168212..d5b8777e 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java @@ -28,6 +28,8 @@ import io.spring.initializr.generator.version.VersionParser; import io.spring.initializr.generator.version.VersionProperty; import io.spring.initializr.generator.version.VersionRange; +import org.springframework.util.Assert; + /** * Define a Bill Of Materials to be represented in the generated project if a dependency * refers to it. @@ -166,6 +168,8 @@ public class BillOfMaterials { public void updateCompatibilityRange(VersionParser versionParser) { this.mappings.forEach((it) -> { try { + Assert.notNull(it.compatibilityRange, + "Invalid mapping for " + this + ": compatibility range is mandatory"); it.range = versionParser.parseRange(it.compatibilityRange); } catch (InvalidVersionException ex) { diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/Dependency.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/Dependency.java index 5ef2c44b..cf7bdb5b 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/Dependency.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/Dependency.java @@ -29,6 +29,7 @@ import io.spring.initializr.generator.version.Version; import io.spring.initializr.generator.version.VersionParser; import io.spring.initializr.generator.version.VersionRange; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** @@ -226,6 +227,8 @@ public class Dependency extends MetadataElement implements Describable { } this.mappings.forEach((it) -> { try { + Assert.notNull(it.compatibilityRange, + "Invalid mapping for " + this + ": compatibility range is mandatory"); it.range = versionParser.parseRange(it.compatibilityRange); } catch (InvalidVersionException ex) {