Skip to content

Asynchronous Instance and binding create/delete operations #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Asynchronous Instance and binding create/delete operations #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 69 additions & 28 deletions .../cloud/sample/bookstore/servicebroker/service/BookStoreServiceInstanceBindingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,27 @@

package org.springframework.cloud.sample.bookstore.servicebroker.service;

import java.util.HashMap;
import java.util.Map;

import reactor.core.publisher.Mono;

import org.springframework.cloud.sample.bookstore.servicebroker.model.ServiceBinding;
import org.springframework.cloud.sample.bookstore.servicebroker.repository.ServiceBindingRepository;
import org.springframework.cloud.sample.bookstore.web.model.ApplicationInformation;
import org.springframework.cloud.sample.bookstore.web.model.User;
import org.springframework.cloud.sample.bookstore.web.security.SecurityAuthorities;
import org.springframework.cloud.sample.bookstore.web.service.UserService;
import org.springframework.cloud.servicebroker.exception.ServiceBrokerInvalidParametersException;
import org.springframework.cloud.servicebroker.exception.ServiceInstanceBindingDoesNotExistException;
import org.springframework.cloud.servicebroker.model.binding.CreateServiceInstanceAppBindingResponse;
import org.springframework.cloud.servicebroker.model.binding.CreateServiceInstanceBindingRequest;
import org.springframework.cloud.servicebroker.model.binding.CreateServiceInstanceBindingResponse;
import org.springframework.cloud.servicebroker.model.binding.DeleteServiceInstanceBindingRequest;
import org.springframework.cloud.servicebroker.model.binding.DeleteServiceInstanceBindingResponse;
import org.springframework.cloud.servicebroker.model.binding.GetServiceInstanceAppBindingResponse;
import org.springframework.cloud.servicebroker.model.binding.GetServiceInstanceBindingRequest;
import org.springframework.cloud.servicebroker.model.binding.GetServiceInstanceBindingResponse;
import org.springframework.cloud.servicebroker.model.binding.*;
import org.springframework.cloud.servicebroker.model.instance.OperationState;
import org.springframework.cloud.servicebroker.service.ServiceInstanceBindingService;
import org.springframework.stereotype.Service;
import org.springframework.web.util.UriComponentsBuilder;
import reactor.core.publisher.Mono;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Future;

@Service
public class BookStoreServiceInstanceBindingService implements ServiceInstanceBindingService {
Expand All @@ -55,16 +53,21 @@ public class BookStoreServiceInstanceBindingService implements ServiceInstanceBi

private final ApplicationInformation applicationInformation;

private final Map<String, Future<?>> tasks;

public BookStoreServiceInstanceBindingService(ServiceBindingRepository bindingRepository, UserService userService,
ApplicationInformation applicationInformation) {
this.bindingRepository = bindingRepository;
this.userService = userService;
this.applicationInformation = applicationInformation;
this.tasks = Collections.synchronizedMap(new HashMap<>());
}

@Override
public Mono<CreateServiceInstanceBindingResponse> createServiceInstanceBinding(
CreateServiceInstanceBindingRequest request) {
String operationName = "bind-" + request.getServiceInstanceId() + "-" + request.getBindingId();

return Mono.just(CreateServiceInstanceAppBindingResponse.builder())
.flatMap(
(responseBuilder) -> this.bindingRepository.existsById(request.getBindingId()).flatMap((exists) -> {
Expand All @@ -74,34 +77,72 @@ public Mono<CreateServiceInstanceBindingResponse> createServiceInstanceBinding(
.credentials(serviceBinding.getCredentials())
.build()));
}
else {
return createUser(request)
.flatMap((user) -> buildCredentials(request.getServiceInstanceId(), user))
.flatMap((credentials) -> this.bindingRepository
.save(new ServiceBinding(request.getBindingId(), request.getParameters(),
credentials))
.thenReturn(
responseBuilder.bindingExisted(false).credentials(credentials).build()));
}

this.tasks.putIfAbsent(operationName,
ForkJoinPool.commonPool()
.submit(() -> createUser(request)
.flatMap((user) -> buildCredentials(request.getServiceInstanceId(), user))
.flatMap((credentials) -> this.bindingRepository.save(new ServiceBinding(
request.getBindingId(), request.getParameters(), credentials)))
.block()));
return Mono.just(responseBuilder.async(true).operation(operationName).build());
}));
}

