Refactor to move Classpath Jar reports into the API module

RedHatInsights · Nov 9, 2023 · 2393ae8 · 2393ae8
1 parent 28e0da1
commit 2393ae8
Show file tree

Hide file tree

Showing 32 changed files with 48 additions and 38 deletions.
diff --git a/api/src/main/java/com/redhat/insights/InsightsReportController.java b/api/src/main/java/com/redhat/insights/InsightsReportController.java
@@ -10,6 +10,8 @@
 import com.redhat.insights.http.InsightsHttpClient;
 import com.redhat.insights.jars.JarInfo;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
+import com.redhat.insights.reports.UpdateReportImpl;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.*;

diff --git a/api/src/main/java/com/redhat/insights/http/InsightsFileWritingClient.java b/api/src/main/java/com/redhat/insights/http/InsightsFileWritingClient.java
@@ -5,9 +5,9 @@
 import static com.redhat.insights.InsightsErrorCode.ERROR_WRITING_FILE;
 
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/api/src/main/java/com/redhat/insights/http/InsightsHttpClient.java b/api/src/main/java/com/redhat/insights/http/InsightsHttpClient.java
@@ -4,7 +4,7 @@
 import static com.redhat.insights.InsightsErrorCode.ERROR_GZIP_FILE;
 
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
+import com.redhat.insights.reports.InsightsReport;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/api/src/main/java/com/redhat/insights/http/InsightsMultiClient.java b/api/src/main/java/com/redhat/insights/http/InsightsMultiClient.java
@@ -4,8 +4,8 @@
 import static com.redhat.insights.InsightsErrorCode.ERROR_CLIENT_FAILED;
 
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import java.util.Arrays;
 import java.util.List;
 

