diff --git a/src/main/java/com/solubris/enforcer/VersionPropertyRule.java b/src/main/java/com/solubris/enforcer/VersionPropertyRule.java index 3944a67..e800b0c 100644 --- a/src/main/java/com/solubris/enforcer/VersionPropertyRule.java +++ b/src/main/java/com/solubris/enforcer/VersionPropertyRule.java @@ -76,14 +76,14 @@ protected Stream scan() { .map(e -> { String effectiveVersion = e.getKey(); List artifacts = e.getValue(); - long propertyCount = artifacts.stream() + long implicitVersionCount = artifacts.stream() .filter(Artifact::hasImplicitVersion) .count(); if (artifacts.size() > 1) { - if (propertyCount == 0) return missingProperty(effectiveVersion, artifacts); - if (propertyCount < artifacts.size()) return unusedProperty(effectiveVersion, artifacts); + if (implicitVersionCount == 0) return missingProperty(effectiveVersion, artifacts); + if (implicitVersionCount < artifacts.size()) return unusedProperty(effectiveVersion, artifacts); } else if (artifacts.size() == 1) { - if (propertyCount == 1) return redundantProperty(artifacts.get(0)); + if (implicitVersionCount == 1) return redundantProperty(artifacts.get(0)); } return null; }).filter(Objects::nonNull); @@ -114,7 +114,7 @@ private String redundantProperty(Artifact artifact) { * That's possible due to coincidental properties - another edge case to consider. */ private static String unusedProperty(String effectiveVersion, List artifacts) { - String unused = artifacts.stream() + String explicitVersionLocations = artifacts.stream() .filter(Artifact::hasExplicitVersion) .map(Artifact::key) .collect(joining(", ")); @@ -125,20 +125,20 @@ private static String unusedProperty(String effectiveVersion, List art .findAny().orElse("unknown"); return String.format( "Version property %s=%s exists but is not used everywhere. Unused locations: %s", - propertyName, effectiveVersion, unused); + propertyName, effectiveVersion, explicitVersionLocations); } private String missingProperty(String version, List artifacts) { if (!requirePropertiesForDuplicates) return null; - String unused = artifacts.stream() + String locationsWithoutProperty = artifacts.stream() .filter(a -> Objects.equals(a.getVersion(), a.getEffectiveVersion())) .map(Artifact::key) .collect(joining(", ")); return String.format( "Version '%s' exists in multiple locations, please extract a version property. " + "Unused locations: %s", - version, unused); + version, locationsWithoutProperty); } /**