refactor: move package

move renderer, sink package from mojo to plugin-report module
bsorrentino · Feb 15, 2024 · 6040da2 · 6040da2
1 parent d8e8430
commit 6040da2
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 27 deletions.
diff --git a/plugin-report/pom.xml b/plugin-report/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.bsc.maven</groupId>
+        <artifactId>maven-confluence-parent</artifactId>
+        <version>8.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>confluence-plugin-report</artifactId>
+    <name>CONFLUENCE-REPORTING::Plugin-Report</name>
+    <description>maven confluence plugin - plugin report</description>
+    <url>https://github.com/bsorrentino/maven-confluence-plugin</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bsc.maven</groupId>
+            <artifactId>maven-confluence-core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-tools-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-tools-generators</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+            <version>2.4</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...eporting/plugin/ConfluenceWikiWriter.java → .../org/bsc/plugin/ConfluenceWikiWriter.java b/...eporting/plugin/ConfluenceWikiWriter.java → .../org/bsc/plugin/ConfluenceWikiWriter.java
@@ -1,4 +1,4 @@
-package org.bsc.reporting.plugin;
+package org.bsc.plugin;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/.../plugin/PluginConfluenceDocGenerator.java → .../plugin/PluginConfluenceDocGenerator.java b/.../plugin/PluginConfluenceDocGenerator.java → .../plugin/PluginConfluenceDocGenerator.java
@@ -1,32 +1,31 @@
-package org.bsc.reporting.plugin;
-
-import static org.bsc.confluence.ConfluenceHtmlUtils.replaceHTML;
-import static org.bsc.reporting.plugin.ConfluenceWikiWriter.createAnchor;
-import static org.bsc.reporting.plugin.ConfluenceWikiWriter.createLinkToAnchor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
+package org.bsc.plugin;
 
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.tools.plugin.PluginToolsRequest;
 import org.apache.maven.tools.plugin.generator.Generator;
 import org.apache.maven.tools.plugin.generator.GeneratorException;
-import org.bsc.confluence.ConfluenceHtmlUtils;
 import org.bsc.confluence.ConfluenceService;
 import org.bsc.confluence.ConfluenceService.Model;
 import org.bsc.confluence.ConfluenceService.Storage;
 import org.bsc.confluence.ConfluenceService.Storage.Representation;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import static org.bsc.confluence.ConfluenceHtmlUtils.replaceHTML;
+import static org.bsc.plugin.ConfluenceWikiWriter.createAnchor;
+import static org.bsc.plugin.ConfluenceWikiWriter.createLinkToAnchor;
+
 /**
  *
  * @author Sorrentino
@@ -424,7 +423,7 @@ private List<Parameter> getParametersByRequired(boolean required, List<Parameter
         if( parameterList == null) 
             return Collections.emptyList();
 
-        final List<Parameter> list = new ArrayList<Parameter>();
+        final List<Parameter> list = new ArrayList<>();
 
         for (Parameter parameter : parameterList) {
             if (parameter.isRequired() == required) {

diff --git a/...orting/renderer/DependenciesRenderer.java → ...plugin/renderer/DependenciesRenderer.java b/...orting/renderer/DependenciesRenderer.java → ...plugin/renderer/DependenciesRenderer.java
@@ -1,4 +1,5 @@
-package org.bsc.reporting.renderer;
+package org.bsc.plugin.renderer;
+
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...c/reporting/renderer/PluginsRenderer.java → .../bsc/plugin/renderer/PluginsRenderer.java b/...c/reporting/renderer/PluginsRenderer.java → .../bsc/plugin/renderer/PluginsRenderer.java
@@ -3,7 +3,8 @@
  * and open the template in the editor.
  */
 
-package org.bsc.reporting.renderer;
+package org.bsc.plugin.renderer;
+
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...ting/renderer/ProjectSummaryRenderer.java → ...ugin/renderer/ProjectSummaryRenderer.java b/...ting/renderer/ProjectSummaryRenderer.java → ...ugin/renderer/ProjectSummaryRenderer.java
@@ -1,4 +1,5 @@
-package org.bsc.reporting.renderer;
+package org.bsc.plugin.renderer;
+
 
 import java.util.Locale;
 

diff --git a/...porting/renderer/ProjectTeamRenderer.java → .../plugin/renderer/ProjectTeamRenderer.java b/...porting/renderer/ProjectTeamRenderer.java → .../plugin/renderer/ProjectTeamRenderer.java
@@ -1,4 +1,5 @@
-package org.bsc.reporting.renderer;
+package org.bsc.plugin.renderer;
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/...renderer/ReportingResolutionListener.java → ...renderer/ReportingResolutionListener.java b/...renderer/ReportingResolutionListener.java → ...renderer/ReportingResolutionListener.java
@@ -1,4 +1,5 @@
-package org.bsc.reporting.renderer;
+package org.bsc.plugin.renderer;
+
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...g/bsc/reporting/renderer/ScmRenderer.java → .../org/bsc/plugin/renderer/ScmRenderer.java b/...g/bsc/reporting/renderer/ScmRenderer.java → .../org/bsc/plugin/renderer/ScmRenderer.java
@@ -1,4 +1,4 @@
-package org.bsc.reporting.renderer;
+package org.bsc.plugin.renderer;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -40,7 +40,7 @@
 import java.util.List;
 import java.util.Locale;
 import org.apache.maven.report.projectinfo.AbstractProjectInfoRenderer;
-import org.bsc.reporting.sink.ConfluenceSink;
+import org.bsc.plugin.sink.ConfluenceSink;
 
 /**
  * Scm renderer class

diff --git a/...rg/bsc/reporting/sink/ConfluenceSink.java → ...a/org/bsc/plugin/sink/ConfluenceSink.java b/...rg/bsc/reporting/sink/ConfluenceSink.java → ...a/org/bsc/plugin/sink/ConfluenceSink.java
@@ -1,4 +1,4 @@
-package org.bsc.reporting.sink;
+package org.bsc.plugin.sink;
 
 import java.io.PrintWriter;
 import java.io.Writer;

diff --git a/.../org/bsc/reporting/sink/SinkDelegate.java → ...ava/org/bsc/plugin/sink/SinkDelegate.java b/.../org/bsc/reporting/sink/SinkDelegate.java → ...ava/org/bsc/plugin/sink/SinkDelegate.java
@@ -1,4 +1,5 @@
-package org.bsc.reporting.sink;
+package org.bsc.plugin.sink;
+
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;