diff --git a/api/src/main/java/com/redhat/insights/jars/JarInfoSubreport.java b/api/src/main/java/com/redhat/insights/jars/JarInfoSubreport.java
@@ -8,8 +8,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsSubreport;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/api/src/main/java/com/redhat/insights/jars/JarInfoSubreportSerializer.java b/api/src/main/java/com/redhat/insights/jars/JarInfoSubreportSerializer.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.redhat.insights.InsightsSubreport;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.io.IOException;
 
 public class JarInfoSubreportSerializer extends JsonSerializer<InsightsSubreport> {

diff --git a/.../insights/AbstractTopLevelReportBase.java → ...s/reports/AbstractTopLevelReportBase.java b/.../insights/AbstractTopLevelReportBase.java → ...s/reports/AbstractTopLevelReportBase.java
@@ -1,7 +1,8 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.databind.JsonSerializer;
+import com.redhat.insights.Filtering;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.logging.InsightsLogger;
 import java.io.IOException;

diff --git a/...core/app/AppInsightsReportSerializer.java → .../reports/AppInsightsReportSerializer.java b/...core/app/AppInsightsReportSerializer.java → .../reports/AppInsightsReportSerializer.java
@@ -1,10 +1,9 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights.core.app;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.redhat.insights.InsightsSubreport;
 import java.io.IOException;
 
 /** A generic Java application {@link InsightsSubreport} JSON serializer implementation. */

diff --git a/...sights/core/app/AppInsightsSubreport.java → ...nsights/reports/AppInsightsSubreport.java b/...sights/core/app/AppInsightsSubreport.java → ...nsights/reports/AppInsightsSubreport.java
@@ -1,8 +1,7 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights.core.app;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.databind.JsonSerializer;
-import com.redhat.insights.InsightsSubreport;
 
 /** A generic Java application {@link InsightsSubreport} implementation. */
 public final class AppInsightsSubreport implements InsightsSubreport {

diff --git a/...a/com/redhat/insights/InsightsReport.java → ...dhat/insights/reports/InsightsReport.java b/...a/com/redhat/insights/InsightsReport.java → ...dhat/insights/reports/InsightsReport.java
@@ -1,11 +1,13 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights;
+package com.redhat.insights.reports;
 
 import static com.redhat.insights.InsightsErrorCode.ERROR_SERIALIZING_TO_JSON;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.redhat.insights.Filtering;
+import com.redhat.insights.InsightsException;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/...at/insights/InsightsReportSerializer.java → ...hts/reports/InsightsReportSerializer.java b/...at/insights/InsightsReportSerializer.java → ...hts/reports/InsightsReportSerializer.java
@@ -1,5 +1,5 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

diff --git a/...om/redhat/insights/InsightsSubreport.java → ...t/insights/reports/InsightsSubreport.java b/...om/redhat/insights/InsightsSubreport.java → ...t/insights/reports/InsightsSubreport.java
@@ -1,5 +1,5 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.databind.JsonSerializer;
 

diff --git a/...va/com/redhat/insights/ObjectMappers.java → ...edhat/insights/reports/ObjectMappers.java b/...va/com/redhat/insights/ObjectMappers.java → ...edhat/insights/reports/ObjectMappers.java
@@ -1,5 +1,5 @@
 /* Copyright (C) Red Hat 2023 */
-package com.redhat.insights;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...com/redhat/insights/UpdateReportImpl.java → ...at/insights/reports/UpdateReportImpl.java b/...com/redhat/insights/UpdateReportImpl.java → ...at/insights/reports/UpdateReportImpl.java
@@ -1,7 +1,8 @@
 /* Copyright (C) Red Hat 2023 */
-package com.redhat.insights;
+package com.redhat.insights.reports;
 
 import com.fasterxml.jackson.databind.JsonSerializer;
+import com.redhat.insights.Filtering;
 import com.redhat.insights.jars.JarInfo;
 import com.redhat.insights.jars.JarInfoSubreport;
 import com.redhat.insights.logging.InsightsLogger;

diff --git a/api/src/test/java/com/redhat/insights/AbstractReportTest.java b/api/src/test/java/com/redhat/insights/AbstractReportTest.java
@@ -11,6 +11,8 @@
 import com.redhat.insights.jars.JarInfoSubreport;
 import com.redhat.insights.jars.JarInfoSubreportSerializer;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
+import com.redhat.insights.reports.InsightsReportSerializer;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;

diff --git a/api/src/test/java/com/redhat/insights/InsightsReportControllerTest.java b/api/src/test/java/com/redhat/insights/InsightsReportControllerTest.java
@@ -10,6 +10,7 @@
 import com.redhat.insights.doubles.NoopInsightsLogger;
 import com.redhat.insights.http.InsightsHttpClient;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.Test;

diff --git a/api/src/test/java/com/redhat/insights/TestTopLevelReport.java b/api/src/test/java/com/redhat/insights/TestTopLevelReport.java
@@ -7,6 +7,8 @@
 import com.redhat.insights.jars.ClasspathJarInfoSubreport;
 import com.redhat.insights.jars.JarInfo;
 import com.redhat.insights.jars.JarInfoSubreport;
+import com.redhat.insights.reports.InsightsReport;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.io.IOException;
 import java.util.*;
 import org.junit.jupiter.api.Test;

diff --git a/api/src/test/java/com/redhat/insights/TestUpdateReport.java b/api/src/test/java/com/redhat/insights/TestUpdateReport.java
@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.redhat.insights.jars.JarInfo;
+import com.redhat.insights.reports.UpdateReportImpl;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ArrayBlockingQueue;

diff --git a/api/src/test/java/com/redhat/insights/doubles/DummyInsightsSubreport.java b/api/src/test/java/com/redhat/insights/doubles/DummyInsightsSubreport.java
@@ -2,7 +2,7 @@
 package com.redhat.insights.doubles;
 
 import com.fasterxml.jackson.databind.JsonSerializer;
-import com.redhat.insights.InsightsSubreport;
+import com.redhat.insights.reports.InsightsSubreport;
 
 /** A generic Java application {@link InsightsSubreport} implementation. */
 public final class DummyInsightsSubreport implements InsightsSubreport {

diff --git a/api/src/test/java/com/redhat/insights/doubles/DummyTopLevelReport.java b/api/src/test/java/com/redhat/insights/doubles/DummyTopLevelReport.java
@@ -1,9 +1,9 @@
 /* Copyright (C) Red Hat 2022-2023 */
 package com.redhat.insights.doubles;
 
-import com.redhat.insights.AbstractTopLevelReportBase;
-import com.redhat.insights.InsightsSubreport;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.AbstractTopLevelReportBase;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/api/src/test/java/com/redhat/insights/doubles/NoopInsightsHttpClient.java b/api/src/test/java/com/redhat/insights/doubles/NoopInsightsHttpClient.java
@@ -1,8 +1,8 @@
 /* Copyright (C) Red Hat 2023 */
 package com.redhat.insights.doubles;
 
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.http.InsightsHttpClient;
+import com.redhat.insights.reports.InsightsReport;
 
 public final class NoopInsightsHttpClient implements InsightsHttpClient {
 

diff --git a/api/src/test/java/com/redhat/insights/doubles/StoringInsightsHttpClient.java b/api/src/test/java/com/redhat/insights/doubles/StoringInsightsHttpClient.java
@@ -1,8 +1,8 @@
 /* Copyright (C) Red Hat 2023 */
 package com.redhat.insights.doubles;
 
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.http.InsightsHttpClient;
+import com.redhat.insights.reports.InsightsReport;
 
 /**
  * Fake http client, which will store content of report sent. Designed to test @link

diff --git a/api/src/test/java/com/redhat/insights/http/InsightsFileWritingClientTest.java b/api/src/test/java/com/redhat/insights/http/InsightsFileWritingClientTest.java
@@ -6,10 +6,10 @@
 import static org.mockito.Mockito.when;
 
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.doubles.NoopInsightsLogger;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/api/src/test/java/com/redhat/insights/http/InsightsMultiClientTest.java b/api/src/test/java/com/redhat/insights/http/InsightsMultiClientTest.java
@@ -5,12 +5,12 @@
 import static org.mockito.Mockito.*;
 
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.doubles.DummyTopLevelReport;
 import com.redhat.insights.doubles.NoopInsightsLogger;
 import com.redhat.insights.doubles.StoringInsightsHttpClient;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/api/src/test/java/com/redhat/insights/it/InsightsReportControllerTest.java b/api/src/test/java/com/redhat/insights/it/InsightsReportControllerTest.java
@@ -9,15 +9,15 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.InsightsReportController;
-import com.redhat.insights.InsightsSubreport;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.doubles.*;
 import com.redhat.insights.jars.ClasspathJarInfoSubreport;
 import com.redhat.insights.jars.JarInfo;
 import com.redhat.insights.jars.JarInfoSubreport;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.*;

diff --git a/runtime/src/main/java/com/redhat/insights/core/httpclient/InsightsJdkHttpClient.java b/runtime/src/main/java/com/redhat/insights/core/httpclient/InsightsJdkHttpClient.java
@@ -4,10 +4,10 @@
 import static com.redhat.insights.InsightsErrorCode.*;
 
 import com.redhat.insights.InsightsException;
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.http.InsightsHttpClient;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.net.ProxySelector;

diff --git a/.../insights/core/app/AppTopLevelReport.java → ...ights/core/reports/AppTopLevelReport.java b/.../insights/core/app/AppTopLevelReport.java → ...ights/core/reports/AppTopLevelReport.java
@@ -1,11 +1,11 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights.core.app;
+package com.redhat.insights.core.reports;
 
-import com.redhat.insights.InsightsSubreport;
 import com.redhat.insights.config.InsightsConfiguration;
-import com.redhat.insights.core.TopLevelReportBaseImpl;
 import com.redhat.insights.jars.ClasspathJarInfoSubreport;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.AppInsightsSubreport;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.util.Map;
 
 /**

diff --git a/...insights/core/TopLevelReportBaseImpl.java → .../core/reports/TopLevelReportBaseImpl.java b/...insights/core/TopLevelReportBaseImpl.java → .../core/reports/TopLevelReportBaseImpl.java
@@ -1,10 +1,10 @@
 /* Copyright (C) Red Hat 2022-2023 */
-package com.redhat.insights.core;
+package com.redhat.insights.core.reports;
 
-import com.redhat.insights.AbstractTopLevelReportBase;
-import com.redhat.insights.InsightsSubreport;
 import com.redhat.insights.config.InsightsConfiguration;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.AbstractTopLevelReportBase;
+import com.redhat.insights.reports.InsightsSubreport;
 import java.util.*;
 
 /**

diff --git a/runtime/src/test/java/com/redhat/insights/InsightsReportControllerThreadingTest.java b/runtime/src/test/java/com/redhat/insights/InsightsReportControllerThreadingTest.java
@@ -6,9 +6,9 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import com.redhat.insights.core.app.AppTopLevelReport;
 import com.redhat.insights.core.httpclient.HttpResponseBase;
 import com.redhat.insights.core.httpclient.MockInsightsJdkHttpClient;
+import com.redhat.insights.core.reports.AppTopLevelReport;
 import com.redhat.insights.doubles.MockInsightsConfiguration;
 import com.redhat.insights.doubles.NoopInsightsLogger;
 import com.redhat.insights.tls.PEMSupport;

diff --git a/runtime/src/test/java/com/redhat/insights/TopLevelReportBaseImplTest.java b/runtime/src/test/java/com/redhat/insights/TopLevelReportBaseImplTest.java
@@ -4,11 +4,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.redhat.insights.config.EnvAndSysPropsInsightsConfiguration;
-import com.redhat.insights.core.app.AppInsightsSubreport;
-import com.redhat.insights.core.app.AppTopLevelReport;
+import com.redhat.insights.core.reports.AppTopLevelReport;
 import com.redhat.insights.jars.ClasspathJarInfoSubreport;
 import com.redhat.insights.jars.JarInfo;
 import com.redhat.insights.logging.PrintLogger;
+import com.redhat.insights.reports.AppInsightsSubreport;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 

diff --git a/runtime/src/test/java/com/redhat/insights/core/httpclient/InsightsJdkHttpClientTest.java b/runtime/src/test/java/com/redhat/insights/core/httpclient/InsightsJdkHttpClientTest.java
@@ -4,13 +4,13 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import com.redhat.insights.InsightsReport;
 import com.redhat.insights.config.InsightsConfiguration;
-import com.redhat.insights.core.app.AppTopLevelReport;
+import com.redhat.insights.core.reports.AppTopLevelReport;
 import com.redhat.insights.doubles.DummyTopLevelReport;
 import com.redhat.insights.doubles.MockInsightsConfiguration;
 import com.redhat.insights.doubles.NoopInsightsLogger;
 import com.redhat.insights.logging.InsightsLogger;
+import com.redhat.insights.reports.InsightsReport;
 import com.redhat.insights.tls.PEMSupport;
 import java.io.File;
 import java.io.IOException;

diff --git a/runtime/src/test/java/com/redhat/insights/it/EphemeralEnvironmentTest.java b/runtime/src/test/java/com/redhat/insights/it/EphemeralEnvironmentTest.java
@@ -7,12 +7,12 @@
 
 import com.redhat.insights.InsightsReportController;
 import com.redhat.insights.config.EnvAndSysPropsInsightsConfiguration;
-import com.redhat.insights.core.app.AppInsightsSubreport;
-import com.redhat.insights.core.app.AppTopLevelReport;
 import com.redhat.insights.core.httpclient.InsightsJdkHttpClient;
+import com.redhat.insights.core.reports.AppTopLevelReport;
 import com.redhat.insights.doubles.DefaultConfiguration;
 import com.redhat.insights.jars.ClasspathJarInfoSubreport;
 import com.redhat.insights.logging.TestLogger;
+import com.redhat.insights.reports.AppInsightsSubreport;
 import com.redhat.insights.tls.PEMSupport;
 import java.nio.file.Path;
 import java.time.Duration;