Merge pull request #46 from lburgazzoli/caffeine

Caffeine
apache · Jul 9, 2019 · 206aebb · 206aebb
2 parents 86e02a7 + 1a808a0
commit 206aebb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/...ore/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/...ore/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -26,9 +26,20 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
-
 import javax.inject.Inject;
 
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
+import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.substrate.ReflectiveMethodBuildItem;
+import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem;
+import io.quarkus.jaxb.deployment.JaxbEnabledBuildItem;
+import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
 import org.apache.camel.Consumer;
 import org.apache.camel.Converter;
 import org.apache.camel.Endpoint;
@@ -49,20 +60,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveMethodBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem;
-import io.quarkus.jaxb.deployment.JaxbEnabledBuildItem;
-import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
-
 class CamelProcessor {
 
     private static final List<Class<?>> CAMEL_REFLECTIVE_CLASSES = Arrays.asList(
@@ -119,13 +116,6 @@ FeatureBuildItem feature() {
         return new FeatureBuildItem(FeatureBuildItem.CAMEL_CORE);
     }
 
-    @BuildStep
-    SubstrateConfigBuildItem processSystemProperties() {
-        return SubstrateConfigBuildItem.builder()
-                .addNativeImageSystemProperty("CamelSimpleLRUCacheFactory", "true")
-                .build();
-    }
-
     @BuildStep
     List<HotDeploymentWatchedFileBuildItem> configFile() {
         return buildTimeConfig.routesUris.stream()

diff --git a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanITCase.java b/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelInfinispanITCase.java
@@ -16,11 +16,8 @@
  */
 package io.quarkus.it.camel.core;
 
-import org.junit.jupiter.api.Disabled;
-
 import io.quarkus.test.junit.SubstrateTest;
 
-@Disabled("See https://github.com/quarkusio/quarkus/issues/2351")
 @SubstrateTest
 public class CamelInfinispanITCase extends CamelInfinispanTest {
 }