Refactor GooglePubSubConfig

src/main/java/org/rutebanken/tiamat/changelog/EntityChangedEventPubSubPublisher.java

@@ -15,7 +15,7 @@
 
 package org.rutebanken.tiamat.changelog;
 
-import org.rutebanken.tiamat.config.GooglePubSubConfig;
+import org.rutebanken.tiamat.config.PubsubOutboundGateway;
 import org.rutebanken.tiamat.model.EntityInVersionStructure;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,7 +29,7 @@
 public class EntityChangedEventPubSubPublisher extends EntityChangedEventPublisher implements EntityChangedListener {
 
     @Autowired
-    private GooglePubSubConfig.PubsubOutboundGateway pubsubOutboundGateway;
+    private PubsubOutboundGateway pubsubOutboundGateway;
 
     @Value("${changelog.gcp.publish.enabled:true}")
     private boolean pubSubPublish;

src/main/java/org/rutebanken/tiamat/config/GooglePubSubConfig.java

@@ -6,7 +6,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.MessageHandler;
 
@@ -21,9 +20,4 @@ public class GooglePubSubConfig {
     public MessageHandler messageSender(PubSubTemplate pubsubTemplate) {
         return new PubSubMessageHandler(pubsubTemplate, pubSubTopic);
     }
-
-    @MessagingGateway(defaultRequestChannel = "pubsubOutputChannel")
-    public interface PubsubOutboundGateway {
-        void sendToPubsub(String text);
-    }
 }

src/main/java/org/rutebanken/tiamat/config/PubsubOutboundGateway.java

@@ -0,0 +1,10 @@
+package org.rutebanken.tiamat.config;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.integration.annotation.MessagingGateway;
+
+@Profile("google-pubsub")
+@MessagingGateway(defaultRequestChannel = "pubsubOutputChannel")
+public interface PubsubOutboundGateway {
+    void sendToPubsub(String text);
+}