diff --git a/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ConsumerFilter.java b/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ConsumerFilter.java index 3bdd61c43..cf257a4e5 100644 --- a/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ConsumerFilter.java +++ b/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ConsumerFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2018-2020 Expedia, Inc. + * Copyright (C) 2018-2025 Expedia, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.expediagroup.streamplatform.streamregistry.graphql.filters; import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matches; +import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matchesInt; import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matchesSpecification; import java.util.function.Predicate; @@ -49,7 +50,7 @@ public boolean test(Consumer consumer) { if (!matches(consumer.getKey().getZone(), keyQuery.getZoneRegex())) { return false; } - if (keyQuery.getStreamVersion() != null && consumer.getKey().getStreamVersion() != keyQuery.getStreamVersion()) { + if (keyQuery.getStreamVersion() != null && !matchesInt(consumer.getKey().getStreamVersion(), this.keyQuery.getStreamVersion())) { return false; } } diff --git a/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerBindingFilter.java b/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerBindingFilter.java index 6d57539a1..79196725c 100644 --- a/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerBindingFilter.java +++ b/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerBindingFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2018-2021 Expedia, Inc. + * Copyright (C) 2018-2025 Expedia, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.expediagroup.streamplatform.streamregistry.graphql.filters; import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matches; +import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matchesInt; import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matchesSpecification; import java.util.function.Predicate; @@ -55,7 +56,7 @@ public static Boolean matchesProducerBindingKey(ProducerBindingKey key, Producer if (!matches(key.getStreamName(), keyQuery.getStreamNameRegex())) { return false; } - if (keyQuery.getStreamVersion() != null && key.getStreamVersion() != keyQuery.getStreamVersion()) { + if (keyQuery.getStreamVersion() != null && !matchesInt(key.getStreamVersion(),keyQuery.getStreamVersion())) { return false; } if (!matches(key.getProducerName(), keyQuery.getProducerNameRegex())) { diff --git a/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerFilter.java b/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerFilter.java index 8f1a3e775..334eca651 100644 --- a/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerFilter.java +++ b/graphql/api/src/main/java/com/expediagroup/streamplatform/streamregistry/graphql/filters/ProducerFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2018-2020 Expedia, Inc. + * Copyright (C) 2018-2025 Expedia, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.expediagroup.streamplatform.streamregistry.graphql.filters; import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matches; +import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matchesInt; import static com.expediagroup.streamplatform.streamregistry.graphql.filters.FilterUtility.matchesSpecification; import java.util.function.Predicate; @@ -49,7 +50,7 @@ public boolean test(Producer d) { if (!matches(d.getKey().getZone(), keyQuery.getZoneRegex())) { return false; } - if (keyQuery.getStreamVersion() != null && d.getKey().getStreamVersion() != keyQuery.getStreamVersion()) { + if (keyQuery.getStreamVersion() != null && !matchesInt(d.getKey().getStreamVersion(), keyQuery.getStreamVersion())) { return false; } }