Merge branch 'observable' of https://github.com/rstoyanchev/event-sou…

…rcing-examples into rstoyanchev-observable
dlouvton · Jun 7, 2015 · b3ceb56 · b3ceb56
2 parents 7f07d53 + 6561620
commit b3ceb56
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -19,10 +19,10 @@ For more information, please see the [wiki](../../wiki)
 
 # About the event store
 
-The application use one of two event stores:
+The application uses one of two event stores:
 
-* embedded SQL-based event store, which is great for integration tests
-* event store server
+* Embedded SQL-based event store, which is great for integration tests
+* Event store server
 
 # Running the tests
 

diff --git a/...ichardson/eventstore/javaexamples/banking/web/commandside/accounts/AccountController.java b/...ichardson/eventstore/javaexamples/banking/web/commandside/accounts/AccountController.java
@@ -10,6 +10,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
+
+import rx.Observable;
 import rx.functions.Func1;
 
 @RestController
@@ -24,14 +26,14 @@ public AccountController(AccountService accountService) {
   }
 
   @RequestMapping(method = RequestMethod.POST)
-  public DeferredResult<CreateAccountResponse> createAccount(@RequestBody CreateAccountRequest request) {
-    return DeferredUtils.toDeferredResult(accountService.openAccount(request.getInitialBalance()).map(new Func1<EntityWithIdAndVersion<Account>, CreateAccountResponse>() {
+  public Observable<CreateAccountResponse> createAccount(@RequestBody CreateAccountRequest request) {
+    return accountService.openAccount(request.getInitialBalance()).map(new Func1<EntityWithIdAndVersion<Account>, CreateAccountResponse>() {
 
       @Override
       public CreateAccountResponse call(EntityWithIdAndVersion<Account> entityAndEventInfo) {
         return new CreateAccountResponse(entityAndEventInfo.getEntityIdentifier().getId());
       }
 
-    }));
+    });
   }
 }
diff --git a/...re/javaexamples/banking/web/commandside/accounts/CommandSideWebAccountsConfiguration.java b/...re/javaexamples/banking/web/commandside/accounts/CommandSideWebAccountsConfiguration.java
@@ -1,13 +1,35 @@
 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.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
 @Configuration
 @Import({AccountConfiguration.class})
 @ComponentScan
