Merge pull request #2391 from subutai-io/dev

#2379 (Dev -> Master)
subutai-io · Apr 10, 2018 · 6757d63 · 6757d63
2 parents f2c4341 + 7580af5
commit 6757d63
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 4 deletions.
diff --git a/...c/main/java/io/subutai/core/environment/metadata/impl/EnvironmentMetadataManagerImpl.java b/...c/main/java/io/subutai/core/environment/metadata/impl/EnvironmentMetadataManagerImpl.java
@@ -91,6 +91,7 @@ public void pushEvent( final Event event )
         {
             LOG.debug( "Event received: {} {}", event, JsonUtil.toJson( event ) );
             LOG.debug( "OS: {}", event.getCustomMetaByKey( "OS" ) );
+            LOG.debug( "Nature: {}", event.getPayload().getNature() );
         }
         catch ( JsonProcessingException e )
         {

diff --git a/management/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/Event.java b/management/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/Event.java
@@ -5,6 +5,7 @@
 
 import io.subutai.hub.share.event.meta.CustomMeta;
 import io.subutai.hub.share.event.meta.OriginMeta;
+import io.subutai.hub.share.event.meta.SourceMeta;
 import io.subutai.hub.share.event.payload.Payload;
 
 
@@ -18,6 +19,8 @@ public interface Event
 
     OriginMeta getOrigin();
 
+    SourceMeta getSource();
+
     void addCustomMeta( CustomMeta customMeta );
 
     List<CustomMeta> getCustomMetaByKey( String key );

diff --git a/...ement/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/EventMessage.java b/...ement/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/EventMessage.java
@@ -48,6 +48,13 @@ public OriginMeta getOrigin()
     }
 
 
+    @Override
+    public SourceMeta getSource()
+    {
+        return this.metaData.getSource();
+    }
+
+
     @Override
     public Payload getPayload()
     {

diff --git a/...nt/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/meta/SourceMeta.java b/...nt/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/meta/SourceMeta.java
@@ -2,6 +2,7 @@
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @JsonAutoDetect( fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
@@ -15,6 +16,7 @@ public enum Type
 
 
     private String name;
+    @JsonProperty( value = "value" )
     private Type type;
 
 

diff --git a/...ver/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/CustomPayload.java b/...ver/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/CustomPayload.java
@@ -22,7 +22,7 @@ public CustomPayload( final String message )
 
 
     @Override
-    Nature getNature()
+    public Nature getNature()
     {
         return Nature.CUSTOM;
     }

diff --git a/...server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/LogPayload.java b/...server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/LogPayload.java
@@ -38,7 +38,7 @@ public LogPayload( final String source, final String message, final Level level
 
 
     @Override
-    Nature getNature()
+    public Nature getNature()
     {
         return Nature.LOG;
     }

diff --git a/...nt/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/Payload.java b/...nt/server/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/Payload.java
@@ -22,5 +22,5 @@ public enum Nature
     }
 
 
-    abstract Nature getNature();
+    public abstract Nature getNature();
 }
diff --git a/...r/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/ProgressPayload.java b/...r/subutai-hub-share/src/main/java/io/subutai/hub/share/event/payload/ProgressPayload.java
@@ -32,7 +32,7 @@ private ProgressPayload()
 
 
     @Override
-    Nature getNature()
+    public Nature getNature()
     {
         return Nature.PROGRESS;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,5 +22,5 @@ public enum Nature @@
         }
-        abstract Nature getNature();
+        public abstract Nature getNature();
     }