Merge pull request #127 from ligangty/quarkus-3

Quarkus 3 migration
Commonjava · Jan 6, 2024 · 68d5346 · 68d5346
2 parents 93babb2 + 4db9e7e
commit 68d5346
Show file tree

Hide file tree

Showing 108 changed files with 389 additions and 1,778 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>service-parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.commonjava.indy.service</groupId>
@@ -44,7 +44,7 @@
 
     <atlas.version>1.1.1</atlas.version>
     <indymodel.version>1.5-SNAPSHOT</indymodel.version>
-    <indysecurity.verison>1.1</indysecurity.verison>
+    <indysecurity.verison>1.2-SNAPSHOT</indysecurity.verison>
 
     <cassandra.version>3.11.3</cassandra.version>
     <infinispan.version>14.0.6.Final</infinispan.version>
@@ -216,9 +216,13 @@
       <artifactId>jackson-dataformat-yaml</artifactId>
       <version>2.14.0</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.infinispan</groupId>-->
+<!--      <artifactId>infinispan-core</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-core</artifactId>
+      <artifactId>infinispan-core-jakarta</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
@@ -234,11 +238,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-      <version>2.0.2.Final</version>
-    </dependency>
     <dependency>
       <groupId>org.commonjava.atlas</groupId>
       <artifactId>atlas-relationships-api</artifactId>
@@ -350,8 +349,8 @@
     </dependency>
     <dependency>
       <groupId>org.commonjava.util</groupId>
-      <artifactId>http-testserver-core</artifactId>
-      <version>2.0</version>
+      <artifactId>http-testserver-quarkus</artifactId>
+      <version>2.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/main/java/org/commonjava/indy/service/repository/change/GroupConsistencyListener.java b/src/main/java/org/commonjava/indy/service/repository/change/GroupConsistencyListener.java
@@ -29,8 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.Set;
 
 import static org.commonjava.indy.service.repository.change.event.kafka.KafkaEventUtils.CHANNEL_INTERNAL;

diff --git a/src/main/java/org/commonjava/indy/service/repository/change/audit/StoreAuditManager.java b/src/main/java/org/commonjava/indy/service/repository/change/audit/StoreAuditManager.java
@@ -31,9 +31,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...java/org/commonjava/indy/service/repository/change/event/DefaultStoreEventDispatcher.java b/...java/org/commonjava/indy/service/repository/change/event/DefaultStoreEventDispatcher.java
@@ -34,9 +34,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

diff --git a/...in/java/org/commonjava/indy/service/repository/change/event/NoOpStoreEventDispatcher.java b/...in/java/org/commonjava/indy/service/repository/change/event/NoOpStoreEventDispatcher.java
@@ -20,8 +20,8 @@
 import org.commonjava.indy.service.repository.model.ArtifactStore;
 import org.commonjava.indy.service.repository.model.StoreKey;
 
-import javax.enterprise.inject.Alternative;
-import javax.inject.Named;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Named;
 import java.util.Map;
 
 @Alternative

