[java-mvn-enforcer] 02/05: Minor refactor. Keep the MavenLoader in one place

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-mvn-enforcer.

View the commit online:
http://git.shibboleth.net/view/?p=java-mvn-enforcer.git;a=commit;h=4f986a643d0e0d27b95f459acc435e9a454d33a7

commit 4f986a643d0e0d27b95f459acc435e9a454d33a7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 6 15:09:21 2021 +0100

    Minor refactor. Keep the MavenLoader in one place
---
 .../net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java  | 15 ++++-----------
 .../net/shibboleth/mvn/enforcer/impl/JarEnforcer.java     |  2 +-
 .../net/shibboleth/mvn/enforcer/impl/M2SigChecker.java    |  7 ++-----
 .../shibboleth/mvn/enforcer/impl/ProjectPomContext.java   |  6 ++++++
 .../java/net/shibboleth/mvn/enforcer/impl/SigChecker.java |  7 ++-----
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java
index 9edf19f..caeac46 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/BaseSigChecker.java
@@ -55,18 +55,11 @@ public class BaseSigChecker {
     /** The key rings for our signature test. */
     private final Map<String, Optional<GPGKeyRing>> keyRings = new HashMap<>();
     
-    /** The injected thing that collects maven artifacts.  */
-    private final MavenLoader mavenLoader;
-    
     /** Constructor.
-     * @param loader How to get artifacts
      * @param project The project
      * @param writer Where to write our report
      */
-    public BaseSigChecker(@Nonnull final MavenLoader loader,
-                      @Nonnull final ProjectPomContext project,
-                      @Nonnull final PrintWriter writer) {
-        mavenLoader = Constraint.isNotNull(loader, "Loader must not be null");
+    public BaseSigChecker(@Nonnull final ProjectPomContext project, @Nonnull final PrintWriter writer) {
         projectContext = Constraint.isNotNull(project, "project must not be null");
         report = Constraint.isNotNull(writer, "Writer must not be null");
         if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
@@ -82,10 +75,10 @@ public class BaseSigChecker {
     }
 
     /** Get the {@link MavenLoader} for the operation.
-     * @return {@link #mavenLoader}
+     * @return the {@link MavenLoader} from the {@link ProjectPomContext}
      */
     protected MavenLoader getMavenLoader() {
-        return mavenLoader;
+        return getProjectContext().getMavenLoader();
     }
     
     /** Get the {@link PrintWriter} used for reporting.
@@ -159,7 +152,7 @@ public class BaseSigChecker {
     private Signature getSignature(final PomArtifact artifact) {
         Path path;
         try {
-            path = mavenLoader.downloadArtifact(artifact, "jar.asc");
+            path = getMavenLoader().downloadArtifact(artifact, "jar.asc");
         } catch (final Exception e) {
             log.debug("Error loading {} from maven loader", artifact, e);
             path = null;
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
index 44d53e0..8991eb3 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/JarEnforcer.java
@@ -159,7 +159,7 @@ public class JarEnforcer implements EnforcerRule, MavenLoader{
                     try (final PrintWriter report =
                             new PrintWriter(new BufferedOutputStream(new FileOutputStream(out)))) {
                         report.format("Signature Testing started at %s\n\n", Instant.now().toString());
-                        final SigChecker sigChecker = new SigChecker(this, pomContext, report);
+                        final SigChecker sigChecker = new SigChecker(pomContext, report);
                         signatureResult = sigChecker.testSignatures(jarPaths);
                         report.format("Completed at %s\n\n", Instant.now().toString());
                         if (!signatureResult) {
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/M2SigChecker.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/M2SigChecker.java
index c2015dc..9cd535f 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/M2SigChecker.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/M2SigChecker.java
@@ -42,14 +42,11 @@ public class M2SigChecker extends BaseSigChecker {
     private int failCount;
 
     /** Constructor.
-     * @param loader How to get artifacts
      * @param project The project
      * @param writer Where to write our report
      */
-    public M2SigChecker(@Nonnull final MavenLoader loader,
-                      @Nonnull final ProjectPomContext project,
-                      @Nonnull final PrintWriter writer) {
-        super(loader, project, writer);
+    public M2SigChecker(@Nonnull final ProjectPomContext project, @Nonnull final PrintWriter writer) {
+        super(project, writer);
     }
     
     /** The Body of the signature test.  Are all the files what we expected?
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java
index a47b712..9fba5eb 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/ProjectPomContext.java
@@ -135,6 +135,12 @@ public final class ProjectPomContext implements AutoCloseable {
         return artifactToGroup.get(id);
     }
 
+    /** Return the {@link MavenLoader}
+     * @return {@link #mavenLoader}
+     */
+    public MavenLoader getMavenLoader() {
+        return mavenLoader;
+    }
 
     /** Returns the parent Pom.
      * @return the parent Pom.
diff --git a/src/main/java/net/shibboleth/mvn/enforcer/impl/SigChecker.java b/src/main/java/net/shibboleth/mvn/enforcer/impl/SigChecker.java
index 4b1e852..6456670 100644
--- a/src/main/java/net/shibboleth/mvn/enforcer/impl/SigChecker.java
+++ b/src/main/java/net/shibboleth/mvn/enforcer/impl/SigChecker.java
@@ -40,14 +40,11 @@ public class SigChecker extends BaseSigChecker {
     private final Logger log = EnforcerLogger.getLogger(SigChecker.class);
 
     /** Constructor.
-     * @param loader How to get artifacts
      * @param project The project
      * @param report Where to write our report
      */
-    public SigChecker(@Nonnull final MavenLoader loader,
-                      @Nonnull final ProjectPomContext project,
-                      @Nonnull final PrintWriter report) {
-        super(loader, project, report);
+    public SigChecker(@Nonnull final ProjectPomContext project, @Nonnull final PrintWriter report) {
+        super(project, report);
     }
     
     /** The Body of the signature test.  Are all the files what we expected?

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.