Add service type

aint · Mar 16, 2019 · 981ba69 · 981ba69
1 parent e7c18b1
commit 981ba69
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/com/github/aint/octopus/DependencyJson.java b/src/main/java/com/github/aint/octopus/DependencyJson.java
@@ -15,11 +15,9 @@
 public class DependencyJson {
 
     private EventType eventType;
-
     private String serviceName;
-
+    private String serviceType;
     private String serviceMetadata;
-
     private Map<DependencyType, Set<String>> dependencies;
 
     public enum EventType {
@@ -30,4 +28,5 @@ public enum DependencyType {
         SERVICES, LAMBDAS, DATABASES, THIRD_PARTY
     }
 
+    // DependencyType => EntityType
 }
diff --git a/src/main/java/com/github/aint/octopus/OctopusService.java b/src/main/java/com/github/aint/octopus/OctopusService.java
@@ -28,12 +28,12 @@ public DependencyJson createEvent() {
                 springAppMetadata.getJavaVersion(),
                 springAppMetadata.getSpringVersion(),
                 springAppMetadata.isCachingEnabled() ? "| :cache:" : "");
-        return new DependencyJson(DependencyJson.EventType.CREATE, appName, appMetadata, deps);
+        return new DependencyJson(DependencyJson.EventType.CREATE, appName, "svc", appMetadata, deps);
     }
 
     public DependencyJson destroyEvent() {
         String appName = springAppMetadata.getApplicationName();
-        return new DependencyJson(DependencyJson.EventType.DELETE, appName, null, null);
+        return new DependencyJson(DependencyJson.EventType.DELETE, appName, null, null, null);
     }
 
 }
diff --git a/src/test/groovy/com/github/aint/octopus/ApplicationListenerBeanTest.groovy b/src/test/groovy/com/github/aint/octopus/ApplicationListenerBeanTest.groovy
@@ -51,6 +51,7 @@ class ApplicationListenerBeanTest extends Specification {
         def dependencyJson = DependencyJson.builder()
                 .eventType(DependencyJson.EventType.CREATE)
                 .serviceName("devaron")
+                .serviceType("svc")
                 .serviceMetadata("Java 11, Spring 5")
                 .build()
         octopusService.createEvent() >> dependencyJson
@@ -69,6 +70,7 @@ class ApplicationListenerBeanTest extends Specification {
                    {
                      "eventType": "${dependencyJson.eventType.name()}",
                      "serviceName": "${dependencyJson.serviceName}",
+                     "serviceType": "${dependencyJson.serviceType}",
                      "serviceMetadata": "${dependencyJson.serviceMetadata}",
                      "dependencies": null
                    }
@@ -88,6 +90,7 @@ class ApplicationListenerBeanTest extends Specification {
         def dependencyJson = DependencyJson.builder()
                 .eventType(DependencyJson.EventType.DELETE)
                 .serviceName("devaron")
+                .serviceType("svc")
                 .serviceMetadata("Java 11, Spring 5")
                 .build()
         octopusService.destroyEvent() >> dependencyJson
@@ -106,6 +109,7 @@ class ApplicationListenerBeanTest extends Specification {
                    {
                      "eventType": "${dependencyJson.eventType.name()}",
                      "serviceName": "${dependencyJson.serviceName}",
+                     "serviceType": "${dependencyJson.serviceType}",
                      "serviceMetadata": "${dependencyJson.serviceMetadata}",
                      "dependencies": null
                    }