@Override
public Mono<DeleteServiceInstanceBindingResponse> deleteServiceInstanceBinding(
DeleteServiceInstanceBindingRequest request) {
String operationName = "unbind-" + request.getServiceInstanceId() + "-" + request.getBindingId();

return Mono.just(request.getBindingId())
.flatMap((bindingId) -> this.bindingRepository.existsById(bindingId).flatMap((exists) -> {
if (exists) {
return this.bindingRepository.deleteById(bindingId)
.then(this.userService.deleteUser(bindingId))
.thenReturn(DeleteServiceInstanceBindingResponse.builder().build());
}
else {
if (!exists) {
return Mono.error(new ServiceInstanceBindingDoesNotExistException(bindingId));
}

this.tasks.putIfAbsent(operationName,
ForkJoinPool.commonPool()
.submit(() -> this.bindingRepository.deleteById(bindingId)
.then(this.userService.deleteUser(bindingId))
.block()));
return Mono
.just(DeleteServiceInstanceBindingResponse.builder().async(true).operation(operationName).build());
}));
}

@Override
public Mono<GetLastServiceBindingOperationResponse> getLastOperation(
GetLastServiceBindingOperationRequest request) {
return Mono.just(request.getOperation()).flatMap((operationName) -> {
Future<?> task = tasks.get(operationName);
if (task == null) {
return Mono.error(new ServiceBrokerInvalidParametersException("unknown operation: " + operationName));
}
if (task.isDone()) {
try {
task.get();
}
catch (ExecutionException | InterruptedException e) {
return Mono.just(GetLastServiceBindingOperationResponse.builder()
.operationState(OperationState.FAILED)
.description(e.getMessage())
.build());
}
finally {
tasks.remove(operationName);
}

return Mono.just(GetLastServiceBindingOperationResponse.builder()
.operationState(OperationState.SUCCEEDED)
.build());
}

return Mono.just(GetLastServiceBindingOperationResponse.builder()
.operationState(OperationState.IN_PROGRESS)
.build());
});
}

@Override
public Mono<GetServiceInstanceBindingResponse> getServiceInstanceBinding(GetServiceInstanceBindingRequest request) {
return Mono.just(request.getBindingId())
Expand Down
79 changes: 61 additions & 18 deletions ...amework/cloud/sample/bookstore/servicebroker/service/BookStoreServiceInstanceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,22 @@

package org.springframework.cloud.sample.bookstore.servicebroker.service;

import reactor.core.publisher.Mono;

import org.springframework.cloud.sample.bookstore.servicebroker.model.ServiceInstance;
import org.springframework.cloud.sample.bookstore.servicebroker.repository.ServiceInstanceRepository;
import org.springframework.cloud.sample.bookstore.web.service.BookStoreService;
import org.springframework.cloud.servicebroker.exception.ServiceBrokerInvalidParametersException;
import org.springframework.cloud.servicebroker.exception.ServiceInstanceDoesNotExistException;
import org.springframework.cloud.servicebroker.model.instance.CreateServiceInstanceRequest;
import org.springframework.cloud.servicebroker.model.instance.CreateServiceInstanceResponse;
import org.springframework.cloud.servicebroker.model.instance.DeleteServiceInstanceRequest;
import org.springframework.cloud.servicebroker.model.instance.DeleteServiceInstanceResponse;
import org.springframework.cloud.servicebroker.model.instance.GetServiceInstanceRequest;
import org.springframework.cloud.servicebroker.model.instance.GetServiceInstanceResponse;
import org.springframework.cloud.servicebroker.model.instance.*;
import org.springframework.cloud.servicebroker.service.ServiceInstanceService;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Future;

@Service
public class BookStoreServiceInstanceService implements ServiceInstanceService {
Expand All @@ -38,26 +40,32 @@ public class BookStoreServiceInstanceService implements ServiceInstanceService {

private final ServiceInstanceRepository instanceRepository;

private final Map<String, Future<?>> tasks;

public BookStoreServiceInstanceService(BookStoreService storeService,
ServiceInstanceRepository instanceRepository) {
this.storeService = storeService;
this.instanceRepository = instanceRepository;
this.tasks = Collections.synchronizedMap(new HashMap<>());
}

@Override
public Mono<CreateServiceInstanceResponse> createServiceInstance(CreateServiceInstanceRequest request) {
String operationName = "provision-" + request.getServiceInstanceId();

return Mono.just(request.getServiceInstanceId())
.flatMap((instanceId) -> Mono.just(CreateServiceInstanceResponse.builder())
.flatMap((responseBuilder) -> this.instanceRepository.existsById(instanceId).flatMap((exists) -> {
if (exists) {
return Mono.just(responseBuilder.instanceExisted(true).build());
}
else {
return this.storeService.createBookStore(instanceId)

this.tasks.putIfAbsent(operationName, ForkJoinPool.commonPool()
.submit(() -> this.storeService.createBookStore(instanceId)
.then(this.instanceRepository.save(new ServiceInstance(instanceId,
request.getServiceDefinitionId(), request.getPlanId(), request.getParameters())))
.thenReturn(responseBuilder.build());
}
.block()));
return Mono.just(responseBuilder.async(true).operation(operationName).build());
})));
}

Expand All @@ -75,17 +83,52 @@ public Mono<GetServiceInstanceResponse> getServiceInstance(GetServiceInstanceReq

@Override
public Mono<DeleteServiceInstanceResponse> deleteServiceInstance(DeleteServiceInstanceRequest request) {
String operationName = "deprovision-" + request.getServiceInstanceId();

return Mono.just(request.getServiceInstanceId())
.flatMap((instanceId) -> this.instanceRepository.existsById(instanceId).flatMap((exists) -> {
if (exists) {
return this.storeService.deleteBookStore(instanceId)
.then(this.instanceRepository.deleteById(instanceId))
.thenReturn(DeleteServiceInstanceResponse.builder().build());
}
else {
if (!exists) {
return Mono.error(new ServiceInstanceDoesNotExistException(instanceId));
}

this.tasks.putIfAbsent(operationName,
ForkJoinPool.commonPool()
.submit(() -> this.storeService.deleteBookStore(instanceId)
.then(this.instanceRepository.deleteById(instanceId))
.block()));
return Mono.just(DeleteServiceInstanceResponse.builder().async(true).operation(operationName).build());
}));
}

@Override
public Mono<GetLastServiceOperationResponse> getLastOperation(GetLastServiceOperationRequest request) {
return Mono.just(request.getOperation()).flatMap((operationName) -> {
Future<?> task = tasks.get(operationName);
if (task == null) {
return Mono.error(new ServiceBrokerInvalidParametersException("unknown operation: " + operationName));
}

if (task.isDone()) {
try {
task.get();
}
catch (ExecutionException | InterruptedException e) {
return Mono.just(GetLastServiceOperationResponse.builder()
.operationState(OperationState.FAILED)
.description(e.getMessage())
.build());
}
finally {
tasks.remove(operationName);
}

return Mono
.just(GetLastServiceOperationResponse.builder().operationState(OperationState.SUCCEEDED).build());
}

return Mono
.just(GetLastServiceOperationResponse.builder().operationState(OperationState.IN_PROGRESS).build());
});
}

}