[nifi-maven] branch main updated: NIFI-11282 Fix checkstyle issues

[joewitt]

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
     new 8a42ff1  NIFI-11282 Fix checkstyle issues
     new 444dcfd  Merge pull request #31 from kevdoran/NIFI-11282
8a42ff1 is described below

commit 8a42ff1b316afb9879bbddf28538d794a4e38927
Author: Kevin Doran <kdo...@apache.org>
AuthorDate: Mon Mar 13 18:35:48 2023 -0400

    NIFI-11282 Fix checkstyle issues
---
 src/main/java/org/apache/nifi/NarMojo.java              | 17 ++++++-----------
 .../extraction/ExtensionClassLoaderFactoryTest.java     |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/apache/nifi/NarMojo.java 
b/src/main/java/org/apache/nifi/NarMojo.java
index 64a8049..f7ac09c 100644
--- a/src/main/java/org/apache/nifi/NarMojo.java
+++ b/src/main/java/org/apache/nifi/NarMojo.java
@@ -26,9 +26,6 @@ import 
org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.installer.ArtifactInstaller;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.RepositoryRequest;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -36,17 +33,16 @@ import 
org.apache.maven.artifact.resolver.DefaultArtifactResolver;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
-import org.apache.maven.plugins.dependency.utils.DependencyUtil;
-import org.apache.maven.plugins.dependency.utils.filters.DestFileFilter;
-import 
org.apache.maven.plugins.dependency.utils.translators.ArtifactTranslator;
-import 
org.apache.maven.plugins.dependency.utils.translators.ClassifierTypeTranslator;
-
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
+import org.apache.maven.plugins.dependency.utils.DependencyUtil;
+import org.apache.maven.plugins.dependency.utils.filters.DestFileFilter;
+import 
org.apache.maven.plugins.dependency.utils.translators.ArtifactTranslator;
+import 
org.apache.maven.plugins.dependency.utils.translators.ClassifierTypeTranslator;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.project.ProjectBuilder;
@@ -980,8 +976,7 @@ public class NarMojo extends AbstractMojo {
             for (Artifact artifact : artifacts) {
                 ArtifactResolutionRequest req = 
getArtifactResolutionRequest(artifact);
                 ArtifactResolutionResult result = 
artifactResolver.resolve(req);
-                if (result.getArtifacts() != null)
-                {
+                if (result.getArtifacts() != null) {
                     unResolvedArtifacts.removeAll(result.getArtifacts());
                 }
             }
diff --git 
a/src/test/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactoryTest.java
 
b/src/test/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactoryTest.java
index c6e6cf0..751ec01 100644
--- 
a/src/test/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactoryTest.java
+++ 
b/src/test/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactoryTest.java
@@ -124,7 +124,7 @@ class ExtensionClassLoaderFactoryTest {
         }
         verifyNoMoreInteractions(artifactResolver);
     }
-    
+
     private List<ArtifactResolutionRequest> 
getExpectedArtifactResolutionRequests() {
         ArtifactResolutionRequest request1 = new ArtifactResolutionRequest();
         request1.setArtifact(artifact2);