From 07a9528d39cd6a40e544d57bef4407ebece83a7c Mon Sep 17 00:00:00 2001 From: German Osin Date: Mon, 4 Oct 2021 17:19:25 +0300 Subject: [PATCH] ISSUE-925 Added delete,compact topics config (#926) * ISSUE-925 Added delete,compact topics config * Fixed checkstyle --- .../kafka/ui/model/CleanupPolicy.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/CleanupPolicy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/CleanupPolicy.java index bfbfdf9d81a..6e75c3edecb 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/CleanupPolicy.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/CleanupPolicy.java @@ -2,27 +2,37 @@ import com.provectus.kafka.ui.exception.IllegalEntityStateException; import java.util.Arrays; +import java.util.Collections; +import java.util.List; public enum CleanupPolicy { DELETE("delete"), COMPACT("compact"), - COMPACT_DELETE("compact,delete"), + COMPACT_DELETE(Arrays.asList("compact,delete", "delete,compact")), UNKNOWN("unknown"); - private final String cleanUpPolicy; + private final List cleanUpPolicy; CleanupPolicy(String cleanUpPolicy) { + this(Collections.singletonList(cleanUpPolicy)); + } + + CleanupPolicy(List cleanUpPolicy) { this.cleanUpPolicy = cleanUpPolicy; } public String getCleanUpPolicy() { - return cleanUpPolicy; + return cleanUpPolicy.get(0); } public static CleanupPolicy fromString(String string) { return Arrays.stream(CleanupPolicy.values()) - .filter(v -> v.cleanUpPolicy.equals(string.replace(" ", ""))) - .findFirst() + .filter(v -> + v.cleanUpPolicy.stream().anyMatch( + s -> s.equals(string.replace(" ", "") + ) + ) + ).findFirst() .orElseThrow(() -> new IllegalEntityStateException("Unknown cleanup policy value: " + string)); }