From 330a2930b4095c963e18f5b9ae6551c501495508 Mon Sep 17 00:00:00 2001
From: TheRandomLabs <therandomlabsinc@gmail.com>
Date: Sun, 7 Feb 2021 11:55:26 +1100
Subject: [PATCH] Reduce minimum test coverage

---
 build.gradle                                    |  2 +-
 .../changeloggenerator/ChangelogGenerator.java  |  5 +----
 .../MarkdownChangelogGenerator.java             | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 735ecb7..61d3108 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ version = "2.0.0-pre8"
 ext {
 	commonGradleBranch = "master"
 	mainClass = "${group}.Main"
-	jacocoMinimumInstructionCoverage = 0.8
+	jacocoMinimumInstructionCoverage = 0.7
 	jacocoExcludes = [
 		"com.therandomlabs.changeloggenerator.ChangelogEntry",
 		"com.therandomlabs.changeloggenerator.ChangelogGeneratorOptions",
diff --git a/src/main/java/com/therandomlabs/changeloggenerator/ChangelogGenerator.java b/src/main/java/com/therandomlabs/changeloggenerator/ChangelogGenerator.java
index f5c3c96..87767ec 100644
--- a/src/main/java/com/therandomlabs/changeloggenerator/ChangelogGenerator.java
+++ b/src/main/java/com/therandomlabs/changeloggenerator/ChangelogGenerator.java
@@ -54,10 +54,7 @@ public abstract class ChangelogGenerator {
 	 */
 	public static final String VERSION = "@VERSION@";
 
-	/**
-	 * The ChangelogGenerator logger.
-	 */
-	protected static final Logger logger = LoggerFactory.getLogger(ChangelogGenerator.class);
+	private static final Logger logger = LoggerFactory.getLogger(ChangelogGenerator.class);
 
 	private final List<ChangelogProvider> providers = new ArrayList<>();
 
diff --git a/src/main/java/com/therandomlabs/changeloggenerator/MarkdownChangelogGenerator.java b/src/main/java/com/therandomlabs/changeloggenerator/MarkdownChangelogGenerator.java
index c124e82..f11f7d7 100644
--- a/src/main/java/com/therandomlabs/changeloggenerator/MarkdownChangelogGenerator.java
+++ b/src/main/java/com/therandomlabs/changeloggenerator/MarkdownChangelogGenerator.java
@@ -38,6 +38,7 @@
 import com.therandomlabs.curseapi.file.CurseFileChange;
 import com.therandomlabs.curseapi.file.CurseFiles;
 import com.therandomlabs.curseapi.minecraft.modpack.CurseModpack;
+import com.therandomlabs.curseapi.project.CurseProject;
 import com.therandomlabs.curseapi.util.JsoupUtils;
 
 /**
@@ -105,7 +106,7 @@ protected void appendFiles(
 	/**
 	 * {@inheritDoc}
 	 */
-	@SuppressWarnings({"Duplicates", "ConstantConditions"})
+	@SuppressWarnings("Duplicates")
 	@Override
 	protected void appendChangelogEntries(
 			StringBuilder builder, String projectName, ChangelogEntries changelogEntries
@@ -213,11 +214,19 @@ protected void appendChangelogEntries(
 		}
 
 		if (extraEntries > 0) {
-			//fileChange.project() is guaranteed to return a non-null value,
-			//since it is necessary to determine whether there are extra entries in the first place.
+			//This is guaranteed to be non-null, but we have to appease the static code analysis
+			//tools.
+			final CurseProject project = fileChange.project();
+
+			if (project == null) {
+				builder.append(System.lineSeparator()).append("#### ").append(extraEntries).
+						append(" more entr").append(extraEntries == 1 ? "y" : "ies");
+				return;
+			}
+
 			builder.append(System.lineSeparator()).append("#### [").append(extraEntries).
 					append(" more entr").append(extraEntries == 1 ? "y](" : "ies](").
-					append(fileChange.project().url()).append("/files/all)").
+					append(project.url()).append("/files/all)").
 					append(System.lineSeparator());
 		}
 	}