From 249fd8720d9b019b3f02d75ab2de8cb9479d3499 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 8 Nov 2017 09:33:58 -0800 Subject: Fix NPE when artifact dependency version is null Change-Id: I56d6813b54ea769ca4bc6f0d7bf098b12cd0c6bc Issue-ID: INT-330 Signed-off-by: Gary Wu --- version-manifest/pom.xml | 2 +- .../java/org/onap/integration/versionmanifest/VersionCheckMojo.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'version-manifest') diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml index 0826aeb87..361262e83 100644 --- a/version-manifest/pom.xml +++ b/version-manifest/pom.xml @@ -8,7 +8,7 @@ org.onap.integration version-manifest - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT maven-plugin ONAP Version Manifest and Maven Plugin https://www.onap.org diff --git a/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java index 75da50ff0..dfac6cd17 100644 --- a/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java +++ b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java @@ -130,9 +130,9 @@ public class VersionCheckMojo extends AbstractMojo { // used for formatting int[] columnWidths = new int[10]; - columnWidths[0] = actualVersions.keySet().stream().mapToInt(String::length).max().orElse(1); - columnWidths[1] = actualVersions.values().stream().mapToInt(String::length).max().orElse(1); - columnWidths[2] = expectedVersions.values().stream().mapToInt(String::length).max().orElse(1); + columnWidths[0] = actualVersions.keySet().stream().mapToInt(s -> ("" + s).length()).max().orElse(1); + columnWidths[1] = actualVersions.values().stream().mapToInt(s -> ("" + s).length()).max().orElse(1); + columnWidths[2] = expectedVersions.values().stream().mapToInt(s -> ("" + s).length()).max().orElse(1); String format = " %-" + columnWidths[0] + "s" + " %" + columnWidths[1] + "s -> %" + columnWidths[2] + "s"; if (mismatches.isEmpty()) { -- cgit 1.2.3-korg