From 4f8f3bfd41e148fd30796bd1b5757efe5ad2c8e2 Mon Sep 17 00:00:00 2001
From: Mattias Hellborg Arthursson <mattias@261consulting.com>
Date: Wed, 25 Sep 2013 11:34:18 +0200
Subject: [PATCH] LDAP-263: Extracted interface to minimize class coupling in
 query package.

---
 .../query/AppendableContainerCriteria.java    | 26 +++++++++++++++++++
 .../ldap/query/DefaultConditionCriteria.java  |  4 +--
 .../ldap/query/DefaultContainerCriteria.java  |  5 ++--
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java

diff --git a/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java b/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java
new file mode 100644
index 00000000..03a2a699
--- /dev/null
+++ b/core/src/main/java/org/springframework/ldap/query/AppendableContainerCriteria.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2005-2013 the original author or authors.
+ *
+ * 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 org.springframework.ldap.query;
+
+import org.springframework.ldap.filter.Filter;
+
+/**
+ * @author Mattias Hellborg Arthursson
+ */
+interface AppendableContainerCriteria extends ContainerCriteria {
+    ContainerCriteria append(Filter filter);
+}
diff --git a/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java b/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java
index e9211671..9d9979db 100644
--- a/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/DefaultConditionCriteria.java
@@ -30,11 +30,11 @@ import org.springframework.ldap.filter.WhitespaceWildcardsFilter;
  * @since 2.0
  */
 class DefaultConditionCriteria implements ConditionCriteria {
-    private final DefaultContainerCriteria parent;
+    private final AppendableContainerCriteria parent;
     private final String attribute;
     private boolean negated = false;
 
-    DefaultConditionCriteria(DefaultContainerCriteria parent, String attribute) {
+    DefaultConditionCriteria(AppendableContainerCriteria parent, String attribute) {
         this.parent = parent;
         this.attribute = attribute;
     }
diff --git a/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java b/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java
index 77e6a158..760f5178 100644
--- a/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java
+++ b/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java
@@ -29,7 +29,7 @@ import static org.springframework.ldap.query.CriteriaContainerType.OR;
  * @author Mattias Hellborg Arthursson
  * @since 2.0
  */
-class DefaultContainerCriteria implements ContainerCriteria {
+class DefaultContainerCriteria implements AppendableContainerCriteria {
     private final Set<Filter> filters = new LinkedHashSet<Filter>();
     private final LdapQuery topQuery;
     private CriteriaContainerType type;
@@ -38,7 +38,8 @@ class DefaultContainerCriteria implements ContainerCriteria {
         this.topQuery = topQuery;
     }
 
-    DefaultContainerCriteria append(Filter filter) {
+    @Override
+    public DefaultContainerCriteria append(Filter filter) {
         this.filters.add(filter);
         return this;
     }