TSK-1163 refactored ExampleRestApplication

rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestApplication.java

@@ -1,18 +1,13 @@
 package pro.taskana.rest;
 
 import javax.annotation.PostConstruct;
-import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Import;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.transaction.PlatformTransactionManager;
 
 import pro.taskana.jobs.TransactionalJobsConfiguration;
 import pro.taskana.ldap.LdapCacheTestImpl;
@@ -26,6 +21,7 @@ import pro.taskana.sampledata.SampleDataGenerator;
 @ComponentScan(basePackages = "pro.taskana")
 @SuppressWarnings("checkstyle:Indentation")
 @Import({
+  ExampleRestConfiguration.class,
   TransactionalJobsConfiguration.class,
   LdapConfiguration.class,
   RestConfiguration.class,
@@ -33,34 +29,27 @@ import pro.taskana.sampledata.SampleDataGenerator;
 })
 public class ExampleRestApplication {
 
-  @Value("${taskana.schemaName:TASKANA}")
+  private final SampleDataGenerator sampleDataGenerator;
-  public String schemaName;
+  private final LdapClient ldapClient;
+  private final LdapCacheTestImpl ldapCacheTest;
 
   @Value("${generateSampleData:true}")
   public boolean generateSampleData;
 
-  @Autowired private SampleDataGenerator sampleDataGenerator;
+  @Autowired
-
+  public ExampleRestApplication(
-  @Autowired private LdapClient ldapClient;
+      SampleDataGenerator sampleDataGenerator,
-
+      LdapClient ldapClient,
-  @Autowired private LdapCacheTestImpl ldapCacheTest;
+      LdapCacheTestImpl ldapCacheTest) {
+    this.sampleDataGenerator = sampleDataGenerator;
+    this.ldapClient = ldapClient;
+    this.ldapCacheTest = ldapCacheTest;
+  }
 
   public static void main(String[] args) {
     SpringApplication.run(ExampleRestApplication.class, args);
   }
 
-  @Bean
-  public PlatformTransactionManager txManager(DataSource dataSource) {
-    return new DataSourceTransactionManager(dataSource);
-  }
-
-  @Bean
-  @DependsOn("getTaskanaEngine") // generate sample data after schema was inserted
-  public SampleDataGenerator generateSampleData(DataSource dataSource) {
-    sampleDataGenerator = new SampleDataGenerator(dataSource, schemaName);
-    return sampleDataGenerator;
-  }
-
   @PostConstruct
   private void init() {
     if (!ldapClient.useLdap()) {

rest/taskana-rest-spring-example-boot/src/main/java/pro/taskana/rest/ExampleRestConfiguration.java

@@ -0,0 +1,27 @@
+package pro.taskana.rest;
+
+import javax.sql.DataSource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import pro.taskana.sampledata.SampleDataGenerator;
+
+public class ExampleRestConfiguration {
+
+  @Value("${taskana.schemaName:TASKANA}")
+  public String schemaName;
+
+  @Bean
+  public PlatformTransactionManager txManager(DataSource dataSource) {
+    return new DataSourceTransactionManager(dataSource);
+  }
+
+  @Bean
+  @DependsOn("getTaskanaEngine") // generate sample data after schema was inserted
+  public SampleDataGenerator generateSampleData(DataSource dataSource) {
+    return new SampleDataGenerator(dataSource, schemaName);
+  }
+}