diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc index c1921cf..67db5c7 100644 --- a/docs/modules/ROOT/pages/includes/attributes.adoc +++ b/docs/modules/ROOT/pages/includes/attributes.adoc @@ -1,3 +1,3 @@ -:project-version: 1.2.0 -:infinispan-version: 15.0.19.Final +:project-version: 2.0.0 +:infinispan-version: 16.0.0.Dev04 :examples-dir: ./../examples/ diff --git a/docs/modules/ROOT/pages/includes/quarkus-infinispan-embedded_quarkus.infinispan-embedded.adoc b/docs/modules/ROOT/pages/includes/quarkus-infinispan-embedded_quarkus.infinispan-embedded.adoc index e073e83..a75f1b0 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-infinispan-embedded_quarkus.infinispan-embedded.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-infinispan-embedded_quarkus.infinispan-embedded.adoc @@ -47,7 +47,7 @@ Environment variable: `+++QUARKUS_INFINISPAN_EMBEDDED_CLUSTERED+++` endif::add-copy-button-to-env-var[] -- |boolean -|`true` +|`+++true+++` |=== diff --git a/extension/deployment/pom.xml b/extension/deployment/pom.xml index 5381205..8458c49 100644 --- a/extension/deployment/pom.xml +++ b/extension/deployment/pom.xml @@ -24,8 +24,10 @@ quarkus-caffeine-deployment - io.quarkus - quarkus-micrometer-registry-prometheus-deployment + io.quarkiverse.micrometer.registry + quarkus-micrometer-registry-prometheus-v1-deployment + ${quarkus-micrometer-registry-prometheus-v1.version} + true io.quarkus diff --git a/extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java b/extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java index b8360dd..bc5a24e 100644 --- a/extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java +++ b/extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java @@ -17,8 +17,6 @@ import jakarta.enterprise.inject.Default; import org.infinispan.AdvancedCache; -import org.infinispan.commons.marshall.AbstractExternalizer; -import org.infinispan.commons.marshall.AdvancedExternalizer; import org.infinispan.configuration.cache.AbstractModuleConfigurationBuilder; import org.infinispan.configuration.cache.StoreConfiguration; import org.infinispan.configuration.cache.StoreConfigurationBuilder; @@ -30,7 +28,6 @@ import org.infinispan.interceptors.AsyncInterceptor; import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.notifications.Listener; -import org.infinispan.persistence.spi.CacheWriter; import org.infinispan.persistence.spi.NonBlockingStore; import org.infinispan.protostream.BaseMarshaller; import org.infinispan.protostream.EnumMarshaller; @@ -161,7 +158,6 @@ ProtobufInitializers setup(BuildProducer reflectiveCla // We need to use the CombinedIndex for these interfaces in order to discover implementations of the various // subclasses. addReflectionForClass(CacheLoader.class, combinedIndex, reflectiveClass, excludedClasses); - addReflectionForClass(CacheWriter.class, combinedIndex, reflectiveClass, excludedClasses); addReflectionForClass(NonBlockingStore.class, combinedIndex, reflectiveClass, excludedClasses); addReflectionForName(AsyncInterceptor.class.getName(), true, combinedIndex, reflectiveClass, false, true, excludedClasses); @@ -181,11 +177,6 @@ ProtobufInitializers setup(BuildProducer reflectiveCla } } - // We only register the app advanced externalizers as all of the Infinispan ones are explicitly defined - addReflectionForClass(AdvancedExternalizer.class, appOnlyIndex, reflectiveClass, Collections.emptySet()); - // Due to the index not containing AbstractExternalizer it doesn't know that it implements AdvancedExternalizer - // thus we also have to include classes that extend AbstractExternalizer - addReflectionForClass(AbstractExternalizer.class, appOnlyIndex, reflectiveClass, Collections.emptySet()); addReflectionForClass(CacheHealth.class, appOnlyIndex, reflectiveClass, Collections.emptySet()); addReflectionForClass(ClusterHealth.class, appOnlyIndex, reflectiveClass, Collections.emptySet()); diff --git a/extension/runtime/pom.xml b/extension/runtime/pom.xml index ebbcc52..64e3b54 100644 --- a/extension/runtime/pom.xml +++ b/extension/runtime/pom.xml @@ -26,8 +26,10 @@ quarkus-caffeine - io.quarkus - quarkus-micrometer-registry-prometheus + io.quarkiverse.micrometer.registry + quarkus-micrometer-registry-prometheus-v1 + ${quarkus-micrometer-registry-prometheus-v1.version} + true io.quarkus diff --git a/extension/runtime/src/main/java/io/quarkiverse/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java b/extension/runtime/src/main/java/io/quarkiverse/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java index 96de6d5..efb6cff 100644 --- a/extension/runtime/src/main/java/io/quarkiverse/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java +++ b/extension/runtime/src/main/java/io/quarkiverse/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.UncheckedIOException; import java.util.List; import java.util.Map; @@ -125,16 +124,6 @@ private static class QuarkusContextInitializer implements SerializationContextIn } - @Override - public String getProtoFileName() { - return schema.getName(); - } - - @Override - public String getProtoFile() throws UncheckedIOException { - return schema.toString(); - } - @Override public void registerSchema(SerializationContext serCtx) { serCtx.registerProtoFiles(fromString(schema.getName(), schema.toString())); diff --git a/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/AbstractSerializationContextInitializer.java b/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/AbstractSerializationContextInitializer.java index ed988db..a875b55 100644 --- a/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/AbstractSerializationContextInitializer.java +++ b/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/AbstractSerializationContextInitializer.java @@ -1,7 +1,5 @@ package io.quarkiverse.infinispan.embedded.it.extension; -import java.io.UncheckedIOException; - import org.infinispan.protostream.SerializationContext; import org.infinispan.protostream.SerializationContextInitializer; @@ -48,12 +46,6 @@ */ public abstract class AbstractSerializationContextInitializer implements SerializationContextInitializer { - @Override - public abstract String getProtoFileName(); - - @Override - public abstract String getProtoFile() throws UncheckedIOException; - @Override public abstract void registerSchema(SerializationContext serCtx); diff --git a/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestAdvancedExternalizer.java b/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestAdvancedExternalizer.java deleted file mode 100644 index 8570a2f..0000000 --- a/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestAdvancedExternalizer.java +++ /dev/null @@ -1,79 +0,0 @@ -package io.quarkiverse.infinispan.embedded.it.extension; - -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.util.Date; -import java.util.Set; - -import org.infinispan.commons.marshall.AbstractExternalizer; -import org.infinispan.commons.marshall.AdvancedExternalizer; -import org.infinispan.commons.util.Util; - -/** - * Contains various AdvancedExternalizers implementations to test with XML configuration - */ -public class TestAdvancedExternalizer { - - public static class IdViaConfigObj { - String name; - - public IdViaConfigObj setName(String name) { - this.name = name; - return this; - } - - public static class Externalizer implements AdvancedExternalizer { - @Override - public void writeObject(ObjectOutput output, IdViaConfigObj object) throws IOException { - output.writeUTF(object.name); - } - - @Override - public IdViaConfigObj readObject(ObjectInput input) throws IOException, ClassNotFoundException { - return new IdViaConfigObj().setName(input.readUTF()); - } - - @Override - public Set> getTypeClasses() { - return Util.asSet(IdViaConfigObj.class); - } - - @Override - public Integer getId() { - return null; - } - } - } - - public static class IdViaAnnotationObj { - Date date; - - public IdViaAnnotationObj setDate(Date date) { - this.date = date; - return this; - } - - public static class Externalizer extends AbstractExternalizer { - @Override - public void writeObject(ObjectOutput output, IdViaAnnotationObj object) throws IOException { - output.writeObject(object.date); - } - - @Override - public IdViaAnnotationObj readObject(ObjectInput input) throws IOException, ClassNotFoundException { - return new IdViaAnnotationObj().setDate((Date) input.readObject()); - } - - @Override - public Integer getId() { - return 5678; - } - - @Override - public Set> getTypeClasses() { - return Util.asSet(IdViaAnnotationObj.class); - } - } - } -} diff --git a/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestCacheLoader.java b/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestCacheLoader.java deleted file mode 100644 index 8683cb7..0000000 --- a/integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestCacheLoader.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.quarkiverse.infinispan.embedded.it.extension; - -import java.util.concurrent.Executor; -import java.util.function.Predicate; - -import org.infinispan.persistence.spi.AdvancedLoadWriteStore; -import org.infinispan.persistence.spi.InitializationContext; -import org.infinispan.persistence.spi.MarshallableEntry; -import org.reactivestreams.Publisher; - -// Here to test a custom cache loader configured via XML -public class TestCacheLoader implements AdvancedLoadWriteStore { - @Override - public int size() { - return 0; - } - - @Override - public Publisher entryPublisher(Predicate filter, boolean fetchValue, boolean fetchMetadata) { - return null; - } - - @Override - public void clear() { - - } - - @Override - public void purge(Executor threadPool, PurgeListener listener) { - - } - - @Override - public void init(InitializationContext ctx) { - - } - - @Override - public void write(MarshallableEntry entry) { - - } - - @Override - public MarshallableEntry loadEntry(Object key) { - return null; - } - - @Override - public boolean delete(Object key) { - return false; - } - - @Override - public boolean contains(Object key) { - return false; - } - - @Override - public void start() { - - } - - @Override - public void stop() { - - } -} diff --git a/pom.xml b/pom.xml index e071b09..6fe5d84 100644 --- a/pom.xml +++ b/pom.xml @@ -21,12 +21,13 @@ HEAD - 3.20.1 - 1.2.0 - 15.0.19.Final + 3.27.0 + 3.25.0 + 3.12.1 + 3.4.1 + 16.0.0.Dev04 1.0.14.Final 3.26.3 - 7.1.2.Final @@ -44,13 +45,6 @@ pom import - - org.hibernate.search - hibernate-search-bom - ${hibernate-search.version} - pom - import - io.quarkus quarkus-bom @@ -75,7 +69,7 @@ io.quarkus.bot build-reporter-maven-extension - 3.9.6 + ${quarkus-build-reporter.version}