diff --git a/src/main/java/io/github/mfoo/libyear/LibYearMojo.java b/src/main/java/io/github/mfoo/libyear/LibYearMojo.java index ac6154d..e4ef98e 100644 --- a/src/main/java/io/github/mfoo/libyear/LibYearMojo.java +++ b/src/main/java/io/github/mfoo/libyear/LibYearMojo.java @@ -564,42 +564,31 @@ public void execute() throws MojoExecutionException { } } - private void generateReport(Set dependencies, final String categorie) { + private void generateReport(Set dependencies, final String category) { if (StringUtils.isBlank(reportFile)) { return; } StringBuilder logsToReport = new StringBuilder(); - - dependencies.stream().forEach(dependency -> { + dependencies.forEach(dependency -> { try { Artifact artifact = artifactFactory.createArtifact(dependency); Optional currentReleaseDate = getReleaseDate(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion()); - String depName = dependency.getGroupId() + ":" + dependency.getArtifactId(); - String libYearsStr = "unknown"; - if (!currentReleaseDate.isEmpty()) { + if (currentReleaseDate.isPresent()) { long libWeeksOutdated = ChronoUnit.WEEKS.between(currentReleaseDate.get(), LocalDate.now()); float libYearsOutdated = libWeeksOutdated / 52f; if (libYearsOutdated > 0 && (minLibYearsForReport <= 0 || libYearsOutdated > minLibYearsForReport)) { - libYearsStr = String.format(Locale.US, "%.2f", libYearsOutdated); + String libYearsStr = String.format(Locale.US, "%.2f", libYearsOutdated); + writeToReport(category, dependency, logsToReport, libYearsStr); } + } else { + writeToReport(category, dependency, logsToReport, "unknown"); } - logsToReport - .append(depName) - .append(",") - .append(dependency.getVersion()) - .append(",") - .append(dependency.getType()) - .append(",") - .append(categorie) - .append(",") - .append(libYearsStr) - .append(System.lineSeparator()); } catch (Exception e) { getLog().error("Exception by writing report", e); } @@ -617,6 +606,20 @@ private void generateReport(Set dependencies, final String categorie } } + private void writeToReport(String category, Dependency dependency, StringBuilder logsToReport, String libYearsStr) { + logsToReport + .append(dependency.getGroupId()).append(":").append(dependency.getArtifactId()) + .append(",") + .append(dependency.getVersion()) + .append(",") + .append(dependency.getType()) + .append(",") + .append(category) + .append(",") + .append(libYearsStr) + .append(System.lineSeparator()); + } + private VersionsHelper getHelper() throws MojoExecutionException { if (helper == null) { RuleService ruleService = new RulesServiceBuilder()