diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml index 0995cd1e2..6af1909e2 100644 --- a/lib/taskana-spring-example/pom.xml +++ b/lib/taskana-spring-example/pom.xml @@ -1,50 +1,40 @@ - 4.0.0 - pro.taskana taskana-spring-example - 1.1.3-SNAPSHOT + + ${project.groupId}:${project.artifactId} + The Taskana Spring sample application. + - org.springframework.boot - spring-boot-starter-parent - 2.0.2.RELEASE - + taskana-lib-parent + pro.taskana + 1.1.2-SNAPSHOT + .. - - 1.8 - 1.8 - UTF-8 - + org.springframework.boot spring-boot-starter-web - - - org.springframework - spring-context + ${version.spring-boot} org.springframework.boot spring-boot-starter-jdbc - - - org.springframework - spring-tx - - - com.h2database - h2 + ${version.spring-boot} org.springframework.boot spring-boot-starter-test + ${version.spring-boot} pro.taskana taskana-spring ${project.version} + junit junit @@ -57,17 +47,20 @@ 1.3 test + + com.h2database + h2 + 1.4.194 + test + - org.springframework.boot spring-boot-maven-plugin + ${version.spring-boot} - ${project.groupId}:${project.artifactId} - http://taskana.pro - The Taskana Spring sample application. diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java index ca4694b92..3074fe674 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java @@ -19,6 +19,9 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; +/** + * TODO. + */ @Component @Transactional public class ExampleBootstrap { diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java index 24e8c46aa..6457b69dd 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java @@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import pro.taskana.configuration.SpringTaskanaEngineConfiguration; /** - * Class to set /load configuration for Taskana Library + * Class to set /load configuration for Taskana Library. * */ @Configuration @@ -28,6 +28,9 @@ public class TaskanaConfig { @Value("${taskana.schemaName:TASKANA}") private String schemaName; + /** + * TODO. + */ @Profile("inmemorydb") @Configuration @PropertySource("classpath:customdb.properties") @@ -44,7 +47,8 @@ public class TaskanaConfig { @Bean @Primary public DataSource dataSource(DataSourceProperties properties) { - DataSource dataSource = properties.initializeDataSourceBuilder().build(); + DataSource dataSource = properties. + initializeDataSourceBuilder().build(); // if TaskanaEngineImpl runs with SpringManagedTransactionFactory, then // there is no need to wrap the dataSource into TransactionAwareDataSourceProxy ... // return new TransactionAwareDataSourceProxy(dataSource); diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfigTestApplication.java b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfigTestApplication.java index dbf5320c8..486b23bdb 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfigTestApplication.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfigTestApplication.java @@ -5,14 +5,15 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.Import; /** - * Class to start an Application to test Taskana + * Class to start an Application to test Taskana. * */ @SpringBootApplication @Import(TaskanaConfig.class) +@SuppressWarnings("checkstyle:hideutilityclassconstructor") public class TaskanaConfigTestApplication { - public static void main(String[] args) { - new SpringApplicationBuilder(TaskanaConfigTestApplication.class).run(args); - } + public static void main(String[] args) { + new SpringApplicationBuilder(TaskanaConfigTestApplication.class).run(args); + } } diff --git a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java index 7365cf650..6a0b0cd5f 100644 --- a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java +++ b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java @@ -8,7 +8,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.internal.verification.VerificationModeFactory.atLeastOnce; @@ -35,6 +34,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; +import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; import pro.taskana.exceptions.DomainNotFoundException; @@ -43,7 +43,6 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.exceptions.WorkbasketAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.history.HistoryEventProducer; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.TaskanaEngineImpl; import pro.taskana.impl.WorkbasketImpl; @@ -63,27 +62,31 @@ import pro.taskana.transaction.TaskanaTransactionProvider; public class TaskanaTransactionIntTest { private static final int POOL_TIME_TO_WAIT = 50; - - @Autowired - private TestRestTemplate restTemplate; - - @Autowired - private DataSource dataSource; - - @Autowired - private JdbcTemplate jdbcTemplate; - - @Autowired - private TaskanaEngine taskanaEngine; - @Autowired TaskanaTransactionProvider springTransactionProvider; - + @Autowired + private TestRestTemplate restTemplate; + @Autowired + private DataSource dataSource; + @Autowired + private JdbcTemplate jdbcTemplate; + @Autowired + private TaskanaEngine taskanaEngine; @Captor private ArgumentCaptor captorLoggingEvent; @Mock - private Appender mockAppender; + private Appender mockAppender; + + private static ObjectReference createDefaultObjRef() { + ObjectReference objRef = new ObjectReference(); + objRef.setCompany("company"); + objRef.setSystem("system"); + objRef.setSystemInstance("instance"); + objRef.setType("type"); + objRef.setValue("value"); + return objRef; + } @Before public void before() { @@ -324,14 +327,4 @@ public class TaskanaTransactionIntTest { task.setPrimaryObjRef(createDefaultObjRef()); return task; } - - private static ObjectReference createDefaultObjRef() { - ObjectReference objRef = new ObjectReference(); - objRef.setCompany("company"); - objRef.setSystem("system"); - objRef.setSystemInstance("instance"); - objRef.setType("type"); - objRef.setValue("value"); - return objRef; - } } diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml index 3542d5c46..70a3ca712 100644 --- a/lib/taskana-spring/pom.xml +++ b/lib/taskana-spring/pom.xml @@ -24,6 +24,7 @@ org.springframework spring-tx ${version.spring} + provided