fixes #72 cascade delete service endpoints if the service is deteted

Author: stevehu

service/src/main/java/com/networknt/oauth/service/handler/Oauth2ServiceServiceIdDeleteHandler.java

@@ -3,24 +3,33 @@
 import com.hazelcast.core.IMap;
 import com.networknt.oauth.cache.CacheStartupHookProvider;
 import com.networknt.oauth.cache.model.Service;
+import com.networknt.oauth.cache.model.ServiceEndpoint;
 import com.networknt.status.Status;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Delete a service by a serviceId, if there are endpoints associated with the service
+ * delete endpoints before deleting the service.
+ *
+ * @author Steve Hu
+ */
 public class Oauth2ServiceServiceIdDeleteHandler implements HttpHandler {
     static final String SERVICE_NOT_FOUND = "ERR12015";
     static Logger logger = LoggerFactory.getLogger(Oauth2ServiceServiceIdGetHandler.class);
     @Override
     public void handleRequest(HttpServerExchange exchange) throws Exception {
         String serviceId = exchange.getQueryParameters().get("serviceId").getFirst();
+        IMap<String, ServiceEndpoint> serviceEndpoints = CacheStartupHookProvider.hz.getMap("serviceEndpoints");
         IMap<String, Service> services = CacheStartupHookProvider.hz.getMap("services");
         if(services.get(serviceId) == null) {
             Status status = new Status(SERVICE_NOT_FOUND, serviceId);
             exchange.setStatusCode(status.getStatusCode());
             exchange.getResponseSender().send(status.toString());
         } else {
+            serviceEndpoints.delete(serviceId);
             services.delete(serviceId);
         }
     }

service/src/test/java/com/networknt/oauth/service/handler/Oauth2ServicePostHandlerTest.java

@@ -36,7 +36,7 @@ public class Oauth2ServicePostHandlerTest {
 
     @Test
     public void testOauth2ServicePostHandler() throws ClientException, ApiException, UnsupportedEncodingException {
-        String service = "{\"serviceId\":\"AACT0003\",\"serviceType\":\"swagger\",\"serviceName\":\"Retail Account\",\"serviceDesc\":\"Microservices for Retail Account\",\"scope\":\"act.r act.w\",\"ownerId\":\"admin\"}";
+        String service = "{\"serviceId\":\"AACT0005\",\"serviceType\":\"swagger\",\"serviceName\":\"Retail Account\",\"serviceDesc\":\"Microservices for Retail Account\",\"scope\":\"act.r act.w\",\"ownerId\":\"admin\"}";
         final AtomicReference<ClientResponse> reference = new AtomicReference<>();
         final Http2Client client = Http2Client.getInstance();
         final CountDownLatch latch = new CountDownLatch(1);

service/src/test/java/com/networknt/oauth/service/handler/Oauth2ServiceServiceIdEndpointDeleteHandlerTest.java

@@ -49,7 +49,7 @@ public void testOauth2ServiceServiceIdEndpointDeleteHandlerTest() throws ClientE
         }
         final AtomicReference<ClientResponse> reference = new AtomicReference<>();
         try {
-            ClientRequest request = new ClientRequest().setPath("/oauth2/service/AACT0002/endpoint").setMethod(Methods.DELETE);
+            ClientRequest request = new ClientRequest().setPath("/oauth2/service/AACT0003/endpoint").setMethod(Methods.DELETE);
 
             connection.sendRequest(request, client.createClientCallback(reference, latch));
 
@@ -78,7 +78,7 @@ public void testServiceEndpointNotFound() throws ClientException, IOException {
         }
         final AtomicReference<ClientResponse> reference = new AtomicReference<>();
         try {
-            ClientRequest request = new ClientRequest().setPath("/oauth2/service/AACT0003/endpoint").setMethod(Methods.DELETE);
+            ClientRequest request = new ClientRequest().setPath("/oauth2/service/AACT0004/endpoint").setMethod(Methods.DELETE);
 
             connection.sendRequest(request, client.createClientCallback(reference, latch));
 

service/src/test/resources/create_h2.sql

@@ -76,8 +76,10 @@ INSERT INTO client (client_id, client_type, client_secret, client_profile, clien
 
 INSERT INTO service (service_id, service_type, service_name, service_desc, scope, owner_id) VALUES ('AACT0001', 'openapi', 'Account Service', 'A microservice that serves account information', 'a.r b.r', 'admin');
 INSERT INTO service (service_id, service_type, service_name, service_desc, scope, owner_id) VALUES ('AACT0002', 'openapi', 'Account Service', 'A microservice that serves account information', 'a.r b.r', 'admin');
+INSERT INTO service (service_id, service_type, service_name, service_desc, scope, owner_id) VALUES ('AACT0003', 'openapi', 'Account Service', 'A microservice that serves account information', 'a.r b.r', 'admin');
 
 INSERT INTO service_endpoint(service_id, endpoint, operation, scope) VALUES ('AACT0001', '/v1/getData@get', 'retrieve data', 'data.r');
 INSERT INTO service_endpoint(service_id, endpoint, operation, scope) VALUES ('AACT0001', '/v1/postData@post', 'create data', 'data.w');
 
-INSERT INTO service_endpoint(service_id, endpoint, operation, scope) VALUES ('AACT0002', '/v1/deleteData@delete', 'deleteData', 'data.w');
+INSERT INTO service_endpoint(service_id, endpoint, operation, scope) VALUES ('AACT0002', '/v1/deleteData@delete', 'deleteData', 'data.w');
+INSERT INTO service_endpoint(service_id, endpoint, operation, scope) VALUES ('AACT0003', '/v1/deleteData@delete', 'deleteData', 'data.w');