diff --git a/.gitignore b/.gitignore index 2e670bc3..659fa37a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ .gradle .project .settings +.checkstyle bin build .DS_Store diff --git a/build.gradle b/build.gradle index b1ca91dd..ea619e80 100644 --- a/build.gradle +++ b/build.gradle @@ -78,9 +78,8 @@ subprojects { subproject -> } } - // ensure JDK 6 compatibility - sourceCompatibility=1.6 - targetCompatibility=1.6 + sourceCompatibility=1.8 + targetCompatibility=1.8 ext { cglibVersion = '3.1' @@ -97,7 +96,7 @@ subprojects { subproject -> rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '3.6.3' rabbitmqHttpClientVersion = '1.0.0.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.7.RELEASE' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.M1' springRetryVersion = '1.1.3.RELEASE' } diff --git a/gradle.properties b/gradle.properties index 5f2296b0..631e2efe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=1.6.2.BUILD-SNAPSHOT +version=2.0.0.BUILD-SNAPSHOT org.gradle.daemon=true diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java deleted file mode 100644 index b4dd9c15..00000000 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java +++ /dev/null @@ -1,674 +0,0 @@ -/* - * Copyright 2011-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. - * 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.springframework.amqp.rabbit.log4j; - -import java.io.UnsupportedEncodingException; -import java.util.Calendar; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.Layout; -import org.apache.log4j.Level; -import org.apache.log4j.PatternLayout; -import org.apache.log4j.spi.ErrorCode; -import org.apache.log4j.spi.LocationInfo; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.log4j.spi.ThrowableInformation; - -import org.springframework.amqp.AmqpException; -import org.springframework.amqp.core.DirectExchange; -import org.springframework.amqp.core.Exchange; -import org.springframework.amqp.core.FanoutExchange; -import org.springframework.amqp.core.HeadersExchange; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageDeliveryMode; -import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.core.TopicExchange; -import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; -import org.springframework.amqp.rabbit.core.DeclareExchangeConnectionListener; -import org.springframework.amqp.rabbit.core.RabbitAdmin; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.rabbit.support.LogAppenderUtils; - -/** - * A Log4J appender that publishes logging events to an AMQP Exchange. - *

- * A fully-configured AmqpAppender, with every option set to their defaults, would look like this: - * 

