NationalSecurityAgency · doublejai · Oct 17, 2024 · Nov 18, 2024 · Oct 25, 2024 · Nov 7, 2024
diff --git a/core/base-rest-responses b/core/base-rest-responses
diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml
@@ -26,6 +26,10 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>authorization-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-core</artifactId>

diff --git a/core/common-util/src/main/java/datawave/core/common/logging/ThreadConfigurableLogger.java b/core/common-util/src/main/java/datawave/core/common/logging/ThreadConfigurableLogger.java
diff --git a/core/common-util/src/main/java/datawave/core/common/util/EnvProvider.java b/core/common-util/src/main/java/datawave/core/common/util/EnvProvider.java
@@ -1,13 +1,12 @@
 package datawave.core.common.util;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
-
-import datawave.core.common.logging.ThreadConfigurableLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EnvProvider {
 
-    private static final Logger log = ThreadConfigurableLogger.getLogger(EnvProvider.class);
+    private static final Logger log = LoggerFactory.getLogger(EnvProvider.class);
 
     private static final String ENV_PREFIX = "env:";
 

diff --git a/core/in-memory-accumulo b/core/in-memory-accumulo
diff --git a/core/metrics-reporter b/core/metrics-reporter
diff --git a/core/utils/accumulo-utils b/core/utils/accumulo-utils
diff --git a/core/utils/common-utils b/core/utils/common-utils
diff --git a/core/utils/metadata-utils b/core/utils/metadata-utils
diff --git a/core/utils/type-utils b/core/utils/type-utils
diff --git a/microservices/microservice-parent b/microservices/microservice-parent
diff --git a/microservices/microservice-service-parent b/microservices/microservice-service-parent
diff --git a/microservices/services/accumulo b/microservices/services/accumulo
diff --git a/microservices/services/audit b/microservices/services/audit
diff --git a/microservices/services/authorization b/microservices/services/authorization
diff --git a/microservices/services/config b/microservices/services/config
diff --git a/microservices/services/dictionary b/microservices/services/dictionary
diff --git a/microservices/services/hazelcast b/microservices/services/hazelcast
diff --git a/microservices/services/map b/microservices/services/map
diff --git a/microservices/services/mapreduce-query b/microservices/services/mapreduce-query
diff --git a/microservices/services/modification b/microservices/services/modification
diff --git a/microservices/services/query b/microservices/services/query
diff --git a/microservices/services/query-executor b/microservices/services/query-executor
diff --git a/microservices/services/query-metric b/microservices/services/query-metric
diff --git a/microservices/starters/audit b/microservices/starters/audit
diff --git a/microservices/starters/cache b/microservices/starters/cache
diff --git a/microservices/starters/cached-results b/microservices/starters/cached-results
diff --git a/microservices/starters/datawave b/microservices/starters/datawave
diff --git a/microservices/starters/metadata b/microservices/starters/metadata
diff --git a/microservices/starters/query b/microservices/starters/query
diff --git a/microservices/starters/query-metric b/microservices/starters/query-metric
diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/TypeRegistry.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/TypeRegistry.java
@@ -12,12 +12,12 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.RecordReader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
-import datawave.core.common.logging.ThreadConfigurableLogger;
 import datawave.ingest.data.config.ConfigurationHelper;
 import datawave.ingest.data.config.DataTypeOverrideHelper;
 import datawave.ingest.data.config.filter.KeyValueFilter;
@@ -28,7 +28,7 @@
 
 public class TypeRegistry extends HashMap<String,Type> {
 
-    private static final Logger log = ThreadConfigurableLogger.getLogger(TypeRegistry.class);
+    private static final Logger log = LoggerFactory.getLogger(TypeRegistry.class);
 
     public static final String ALL_PREFIX = "all";
+53 −5		.github/workflows/tests.yaml
+1 −1		src/main/java/datawave/query/util/MetadataHelper.java
+0 −18		.github/workflows/build-images.yml
+78 −7		.github/workflows/tests.yaml
+6 −6		api/pom.xml
+8 −8		service/pom.xml
+1 −1		service/src/main/java/datawave/microservice/accumulo/admin/AdminService.java
+1 −1		service/src/main/java/datawave/microservice/accumulo/stats/util/AccumuloMonitorLocator.java
+1 −1		service/src/test/java/datawave/microservice/accumulo/stats/StatsServiceTest.java
+1 −1		service/src/test/java/datawave/microservice/accumulo/stats/util/AccumuloMonitorLocatorTest.java
+0 −18		.github/workflows/build-images.yml
+72 −7		.github/workflows/tests.yaml
+0 −18		.github/workflows/build-images.yml
+77 −7		.github/workflows/tests.yaml
+6 −6		jobs/core/pom.xml
+5 −5		service/pom.xml
+0 −18		.github/workflows/build-images.yml
+55 −7		.github/workflows/tests.yaml
+2 −2		api/pom.xml
+5 −5		service/pom.xml
+55 −7		.github/workflows/tests.yaml
+10 −16		pom.xml
+33 −129		src/main/java/datawave/microservice/query/cachedresults/CachedResultsQueryService.java
+16 −22		src/main/java/datawave/microservice/query/cachedresults/config/CachedResultsQueryConfiguration.java
+6 −16		src/main/java/datawave/microservice/query/cachedresults/status/CachedResultsQueryStatus.java
+26 −57		src/main/java/datawave/microservice/query/cachedresults/status/cache/CachedResultsQueryCache.java
+4 −4		src/main/java/datawave/microservice/query/cachedresults/status/cache/CachedResultsQueryIdByAliasCache.java
+4 −4		src/main/java/datawave/microservice/query/cachedresults/status/cache/CachedResultsQueryIdByViewCache.java
+3 −3		src/main/java/datawave/microservice/query/cachedresults/status/cache/CachedResultsQueryStatusCache.java
+0 −40		src/main/java/datawave/microservice/query/cachedresults/status/cache/DefinedQueryIdByCachedQueryIdCache.java
+55 −7		.github/workflows/tests.yaml
+15 −15		pom.xml
+0 −39		src/main/java/datawave/microservice/config/RequestScopeBeanSupplier.java