Merge 054a0ee into 1db605a

OpenWiseSolutions · Nov 8, 2018 · 2f6a3ff · 2f6a3ff
2 parents 1db605a + 054a0ee
commit 2f6a3ff
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/test/src/main/java/org/openhubframework/openhub/test/TestConfig.java b/test/src/main/java/org/openhubframework/openhub/test/TestConfig.java
@@ -26,7 +26,11 @@
 import org.apache.camel.spring.boot.CamelConfigurationProperties;
 import org.apache.camel.spring.boot.CamelContextConfiguration;
 import org.apache.camel.spring.boot.RoutesCollector;
+import org.openhubframework.openhub.api.route.WebServiceUriBuilder;
+import org.openhubframework.openhub.common.OpenHubPropertyConstants;
+import org.openhubframework.openhub.test.route.TestWsUriBuilder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.*;
@@ -97,5 +101,17 @@ public void afterApplicationStart(CamelContext camelContext) {
           }
       };
     }
+
+    /**
+     * Registration of test implementation of {@link WebServiceUriBuilder}.
+     *
+     * @see TestWsUriBuilder for more information.
+     */
+    @Primary
+    @Bean
+    @ConditionalOnProperty(name = OpenHubPropertyConstants.PREFIX + "test.ws-uri-builder.enabled", matchIfMissing = true)
+    public WebServiceUriBuilder testWebServiceUriBuilder() {
+        return new TestWsUriBuilder();
+    }
 }
 
diff --git a/test/src/main/java/org/openhubframework/openhub/test/route/TestWsUriBuilder.java b/test/src/main/java/org/openhubframework/openhub/test/route/TestWsUriBuilder.java
@@ -19,8 +19,6 @@
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import org.openhubframework.openhub.api.route.WebServiceUriBuilder;
@@ -41,8 +39,6 @@
  *
  * @author Petr Juza
  */
-@Component
-@Primary
 public class TestWsUriBuilder implements WebServiceUriBuilder {
 
     public static final String URI_WS_IN = "direct:inWS_";
@@ -74,4 +70,4 @@ public String getInWsUri(QName qName, String endpointMappingRef, @Nullable Strin
 
         return URI_WS_IN + qName.getLocalPart();
     }
-}
+}
diff --git a/test/src/main/resources/application-test.properties b/test/src/main/resources/application-test.properties
@@ -86,3 +86,10 @@ camel.springboot.name=camelContext
 # Code of actual node for this application server instance
 ohf.cluster.actualNodeInstance.code = TestNode
 
+# ===============================
+# = TEST
+# ===============================
+# Configurations for unit tests
+
+# WebServiceUriBuilder for tests
+ohf.test.ws-uri-builder.enabled = true