One more change

hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/ChannelConsumerSettings.java

@@ -20,12 +20,12 @@ package ca.uhn.fhir.jpa.subscription.channel.api;
  * #L%
  */
 
-public class ChannelConsumerOptions {
+public class ChannelConsumerSettings {
 
 	/**
 	 * Constructor
 	 */
-	public ChannelConsumerOptions() {
+	public ChannelConsumerSettings() {
 		super();
 	}
 
@@ -35,7 +35,7 @@ public class ChannelConsumerOptions {
 		return myConcurrentConsumers;
 	}
 
-	public ChannelConsumerOptions setConcurrentConsumers(int theConcurrentConsumers) {
+	public ChannelConsumerSettings setConcurrentConsumers(int theConcurrentConsumers) {
 		myConcurrentConsumers = theConcurrentConsumers;
 		return this;
 	}

hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/api/IChannelFactory.java

@@ -30,7 +30,7 @@ public interface IChannelFactory {
 	 * Create a channel that is used to receive messages from the queue.
 	 *
 	 * <p>
-	 * Implementations can choose to return the same object for multiple invocations of this method (and {@link #getOrCreateReceiver(String, Class, ChannelConsumerOptions)}
+	 * Implementations can choose to return the same object for multiple invocations of this method (and {@link #getOrCreateReceiver(String, Class, ChannelConsumerSettings)}
 	 * when invoked with the same {@literal theChannelName} if they need to, or they can create a new instance.
 	 * </p>
 	 *
@@ -38,18 +38,18 @@ public interface IChannelFactory {
 	 * @param theMessageType The object type that will be placed on this queue. Objects will be Jackson-annotated structures.
 	 * @param theConfig      Contains the configuration for subscribers. Note that this parameter is provided for
 	 *                       both {@link #getOrCreateReceiver} and
-	 *                       {@link #getOrCreateProducer(String, Class, ChannelConsumerOptions)}
+	 *                       {@link #getOrCreateProducer(String, Class, ChannelConsumerSettings)}
 	 *                       even though this object is used to configure the sender only. We do this because the factory
 	 *                       may want to create a single object to be used for both the sender and receiver, so this allows
 	 *                       the config details to be known regardless of which method is returned first.
 	 */
-	IChannelReceiver getOrCreateReceiver(String theChannelName, Class<?> theMessageType, ChannelConsumerOptions theConfig);
+	IChannelReceiver getOrCreateReceiver(String theChannelName, Class<?> theMessageType, ChannelConsumerSettings theConfig);
 
 	/**
 	 * Create a channel that is used to send messages to the queue.
 	 *
 	 * <p>
-	 * Implementations can choose to return the same object for multiple invocations of this method (and {@link #getOrCreateReceiver(String, Class, ChannelConsumerOptions)}
+	 * Implementations can choose to return the same object for multiple invocations of this method (and {@link #getOrCreateReceiver(String, Class, ChannelConsumerSettings)}
 	 * when invoked with the same {@literal theChannelName} if they need to, or they can create a new instance.
 	 * </p>
 	 *
@@ -57,11 +57,11 @@ public interface IChannelFactory {
 	 * @param theMessageType The object type that will be placed on this queue. Objects will be Jackson-annotated structures.
 	 * @param theConfig      Contains the configuration for subscribers. Note that this parameter is provided for
 	 *                       both {@link #getOrCreateReceiver} and
-	 *                       {@link #getOrCreateProducer(String, Class, ChannelConsumerOptions)}
+	 *                       {@link #getOrCreateProducer(String, Class, ChannelConsumerSettings)}
 	 *                       even though this object is used to configure the sender only. We do this because the factory
 	 *                       may want to create a single object to be used for both the sender and receiver, so this allows
 	 *                       the config details to be known regardless of which method is returned first.
 	 */
-	IChannelProducer getOrCreateProducer(String theChannelName, Class<?> theMessageType, ChannelConsumerOptions theConfig);
+	IChannelProducer getOrCreateProducer(String theChannelName, Class<?> theMessageType, ChannelConsumerSettings theConfig);
 
 }

hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/LinkedBlockingChannelFactory.java

@@ -20,7 +20,7 @@ package ca.uhn.fhir.jpa.subscription.channel.impl;
  * #L%
  */
 
-import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerOptions;
+import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelProducer;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver;
@@ -54,12 +54,12 @@ public class LinkedBlockingChannelFactory implements IChannelFactory {
 	}
 
 	@Override
-	public IChannelReceiver getOrCreateReceiver(String theChannelName, Class<?> theMessageType, ChannelConsumerOptions theConfig) {
+	public IChannelReceiver getOrCreateReceiver(String theChannelName, Class<?> theMessageType, ChannelConsumerSettings theConfig) {
 		return getOrCreateChannel(theChannelName, theConfig.getConcurrentConsumers());
 	}
 
 	@Override
-	public IChannelProducer getOrCreateProducer(String theChannelName, Class<?> theMessageType, ChannelConsumerOptions theConfig) {
+	public IChannelProducer getOrCreateProducer(String theChannelName, Class<?> theMessageType, ChannelConsumerSettings theConfig) {
 		return getOrCreateChannel(theChannelName, theConfig.getConcurrentConsumers());
 	}
 

hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/channel/subscription/SubscriptionChannelFactory.java

@@ -23,7 +23,7 @@ package ca.uhn.fhir.jpa.subscription.channel.subscription;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelProducer;
-import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerOptions;
+import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings;
 import ca.uhn.fhir.jpa.subscription.model.ResourceDeliveryJsonMessage;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage;
 import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionConstants;
@@ -47,36 +47,36 @@ public class SubscriptionChannelFactory {
 		myQueueChannelFactory = theQueueChannelFactory;
 	}
 
-	public IChannelProducer newDeliverySendingChannel(String theChannelName, ChannelConsumerOptions theOptions) {
+	public IChannelProducer newDeliverySendingChannel(String theChannelName, ChannelConsumerSettings theOptions) {
-		ChannelConsumerOptions config = newConfigForDeliveryChannel(theOptions);
+		ChannelConsumerSettings config = newConfigForDeliveryChannel(theOptions);
 		return myQueueChannelFactory.getOrCreateProducer(theChannelName, ResourceDeliveryJsonMessage.class, config);
 	}
 
-	public IChannelReceiver newDeliveryReceivingChannel(String theChannelName, ChannelConsumerOptions theOptions) {
+	public IChannelReceiver newDeliveryReceivingChannel(String theChannelName, ChannelConsumerSettings theOptions) {
-		ChannelConsumerOptions config = newConfigForDeliveryChannel(theOptions);
+		ChannelConsumerSettings config = newConfigForDeliveryChannel(theOptions);
 		IChannelReceiver channel = myQueueChannelFactory.getOrCreateReceiver(theChannelName, ResourceDeliveryJsonMessage.class, config);
 		return new BroadcastingSubscribableChannelWrapper(channel);
 	}
 
-	public IChannelProducer newMatchingSendingChannel(String theChannelName, ChannelConsumerOptions theOptions) {
+	public IChannelProducer newMatchingSendingChannel(String theChannelName, ChannelConsumerSettings theOptions) {
-		ChannelConsumerOptions config = newConfigForMatchingChannel(theOptions);
+		ChannelConsumerSettings config = newConfigForMatchingChannel(theOptions);
 		return myQueueChannelFactory.getOrCreateProducer(theChannelName, ResourceModifiedJsonMessage.class, config);
 	}
 
-	public IChannelReceiver newMatchingReceivingChannel(String theChannelName, ChannelConsumerOptions theOptions) {
+	public IChannelReceiver newMatchingReceivingChannel(String theChannelName, ChannelConsumerSettings theOptions) {
-		ChannelConsumerOptions config = newConfigForMatchingChannel(theOptions);
+		ChannelConsumerSettings config = newConfigForMatchingChannel(theOptions);
 		IChannelReceiver channel = myQueueChannelFactory.getOrCreateReceiver(theChannelName, ResourceModifiedJsonMessage.class, config);
 		return new BroadcastingSubscribableChannelWrapper(channel);
 	}
 
-	protected ChannelConsumerOptions newConfigForDeliveryChannel(ChannelConsumerOptions theOptions) {
+	protected ChannelConsumerSettings newConfigForDeliveryChannel(ChannelConsumerSettings theOptions) {
-		ChannelConsumerOptions config = new ChannelConsumerOptions();
+		ChannelConsumerSettings config = new ChannelConsumerSettings();
 		config.setConcurrentConsumers(getDeliveryChannelConcurrentConsumers());
 		return config;
 	}
 
-	protected ChannelConsumerOptions newConfigForMatchingChannel(ChannelConsumerOptions theOptions) {
+	protected ChannelConsumerSettings newConfigForMatchingChannel(ChannelConsumerSettings theOptions) {
-		ChannelConsumerOptions config = new ChannelConsumerOptions();
+		ChannelConsumerSettings config = new ChannelConsumerSettings();
 		config.setConcurrentConsumers(getMatchingChannelConcurrentConsumers());
 		return config;
 	}

hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/standalone/BaseBlockingQueueSubscribableChannelDstu3Test.java

@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.interceptor.api.HookParams;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerOptions;
+import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings;
 import ca.uhn.fhir.jpa.subscription.channel.subscription.ISubscriptionDeliveryChannelNamer;
 import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionChannelFactory;
 import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionLoader;
@@ -46,7 +46,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.SubscribableChannel;
 
@@ -57,7 +56,7 @@ import java.util.List;
 
 public abstract class BaseBlockingQueueSubscribableChannelDstu3Test extends BaseSubscriptionDstu3Test {
 	private static final Logger ourLog = LoggerFactory.getLogger(SubscriptionMatchingSubscriberTest.class);
-	public static final ChannelConsumerOptions CONSUMER_OPTIONS = new ChannelConsumerOptions().setConcurrentConsumers(1);
+	public static final ChannelConsumerSettings CONSUMER_OPTIONS = new ChannelConsumerSettings().setConcurrentConsumers(1);
 	protected static ObservationListener ourObservationListener;
 
 	@Autowired