fix #3275: filterable should not modify the current context

this introduces a builder for near backwards compatibility

Author: shawkins

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterBuilder.java

@@ -0,0 +1,23 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fabric8.kubernetes.client.dsl;
+
+import io.fabric8.kubernetes.api.builder.Builder;
+
+public interface FilterBuilder<T> extends Filterable<FilterBuilder<T>>, Builder<T> {
+  
+}

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListDeletable.java

@@ -16,5 +16,11 @@
 package io.fabric8.kubernetes.client.dsl;
 
 public interface FilterWatchListDeletable<T, L> extends Filterable<FilterWatchListDeletable<T, L>>, WatchListDeletable<T, L> {
+  
+  /**
+   * Accumulate a filter on the context, when done {@link FilterBuilder#build()} must be called
+   * @return a filter builder
+   */
+  FilterBuilder<FilterWatchListDeletable<T, L>> withFilter(); 
 
 }

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Filterable.java

@@ -20,10 +20,21 @@
 
 import java.util.Map;
 
+/**
+ * Each filter method applies in an additive way to the previous filter state.
+ * @param <T>
+ */
 public interface Filterable<T> {
 
   T withLabels(Map<String, String> labels);
 
+  /**
+   * @deprecated as the underlying implementation does not align with the arguments anymore.
+   *    It is possible to negate multiple values with the same key, e.g.:
+   *    foo != bar , foo != baz
+   *    To support this a multi-value map is needed, as a regular map would override the key with the new value.
+   */
+  @Deprecated
   T withoutLabels(Map<String, String> labels);
 
   T withLabelIn(String key, String ... values);
@@ -32,16 +43,29 @@ public interface Filterable<T> {
 
   T withLabel(String key, String value);
 
-  T withLabel(String key);
+  default T withLabel(String key) {
+    return withLabel(key, null);
+  }
 
   T withoutLabel(String key, String value);
 
-  T withoutLabel(String key);
+  default T withoutLabel(String key) {
+    return withoutLabel(key, null);
+  }
 
-  T withFields(Map<String, String> labels);
+  T withFields(Map<String, String> fields);
 
   T withField(String key, String value);
 
+  /**
+   * @deprecated as the underlying implementation does not align with the arguments fully.
+   *    Method is created to have a similar API as `withoutLabels`, but should eventually be replaced
+   *    with something better for the same reasons.
+   *    It is possible to negate multiple values with the same key, e.g.:
+   *    foo != bar , foo != baz
+   *    To support this a multi-value map is needed, as a regular map would override the key with the new value.
+   */
+  @Deprecated
   T withoutFields(Map<String, String> fields);
 
   T withoutField(String key, String value);