Deprecate HornetQ support

Closes gh-6377
This commit is contained in:
Stephane Nicoll
2016-07-13 10:06:19 +02:00
parent 8319291efd
commit 6bd7a2fedd
15 changed files with 77 additions and 11 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ import org.springframework.context.annotation.Import;
* @author Phillip Webb
* @since 1.1.0
* @see HornetQProperties
* @deprecated as of 1.4 in favor of the artemis support
*/
@Configuration
@AutoConfigureBefore(JmsAutoConfiguration.class)
@@ -51,6 +52,7 @@ import org.springframework.context.annotation.Import;
@Import({ HornetQEmbeddedServerConfiguration.class,
HornetQXAConnectionFactoryConfiguration.class,
HornetQConnectionFactoryConfiguration.class })
@Deprecated
public class HornetQAutoConfiguration {
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,9 @@ import org.hornetq.jms.server.embedded.EmbeddedJMS;
* @author Phillip Webb
* @since 1.1.0
* @see HornetQAutoConfiguration
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
public interface HornetQConfigurationCustomizer {
/**

View File

@@ -30,9 +30,11 @@ import org.springframework.context.annotation.Configuration;
*
* @author Phillip Webb
* @since 1.2.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Configuration
@ConditionalOnMissingBean(ConnectionFactory.class)
@Deprecated
class HornetQConnectionFactoryConfiguration {
@Bean

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,7 +40,9 @@ import org.springframework.util.ClassUtils;
* @author Phillip Webb
* @author Stephane Nicoll
* @since 1.2.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
class HornetQConnectionFactoryFactory {
static final String EMBEDDED_JMS_CLASS = "org.hornetq.jms.server.embedded.EmbeddedJMS";

View File

@@ -34,7 +34,9 @@ import org.springframework.boot.autoconfigure.jms.hornetq.HornetQProperties.Embe
* @author Stephane Nicoll
* @author Phillip Webb
* @since 1.1.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
class HornetQEmbeddedConfigurationFactory {
private static final Log logger = LogFactory

View File

@@ -41,10 +41,12 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
* @author Phillip Webb
* @author Stephane Nicoll
* @since 1.2.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Configuration
@ConditionalOnClass(name = HornetQConnectionFactoryFactory.EMBEDDED_JMS_CLASS)
@ConditionalOnProperty(prefix = "spring.hornetq.embedded", name = "enabled", havingValue = "true", matchIfMissing = true)
@Deprecated
class HornetQEmbeddedServerConfiguration {
private final HornetQProperties properties;

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,9 @@ package org.springframework.boot.autoconfigure.jms.hornetq;
*
* @author Stephane Nicoll
* @since 1.1.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
public enum HornetQMode {
/**

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@ import org.hornetq.spi.core.naming.BindingRegistry;
*
* @author Stephane Nicoll
* @since 1.1.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
public class HornetQNoOpBindingRegistry implements BindingRegistry {
@Override

View File

@@ -30,8 +30,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* @author Stephane Nicoll
* @since 1.1.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@ConfigurationProperties(prefix = "spring.hornetq")
@Deprecated
public class HornetQProperties {
/**

View File

@@ -35,11 +35,13 @@ import org.springframework.context.annotation.Primary;
*
* @author Phillip Webb
* @since 1.2.0
* @deprecated as of 1.4 in favor of the artemis support
*/
@Configuration
@ConditionalOnMissingBean(ConnectionFactory.class)
@ConditionalOnClass(TransactionManager.class)
@ConditionalOnBean(XAConnectionFactoryWrapper.class)
@Deprecated
class HornetQXAConnectionFactoryConfiguration {
@Primary

View File

@@ -30,7 +30,9 @@ import org.springframework.util.StringUtils;
*
* @author Stéphane Lagraulet
* @author Stephane Nicoll
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
class SpringBootHornetQConnectionFactory extends HornetQConnectionFactory {
private final HornetQProperties properties;

View File

@@ -30,7 +30,9 @@ import org.springframework.util.StringUtils;
*
* @author Stéphane Lagraulet
* @author Stephane Nicoll
* @deprecated as of 1.4 in favor of the artemis support
*/
@Deprecated
class SpringBootHornetQXAConnectionFactory extends HornetQXAConnectionFactory {
private final HornetQProperties properties;

View File

@@ -65,6 +65,8 @@ import static org.mockito.Mockito.spy;
*
* @author Stephane Nicoll
*/
@Deprecated
@SuppressWarnings("deprecation")
public class HornetQAutoConfigurationTests {
@Rule

View File

@@ -28,6 +28,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll
* @author Phillip Webb
*/
@Deprecated
@SuppressWarnings("deprecation")
public class HornetQEmbeddedConfigurationFactoryTests {
@Test