Merge pull request #50615 from mkouba/cache-api-artifact

quarkus-cache minor cleanup

Author: mkouba

bom/application/pom.xml

@@ -3394,11 +3394,6 @@
                 <artifactId>quarkus-cache-deployment-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-cache-runtime-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-google-cloud-functions</artifactId>

extensions/cache/deployment-spi/pom.xml

@@ -18,10 +18,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-cache-runtime-spi</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/AdditionalCacheNameBuildItem.java

@@ -1,4 +1,4 @@
-package io.quarkus.cache.deployment.spi;
+package io.quarkus.cache.deployment;
 
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.cache.CacheManagerInfo;

extensions/cache/deployment-spi/src/main/java/io/quarkus/cache/deployment/spi/CacheManagerInfoBuildItem.java renamed to extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheManagerInfoBuildItem.java

@@ -54,7 +54,6 @@
 import io.quarkus.cache.deployment.exception.UnsupportedRepeatedAnnotationException;
 import io.quarkus.cache.deployment.exception.VoidReturnTypeTargetException;
 import io.quarkus.cache.deployment.spi.AdditionalCacheNameBuildItem;
-import io.quarkus.cache.deployment.spi.CacheManagerInfoBuildItem;
 import io.quarkus.cache.deployment.spi.CacheTypeBuildItem;
 import io.quarkus.cache.runtime.CacheBuildConfig;
 import io.quarkus.cache.runtime.CacheInvalidateAllInterceptor;
@@ -104,7 +103,6 @@ CacheTypeBuildItem type(CacheBuildConfig config) {
     @BuildStep
     void validateCacheAnnotationsAndProduceCacheNames(CombinedIndexBuildItem combinedIndex,
             List<AdditionalCacheNameBuildItem> additionalCacheNames,
-            List<io.quarkus.cache.deployment.AdditionalCacheNameBuildItem> additionalCacheNamesDeprecated,
             BuildProducer<ValidationErrorBuildItem> validationErrors,
             BuildProducer<CacheNamesBuildItem> cacheNames, BeanDiscoveryFinishedBuildItem beanDiscoveryFinished) {
 
@@ -174,9 +172,6 @@ void validateCacheAnnotationsAndProduceCacheNames(CombinedIndexBuildItem combine
         for (AdditionalCacheNameBuildItem additionalCacheName : additionalCacheNames) {
             names.add(additionalCacheName.getName());
         }
-        for (io.quarkus.cache.deployment.AdditionalCacheNameBuildItem additionalCacheName : additionalCacheNamesDeprecated) {
-            names.add(additionalCacheName.getName());
-        }
         cacheNames.produce(new CacheNamesBuildItem(names));
 
         if (!keyGenerators.isEmpty()) {
@@ -277,6 +272,7 @@ SyntheticBeanBuildItem configureCacheManagerSyntheticBean(List<CacheManagerInfoB
                 .scope(ApplicationScoped.class)
                 .supplier(cacheManagerSupplier)
                 .setRuntimeInit()
+                .startup()
                 .done();
     }
 

extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java

@@ -19,7 +19,6 @@
         <module>deployment</module>
         <module>deployment-spi</module>
         <module>runtime</module>
-        <module>runtime-spi</module>
         <module>runtime-dev</module>
     </modules>
 </project>

extensions/cache/pom.xml

@@ -31,10 +31,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-cache-runtime-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web</artifactId>