This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 481197d30ac30d7b091ddc6611702b038ce2a48f
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Dec 18 11:25:42 2018 +0100
Remove files related to the removed HazelcastComponent
---
.../hazelcast/HazelcastCamelTestHelper.java | 3 -
.../HazelcastComponentAutoConfiguration.java | 114 ---------------------
.../HazelcastComponentConfiguration.java | 77 --------------
.../HazelcastInstanceCustomizerTest.java | 91 ----------------
.../src/test/resources/application.properties | 18 ----
.../src/test/resources/logback.xml | 52 ----------
6 files changed, 355 deletions(-)
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestHelper.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestHelper.java
index 425eb5a..348fa95 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestHelper.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestHelper.java
@@ -70,9 +70,6 @@ public final class HazelcastCamelTestHelper {
HazelcastTopicComponent topic = new HazelcastTopicComponent(context);
topic.setHazelcastInstance(hazelcastInstance);
context.addComponent("hazelcast-topic", topic);
- HazelcastComponent old = new HazelcastComponent(context);
- old.setHazelcastInstance(hazelcastInstance);
- context.addComponent("hazelcast", old);
}
}
diff --git
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
deleted file mode 100644
index 2a0c13a..0000000
---
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.hazelcast.springboot;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.hazelcast.HazelcastComponent;
-import org.apache.camel.support.IntrospectionSupport;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionMessage;
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.context.properties.bind.Bindable;
-import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@Configuration
-@ConditionalOnBean(type =
"org.apache.camel.spring.boot.CamelAutoConfiguration")
-@Conditional(HazelcastComponentAutoConfiguration.Condition.class)
-@AutoConfigureAfter(name =
"org.apache.camel.spring.boot.CamelAutoConfiguration")
-@EnableConfigurationProperties(HazelcastComponentConfiguration.class)
-public class HazelcastComponentAutoConfiguration {
-
- @Lazy
- @Bean(name = "hazelcast-component")
- @ConditionalOnClass(CamelContext.class)
- @ConditionalOnMissingBean(HazelcastComponent.class)
- public HazelcastComponent configureHazelcastComponent(
- CamelContext camelContext,
- HazelcastComponentConfiguration configuration) throws Exception {
- HazelcastComponent component = new HazelcastComponent();
- component.setCamelContext(camelContext);
- Map<String, Object> parameters = new HashMap<>();
- IntrospectionSupport.getProperties(configuration, parameters, null,
- false);
- for (Map.Entry<String, Object> entry : parameters.entrySet()) {
- Object value = entry.getValue();
- Class<?> paramClass = value.getClass();
- if (paramClass.getName().endsWith("NestedConfiguration")) {
- Class nestedClass = null;
- try {
- nestedClass = (Class) paramClass.getDeclaredField(
- "CAMEL_NESTED_CLASS").get(null);
- HashMap<String, Object> nestedParameters = new HashMap<>();
- IntrospectionSupport.getProperties(value, nestedParameters,
- null, false);
- Object nestedProperty = nestedClass.newInstance();
- IntrospectionSupport.setProperties(camelContext,
- camelContext.getTypeConverter(), nestedProperty,
- nestedParameters);
- entry.setValue(nestedProperty);
- } catch (NoSuchFieldException e) {
- }
- }
- }
- IntrospectionSupport.setProperties(camelContext,
- camelContext.getTypeConverter(), component, parameters);
- return component;
- }
-
-
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
- public static class Condition extends SpringBootCondition {
- @Override
- public ConditionOutcome getMatchOutcome(
- ConditionContext conditionContext,
- AnnotatedTypeMetadata annotatedTypeMetadata) {
- boolean groupEnabled = isEnabled(conditionContext,
- "camel.component.", true);
- ConditionMessage.Builder message = ConditionMessage
- .forCondition("camel.component.hazelcast");
- if (isEnabled(conditionContext, "camel.component.hazelcast.",
- groupEnabled)) {
- return ConditionOutcome.match(message.because("enabled"));
- }
- return ConditionOutcome.noMatch(message.because("not enabled"));
- }
-
- private boolean isEnabled(
- org.springframework.context.annotation.ConditionContext
context,
- java.lang.String prefix, boolean defaultValue) {
- String property = prefix.endsWith(".") ? prefix + "enabled" :
prefix + ".enabled";
- return Binder.get(context.getEnvironment()).bind(property,
Bindable.of(Boolean.class)).orElse(defaultValue);
- }
- }
-}
\ No newline at end of file
diff --git
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentConfiguration.java
deleted file mode 100644
index abda166..0000000
---
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentConfiguration.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.hazelcast.springboot;
-
-import javax.annotation.Generated;
-import com.hazelcast.core.HazelcastInstance;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
-
-/**
- * The hazelcast component allows you to work with the Hazelcast distributed
- * data grid / cache.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.hazelcast")
-public class HazelcastComponentConfiguration {
-
- /**
- * The hazelcast instance reference which can be used for hazelcast
- * endpoint. If you don't specify the instance reference camel use the
- * default hazelcast instance from the camel-hazelcast instance.
- */
- @NestedConfigurationProperty
- private HazelcastInstance hazelcastInstance;
- /**
- * The hazelcast mode reference which kind of instance should be used. If
- * you don't specify the mode then the node mode will be the default.
- */
- private String hazelcastMode = "node";
- /**
- * Whether the component should resolve property placeholders on itself
when
- * starting. Only properties which are of String type can use property
- * placeholders.
- */
- private Boolean resolvePropertyPlaceholders = true;
-
- public HazelcastInstance getHazelcastInstance() {
- return hazelcastInstance;
- }
-
- public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
- this.hazelcastInstance = hazelcastInstance;
- }
-
- public String getHazelcastMode() {
- return hazelcastMode;
- }
-
- public void setHazelcastMode(String hazelcastMode) {
- this.hazelcastMode = hazelcastMode;
- }
-
- public Boolean getResolvePropertyPlaceholders() {
- return resolvePropertyPlaceholders;
- }
-
- public void setResolvePropertyPlaceholders(
- Boolean resolvePropertyPlaceholders) {
- this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
- }
-}
\ No newline at end of file
diff --git
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java
deleted file mode 100644
index 8bc3e93..0000000
---
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.hazelcast.springboot.customizer;
-
-
-import java.util.List;
-
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.HazelcastInstance;
-import org.apache.camel.component.hazelcast.HazelcastComponent;
-import org.apache.camel.component.hazelcast.list.HazelcastListComponent;
-import org.apache.camel.component.hazelcast.set.HazelcastSetComponent;
-import org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@DirtiesContext
-@SpringBootApplication
-@SpringBootTest(
- classes = {
- HazelcastInstanceCustomizerTest.TestConfiguration.class
- },
- properties = {
- "debug=false",
- "camel.component.customizer.enabled=false",
- "camel.component.hazelcast.customizer.enabled=true",
- "camel.component.hazelcast-set.customizer.enabled=true",
- "camel.component.hazelcast-topic.customizer.enabled=true"
- })
-public class HazelcastInstanceCustomizerTest {
- @Autowired
- HazelcastInstance instance;
- @Autowired
- HazelcastTopicComponent topicComponent;
- @Autowired
- List<ComponentCustomizer<HazelcastTopicComponent>> topicCustomizers;
- @Autowired
- HazelcastSetComponent setComponent;
- @Autowired
- List<ComponentCustomizer<HazelcastSetComponent>> setCustomizers;
- @Autowired
- HazelcastListComponent listComponent;
-
- @Test
- public void testInstanceCustomizer() throws Exception {
- Assert.assertNotNull(instance);
-
- Assert.assertNotNull(topicComponent);
- Assert.assertEquals(1, topicCustomizers.size());
- Assert.assertEquals(instance, topicComponent.getHazelcastInstance());
-
- Assert.assertNotNull(setComponent);
- Assert.assertEquals(1, setCustomizers.size());
- Assert.assertEquals(instance, setComponent.getHazelcastInstance());
-
- Assert.assertNotNull(listComponent);
- Assert.assertNull(listComponent.getHazelcastInstance());
- }
-
- @Configuration
- public static class TestConfiguration {
- @Bean(destroyMethod = "shutdown")
- public HazelcastInstance hazelcastInstance() {
- return Hazelcast.newHazelcastInstance();
- }
- }
-}
diff --git
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties
deleted file mode 100644
index 8d7f9c8..0000000
---
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-spring.main.banner-mode = off
diff --git
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/logback.xml
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/logback.xml
deleted file mode 100644
index 41d68d9..0000000
---
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger -
%msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger -
%msg%n</pattern>
- </encoder>
- <file>target/camel-hazelcast-starter-test.log</file>
- </appender>
-
- <logger name="org.apache.camel.component.hazelcast.atomicnumber.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.instance.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.list.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.map.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.multimap.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.queue.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.replicatedmap.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.ringbuffer.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.seda.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.set.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.springboot"
level="DEBUG"/>
- <logger name="org.apache.camel.component.hazelcast.topic.springboot"
level="DEBUG"/>
-
- <root level="INFO">
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
