Merge branch 'release/7.3.4.0.0.0'

imperva · Oct 9, 2019 · 03ec3d9 · 03ec3d9
2 parents 0140a6e + 31eeed7
commit 03ec3d9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -74,13 +74,13 @@ DDC is a Maven project (binaries are deployed in Maven Central) so you can impor
         <dependency>
             <artifactId>ddc-core</artifactId>
             <groupId>com.imperva.ddc</groupId>
-            <version>7.3.3.0.0.0</version>
+            <version>7.3.4.0.0.0</version>
         </dependency>
        <!--To work with ddc service wrapper add the following dependency-->
         <dependency>
             <artifactId>ddc-service</artifactId>
             <groupId>com.imperva.ddc</groupId>
-            <version>7.3.3.0.0.0</version>
+            <version>7.3.4.0.0.0</version>
         </dependency>
     
 ~~~

diff --git a/source/ddc-core/pom.xml b/source/ddc-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.imperva.ddc</groupId>
         <artifactId>domain-directory-controller</artifactId>
-        <version>7.3.3.0.0.1-SNAPSHOT</version>
+        <version>7.3.4.0.0.0</version>
     </parent>
 
     <artifactId>ddc-core</artifactId>

diff --git a/source/ddc-core/src/main/java/com/imperva/ddc/core/language/QueryAssembler.java b/source/ddc-core/src/main/java/com/imperva/ddc/core/language/QueryAssembler.java
@@ -30,6 +30,14 @@ public QueryAssembler addPhrase(FieldType fieldType, PhraseOperator phraseOperat
         return this;
     }
 
+    public QueryAssembler addPhrase(String fieldName, PhraseOperator phraseOperator, String value) {
+        Phrase phrase = new Phrase();
+        phrase.setValue(value);
+        phrase.setPhraseOperator(phraseOperator);
+        this.addPhrase(fieldName, phrase);
+        return this;
+    }
+
     /**
      * Adds a Phrase to the LDAP query
      * @param fieldType {@link FieldType} One of the available query attributes
@@ -44,12 +52,21 @@ public QueryAssembler addPhrase(FieldType fieldType, Phrase phrase) {
         return this;
     }
 
+
+    public QueryAssembler addPhrase(String fieldName, Phrase phrase) {
+        Field field = new Field();
+        field.setName(fieldName);
+        phrase.setAttribute(field);
+        searchPhrases.add(phrase);
+        return this;
+    }
+
     /**
      * Adds a Sentence to the LDAP query
      * @param sentence {@link Sentence} The Sentence to add
      * @return {@link QueryAssembler} Fluent API
      */
-    public  QueryAssembler addSentence(Sentence sentence){
+    public QueryAssembler addSentence(Sentence sentence){
         searchPhrases.add(sentence);
         return this;
     }

diff --git a/source/ddc-service/pom.xml b/source/ddc-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.imperva.ddc</groupId>
         <artifactId>domain-directory-controller</artifactId>
-        <version>7.3.3.0.0.1-SNAPSHOT</version>
+        <version>7.3.4.0.0.0</version>
     </parent>
 
     <artifactId>ddc-service</artifactId>
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.imperva.ddc</groupId>
             <artifactId>ddc-core</artifactId>
-            <version>7.3.3.0.0.1-SNAPSHOT</version>
+            <version>7.3.4.0.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/source/pom.xml b/source/pom.xml
@@ -6,7 +6,7 @@
     <packaging>pom</packaging>
     <groupId>com.imperva.ddc</groupId>
     <artifactId>domain-directory-controller</artifactId>
-    <version>7.3.3.0.0.1-SNAPSHOT</version>
+    <version>7.3.4.0.0.0</version>
     <name>Domain Directory Controller</name>
     <description>
         DDC is an Active Directory Java SDK designed to simplify AD interaction for small, medium and large projects.