Spring Boot docs + cleaning up Spring Boot integration. Example can b…

…e found at https://github.com/jbarrez/spring-boot-activiti-example/
skay2k · Dec 17, 2014 · 295f566 · 295f566
1 parent 9dddf9c
commit 295f566
Show file tree

Hide file tree

Showing 20 changed files with 763 additions and 101 deletions.
diff --git a/modules/activiti-spring-boot/spring-boot-samples/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/pom.xml
@@ -32,4 +32,17 @@
             <artifactId>h2</artifactId>
         </dependency>
     </dependencies>
+
+     <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.6</source>
+                        <target>1.6</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
 </project>
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -17,12 +17,18 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
             <version>5.17.0</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 

diff --git a/...g/boot/EndpointAutoConfigurationTest.java → ...g/boot/EndpointAutoConfigurationTest.java b/...g/boot/EndpointAutoConfigurationTest.java → ...g/boot/EndpointAutoConfigurationTest.java
@@ -1,8 +1,11 @@
-package org.activiti.spring.boot;
+package org.activiti.test.spring.boot;
+
 
 import java.util.Map;
 
 import org.activiti.engine.ProcessEngine;
+import org.activiti.spring.boot.DataSourceProcessEngineAutoConfiguration;
+import org.activiti.spring.boot.EndpointAutoConfiguration;
 import org.activiti.spring.boot.actuate.endpoint.ProcessEngineEndpoint;
 import org.junit.Test;
 import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration;
