Merge pull request #191 from RongtongJin/delete_JacksonAutoConfiguration
[ISSUE# 190] Delete useless code and ambiguous deprecated annotation about JacksonFallbackConfiguration
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
index 0e1e37e..dcb76e9 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
@@ -19,7 +19,6 @@
import java.util.Map;
import java.util.Objects;
-
import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.SessionCredentials;
import org.apache.rocketmq.client.exception.MQClientException;
@@ -41,8 +40,6 @@
import org.springframework.core.env.StandardEnvironment;
import org.springframework.util.StringUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
@Configuration
public class ExtProducerResetConfiguration implements ApplicationContextAware, SmartInitializingSingleton {
private final static Logger log = LoggerFactory.getLogger(ExtProducerResetConfiguration.class);
@@ -53,14 +50,11 @@
private RocketMQProperties rocketMQProperties;
- private ObjectMapper objectMapper;
private RocketMQMessageConverter rocketMQMessageConverter;
- public ExtProducerResetConfiguration(ObjectMapper rocketMQMessageObjectMapper,
- RocketMQMessageConverter rocketMQMessageConverter,
+ public ExtProducerResetConfiguration(RocketMQMessageConverter rocketMQMessageConverter,
StandardEnvironment environment, RocketMQProperties rocketMQProperties) {
this.rocketMQMessageConverter = rocketMQMessageConverter;
- this.objectMapper = rocketMQMessageObjectMapper;
this.environment = environment;
this.rocketMQProperties = rocketMQProperties;
}
@@ -102,7 +96,6 @@
RocketMQTemplate rocketMQTemplate = (RocketMQTemplate)bean;
rocketMQTemplate.setProducer(mqProducer);
rocketMQTemplate.setMessageConverter(rocketMQMessageConverter.getMessageConverter());
- rocketMQTemplate.setObjectMapper(objectMapper);
log.info("Set real producer to :{} {}", beanName, annotation.value());
}
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/JacksonFallbackConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/JacksonFallbackConfiguration.java
deleted file mode 100644
index b6518c0..0000000
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/JacksonFallbackConfiguration.java
+++ /dev/null
@@ -1,35 +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.rocketmq.spring.autoconfigure;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnMissingBean(ObjectMapper.class)
-@Deprecated
-class JacksonFallbackConfiguration {
-
- @Bean
- public ObjectMapper rocketMQMessageObjectMapper() {
- return new ObjectMapper();
- }
-
-}
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
index 27f8264..7bda36c 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.spring.autoconfigure;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
@@ -55,13 +54,10 @@
private RocketMQProperties rocketMQProperties;
- private ObjectMapper objectMapper;
private RocketMQMessageConverter rocketMQMessageConverter;
- public ListenerContainerConfiguration(ObjectMapper rocketMQMessageObjectMapper,
- RocketMQMessageConverter rocketMQMessageConverter,
+ public ListenerContainerConfiguration(RocketMQMessageConverter rocketMQMessageConverter,
StandardEnvironment environment, RocketMQProperties rocketMQProperties) {
- this.objectMapper = rocketMQMessageObjectMapper;
this.rocketMQMessageConverter = rocketMQMessageConverter;
this.environment = environment;
this.rocketMQProperties = rocketMQProperties;
@@ -145,7 +141,6 @@
}
container.setConsumerGroup(environment.resolvePlaceholders(annotation.consumerGroup()));
container.setRocketMQListener((RocketMQListener)bean);
- container.setObjectMapper(objectMapper);
container.setMessageConverter(rocketMQMessageConverter.getMessageConverter());
container.setName(name); // REVIEW ME, use the same clientId or multiple?
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfiguration.java
index f4abf72..8d63e92 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfiguration.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.spring.autoconfigure;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.lang.reflect.Field;
import javax.annotation.PostConstruct;
import org.apache.rocketmq.acl.common.AclClientRPCHook;
@@ -53,10 +52,10 @@
@Configuration
@EnableConfigurationProperties(RocketMQProperties.class)
-@ConditionalOnClass({MQAdmin.class, ObjectMapper.class})
+@ConditionalOnClass({MQAdmin.class})
@ConditionalOnProperty(prefix = "rocketmq", value = "name-server", matchIfMissing = true)
-@Import({JacksonFallbackConfiguration.class, MessageConverterConfiguration.class, ListenerContainerConfiguration.class, ExtProducerResetConfiguration.class})
-@AutoConfigureAfter({JacksonFallbackConfiguration.class, MessageConverterConfiguration.class})
+@Import({MessageConverterConfiguration.class, ListenerContainerConfiguration.class, ExtProducerResetConfiguration.class})
+@AutoConfigureAfter({MessageConverterConfiguration.class})
public class RocketMQAutoConfiguration {
private static final Logger log = LoggerFactory.getLogger(RocketMQAutoConfiguration.class);
@@ -127,11 +126,9 @@
@ConditionalOnBean(DefaultMQProducer.class)
@ConditionalOnMissingBean(name = RocketMQConfigUtils.ROCKETMQ_TEMPLATE_DEFAULT_GLOBAL_NAME)
public RocketMQTemplate rocketMQTemplate(DefaultMQProducer mqProducer,
- ObjectMapper rocketMQMessageObjectMapper,
RocketMQMessageConverter rocketMQMessageConverter) {
RocketMQTemplate rocketMQTemplate = new RocketMQTemplate();
rocketMQTemplate.setProducer(mqProducer);
- rocketMQTemplate.setObjectMapper(rocketMQMessageObjectMapper);
rocketMQTemplate.setMessageConverter(rocketMQMessageConverter.getMessageConverter());
return rocketMQTemplate;
}
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
index dd34155..1072b76 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.spring.core;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -48,9 +47,6 @@
private DefaultMQProducer producer;
- @Deprecated
- private ObjectMapper objectMapper;
-
private String charset = "UTF-8";
private MessageQueueSelector messageQueueSelector = new SelectMessageQueueByHash();
@@ -63,16 +59,6 @@
this.producer = producer;
}
- @Deprecated
- public ObjectMapper getObjectMapper() {
- return objectMapper;
- }
-
- @Deprecated
- public void setObjectMapper(ObjectMapper objectMapper) {
- this.objectMapper = objectMapper;
- }
-
public String getCharset() {
return charset;
}
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
index c924864..2d8a043 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
@@ -17,7 +17,6 @@
package org.apache.rocketmq.spring.support;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
@@ -86,9 +85,6 @@
private String charset = "UTF-8";
- @Deprecated
- private ObjectMapper objectMapper;
-
private MessageConverter messageConverter;
private RocketMQListener rocketMQListener;
@@ -168,16 +164,6 @@
this.charset = charset;
}
- @Deprecated
- public ObjectMapper getObjectMapper() {
- return objectMapper;
- }
-
- @Deprecated
- public void setObjectMapper(ObjectMapper objectMapper) {
- this.objectMapper = objectMapper;
- }
-
public MessageConverter getMessageConverter() {
return messageConverter;
}
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQMessageConverter.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQMessageConverter.java
index c2ee1da..51a6719 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQMessageConverter.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQMessageConverter.java
@@ -18,10 +18,7 @@
package org.apache.rocketmq.spring.support;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import java.util.Objects;
-
import org.springframework.messaging.converter.ByteArrayMessageConverter;
import org.springframework.messaging.converter.CompositeMessageConverter;
import org.springframework.messaging.converter.MappingJackson2MessageConverter;
@@ -75,20 +72,4 @@
return messageConverter;
}
- public MessageConverter resetMessageConverter(
- Collection<MessageConverter> converters) {
- if (messageConverter.getConverters() != null) {
- messageConverter.getConverters().clear();
- }
- Objects.requireNonNull(messageConverter.getConverters()).addAll(converters);
- return messageConverter;
- }
-
- public MessageConverter addMessageConverter(MessageConverter converter) {
- if (messageConverter.getConverters() != null && converter != null) {
- messageConverter.getConverters().add(converter);
- }
- return messageConverter;
- }
-
}
diff --git a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
index c2e9ad9..a359c63 100644
--- a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
+++ b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
@@ -91,7 +91,6 @@
run((context) -> {
assertThat(context).hasSingleBean(DefaultMQProducer.class);
});
-
}
@Test
@@ -140,7 +139,6 @@
assertThat(context).hasSingleBean(TestRocketMQLocalTransactionListener.class);
});
-
}
@Test
