fix: build issues introduced in merge

Signed-off-by: Cali0707 <[email protected]>
knative-extensions · Dec 6, 2024 · 65e3e4b · 65e3e4b
1 parent be5a187
commit 65e3e4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/filter/Filter.java b/data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/filter/Filter.java
@@ -41,10 +41,10 @@ static Filter fromContract(DataPlaneContract.DialectedFilter filter) {
             case PREFIX -> new PrefixFilter(filter.getPrefix().getAttributesMap());
             case SUFFIX -> new SuffixFilter(filter.getSuffix().getAttributesMap());
             case NOT -> new NotFilter(fromContract(filter.getNot().getFilter()));
-            case ANY -> new AnyFilter(filter.getAny().getFiltersList().stream()
+            case ANY -> AnyFilter.newFilter(filter.getAny().getFiltersList().stream()
                     .map(Filter::fromContract)
                     .collect(Collectors.toList()));
-            case ALL -> new AllFilter(filter.getAll().getFiltersList().stream()
+            case ALL -> AllFilter.newFilter(filter.getAll().getFiltersList().stream()
                     .map(Filter::fromContract)
                     .collect(Collectors.toList()));
             case CESQL -> new CeSqlFilter(filter.getCesql().getExpression());
@@ -53,6 +53,6 @@ static Filter fromContract(DataPlaneContract.DialectedFilter filter) {
     }
 
     static Filter fromContract(List<DataPlaneContract.DialectedFilter> filters) {
-        return new AllFilter(filters.stream().map(Filter::fromContract).collect(Collectors.toList()));
+        return AllFilter.newFilter(filters.stream().map(Filter::fromContract).collect(Collectors.toList()));
     }
 }
diff --git a/.../main/java/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleBuilder.java b/.../main/java/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleBuilder.java
@@ -185,28 +185,6 @@ private Filter getFilter() {
         return Filter.noop();
     }
 
-    private static Filter getFilter(List<DataPlaneContract.DialectedFilter> filters) {
-        return AllFilter.newFilter(
-                filters.stream().map(ConsumerVerticleBuilder::getFilter).collect(Collectors.toList()));
-    }
-
-    private static Filter getFilter(DataPlaneContract.DialectedFilter filter) {
-        return switch (filter.getFilterCase()) {
-            case EXACT -> new ExactFilter(filter.getExact().getAttributesMap());
-            case PREFIX -> new PrefixFilter(filter.getPrefix().getAttributesMap());
-            case SUFFIX -> new SuffixFilter(filter.getSuffix().getAttributesMap());
-            case NOT -> new NotFilter(getFilter(filter.getNot().getFilter()));
-            case ANY -> AnyFilter.newFilter(filter.getAny().getFiltersList().stream()
-                    .map(ConsumerVerticleBuilder::getFilter)
-                    .collect(Collectors.toList()));
-            case ALL -> AllFilter.newFilter(filter.getAll().getFiltersList().stream()
-                    .map(ConsumerVerticleBuilder::getFilter)
-                    .collect(Collectors.toList()));
-            case CESQL -> new CeSqlFilter(filter.getCesql().getExpression());
-            default -> Filter.noop();
-        };
-    }
-
     private WebClientOptions createWebClientOptionsFromCACerts(final String caCerts) {
         final var pemTrustOptions = new PemTrustOptions();
         for (String trustBundle : consumerVerticleContext.getTrustBundles()) {