- *   log4j.appender.amqp=org.springframework.amqp.rabbit.log4j.AmqpAppender
- *   #-------------------------------
- *   ## Connection settings
- *   #-------------------------------
- *   log4j.appender.amqp.host=localhost
- *   log4j.appender.amqp.port=5672
- *   #log4j.appender.amqp.addresses=foo:5672,bar:5673 - overrides host and port if present
- *   log4j.appender.amqp.username=guest
- *   log4j.appender.amqp.password=guest
- *   log4j.appender.amqp.virtualHost=/
- *   #-------------------------------
- *   ## Exchange name and type
- *   #-------------------------------
- *   log4j.appender.amqp.exchangeName=logs
- *   log4j.appender.amqp.exchangeType=topic
- *   #-------------------------------
- *   ## Log4J-format pattern to use to create a routing key.
- *   ## The application id is available as %X{applicationId}.
- *   #-------------------------------
- *   log4j.appender.amqp.routingKeyPattern=%c.%p
- *   #-------------------------------
- *   ## Whether or not to declare this configured exchange
- *   #-------------------------------
- *   log4j.appender.amqp.declareExchange=false
- *   #-------------------------------
- *   ## Flags to use when declaring the exchange
- *   #-------------------------------
- *   log4j.appender.amqp.durable=true
- *   log4j.appender.amqp.autoDelete=false
- *   #-------------------------------
- *   ## Message properties
- *   #-------------------------------
- *   log4j.appender.amqp.contentType=text/plain
- *   #log4j.appender.amqp.contentEncoding=null
- *   log4j.appender.amqp.generateId=false
- *   #log4j.appender.amqp.charset=null
- *   log4j.appender.amqp.deliveryMode=PERSISTENT
- *   #-------------------------------
- *   ## Sender configuration
- *   #-------------------------------
- *   log4j.appender.amqp.senderPoolSize=2
- *   log4j.appender.amqp.maxSenderRetries=30
- *   #log4j.appender.amqp.applicationId=null
- *   #-------------------------------
- *   ## Standard Log4J stuff
- *   #-------------------------------
- *   log4j.appender.amqp.layout=org.apache.log4j.PatternLayout
- *   log4j.appender.amqp.layout.ConversionPattern=%d %p %t [%c] - <%m>%n
- *
- * - * @author Jon Brisbin - * @author Gary Russell - * @author Artem Bilan - */ -public class AmqpAppender extends AppenderSkeleton { - - /** - * Key name for the application id (if there is one set via the appender config) in the message properties. - */ - public static final String APPLICATION_ID = "applicationId"; - - /** - * Key name for the logger category name in the message properties - */ - public static final String CATEGORY_NAME = "categoryName"; - - /** - * Key name for the logger level name in the message properties - */ - public static final String CATEGORY_LEVEL = "level"; - - /** - * Name of the exchange to publish log events to. - */ - private String exchangeName = "logs"; - - /** - * Type of the exchange to publish log events to. - */ - private String exchangeType = "topic"; - - /** - * Log4J pattern format to use to generate a routing key. - */ - private String routingKeyPattern = "%c.%p"; - - /** - * Log4J Layout to use to generate routing key. - */ - private Layout routingKeyLayout; - - /** - * Used to synchronize access to pattern layouts. - */ - private final Object layoutMutex = new Object(); - - /** - * Configuration arbitrary application ID. - */ - private String applicationId = null; - - /** - * Where LoggingEvents are queued to send. - */ - private final LinkedBlockingQueue events = new LinkedBlockingQueue(); - - /** - * The pool of senders. - */ - private ExecutorService senderPool = null; - - /** - * How many senders to use at once. Use more senders if you have lots of log output going through this appender. - */ - private int senderPoolSize = 2; - - /** - * How many times to retry sending a message if the broker is unavailable or there is some other error. - */ - private int maxSenderRetries = 30; - - /** - * Retries are delayed like: N ^ log(N), where N is the retry number. - */ - private final Timer retryTimer = new Timer("log-event-retry-delay", true); - - /** - * RabbitMQ ConnectionFactory. - */ - private AbstractConnectionFactory connectionFactory; - - /** - * Additional client connection properties added to the rabbit connection, with the form - * {@code key:value[,key:value]...}. - */ - private String clientConnectionProperties; - - /** - * A comma-delimited list of broker addresses: host:port[,host:port]*. - * @since 1.5.6 - */ - private String addresses; - - /** - * RabbitMQ host to connect to. - */ - private String host = "localhost"; - - /** - * RabbitMQ virtual host to connect to. - */ - private String virtualHost = "/"; - - /** - * RabbitMQ port to connect to. - */ - private int port = 5672; - - /** - * RabbitMQ user to connect as. - */ - private String username = "guest"; - - /** - * RabbitMQ password for this user. - */ - private String password = "guest"; - - /** - * Default content-type of log messages. - */ - private String contentType = "text/plain"; - - /** - * Default content-encoding of log messages. - */ - private String contentEncoding = null; - - /** - * Whether or not to try and declare the configured exchange when this appender starts. - */ - private boolean declareExchange = false; - - /** - * charset to use when converting String to byte[], default null (system default charset used). - * If the charset is unsupported on the current platform, we fall back to using - * the system charset. - */ - private String charset; - - private boolean durable = true; - - private MessageDeliveryMode deliveryMode = MessageDeliveryMode.PERSISTENT; - - private boolean autoDelete = false; - - /** - * Used to determine whether {@link MessageProperties#setMessageId(String)} is set. - */ - private boolean generateId = false; - - public String getHost() { - return this.host; - } - - public void setHost(String host) { - this.host = host; - } - - public int getPort() { - return this.port; - } - - public void setPort(int port) { - this.port = port; - } - - public void setAddresses(String addresses) { - this.addresses = addresses; - } - - public String getAddresses() { - return this.addresses; - } - - public String getVirtualHost() { - return this.virtualHost; - } - - public void setVirtualHost(String virtualHost) { - this.virtualHost = virtualHost; - } - - public String getUsername() { - return this.username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return this.password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getExchangeName() { - return this.exchangeName; - } - - public void setExchangeName(String exchangeName) { - this.exchangeName = exchangeName; - } - - public String getExchangeType() { - return this.exchangeType; - } - - public void setExchangeType(String exchangeType) { - this.exchangeType = exchangeType; - } - - public String getRoutingKeyPattern() { - return this.routingKeyPattern; - } - - public void setRoutingKeyPattern(String routingKeyPattern) { - this.routingKeyPattern = routingKeyPattern; - } - - public boolean isDeclareExchange() { - return this.declareExchange; - } - - public void setDeclareExchange(boolean declareExchange) { - this.declareExchange = declareExchange; - } - - public String getContentType() { - return this.contentType; - } - - public void setContentType(String contentType) { - this.contentType = contentType; - } - - public String getContentEncoding() { - return this.contentEncoding; - } - - public void setContentEncoding(String contentEncoding) { - this.contentEncoding = contentEncoding; - } - - public String getApplicationId() { - return this.applicationId; - } - - public void setApplicationId(String applicationId) { - this.applicationId = applicationId; - } - - public int getSenderPoolSize() { - return this.senderPoolSize; - } - - public void setSenderPoolSize(int senderPoolSize) { - this.senderPoolSize = senderPoolSize; - } - - public int getMaxSenderRetries() { - return this.maxSenderRetries; - } - - public void setMaxSenderRetries(int maxSenderRetries) { - this.maxSenderRetries = maxSenderRetries; - } - - public boolean isDurable() { - return this.durable; - } - - public void setDurable(boolean durable) { - this.durable = durable; - } - - public String getDeliveryMode() { - return this.deliveryMode.toString(); - } - - public void setDeliveryMode(String deliveryMode) { - this.deliveryMode = MessageDeliveryMode.valueOf(deliveryMode); - } - - public boolean isAutoDelete() { - return this.autoDelete; - } - - public void setAutoDelete(boolean autoDelete) { - this.autoDelete = autoDelete; - } - - public boolean isGenerateId() { - return this.generateId; - } - - public void setGenerateId(boolean generateId) { - this.generateId = generateId; - } - - public String getCharset() { - return this.charset; - } - - public void setCharset(String charset) { - this.charset = charset; - } - - /** - * Set additional client connection properties to be added to the rabbit connection, - * with the form {@code key:value[,key:value]...}. - * @param clientConnectionProperties the properties. - * @since 1.5.6 - */ - public void setClientConnectionProperties(String clientConnectionProperties) { - this.clientConnectionProperties = clientConnectionProperties; - } - - @Override - public void activateOptions() { - this.routingKeyLayout = new PatternLayout(this.routingKeyPattern - .replaceAll("%X\\{applicationId\\}", this.applicationId)); - this.connectionFactory = new CachingConnectionFactory(); - this.connectionFactory.setHost(this.host); - this.connectionFactory.setPort(this.port); - if (this.addresses != null) { - this.connectionFactory.setAddresses(this.addresses); - } - this.connectionFactory.setUsername(this.username); - this.connectionFactory.setPassword(this.password); - this.connectionFactory.setVirtualHost(this.virtualHost); - LogAppenderUtils.updateClientConnectionProperties(this.connectionFactory, this.clientConnectionProperties); - updateConnectionClientProperties(this.connectionFactory.getRabbitConnectionFactory().getClientProperties()); - setUpExchangeDeclaration(); - startSenders(); - } - - /** - * Subclasses can override this method to add properties to the connection client - * properties. - * @param clientProperties the client properties. - * @since 1.5.6 - */ - protected void updateConnectionClientProperties(Map clientProperties) { - } - - /** - * @deprecated - use {@link #setUpExchangeDeclaration()} - */ - @Deprecated - protected void maybeDeclareExchange() { - setUpExchangeDeclaration(); - } - - protected void setUpExchangeDeclaration() { - RabbitAdmin admin = new RabbitAdmin(this.connectionFactory); - if (this.declareExchange) { - Exchange x; - if ("topic".equals(this.exchangeType)) { - x = new TopicExchange(this.exchangeName, this.durable, this.autoDelete); - } - else if ("direct".equals(this.exchangeType)) { - x = new DirectExchange(this.exchangeName, this.durable, this.autoDelete); - } - else if ("fanout".equals(this.exchangeType)) { - x = new FanoutExchange(this.exchangeName, this.durable, this.autoDelete); - } - else if ("headers".equals(this.exchangeType)) { - x = new HeadersExchange(this.exchangeType, this.durable, this.autoDelete); - } - else { - x = new TopicExchange(this.exchangeName, this.durable, this.autoDelete); - } - this.connectionFactory.addConnectionListener(new DeclareExchangeConnectionListener(x, admin)); - } - } - - /** - * Submit the required number of senders into the pool. - */ - protected void startSenders() { - this.senderPool = Executors.newCachedThreadPool(); - for (int i = 0; i < this.senderPoolSize; i++) { - this.senderPool.submit(new EventSender()); - } - } - - @Override - public void append(LoggingEvent event) { - this.events.add(new Event(event, event.getProperties())); - } - - @Override - public void close() { - if (null != this.senderPool) { - this.senderPool.shutdownNow(); - this.senderPool = null; - } - if (null != this.connectionFactory) { - this.connectionFactory.destroy(); - } - this.retryTimer.cancel(); - } - - @Override - public boolean requiresLayout() { - return true; - } - - /** - * Subclasses may modify the final message before sending. - * @param message The message. - * @param event The event. - * @return The modified message. - * @since 1.4 - */ - public Message postProcessMessageBeforeSend(Message message, Event event) { - return message; - } - - /** - * Helper class to actually send LoggingEvents asynchronously. - */ - protected class EventSender implements Runnable { - - @Override - public void run() { - try { - RabbitTemplate rabbitTemplate = new RabbitTemplate(AmqpAppender.this.connectionFactory); - while (true) { - final Event event = AmqpAppender.this.events.take(); - LoggingEvent logEvent = event.getEvent(); - - String name = logEvent.getLogger().getName(); - Level level = logEvent.getLevel(); - - MessageProperties amqpProps = new MessageProperties(); - amqpProps.setDeliveryMode(AmqpAppender.this.deliveryMode); - amqpProps.setContentType(AmqpAppender.this.contentType); - if (null != AmqpAppender.this.contentEncoding) { - amqpProps.setContentEncoding(AmqpAppender.this.contentEncoding); - } - amqpProps.setHeader(CATEGORY_NAME, name); - amqpProps.setHeader(CATEGORY_LEVEL, level.toString()); - if (AmqpAppender.this.generateId) { - amqpProps.setMessageId(UUID.randomUUID().toString()); - } - - // Set applicationId, if we're using one - if (null != AmqpAppender.this.applicationId) { - amqpProps.setAppId(AmqpAppender.this.applicationId); - } - - // Set timestamp - Calendar tstamp = Calendar.getInstance(); - tstamp.setTimeInMillis(logEvent.getTimeStamp()); - amqpProps.setTimestamp(tstamp.getTime()); - - // Copy properties in from MDC - @SuppressWarnings("rawtypes") - Map props = event.getProperties(); - @SuppressWarnings("unchecked") - Set> entrySet = props.entrySet(); - for (Entry entry : entrySet) { - amqpProps.setHeader(entry.getKey().toString(), entry.getValue()); - } - LocationInfo locInfo = logEvent.getLocationInformation(); - if (!"?".equals(locInfo.getClassName())) { - amqpProps.setHeader( - "location", - String.format("%s.%s()[%s]", locInfo.getClassName(), locInfo.getMethodName(), - locInfo.getLineNumber())); - } - - StringBuilder msgBody; - String routingKey; - synchronized (AmqpAppender.this.layoutMutex) { - msgBody = new StringBuilder(layout.format(logEvent)); - routingKey = AmqpAppender.this.routingKeyLayout.format(logEvent); - } - if (layout.ignoresThrowable() && null != logEvent.getThrowableInformation()) { - ThrowableInformation tinfo = logEvent.getThrowableInformation(); - for (String line : tinfo.getThrowableStrRep()) { - msgBody.append(String.format("%s%n", line)); - } - } - - // Send a message - try { - Message message = null; - if (AmqpAppender.this.charset != null) { - try { - message = new Message(msgBody.toString().getBytes(AmqpAppender.this.charset), amqpProps); - } - catch (UnsupportedEncodingException e) { /* fall back to default */ } - } - if (message == null) { - message = new Message(msgBody.toString().getBytes(), amqpProps); //NOSONAR (default charset) - } - message = postProcessMessageBeforeSend(message, event); - rabbitTemplate.send(AmqpAppender.this.exchangeName, routingKey, message); - } - catch (AmqpException e) { - int retries = event.incrementRetries(); - if (retries < AmqpAppender.this.maxSenderRetries) { - // Schedule a retry based on the number of times I've tried to re-send this - AmqpAppender.this.retryTimer.schedule(new TimerTask() { - @Override - public void run() { - AmqpAppender.this.events.add(event); - } - }, (long) (Math.pow(retries, Math.log(retries)) * 1000)); - } - else { - errorHandler.error( - "Could not send log message " + logEvent.getRenderedMessage() + " after " - + AmqpAppender.this.maxSenderRetries + " retries", - e, ErrorCode.WRITE_FAILURE, logEvent); - } - } - } - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - } - - /** - * Small helper class to encapsulate a LoggingEvent, its MDC properties, and the number of retries. - */ - @SuppressWarnings("rawtypes") - protected static class Event { - - private final LoggingEvent event; - - private final Map properties; - - private final AtomicInteger retries = new AtomicInteger(0); - - public Event(LoggingEvent event, Map properties) { - this.event = event; - this.properties = properties; - } - - public LoggingEvent getEvent() { - return this.event; - } - - public Map getProperties() { - return this.properties; - } - - public int incrementRetries() { - return this.retries.incrementAndGet(); - } - - } - -} diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/package-info.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/package-info.java deleted file mode 100644 index ec67003f..00000000 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Provides classes supporting Log4J appenders. - */ -package org.springframework.amqp.rabbit.log4j; diff --git a/spring-rabbit/src/main/resources/META-INF/spring.schemas b/spring-rabbit/src/main/resources/META-INF/spring.schemas index 21e0c967..d6f04382 100644 --- a/spring-rabbit/src/main/resources/META-INF/spring.schemas +++ b/spring-rabbit/src/main/resources/META-INF/spring.schemas @@ -1,8 +1,2 @@ -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.1.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.1.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.2.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.3.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.3.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.4.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.4.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.5.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.5.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit-1.6.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.6.xsd -http\://www.springframework.org/schema/rabbit/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.6.xsd +http\://www.springframework.org/schema/rabbit/spring-rabbit-2.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-2.0.xsd +http\://www.springframework.org/schema/rabbit/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-2.0.xsd diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd deleted file mode 100644 index 6255d7e1..00000000 --- a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd +++ /dev/null @@ -1,771 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.1.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.1.xsd deleted file mode 100644 index 338b63e0..00000000 --- a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.1.xsd +++ /dev/null @@ -1,1038 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - used to receive asynchronous replies on the reply-channel the - child element is disallowed because the template itself is the listener. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for replies; optional; if not supplied, methods expecting replies - will use a temporary, exclusive, auto-delete queue. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element). Passed to the Rabbit library when creating the connection. When not supplied, the - Rabbit library currently uses a fixed thread pool ExecutorService with 5 threads. - ]]> - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.2.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.2.xsd deleted file mode 100644 index 506821a1..00000000 --- a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.2.xsd +++ /dev/null @@ -1,1102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - used to receive asynchronous replies on the reply-channel the - child element is disallowed because the template itself is the listener. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for replies; optional; if not supplied, methods expecting replies - will use a temporary, exclusive, auto-delete queue. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element). Passed to the Rabbit library when creating the connection. When not supplied, the - Rabbit library currently uses a fixed thread pool ExecutorService with 5 threads. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.3.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.3.xsd deleted file mode 100644 index 686006ee..00000000 --- a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.3.xsd +++ /dev/null @@ -1,1122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - used to receive asynchronous replies on the reply-channel the - child element is disallowed because the template itself is the listener. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for replies; optional; if not supplied, methods expecting replies - will use a temporary, exclusive, auto-delete queue. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element). Passed to the Rabbit library when creating the connection. When not supplied, the - Rabbit library currently uses a fixed thread pool ExecutorService with 5 threads. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.4.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.4.xsd deleted file mode 100644 index 2925c1de..00000000 --- a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.4.xsd +++ /dev/null @@ -1,1263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - used to receive asynchronous replies on the reply-channel the - child element is disallowed because the template itself is the listener. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for replies; optional; if not supplied, methods expecting replies - will use a temporary, exclusive, auto-delete queue. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element). Passed to the Rabbit library when creating the connection. When not supplied, the - Rabbit library currently uses a fixed thread pool ExecutorService with 5 threads. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.5.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.5.xsd deleted file mode 100644 index 29ea1784..00000000 --- a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.5.xsd +++ /dev/null @@ -1,1371 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ` with this as the bean name. It allows, - for example, access to the containers to start/stop etc, by iterating over the collection. - If the same group is used multiple times, the collection will be the aggregate of all - containers so designated. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - used to receive asynchronous replies on the reply-channel the - child element is disallowed because the template itself is the listener. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for replies; optional; if not supplied, methods expecting replies - will use a temporary, exclusive, auto-delete queue or, if the RabbitMQ version is 3.4 or higher, - using the 'direct reply-to' mechanism. See also 'reply-address'. - ]]> - - - - - - - - - - ' must be configured as a separate '' component, when only - 'reply-address' is in use. - The 'reply-address' and 'reply-queue' must refer to the same queue logically for proper reply routing logic. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element). Passed to the Rabbit library when creating the connection. When not supplied, the - Rabbit library currently uses a fixed thread pool ExecutorService with 5 threads. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.6.xsd b/spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-2.0.xsd similarity index 100% rename from spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-1.6.xsd rename to spring-rabbit/src/main/resources/org/springframework/amqp/rabbit/config/spring-rabbit-2.0.xsd diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderIntegrationTests.java deleted file mode 100644 index 285de0ce..00000000 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderIntegrationTests.java +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright 2011-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. - * 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.springframework.amqp.rabbit.log4j; - -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.xml.parsers.DocumentBuilderFactory; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.log4j.Logger; -import org.apache.log4j.MDC; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageDeliveryMode; -import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; -import org.springframework.amqp.rabbit.test.BrokerRunning; -import org.springframework.amqp.utils.test.TestUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Jon Brisbin - * @author Gary Russell - * @author Gunnar Hillert - * @author Artem Bilan - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "org.springframework.amqp.rabbit.log4j" }, loader = AnnotationConfigContextLoader.class) -@DirtiesContext -public class AmqpAppenderIntegrationTests { - - @Rule - public BrokerRunning brokerIsRunning = BrokerRunning.isRunning(); - - @Autowired - private ApplicationContext applicationContext; - - private Logger log; - - private SimpleMessageListenerContainer listenerContainer; - - @SuppressWarnings("deprecation") // SF 4.2.1 - @Before - public void setUp() throws Exception { - org.springframework.util.Log4jConfigurer.initLogging("classpath:log4j-amqp.properties"); - log = Logger.getLogger(getClass()); - listenerContainer = applicationContext.getBean(SimpleMessageListenerContainer.class); - } - - @After - public void tearDown() { - listenerContainer.shutdown(); - } - - @SuppressWarnings("deprecation") // SF 4.2.1 - @AfterClass - public static void reset() throws Exception { - org.springframework.util.Log4jConfigurer.initLogging("classpath:log4j.properties"); - } - - @Test - public void testAppender() throws InterruptedException { - TestListener testListener = (TestListener) applicationContext.getBean("testListener", 4); - listenerContainer.setMessageListener(testListener); - listenerContainer.start(); - - AmqpAppender appender = (AmqpAppender) log.getParent().getAllAppenders().nextElement(); - assertFalse(appender.isDurable()); - assertEquals(MessageDeliveryMode.NON_PERSISTENT.toString(), appender.getDeliveryMode()); - - Logger log = Logger.getLogger(getClass()); - - log.debug("This is a DEBUG message"); - log.info("This is an INFO message"); - log.warn("This is a WARN message"); - log.error("This is an ERROR message", new RuntimeException("Test exception")); - - assertTrue(testListener.getLatch().await(5, TimeUnit.SECONDS)); - assertNotNull(testListener.getId()); - - assertThat(TestUtils.getPropertyValue(appender, "connectionFactory.connectionListener.delegates", - Collection.class).size(), equalTo(1)); - } - - @Test - public void testAppenderWithProps() throws InterruptedException { - TestListener testListener = (TestListener) applicationContext.getBean("testListener", 4); - listenerContainer.setMessageListener(testListener); - listenerContainer.start(); - - String propertyName = "someproperty"; - String propertyValue = "property.value"; - MDC.put(propertyName, propertyValue); - log.debug("This is a DEBUG message with properties"); - log.info("This is an INFO message with properties"); - log.warn("This is a WARN message with properties"); - log.error("This is an ERROR message with properties", new RuntimeException("Test exception")); - MDC.remove(propertyName); - - assertTrue(testListener.getLatch().await(5, TimeUnit.SECONDS)); - MessageProperties messageProperties = testListener.getMessageProperties(); - assertNotNull(messageProperties); - assertNotNull(messageProperties.getHeaders().get(propertyName)); - assertEquals(propertyValue, messageProperties.getHeaders().get(propertyName)); - assertEquals("bar", messageProperties.getHeaders().get("foo")); - } - - @Test - public void testCharset() throws InterruptedException { - Logger packageLogger = Logger.getLogger("org.springframework.amqp.rabbit.log4j"); - AmqpAppender appender = (AmqpAppender) packageLogger.getAppender("amqp"); - assertEquals("UTF-8", appender.getCharset()); - - TestListener testListener = (TestListener) applicationContext.getBean("testListener", 1); - listenerContainer.setMessageListener(testListener); - listenerContainer.start(); - - String foo = "\u0fff"; // UTF-8 -> 0xe0bfbf - log.info(foo); - assertTrue(testListener.getLatch().await(5, TimeUnit.SECONDS)); - byte[] body = testListener.getMessage().getBody(); - int lineSeparatorExtraBytes = System.getProperty("line.separator").getBytes().length - 1; - assertEquals(0xe0, body[body.length - 5 - lineSeparatorExtraBytes] & 0xff); - assertEquals(0xbf, body[body.length - 4 - lineSeparatorExtraBytes] & 0xff); - assertEquals(0xbf, body[body.length - 3 - lineSeparatorExtraBytes] & 0xff); - } - - @Test - public void testIgnoresThrowableWithCustomLayout() throws Exception { - Logger customLayoutLogger = Logger.getLogger("org.springframework.amqp.rabbit.logging.customLayout"); - - TestListener testListener = (TestListener) applicationContext.getBean("testListener", 1); - listenerContainer.setMessageListener(testListener); - listenerContainer.start(); - - customLayoutLogger.error("This is an ERROR message", new RuntimeException("Test exception")); - assertTrue(testListener.getLatch().await(5, TimeUnit.SECONDS)); - assertNotNull(testListener.getId()); - - //This code parses an XML and ends up with exception without the general fix for AMQP-363 - DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(testListener.getMessage().getBody())); - listenerContainer.destroy(); - } - - - /* - * When running as main(); should shutdown cleanly. - */ - @SuppressWarnings("deprecation") // SF 4.2.1 - public static void main(String[] args) throws Exception { - org.springframework.util.Log4jConfigurer.initLogging("classpath:log4j-amqp.properties"); - Log logger = LogFactory.getLog(AmqpAppenderIntegrationTests.class); - logger.info("foo"); - Thread.sleep(1000); - org.springframework.util.Log4jConfigurer.shutdownLogging(); - } - - public static class EnhancedAppender extends AmqpAppender { - - private String foo; - - @Override - public Message postProcessMessageBeforeSend(Message message, Event event) { - message.getMessageProperties().setHeader("foo", this.foo); - return message; - } - - public String getFoo() { - return this.foo; - } - - public void setFoo(String foo) { - this.foo = foo; - } - - @Override - protected void updateConnectionClientProperties(Map clientProperties) { - assertEquals("bar", clientProperties.get("foo")); - assertEquals("qux", clientProperties.get("baz")); - clientProperties.put("foo", this.foo.toUpperCase()); - } - - } - -} diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AnnotationConfigContextLoader.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AnnotationConfigContextLoader.java deleted file mode 100644 index ddc4ec0f..00000000 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AnnotationConfigContextLoader.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2011-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. - * 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.springframework.amqp.rabbit.log4j; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.test.context.ContextLoader; - -/** - * @author Jon Brisbin - */ -public class AnnotationConfigContextLoader implements ContextLoader { - @Override - public String[] processLocations(Class clazz, String... locations) { - return locations; - } - - @Override - public ApplicationContext loadContext(String... locations) throws Exception { - return new AnnotationConfigApplicationContext(locations); - } -} diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderConfiguration.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderConfiguration.java similarity index 95% rename from spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderConfiguration.java rename to spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderConfiguration.java index c0b80860..28523b30 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderConfiguration.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.amqp.rabbit.log4j; +package org.springframework.amqp.rabbit.logback; import javax.annotation.PreDestroy; @@ -37,10 +37,6 @@ import org.springframework.context.annotation.Scope; @Configuration public class AmqpAppenderConfiguration { - static { - // DOMConfigurator.configure(AmqpAppenderTests.class.getResource("/log4j.xml")); - } - private static final String QUEUE = "amqp.appender.test"; private static final String EXCHANGE = "logs"; diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderIntegrationTests.java index d6480ec6..05c47870 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderIntegrationTests.java @@ -37,8 +37,6 @@ import org.slf4j.MDC; import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessageProperties; import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; -import org.springframework.amqp.rabbit.log4j.AmqpAppenderConfiguration; -import org.springframework.amqp.rabbit.log4j.TestListener; import org.springframework.amqp.rabbit.test.BrokerRunning; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/TestListener.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/TestListener.java similarity index 97% rename from spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/TestListener.java rename to spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/TestListener.java index 08f5e0d0..ac224687 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/TestListener.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/TestListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.amqp.rabbit.log4j; +package org.springframework.amqp.rabbit.logback; import java.util.concurrent.CountDownLatch; diff --git a/src/reference/asciidoc/appendix.adoc b/src/reference/asciidoc/appendix.adoc index 8a2fa1fa..2706b8a4 100644 --- a/src/reference/asciidoc/appendix.adoc +++ b/src/reference/asciidoc/appendix.adoc @@ -7,6 +7,230 @@ See <>. [[previous-whats-new]] === Previous Releases +==== Changes in 1.6 Since 1.5 + +===== Testing Support + +A new testing support library is now provided. +See <> for more information. + +===== Builder + +Builders are now available providing a fluent API for configuring `Queue` and `Exchange` objects. +See <> for more information. + +===== Namespace Changes + +====== Connection Factory + +It is now possible to add a `thread-factory` to a connection factory bean declaration, for example to name the threads +created by the `amqp-client` library. +See <> for more information. + +When using `CacheMode.CONNECTION`, you can now limit the total number of connections allowed. +See <> for more information. + +====== Queue Definitions + +It is now possible to provide a naming strategy for anonymous queues; see <> for more information. + +===== Listener Container Changes + +====== Idle Message Listener Detection + +It is now possible to configure listener containers to publish `ApplicationEvent` s when idle. +See <> for more information. + +====== Mismatched Queue Detection + +By default, when a listener container starts, if queues with mismatched properties or arguments were detected, +the container would log the exception but continue to listen. +The container now has a property `mismatchedQueuesFatal` which will prevent the container (and context) from +starting if the problem is detected during startup. +It will also stop the container if the problem is detected later, such as after recovering from a connection failure. +See <> for more information. + +====== Listener Container Logging + +Now listener container provides its `beanName` into the internal `SimpleAsyncTaskExecutor` as a `threadNamePrefix`. +It is useful for logs analysis. + +====== Default Error Handler + +The default error handler (`ConditionalRejectingErrorHandler`) now considers irrecoverable `@RabbitListener` +exceptions as fatal. +See <> for more information. + + +===== AutoDeclare and RabbitAdmins + +See <> (`autoDeclare`) for some changes to the semantics of that option with respect to the use +of `RabbitAdmin` s in the application context. + +===== AmqpTemplate: receive with timeout + +A number of new `receive()` methods with `timeout` have been introduced for the `AmqpTemplate` + and its `RabbitTemplate` implementation. +See <> for more information. + +===== AsyncRabbitTemplate + +A new `AsyncRabbitTemplate` has been introduced. +This template provides a number of send and receive methods, where the return value is a `ListenableFuture`, which can +be used later to obtain the result either synchronously, or asynchronously. +See <> for more information. + +===== RabbitTemplate Changes + +1.4.1 introduced the ability to use https://www.rabbitmq.com/direct-reply-to.html[Direct reply-to] when the broker +supports it; it is more efficient than using a temporary queue for each reply. +This version allows you to override this default behavior and use a temporary queue by setting the +`useTemporaryReplyQueues` property to `true`. +See <> for more information. + +The `RabbitTemplate` now supports a `user-id-expression` (`userIdExpression` when using Java configuration). +See https://www.rabbitmq.com/validated-user-id.html[Validated User-ID RabbitMQ documentation] and <> for more information. + +===== Message Properties + +====== CorrelationId + +The `correlationId` message property can now be a `String`. +See <> for more information. + +====== Long String Headers + +Previously, the `DefaultMessagePropertiesConverter` "converted" headers longer than the long string limit (default 1024) +to a `DataInputStream` (actually it just referenced the `LongString`'s `DataInputStream`). +On output, this header was not converted (except to a String, e.g. `java.io.DataInputStream@1d057a39` by calling +`toString()` on the stream). + +With this release, long `LongString` s are now left as `LongString` s by default; you can access the contents via +the `getBytes[]`, `toString()`, or `getStream()` methods. +A large incoming `LongString` is now correctly "converted" on output too. + +See <> for more information. + +====== Inbound Delivery Mode + +The `deliveryMode` property is no longer mapped to the `MessageProperties.deliveryMode`; this is to avoid unintended +propagation if the the same `MessageProperties` object is used to send an outbound message. +Instead, the inbound `deliveryMode` header is mapped to `MessageProperties.receivedDeliveryMode`. + +See <> for more information. + +When using annotated endpoints, the header is provided in the header named `AmqpHeaders.RECEIVED_DELIVERY_MODE`. + +See <> for more information. + +====== Inbound User ID + +The `user_id` property is no longer mapped to the `MessageProperties.userId`; this is to avoid unintended +propagation if the the same `MessageProperties` object is used to send an outbound message. +Instead, the inbound `userId` header is mapped to `MessageProperties.receivedUserId`. + +See <> for more information. + +When using annotated endpoints, the header is provided in the header named `AmqpHeaders.RECEIVED_USER_ID`. + +See <> for more information. + +===== RabbitAdmin Changes + +====== Declaration Failures + +Previously, the `ignoreDeclarationFailures` flag only took effect for `IOException` on the channel (such as mis-matched +arguments). +It now takes effect for any exception (such as `TimeoutException`). +In addition, a `DeclarationExceptionEvent` is now published whenever a declaration fails. +The `RabbitAdmin` last declaration event is also available as a property `lastDeclarationExceptionEvent`. +See <> for more information. + +===== @RabbitListener Changes + +====== Multiple Containers per Bean + +When using Java 8 or later, it is now possible to add multiple `@RabbitListener` annotations to `@Bean` classes or +their methods. +When using Java 7 or earlier, you can use the `@RabbitListeners` container annotation to provide the same +functionality. +See <> for more information. + +====== @SendTo SpEL Expressions + +`@SendTo` for routing replies with no `replyTo` property can now be SpEL expressions evaluated against the +request/reply. +See <> for more information. + +====== @QueueBinding Improvements + +You can now specify arguments for queues, exchanges and bindings in `@QueueBinding` annotations. +Header exchanges are now supported by `@QueueBinding`. +See <> for more information. + +===== Delayed Message Exchange + +Spring AMQP now has first class support for the RabbitMQ Delayed Message Exchange plugin. +See <> for more information. + +===== Exchange internal flag + +Any `Exchange` definitions can now be marked as `internal` and the `RabbitAdmin` will pass the value to the broker when +declaring the exchange. +See <> for more information. + +===== CachingConnectionFactory Changes + +====== CachingConnectionFactory Cache Statistics + +The `CachingConnectionFactory` now provides cache properties at runtime and over JMX. +See <> for more information. + +====== Access the Underlying RabbitMQ Connection Factory + +A new getter has been added to provide access to the underlying factory. +This can be used, for example, to add custom connection properties. +See <> for more information. + +====== Channel Cache + +The default channel cache size has been increased from 1 to 25. +See <> for more information. + +In addition, the `SimpleMessageListenerContainer` no longer adjusts the cache size to be at least as large as the number +of `concurrentConsumers` - this was superfluous, since the container consumer channels are never cached. + +===== RabbitConnectionFactoryBean + +The factory bean now exposes a property to add client connection properties to connections made by the resulting +factory. + +===== Java Deserialization + +A "white list" of allowable classes can now be configured when using Java deserialization. +It is important to consider creating a white list if you accept messages with serialized java objects from +untrusted sources. +See <> for more information. + +===== JSON MessageConverter + +Improvements to the JSON message converter now allow the consumption of messages that don't have type information +in message headers. +See <> and <> for more information. + +===== Logging Appenders + +====== Log4j2 + +A log4j2 appender has been added, and the appenders can now be configured with an `addresses` property to connect +to a broker cluster. + +====== Client Connection Properties + +You can now add custom client connection properties to RabbitMQ connections. + +See <> for more information. + ==== Changes in 1.5 Since 1.4 ===== spring-erlang is No Longer Supported diff --git a/src/reference/asciidoc/logging.adoc b/src/reference/asciidoc/logging.adoc index 0fed05dd..81be9f39 100644 --- a/src/reference/asciidoc/logging.adoc +++ b/src/reference/asciidoc/logging.adoc @@ -3,7 +3,6 @@ The framework provides logging appenders for several popular logging subsystems: -- log4j (since Spring AMQP _version 1.1_) - logback (since Spring AMQP _version 1.4_) - log4j2 (since Spring AMQP _version 1.6_) @@ -111,24 +110,6 @@ If the charset is unsupported on the current platform, we fall back to using the |=== -==== Log4j Appender - -.Example log4j.properties Snippet -[source, text] ----- -log4j.appender.amqp.addresses=foo:5672,bar:5672 -log4j.appender.amqp=org.springframework.amqp.rabbit.log4j.AmqpAppender -log4j.appender.amqp.applicationId=myApplication -log4j.appender.amqp.routingKeyPattern=%X{applicationId}.%c.%p -log4j.appender.amqp.layout=org.apache.log4j.PatternLayout -log4j.appender.amqp.layout.ConversionPattern=%d %p %t [%c] - <%m>%n -log4j.appender.amqp.generateId=true -log4j.appender.amqp.charset=UTF-8 -log4j.appender.amqp.durable=false -log4j.appender.amqp.deliveryMode=NON_PERSISTENT -log4j.appender.amqp.declareExchange=true ----- - ==== Log4j2 Appender .Example log4j2.xml Snippet diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc index 8194aac1..ae82d0d3 100644 --- a/src/reference/asciidoc/whats-new.adoc +++ b/src/reference/asciidoc/whats-new.adoc @@ -1,229 +1,13 @@ [[whats-new]] === What's New -==== Changes in 1.6 Since 1.5 +==== Changes in 2.0 Since 1.6 -===== Testing Support +===== Log4j Appender -A new testing support library is now provided. -See <> for more information. +This appender is no longer available due to the end-of-life of log4j. +See <> for information about the available log appenders. -===== Builder - -Builders are now available providing a fluent API for configuring `Queue` and `Exchange` objects. -See <> for more information. - -===== Namespace Changes - -====== Connection Factory - -It is now possible to add a `thread-factory` to a connection factory bean declaration, for example to name the threads -created by the `amqp-client` library. -See <> for more information. - -When using `CacheMode.CONNECTION`, you can now limit the total number of connections allowed. -See <> for more information. - -====== Queue Definitions - -It is now possible to provide a naming strategy for anonymous queues; see <> for more information. - -===== Listener Container Changes - -====== Idle Message Listener Detection - -It is now possible to configure listener containers to publish `ApplicationEvent` s when idle. -See <> for more information. - -====== Mismatched Queue Detection - -By default, when a listener container starts, if queues with mismatched properties or arguments were detected, -the container would log the exception but continue to listen. -The container now has a property `mismatchedQueuesFatal` which will prevent the container (and context) from -starting if the problem is detected during startup. -It will also stop the container if the problem is detected later, such as after recovering from a connection failure. -See <> for more information. - -====== Listener Container Logging - -Now listener container provides its `beanName` into the internal `SimpleAsyncTaskExecutor` as a `threadNamePrefix`. -It is useful for logs analysis. - -====== Default Error Handler - -The default error handler (`ConditionalRejectingErrorHandler`) now considers irrecoverable `@RabbitListener` -exceptions as fatal. -See <> for more information. - - -===== AutoDeclare and RabbitAdmins - -See <> (`autoDeclare`) for some changes to the semantics of that option with respect to the use -of `RabbitAdmin` s in the application context. - -===== AmqpTemplate: receive with timeout - -A number of new `receive()` methods with `timeout` have been introduced for the `AmqpTemplate` - and its `RabbitTemplate` implementation. -See <> for more information. - -===== AsyncRabbitTemplate - -A new `AsyncRabbitTemplate` has been introduced. -This template provides a number of send and receive methods, where the return value is a `ListenableFuture`, which can -be used later to obtain the result either synchronously, or asynchronously. -See <> for more information. - -===== RabbitTemplate Changes - -1.4.1 introduced the ability to use https://www.rabbitmq.com/direct-reply-to.html[Direct reply-to] when the broker -supports it; it is more efficient than using a temporary queue for each reply. -This version allows you to override this default behavior and use a temporary queue by setting the -`useTemporaryReplyQueues` property to `true`. -See <> for more information. - -The `RabbitTemplate` now supports a `user-id-expression` (`userIdExpression` when using Java configuration). -See https://www.rabbitmq.com/validated-user-id.html[Validated User-ID RabbitMQ documentation] and <> for more information. - -===== Message Properties - -====== CorrelationId - -The `correlationId` message property can now be a `String`. -See <> for more information. - -====== Long String Headers - -Previously, the `DefaultMessagePropertiesConverter` "converted" headers longer than the long string limit (default 1024) -to a `DataInputStream` (actually it just referenced the `LongString`'s `DataInputStream`). -On output, this header was not converted (except to a String, e.g. `java.io.DataInputStream@1d057a39` by calling -`toString()` on the stream). - -With this release, long `LongString` s are now left as `LongString` s by default; you can access the contents via -the `getBytes[]`, `toString()`, or `getStream()` methods. -A large incoming `LongString` is now correctly "converted" on output too. - -See <> for more information. - -====== Inbound Delivery Mode - -The `deliveryMode` property is no longer mapped to the `MessageProperties.deliveryMode`; this is to avoid unintended -propagation if the the same `MessageProperties` object is used to send an outbound message. -Instead, the inbound `deliveryMode` header is mapped to `MessageProperties.receivedDeliveryMode`. - -See <> for more information. - -When using annotated endpoints, the header is provided in the header named `AmqpHeaders.RECEIVED_DELIVERY_MODE`. - -See <> for more information. - -====== Inbound User ID - -The `user_id` property is no longer mapped to the `MessageProperties.userId`; this is to avoid unintended -propagation if the the same `MessageProperties` object is used to send an outbound message. -Instead, the inbound `userId` header is mapped to `MessageProperties.receivedUserId`. - -See <> for more information. - -When using annotated endpoints, the header is provided in the header named `AmqpHeaders.RECEIVED_USER_ID`. - -See <> for more information. - -===== RabbitAdmin Changes - -====== Declaration Failures - -Previously, the `ignoreDeclarationFailures` flag only took effect for `IOException` on the channel (such as mis-matched -arguments). -It now takes effect for any exception (such as `TimeoutException`). -In addition, a `DeclarationExceptionEvent` is now published whenever a declaration fails. -The `RabbitAdmin` last declaration event is also available as a property `lastDeclarationExceptionEvent`. -See <> for more information. - -===== @RabbitListener Changes - -====== Multiple Containers per Bean - -When using Java 8 or later, it is now possible to add multiple `@RabbitListener` annotations to `@Bean` classes or -their methods. -When using Java 7 or earlier, you can use the `@RabbitListeners` container annotation to provide the same -functionality. -See <> for more information. - -====== @SendTo SpEL Expressions - -`@SendTo` for routing replies with no `replyTo` property can now be SpEL expressions evaluated against the -request/reply. -See <> for more information. - -====== @QueueBinding Improvements - -You can now specify arguments for queues, exchanges and bindings in `@QueueBinding` annotations. -Header exchanges are now supported by `@QueueBinding`. -See <> for more information. - -===== Delayed Message Exchange - -Spring AMQP now has first class support for the RabbitMQ Delayed Message Exchange plugin. -See <> for more information. - -===== Exchange internal flag - -Any `Exchange` definitions can now be marked as `internal` and the `RabbitAdmin` will pass the value to the broker when -declaring the exchange. -See <> for more information. - -===== CachingConnectionFactory Changes - -====== CachingConnectionFactory Cache Statistics - -The `CachingConnectionFactory` now provides cache properties at runtime and over JMX. -See <> for more information. - -====== Access the Underlying RabbitMQ Connection Factory - -A new getter has been added to provide access to the underlying factory. -This can be used, for example, to add custom connection properties. -See <> for more information. - -====== Channel Cache - -The default channel cache size has been increased from 1 to 25. -See <> for more information. - -In addition, the `SimpleMessageListenerContainer` no longer adjusts the cache size to be at least as large as the number -of `concurrentConsumers` - this was superfluous, since the container consumer channels are never cached. - -===== RabbitConnectionFactoryBean - -The factory bean now exposes a property to add client connection properties to connections made by the resulting -factory. - -===== Java Deserialization - -A "white list" of allowable classes can now be configured when using Java deserialization. -It is important to consider creating a white list if you accept messages with serialized java objects from -untrusted sources. -See <> for more information. - -===== JSON MessageConverter - -Improvements to the JSON message converter now allow the consumption of messages that don't have type information -in message headers. -See <> and <> for more information. - -===== Logging Appenders - -====== Log4j2 - -A log4j2 appender has been added, and the appenders can now be configured with an `addresses` property to connect -to a broker cluster. - -====== Client Connection Properties - -You can now add custom client connection properties to RabbitMQ connections. - -See <> for more information. ==== Earlier Releases