diff --git a/src/main/java/org/commonjava/indy/service/repository/change/event/StoreEventDispatcher.java b/src/main/java/org/commonjava/indy/service/repository/change/event/StoreEventDispatcher.java
@@ -20,7 +20,7 @@
 import org.commonjava.indy.service.repository.model.ArtifactStore;
 import org.commonjava.indy.service.repository.model.StoreKey;
 
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
 import java.util.Map;
 
 /**

diff --git a/src/main/java/org/commonjava/indy/service/repository/change/event/kafka/KafkaEventUtils.java b/src/main/java/org/commonjava/indy/service/repository/change/event/kafka/KafkaEventUtils.java
@@ -22,8 +22,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 /**
  * This event dispatcher will dispatch Store Event through kafka

diff --git a/src/main/java/org/commonjava/indy/service/repository/client/storage/StorageService.java b/src/main/java/org/commonjava/indy/service/repository/client/storage/StorageService.java
@@ -17,10 +17,10 @@
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
 
 @Path("/api/storage")
 @RegisterRestClient(configKey="storage-service-api")

diff --git a/...in/java/org/commonjava/indy/service/repository/client/util/CustomClientRequestFilter.java b/...in/java/org/commonjava/indy/service/repository/client/util/CustomClientRequestFilter.java
@@ -21,13 +21,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.ext.Provider;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 @Priority(Priorities.AUTHENTICATION)

diff --git a/src/main/java/org/commonjava/indy/service/repository/config/IndyRepositoryConfiguration.java b/src/main/java/org/commonjava/indy/service/repository/config/IndyRepositoryConfiguration.java
@@ -20,7 +20,7 @@
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/src/main/java/org/commonjava/indy/service/repository/controller/AdminController.java b/src/main/java/org/commonjava/indy/service/repository/controller/AdminController.java
@@ -35,14 +35,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.List;
 
-import static javax.ws.rs.core.Response.Status.FORBIDDEN;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 
 @ApplicationScoped
 public class AdminController

diff --git a/src/main/java/org/commonjava/indy/service/repository/controller/MaintenanceController.java b/src/main/java/org/commonjava/indy/service/repository/controller/MaintenanceController.java
@@ -26,8 +26,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/src/main/java/org/commonjava/indy/service/repository/controller/QueryController.java b/src/main/java/org/commonjava/indy/service/repository/controller/QueryController.java
@@ -29,8 +29,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -40,9 +40,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static org.commonjava.indy.service.repository.model.StoreKey.fromString;
 import static org.commonjava.indy.service.repository.model.pkg.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 import static org.commonjava.indy.service.repository.model.pkg.PackageTypeConstants.isValidPackageType;

diff --git a/src/main/java/org/commonjava/indy/service/repository/controller/StatsController.java b/src/main/java/org/commonjava/indy/service/repository/controller/StatsController.java
@@ -25,12 +25,12 @@
 import org.commonjava.indy.service.repository.model.version.Versioning;
 import org.commonjava.indy.service.repository.util.JaxRsUriFormatter;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 
 @ApplicationScoped
 public class StatsController

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/AbstractStoreDataManager.java b/src/main/java/org/commonjava/indy/service/repository/data/AbstractStoreDataManager.java
@@ -32,7 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -50,7 +50,7 @@
 
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonMap;
-import static javax.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
+import static jakarta.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.commonjava.indy.service.repository.data.StoreUpdateAction.DELETE;

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/DefaultArtifactStoreQuery.java b/src/main/java/org/commonjava/indy/service/repository/data/DefaultArtifactStoreQuery.java
@@ -32,7 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/DefaultStoreValidator.java b/src/main/java/org/commonjava/indy/service/repository/data/DefaultStoreValidator.java
@@ -28,9 +28,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/StoreDataManagerProducer.java b/src/main/java/org/commonjava/indy/service/repository/data/StoreDataManagerProducer.java
@@ -18,17 +18,15 @@
 import org.commonjava.indy.service.repository.config.IndyRepositoryConfiguration;
 import org.commonjava.indy.service.repository.data.annotations.ClusterStoreDataManager;
 import org.commonjava.indy.service.repository.data.annotations.MemStoreDataManager;
-import org.commonjava.indy.service.repository.data.annotations.StandaloneStoreDataManager;
 import org.commonjava.indy.service.repository.data.cassandra.CassandraStoreDataManager;
-import org.commonjava.indy.service.repository.data.infinispan.InfinispanStoreDataManager;
 import org.commonjava.indy.service.repository.data.mem.MemoryStoreDataManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class StoreDataManagerProducer
@@ -41,16 +39,11 @@ public class StoreDataManagerProducer
     @Produces
     @ApplicationScoped
     @Default
-    public StoreDataManager produces( @StandaloneStoreDataManager InfinispanStoreDataManager ispnStoreDataManager,
-                                      @ClusterStoreDataManager CassandraStoreDataManager clusterStoreDataManager,
+    public StoreDataManager produces( @ClusterStoreDataManager CassandraStoreDataManager clusterStoreDataManager,
                                       @MemStoreDataManager MemoryStoreDataManager memoryStoreDataManager )
     {
         String storageType = repoConfig.storageType().orElse( "" );
-        if ( IndyRepositoryConfiguration.STORAGE_INFINISPAN.equals( storageType ) )
-        {
-            return ispnStoreDataManager;
-        }
-        else if ( IndyRepositoryConfiguration.STORAGE_CASSANDRA.equals( storageType ) )
+        if ( IndyRepositoryConfiguration.STORAGE_CASSANDRA.equals( storageType ) )
         {
             return clusterStoreDataManager;
         }

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/StoreDataSetupAction.java b/src/main/java/org/commonjava/indy/service/repository/data/StoreDataSetupAction.java
@@ -30,9 +30,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import static org.commonjava.indy.service.repository.model.pkg.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/StoreValidator.java b/src/main/java/org/commonjava/indy/service/repository/data/StoreValidator.java
@@ -17,7 +17,7 @@
 
 import org.commonjava.indy.service.repository.model.ArtifactStore;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * Store Validator  used to validate URL for for {@link ArtifactStore} instances and

diff --git a/...java/org/commonjava/indy/service/repository/data/annotations/ClusterStoreDataManager.java b/...java/org/commonjava/indy/service/repository/data/annotations/ClusterStoreDataManager.java
@@ -15,7 +15,7 @@
  */
 package org.commonjava.indy.service.repository.data.annotations;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ain/java/org/commonjava/indy/service/repository/data/annotations/MemStoreDataManager.java b/...ain/java/org/commonjava/indy/service/repository/data/annotations/MemStoreDataManager.java
@@ -15,7 +15,7 @@
  */
 package org.commonjava.indy.service.repository.data.annotations;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...a/org/commonjava/indy/service/repository/data/annotations/StandaloneStoreDataManager.java b/...a/org/commonjava/indy/service/repository/data/annotations/StandaloneStoreDataManager.java
@@ -15,7 +15,7 @@
  */
 package org.commonjava.indy.service.repository.data.annotations;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/src/main/java/org/commonjava/indy/service/repository/data/cassandra/CassandraClient.java b/src/main/java/org/commonjava/indy/service/repository/data/cassandra/CassandraClient.java
@@ -22,9 +22,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

diff --git a/...in/java/org/commonjava/indy/service/repository/data/cassandra/CassandraConfiguration.java b/...in/java/org/commonjava/indy/service/repository/data/cassandra/CassandraConfiguration.java
@@ -18,8 +18,8 @@
 import io.quarkus.runtime.Startup;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.Optional;
 
 import static java.util.Optional.of;