refactor: move username and origin to properties attribute

M3lkior · Jan 19, 2016 · 4d23a76 · 4d23a76
1 parent 5faf6d1
commit 4d23a76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/src/main/java/io/gravitee/repository/management/api/EventRepository.java b/src/main/java/io/gravitee/repository/management/api/EventRepository.java
@@ -22,11 +22,11 @@
 import java.util.Set;
 
 /**
-* @author Titouan COMPIEGNE
-*/
+ * @author Titouan COMPIEGNE
+ */
 public interface EventRepository extends CrudRepository<Event, String> {
 
-	Set<Event> findByType(List<EventType> eventTypes);
+    Set<Event> findByType(List<EventType> eventTypes);
 
     Set<Event> findByProperty(String key, String value);
 

diff --git a/src/main/java/io/gravitee/repository/management/model/Event.java b/src/main/java/io/gravitee/repository/management/model/Event.java
@@ -43,16 +43,6 @@ public class Event {
      */
     private String parentId;
 
-    /**
-     * The event origin
-     */
-    private String origin;
-
-    /**
-     * The event publisher
-     */
-    private String username;
-
     /**
      * The event properties
      */
@@ -100,22 +90,6 @@ public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
     public Map<String, String> getProperties() {
         return properties;
     }
@@ -141,7 +115,9 @@ public void setUpdatedAt(Date updatedAt) {
     }
 
     public enum EventProperties {
-        API_ID("api_id");
+        API_ID("api_id"),
+        ORIGIN("origin"),
+        USERNAME("username");
 
         private String value;