Merge branch 'master' of github.com:cer/event-sourcing-examples

java-spring/accounts-command-side-service/build.gradle

@@ -18,6 +18,5 @@ dependencies {
 }
 
 test {
-    ignoreFailures true
+    ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null
 }
-

java-spring/accounts-command-side-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/accounts/CommandSideWebAccountsConfiguration.java

@@ -1,25 +1,23 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.web.util.ObservableReturnValueHandler;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Configuration
 @Import({AccountConfiguration.class})
 @ComponentScan
+@EnableAutoConfiguration
 public class CommandSideWebAccountsConfiguration extends WebMvcConfigurerAdapter {
 
 	class FakeThing {}

java-spring/accounts-query-side-service/build.gradle

@@ -18,5 +18,5 @@ dependencies {
 }
 
 test {
-    ignoreFailures true
+    ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null
 }

java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideTestConfiguration.java

@@ -3,10 +3,12 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.ac
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferConfiguration;
 import net.chrisrichardson.eventstore.jdbc.config.JdbcEventStoreConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
 @Import({AccountConfiguration.class, MoneyTransferConfiguration.class, JdbcEventStoreConfiguration.class, QuerySideAccountConfiguration.class})
+@EnableAutoConfiguration
 public class AccountQuerySideTestConfiguration {
 }

java-spring/transactions-command-side-service/build.gradle

@@ -16,6 +16,6 @@ dependencies {
 }
 
 test {
-    ignoreFailures true
+    ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null
 }
 

java-spring/transactions-command-side-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/transactions/MoneyTransferControllerIntegrationTestConfiguration.java

@@ -1,10 +1,12 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions;
 
 import net.chrisrichardson.eventstore.jdbc.config.JdbcEventStoreConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
 @Import({CommandSideWebTransactionsConfiguration.class, JdbcEventStoreConfiguration.class})
+@EnableAutoConfiguration
 public class MoneyTransferControllerIntegrationTestConfiguration {
 }