-public class CommandSideWebAccountsConfiguration {
+public class CommandSideWebAccountsConfiguration extends WebMvcConfigurerAdapter {
+
+	@Autowired
+	private RequestMappingHandlerAdapter adapter;
+
+	@PostConstruct
+	public void init() {
+		// https://jira.spring.io/browse/SPR-13083
+		List<HandlerMethodReturnValueHandler> handlers = new ArrayList<HandlerMethodReturnValueHandler>(adapter.getReturnValueHandlers());
+		handlers.add(0, new ObservableReturnValueHandler());
+		adapter.setReturnValueHandlers(handlers);
+	}
 
 }
diff --git a/...isrichardson/eventstore/javaexamples/banking/web/queryside/QuerySideWebConfiguration.java b/...isrichardson/eventstore/javaexamples/banking/web/queryside/QuerySideWebConfiguration.java
@@ -1,12 +1,35 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.queryside;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.QuerySideAccountConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.util.ObservableReturnValueHandler;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
 @Configuration
 @Import({QuerySideAccountConfiguration.class})
 @ComponentScan
-public class QuerySideWebConfiguration {
+public class QuerySideWebConfiguration extends WebMvcConfigurerAdapter {
+
+	@Autowired
+	private RequestMappingHandlerAdapter adapter;
+
+	@PostConstruct
+	public void init() {
+		// https://jira.spring.io/browse/SPR-13083
+		List<HandlerMethodReturnValueHandler> handlers = new ArrayList<HandlerMethodReturnValueHandler>(adapter.getReturnValueHandlers());
+		handlers.add(0, new ObservableReturnValueHandler());
+		adapter.setReturnValueHandlers(handlers);
+	}
+
 }
diff --git a/...ardson/eventstore/javaexamples/banking/web/queryside/accounts/AccountQueryController.java b/...ardson/eventstore/javaexamples/banking/web/queryside/accounts/AccountQueryController.java
@@ -9,6 +9,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
+
+import rx.Observable;
 import rx.functions.Func1;
 
 import java.math.BigDecimal;
@@ -24,13 +26,13 @@ public AccountQueryController(AccountQueryService accountInfoQueryService) {
   }
 
   @RequestMapping(value="/accounts/{accountId}", method = RequestMethod.GET)
-  public DeferredResult<GetAccountResponse> get(@PathVariable String accountId) {
-    return DeferredUtils.toDeferredResult(accountInfoQueryService.findByAccountId(new EntityIdentifier(accountId)).map(new Func1<AccountInfo, GetAccountResponse>() {
+  public Observable<GetAccountResponse> get(@PathVariable String accountId) {
+    return accountInfoQueryService.findByAccountId(new EntityIdentifier(accountId)).map(new Func1<AccountInfo, GetAccountResponse>() {
       @Override
       public GetAccountResponse call(AccountInfo accountInfo) {
         return new GetAccountResponse(accountInfo.getId(), new BigDecimal(accountInfo.getBalance()));
       }
-    }));
+    });
   }
 
   @ResponseStatus(value= HttpStatus.NOT_FOUND, reason="account not found")

diff --git a/...hrisrichardson/eventstore/javaexamples/banking/web/util/ObservableReturnValueHandler.java b/...hrisrichardson/eventstore/javaexamples/banking/web/util/ObservableReturnValueHandler.java
@@ -0,0 +1,31 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.web.util;
+
+import rx.Observable;
+
+import org.springframework.core.MethodParameter;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.springframework.web.context.request.async.WebAsyncUtils;
+import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+
+public class ObservableReturnValueHandler implements HandlerMethodReturnValueHandler {
+
+	@Override
+	public boolean supportsReturnType(MethodParameter returnType) {
+		return Observable.class.equals(returnType.getParameterType());
+	}
+
+	@Override
+	public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer,
+			NativeWebRequest webRequest) throws Exception {
+
+		if (returnValue == null) {
+			return;
+		}
+		DeferredResult<?> d = DeferredUtils.toDeferredResult((Observable<?>) returnValue);
+		WebAsyncUtils.getAsyncManager(webRequest).startDeferredResultProcessing(d, mavContainer);
+	}
+
+}
diff --git a/...xamples/banking/web/commandside/transactions/CommandSideWebTransactionsConfiguration.java b/...xamples/banking/web/commandside/transactions/CommandSideWebTransactionsConfiguration.java
@@ -1,13 +1,35 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.util.ObservableReturnValueHandler;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
 @Configuration
 @Import({MoneyTransferConfiguration.class})
 @ComponentScan
-public class CommandSideWebTransactionsConfiguration {
+public class CommandSideWebTransactionsConfiguration extends WebMvcConfigurerAdapter {
+
+	@Autowired
+	private RequestMappingHandlerAdapter adapter;
+
+	@PostConstruct
+	public void init() {
+		// https://jira.spring.io/browse/SPR-13083
+		List<HandlerMethodReturnValueHandler> handlers = new ArrayList<HandlerMethodReturnValueHandler>(adapter.getReturnValueHandlers());
+		handlers.add(0, new ObservableReturnValueHandler());
+		adapter.setReturnValueHandlers(handlers);
+	}
 
 }
diff --git a/...eventstore/javaexamples/banking/web/commandside/transactions/MoneyTransferController.java b/...eventstore/javaexamples/banking/web/commandside/transactions/MoneyTransferController.java
@@ -12,6 +12,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
+
+import rx.Observable;
 import rx.functions.Func1;
 
 @RestController
@@ -26,16 +28,16 @@ public MoneyTransferController(MoneyTransferService moneyTransferService) {
   }
 
   @RequestMapping(method = RequestMethod.POST)
-  public DeferredResult<CreateMoneyTransferResponse> createMoneyTransfer(@RequestBody CreateMoneyTransferRequest request) {
+  public Observable<CreateMoneyTransferResponse> createMoneyTransfer(@RequestBody CreateMoneyTransferRequest request) {
     TransferDetails transferDetails = new TransferDetails(new EntityIdentifier(request.getFromAccountId()), new EntityIdentifier(request.getToAccountId()), request.getAmount());
-    return DeferredUtils.toDeferredResult(moneyTransferService.transferMoney(transferDetails).map(new Func1<EntityWithIdAndVersion<MoneyTransfer>, CreateMoneyTransferResponse>() {
+    return moneyTransferService.transferMoney(transferDetails).map(new Func1<EntityWithIdAndVersion<MoneyTransfer>, CreateMoneyTransferResponse>() {
 
       @Override
       public CreateMoneyTransferResponse call(EntityWithIdAndVersion<MoneyTransfer> entityAndEventInfo) {
         return new CreateMoneyTransferResponse(entityAndEventInfo.getEntityIdentifier().getId());
       }
 
-    }));
+    });
   }
 
 }