Eliminating code duplication

Graylog2 · Jul 17, 2024 · a9421f1 · a9421f1
1 parent 1007a47
commit a9421f1
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/indexer/indexset/IndexSetConfig.java b/graylog2-server/src/main/java/org/graylog2/indexer/indexset/IndexSetConfig.java
@@ -42,6 +42,7 @@
 import javax.annotation.Nullable;
 import java.time.ZonedDateTime;
 import java.util.Optional;
+import java.util.Set;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static org.graylog2.indexer.EventIndexTemplateProvider.EVENT_TEMPLATE_TYPE;
@@ -61,6 +62,12 @@ public abstract class IndexSetConfig implements Comparable<IndexSetConfig>, Simp
     public static final String FIELD_INDEX_TEMPLATE_NAME = "index_template_name";
     public static final String FIELD_CUSTOM_FIELD_MAPPINGS = "custom_field_mappings";
 
+    private static final Set<String> TEMPLATE_TYPES_FOR_INDEX_SETS_WITH_IMMUTABLE_FIELD_TYPES = Set.of(
+            EVENT_TEMPLATE_TYPE,
+            IndexTemplateProvider.FAILURE_TEMPLATE_TYPE,
+            IndexTemplateProvider.ILLUMINATE_INDEX_TEMPLATE_TYPE
+    );
+
     @JsonCreator
     public static IndexSetConfig create(@Id @ObjectId @JsonProperty("_id") @Nullable String id,
                                         @JsonProperty(FIELD_TITLE) @NotBlank String title,
@@ -255,26 +262,12 @@ public boolean isRegularIndex() {
 
     @JsonIgnore
     public boolean canHaveCustomFieldMappings() {
-        final String indexTemplateType = this.indexTemplateType().orElse(null);
-        if (EVENT_TEMPLATE_TYPE.equals(indexTemplateType) ||
-                IndexTemplateProvider.FAILURE_TEMPLATE_TYPE.equals(indexTemplateType) ||
-                IndexTemplateProvider.ILLUMINATE_INDEX_TEMPLATE_TYPE.equals(indexTemplateType)
-
-        ) {
-            return false;
-        }
-        return true;
+        return !this.indexTemplateType().map(TEMPLATE_TYPES_FOR_INDEX_SETS_WITH_IMMUTABLE_FIELD_TYPES::contains).orElse(false);
     }
 
     @JsonIgnore
     public boolean canHaveProfile() {
-        final String indexTemplateType = this.indexTemplateType().orElse(null);
-        if (EVENT_TEMPLATE_TYPE.equals(indexTemplateType) ||
-                IndexTemplateProvider.FAILURE_TEMPLATE_TYPE.equals(indexTemplateType) ||
-                IndexTemplateProvider.ILLUMINATE_INDEX_TEMPLATE_TYPE.equals(indexTemplateType)) {
-            return false;
-        }
-        return true;
+        return !this.indexTemplateType().map(TEMPLATE_TYPES_FOR_INDEX_SETS_WITH_IMMUTABLE_FIELD_TYPES::contains).orElse(false);
     }
 
     @Override