adding profile and feature toggle for spring web apis

tiagodolphine · Nov 16, 2020 · f8894b9 · f8894b9
1 parent 9154162
commit f8894b9
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 11 deletions.
diff --git a/api/kogito-api/src/main/java/org/kie/kogito/conf/FeatureToggle.java b/api/kogito-api/src/main/java/org/kie/kogito/conf/FeatureToggle.java
@@ -0,0 +1,2 @@
+package org.kie.kogito.conf;public class FeatureToggle {
+}
diff --git a/integration-tests/integration-tests-springboot/pom.xml b/integration-tests/integration-tests-springboot/pom.xml
@@ -19,7 +19,7 @@
       <artifactId>kogito-springboot-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
+
     <!-- Force resolving dependencies in local Maven repo, needed for it tests -->
     <dependency>
       <groupId>org.infinispan</groupId>
@@ -121,5 +121,34 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>spring-web</id>
+      <activation>
+        <property>
+          <name>spring-web</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <profiles>
+                <profile>spring-web</profile>
+              </profiles>
+              <properties>
+                <SPRING_WEB_API_ENABLED>true</SPRING_WEB_API_ENABLED>
+                <spring.mvc.servlet.path></spring.mvc.servlet.path>
+              </properties>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/...gration-tests/integration-tests-springboot/src/it/integration-tests-springboot-it/pom.xml b/...gration-tests/integration-tests-springboot/src/it/integration-tests-springboot-it/pom.xml
@@ -195,5 +195,46 @@
                 </testResources>
             </build>
         </profile>
+
+        <profile>
+            <id>spring-web</id>
+            <activation>
+                <property>
+                    <name>spring-web</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.kie.kogito</groupId>
+                    <artifactId>kogito-springboot-starter</artifactId>
+                    <version>@project.version@</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.jboss.resteasy</groupId>
+                            <artifactId>resteasy-spring-boot-starter</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                    <version>@version.springboot@</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <SPRING_WEB_API_ENABLED>${SPRING_WEB_API_ENABLED}</SPRING_WEB_API_ENABLED>
+                                <spring.mvc.servlet.path>${spring.mvc.servlet.path}</spring.mvc.servlet.path>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/...ringboot/src/it/integration-tests-springboot-it/src/main/resources/application.properties b/...ringboot/src/it/integration-tests-springboot-it/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 server.address=0.0.0.0
 
-#spring.mvc.servlet.path=/
+spring.mvc.servlet.path=/docs
 
-#resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
+resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
 
 # for these tests, we do NOT want stronglytyped to be enabled, leave it as default disabled.
 # kogito.decisions.stronglytyped=false
diff --git a/...tegration-tests-springboot-it/src/test/extra-resources/persistence/application.properties b/...tegration-tests-springboot-it/src/test/extra-resources/persistence/application.properties
@@ -1,8 +1,8 @@
 server.address=0.0.0.0
 
-#spring.mvc.servlet.path=/docs
+spring.mvc.servlet.path=/docs
 
-#resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
+resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
 
 # Used for persistence profile
 infinispan.remote.sasl-mechanism=PLAIN

diff --git a/...tests-springboot-it/src/test/java/org/kie/kogito/integrationtests/springboot/OASTest.java b/...tests-springboot-it/src/test/java/org/kie/kogito/integrationtests/springboot/OASTest.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.testcontainers.springboot.InfinispanSpringBootTestResource;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.ContextConfiguration;
@@ -49,10 +50,13 @@ class OASTest extends BaseRestTest {
         RestAssured.enableLoggingOfRequestAndResponseIfValidationFails();
     }
 
+    @Value("${spring.mvc.servlet.path}")
+    private String path;
+
     @Test
     public void testOASdmnDefinitions() {
         RestAssured.given()
-                   .get("/dmnDefinitions.json")
+                   .get(path + "/dmnDefinitions.json")
                    .then()
                    .statusCode(200)
                    .body("definitions", aMapWithSize(greaterThan(0)));

diff --git a/...n-tests/integration-tests-springboot/src/it/integration-tests-springboot-kafka-it/pom.xml b/...n-tests/integration-tests-springboot/src/it/integration-tests-springboot-kafka-it/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <groupId>org.kie.kogito</groupId>
-    <artifactId>integration-tests-springboot-it</artifactId>
+    <artifactId>integration-tests-springboot-kakfa-it</artifactId>
     <version>@project.version@</version>
 
     <properties>
@@ -199,5 +199,46 @@
                 </testResources>
             </build>
         </profile>
+
+        <profile>
+            <id>spring-web</id>
+            <activation>
+                <property>
+                    <name>spring-web</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.kie.kogito</groupId>
+                    <artifactId>kogito-springboot-starter</artifactId>
+                    <version>@project.version@</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.jboss.resteasy</groupId>
+                            <artifactId>resteasy-spring-boot-starter</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                    <version>@version.springboot@</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemProperties>
+                                <SPRING_WEB_API_ENABLED>${SPRING_WEB_API_ENABLED}</SPRING_WEB_API_ENABLED>
+                                <spring.mvc.servlet.path>${spring.mvc.servlet.path}</spring.mvc.servlet.path>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/...ot/src/it/integration-tests-springboot-kafka-it/src/main/resources/application.properties b/...ot/src/it/integration-tests-springboot-kafka-it/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 server.address=0.0.0.0
 
-#spring.mvc.servlet.path=/docs
+spring.mvc.servlet.path=/docs
 
-#resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
+resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
 
 spring.kafka.consumer.group-id=kogito-group
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer

diff --git a/...ion-tests-springboot-kafka-it/src/test/extra-resources/persistence/application.properties b/...ion-tests-springboot-kafka-it/src/test/extra-resources/persistence/application.properties
@@ -1,8 +1,8 @@
 server.address=0.0.0.0
 
-#spring.mvc.servlet.path=/docs
+spring.mvc.servlet.path=/docs
 
-#resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
+resteasy.jaxrs.scan-packages=org.kie.kogito.**,http*
 
 # Used for persistence profile
 infinispan.remote.sasl-mechanism=PLAIN
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		package org.kie.kogito.conf;public class FeatureToggle {
		}