Enable search for lookup tables, data adapters and caches

Graylog2 · May 30, 2017 · 45a57e7 · 45a57e7
1 parent 8626f6c
commit 45a57e7
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 82 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/lookup/dto/CacheDto.java b/graylog2-server/src/main/java/org/graylog2/lookup/dto/CacheDto.java
@@ -34,19 +34,24 @@
 @JsonDeserialize(builder = AutoValue_CacheDto.Builder.class)
 public abstract class CacheDto {
 
+    public static final String FIELD_ID = "id";
+    public static final String FIELD_TITLE = "title";
+    public static final String FIELD_DESCRIPTION = "description";
+    public static final String FIELD_NAME = "name";
+
     @Id
     @ObjectId
     @Nullable
-    @JsonProperty("id")
+    @JsonProperty(FIELD_ID)
     public abstract String id();
 
-    @JsonProperty("title")
+    @JsonProperty(FIELD_TITLE)
     public abstract String title();
 
-    @JsonProperty("description")
+    @JsonProperty(FIELD_DESCRIPTION)
     public abstract String description();
 
-    @JsonProperty("name")
+    @JsonProperty(FIELD_NAME)
     public abstract String name();
 
     @JsonProperty("config")
@@ -61,16 +66,16 @@ public static Builder builder() {
     public abstract static class Builder {
         @Id
         @ObjectId
-        @JsonProperty("id")
+        @JsonProperty(FIELD_ID)
         public abstract Builder id(@Nullable String id);
 
-        @JsonProperty("title")
+        @JsonProperty(FIELD_TITLE)
         public abstract Builder title(String title);
 
-        @JsonProperty("description")
+        @JsonProperty(FIELD_DESCRIPTION)
         public abstract Builder description(String description);
 
-        @JsonProperty("name")
+        @JsonProperty(FIELD_NAME)
         public abstract Builder name(String name);
 
         @JsonProperty("config")

diff --git a/graylog2-server/src/main/java/org/graylog2/lookup/dto/DataAdapterDto.java b/graylog2-server/src/main/java/org/graylog2/lookup/dto/DataAdapterDto.java
@@ -33,19 +33,24 @@
 @JsonDeserialize(builder = AutoValue_DataAdapterDto.Builder.class)
 public abstract class DataAdapterDto {
 
+    public static final String FIELD_ID = "id";
+    public static final String FIELD_TITLE = "title";
+    public static final String FIELD_DESCRIPTION = "description";
+    public static final String FIELD_NAME = "name";
+
     @Id
     @ObjectId
     @Nullable
-    @JsonProperty("id")
+    @JsonProperty(FIELD_ID)
     public abstract String id();
 
-    @JsonProperty("title")
+    @JsonProperty(FIELD_TITLE)
     public abstract String title();
 
-    @JsonProperty("description")
+    @JsonProperty(FIELD_DESCRIPTION)
     public abstract String description();
 
-    @JsonProperty("name")
+    @JsonProperty(FIELD_NAME)
     public abstract String name();
 
     @JsonProperty("config")
@@ -60,16 +65,16 @@ public abstract static class Builder {
 
         @Id
         @ObjectId
-        @JsonProperty("id")
+        @JsonProperty(FIELD_ID)
         public abstract Builder id(@Nullable String id);
 
-        @JsonProperty("title")
+        @JsonProperty(FIELD_TITLE)
         public abstract Builder title(String title);
 
-        @JsonProperty("description")
+        @JsonProperty(FIELD_DESCRIPTION)
         public abstract Builder description(String description);
 
-        @JsonProperty("name")
+        @JsonProperty(FIELD_NAME)
         public abstract Builder name(String name);
 
         @JsonProperty("config")

diff --git a/graylog2-server/src/main/java/org/graylog2/lookup/dto/LookupTableDto.java b/graylog2-server/src/main/java/org/graylog2/lookup/dto/LookupTableDto.java
@@ -33,19 +33,24 @@
 @JsonDeserialize(builder = AutoValue_LookupTableDto.Builder.class)
 public abstract class LookupTableDto {
 
+    public static final String FIELD_ID = "id";
+    public static final String FIELD_TITLE = "title";
+    public static final String FIELD_DESCRIPTION = "description";
+    public static final String FIELD_NAME = "name";
+
     @Id
     @ObjectId
     @Nullable
-    @JsonProperty("id")
+    @JsonProperty(FIELD_ID)
     public abstract String id();
 
-    @JsonProperty("title")
+    @JsonProperty(FIELD_TITLE)
     public abstract String title();
 
-    @JsonProperty("description")
+    @JsonProperty(FIELD_DESCRIPTION)
     public abstract String description();
 
-    @JsonProperty("name")
+    @JsonProperty(FIELD_NAME)
     public abstract String name();
 
     @ObjectId
@@ -66,16 +71,16 @@ public static Builder builder() {
     public abstract static class Builder {
         @Id
         @ObjectId
-        @JsonProperty("id")
+        @JsonProperty(FIELD_ID)
         public abstract Builder id(@Nullable String id);
 
-        @JsonProperty("title")
+        @JsonProperty(FIELD_TITLE)
         public abstract Builder title(String title);
 
-        @JsonProperty("description")
+        @JsonProperty(FIELD_DESCRIPTION)
         public abstract Builder description(String description);
 
-        @JsonProperty("name")
+        @JsonProperty(FIELD_NAME)
         public abstract Builder name(String name);
 
         @JsonProperty("cache")