@@ -22,6 +25,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.ResponseEntity;
+import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
@@ -45,7 +49,8 @@ public static class EmbeddedContainerConfiguration {
             MetricFilterAutoConfiguration.class, EndpointWebMvcAutoConfiguration.class,
             ManagementServerPropertiesAutoConfiguration.class,
             MetricRepositoryAutoConfiguration.class,
-            DataSourceProcessEngineAutoConfiguration.DataSourceConfiguration.class, EndpointAutoConfiguration.class})
+            DataSourceProcessEngineAutoConfiguration.DataSourceProcessEngineConfiguration.class, 
+            EndpointAutoConfiguration.class})
     public static class EndpointConfiguration {
 
         @Bean

diff --git a/...t/ProcessEngineAutoConfigurationTest.java → ...t/ProcessEngineAutoConfigurationTest.java b/...t/ProcessEngineAutoConfigurationTest.java → ...t/ProcessEngineAutoConfigurationTest.java
@@ -1,45 +1,33 @@
-package org.activiti.spring.boot;
+package org.activiti.test.spring.boot;
+
+
+import java.util.List;
 
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.ProcessDefinition;
-import org.activiti.spring.SpringProcessEngineConfiguration;
+import org.activiti.spring.boot.DataSourceProcessEngineAutoConfiguration;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import javax.persistence.EntityManagerFactory;
-import java.util.List;
-
 /**
  * @author Josh Long
  */
 public class ProcessEngineAutoConfigurationTest {
 
-    @Test
-    public void processEngineWithJpaEntityManager() throws Exception {
-        AnnotationConfigApplicationContext context = this.context(DataSourceAutoConfiguration.class,
-                HibernateJpaAutoConfiguration.class, JpaProcessEngineAutoConfiguration.JpaConfiguration.class);
-        Assert.assertNotNull("entityManagerFactory should not be null", context.getBean(EntityManagerFactory.class));
-        Assert.assertNotNull("the processEngine should not be null!", context.getBean(ProcessEngine.class));
-        SpringProcessEngineConfiguration configuration = context.getBean(SpringProcessEngineConfiguration.class);
-        Assert.assertNotNull("the " + SpringProcessEngineConfiguration.class.getName() + " should not be null", configuration);
-        Assert.assertNotNull(configuration.getJpaEntityManagerFactory());
-    }
-
     @Test
     public void processEngineWithBasicDataSource() throws Exception {
         AnnotationConfigApplicationContext context = this.context(
-                DataSourceAutoConfiguration.class, DataSourceProcessEngineAutoConfiguration.DataSourceConfiguration.class);
+                DataSourceAutoConfiguration.class, DataSourceProcessEngineAutoConfiguration.DataSourceProcessEngineConfiguration.class);
         Assert.assertNotNull("the processEngine should not be null!", context.getBean(ProcessEngine.class));
     }
 
     @Test
     public void launchProcessDefinition() throws Exception {
         AnnotationConfigApplicationContext applicationContext = this.context(
-                DataSourceAutoConfiguration.class, DataSourceProcessEngineAutoConfiguration.DataSourceConfiguration.class);
+                DataSourceAutoConfiguration.class, DataSourceProcessEngineAutoConfiguration.DataSourceProcessEngineConfiguration.class);
         RepositoryService repositoryService = applicationContext.getBean(RepositoryService.class);
         Assert.assertNotNull("we should have a default repositoryService included", repositoryService);
         List<ProcessDefinition> processDefinitionList = repositoryService.createProcessDefinitionQuery()

diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-integration/pom.xml
@@ -17,6 +17,11 @@
             <artifactId>spring-boot-starter-integration</artifactId>
             <version>5.17.0</version>
         </dependency>
+        <dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 </project>
diff --git a/...oot/IntegrationAutoConfigurationTest.java → ...oot/IntegrationAutoConfigurationTest.java b/...oot/IntegrationAutoConfigurationTest.java → ...oot/IntegrationAutoConfigurationTest.java
@@ -1,11 +1,17 @@
-package org.activiti.spring.boot;
+package org.activiti.test.spring.boot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.spring.boot.DataSourceProcessEngineAutoConfiguration;
 import org.activiti.spring.integration.ActivitiInboundGateway;
 import org.activiti.spring.integration.IntegrationActivityBehavior;
 import org.junit.Assert;
@@ -24,17 +30,64 @@
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
 /**
  * Test the Spring Integration inbound inboundGateway support.
  *
  * @author Josh Long
  */
 public class IntegrationAutoConfigurationTest {
+
+	 @Configuration
+   @Import(BaseConfiguration.class)
+   public static class InboundGatewayConfiguration {
+       @Bean
+       public IntegrationActivityBehavior activitiDelegate(ActivitiInboundGateway activitiInboundGateway) {
+           return new IntegrationActivityBehavior(activitiInboundGateway);
+       }
+
+       @Bean
+       public ActivitiInboundGateway inboundGateway(ProcessEngine processEngine) {
+           return new ActivitiInboundGateway(processEngine, "customerId", "projectId", "orderId");
+       }
+
+       @Bean
+       public IntegrationFlow inboundProcess(ActivitiInboundGateway inboundGateway) {
+           return IntegrationFlows
+                   .from(inboundGateway)
+                   .handle(new GenericHandler<ActivityExecution>() {
+                       @Override
+                       public Object handle(ActivityExecution execution, Map<String, Object> headers) {
+                           return MessageBuilder.withPayload(execution)
+                                   .setHeader("projectId", projectId)
+                                   .setHeader("orderId", "246")
+                                   .copyHeaders(headers).build();
+                       }
+                   })
+                   .get();
+       }
+
+
+       @Bean(name="analysingService")
+       public AnalysingService service() {
+           return new AnalysingService();
+       }
+
+       public static class AnalysingService {
+           private final AtomicReference<String> stringAtomicReference
+                   = new AtomicReference<String>();
+
+           public void dump(String projectId) {
+               this.stringAtomicReference.set(projectId);
+           }
+
+           public AtomicReference<String> getStringAtomicReference() {
+               return stringAtomicReference;
+           }
+       }
+   }
+
+
+   public static final String projectId = "2143243";
 
     private AnnotationConfigApplicationContext context(Class<?>... clzz) {
         AnnotationConfigApplicationContext annotationConfigApplicationContext
@@ -48,7 +101,7 @@ private AnnotationConfigApplicationContext context(Class<?>... clzz) {
     @Test
     public void testLaunchingGatewayProcessDefinition() throws Exception {
         AnnotationConfigApplicationContext applicationContext = this.context(InboundGatewayConfiguration.class);
-
+        
         RepositoryService repositoryService = applicationContext.getBean(RepositoryService.class);
         RuntimeService runtimeService = applicationContext.getBean(RuntimeService.class);
         ProcessEngine processEngine = applicationContext.getBean(ProcessEngine.class);
@@ -72,7 +125,7 @@ public void testLaunchingGatewayProcessDefinition() throws Exception {
 
     @Configuration
     @Import({DataSourceAutoConfiguration.class,
-            DataSourceProcessEngineAutoConfiguration.DataSourceConfiguration.class,
+            DataSourceProcessEngineAutoConfiguration.DataSourceProcessEngineConfiguration.class,
             IntegrationAutoConfiguration.class})
     public static class BaseConfiguration {
 
@@ -88,55 +141,5 @@ public TaskExecutor taskExecutor() {
     }
 
 
-    @Configuration
-    @Import(BaseConfiguration.class)
-    public static class InboundGatewayConfiguration {
-        @Bean
-        public IntegrationActivityBehavior activitiDelegate(ActivitiInboundGateway activitiInboundGateway) {
-            return new IntegrationActivityBehavior(activitiInboundGateway);
-        }
-
-        @Bean
-        public ActivitiInboundGateway inboundGateway(ProcessEngine processEngine) {
-            return new ActivitiInboundGateway(processEngine, "customerId", "projectId", "orderId");
-        }
-
-        @Bean
-        public IntegrationFlow inboundProcess(ActivitiInboundGateway inboundGateway) {
-            return IntegrationFlows
-                    .from(inboundGateway)
-                    .handle(new GenericHandler<ActivityExecution>() {
-                        @Override
-                        public Object handle(ActivityExecution execution, Map<String, Object> headers) {
-                            return MessageBuilder.withPayload(execution)
-                                    .setHeader("projectId", projectId)
-                                    .setHeader("orderId", "246")
-                                    .copyHeaders(headers).build();
-                        }
-                    })
-                    .get();
-        }
-
-
-        @Bean
-        public AnalysingService service() {
-            return new AnalysingService();
-        }
-
-        public static class AnalysingService {
-            private final AtomicReference<String> stringAtomicReference
-                    = new AtomicReference<String>();
-
-            public void dump(String projectId) {
-                this.stringAtomicReference.set(projectId);
-            }
-
-            public AtomicReference<String> getStringAtomicReference() {
-                return stringAtomicReference;
-            }
-        }
-    }
-
-
-    public static final String projectId = "2143243";
+
 }
diff --git a/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml b/modules/activiti-spring-boot/spring-boot-samples/spring-boot-sample-jpa/pom.xml
@@ -17,6 +17,11 @@
             <artifactId>spring-boot-starter-jpa</artifactId>
             <version>5.17.0</version>
         </dependency>
+        <dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 </project>
diff --git a/...e-jpa/src/test/java/org/activiti/test/spring/boot/ProcessEngineAutoConfigurationTest.java b/...e-jpa/src/test/java/org/activiti/test/spring/boot/ProcessEngineAutoConfigurationTest.java
@@ -0,0 +1,39 @@
+package org.activiti.test.spring.boot;
+
+
+import javax.persistence.EntityManagerFactory;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.spring.SpringProcessEngineConfiguration;
+import org.activiti.spring.boot.JpaProcessEngineAutoConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+/**
+ * @author Josh Long
+ */
+public class ProcessEngineAutoConfigurationTest {
+
+    @Test
+    public void processEngineWithJpaEntityManager() throws Exception {
+        AnnotationConfigApplicationContext context = this.context(DataSourceAutoConfiguration.class,
+                HibernateJpaAutoConfiguration.class, JpaProcessEngineAutoConfiguration.JpaConfiguration.class);
+        Assert.assertNotNull("entityManagerFactory should not be null", context.getBean(EntityManagerFactory.class));
+        Assert.assertNotNull("the processEngine should not be null!", context.getBean(ProcessEngine.class));
+        SpringProcessEngineConfiguration configuration = context.getBean(SpringProcessEngineConfiguration.class);
+        Assert.assertNotNull("the " + SpringProcessEngineConfiguration.class.getName() + " should not be null", configuration);
+        Assert.assertNotNull(configuration.getJpaEntityManagerFactory());
+    }
+
+
+    private AnnotationConfigApplicationContext context(Class<?>... clzz) {
+        AnnotationConfigApplicationContext annotationConfigApplicationContext
+                = new AnnotationConfigApplicationContext();
+        annotationConfigApplicationContext.register(clzz);
+        annotationConfigApplicationContext.refresh();
+        return annotationConfigApplicationContext;
+    }
+}
diff --git a/...les/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml b/...les/activiti-spring-boot/spring-boot-samples/spring-boot-sample-rest-api-security/pom.xml
@@ -23,6 +23,12 @@
             <artifactId>spring-boot-starter-security</artifactId>
             <version>5.17.0</version>
         </dependency>
+
+        <dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>