#8 Add Query-Syntax

src/main/java/com/github/smallcreep/jb/hub/api/Projects.java

@@ -33,7 +33,8 @@
  * @since 0.2.0
  */
 public interface Projects extends Iterable<Project>,
-    Sortable<Projects>, Subset<Projects>, Partial<Projects> {
+    Sortable<Projects>, Subset<Projects>, Partial<Projects>,
+    Searchable<Projects> {
 
     /**
      * Get project by id.

src/main/java/com/github/smallcreep/jb/hub/api/Query.java

@@ -0,0 +1,12 @@
+package com.github.smallcreep.jb.hub.api;
+
+/**
+ * JetBrains Hub Query Syntax.
+ *
+ * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
+ * @version $Id$
+ * @see <a href="https://www.jetbrains.com/help/hub/Query-Syntax.html">Query Syntax</a>
+ * @since 0.2.0
+ */
+public interface Query extends Field {
+}

src/main/java/com/github/smallcreep/jb/hub/api/RtProjects.java

@@ -92,4 +92,15 @@ public Iterator<Project> iterator() {
             new RtPagination(this.req, "projects")
         ).iterator();
     }
+
+    @Override
+    public Projects search(final Query query) throws Exception {
+        return new RtProjects(
+            this.origin,
+            this.req
+                .uri()
+                .queryParam("query", query.value())
+                .back()
+        );
+    }
 }

src/main/java/com/github/smallcreep/jb/hub/api/Searchable.java

@@ -0,0 +1,21 @@
+package com.github.smallcreep.jb.hub.api;
+
+/**
+ * Searchable interface use for search elements.
+ *
+ * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
+ * @version $Id$
+ * @param <T> Type of self searchable request
+ * @see <a href="https://www.jetbrains.com/help/hub/Query-Syntax.html">Query Syntax</a>
+ * @since 0.2.0
+ */
+public interface Searchable<T extends Searchable> {
+
+    /**
+     * Search.
+     * @param query Query
+     * @return Self
+     * @throws Exception If fails
+     */
+    T search(Query query) throws Exception;
+}

src/main/java/com/github/smallcreep/jb/hub/api/query/Field.java

@@ -0,0 +1,39 @@
+package com.github.smallcreep.jb.hub.api.query;
+
+import com.github.smallcreep.jb.hub.api.Query;
+import org.cactoos.text.FormattedText;
+
+/**
+ * Simple query field.
+ *
+ * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
+ * @version $Id$
+ * @since 0.2.0
+ */
+public final class Field implements Query {
+
+    /**
+     * Field name.
+     */
+    private final String name;
+
+    /**
+     * Field value.
+     */
+    private final String value;
+
+    /**
+     * Ctor.
+     * @param name Field name
+     * @param value Field value
+     */
+    public Field(final String name, final String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    @Override
+    public String value() throws Exception {
+        return new FormattedText("%s:%s", this.name, this.value).asString();
+    }
+}

src/main/java/com/github/smallcreep/jb/hub/api/query/Or.java

@@ -0,0 +1,48 @@
+package com.github.smallcreep.jb.hub.api.query;
+
+import com.github.smallcreep.jb.hub.api.Query;
+import org.cactoos.iterable.IterableOf;
+import org.cactoos.iterable.Mapped;
+import org.cactoos.iterable.StickyIterable;
+import org.cactoos.text.JoinedText;
+
+/**
+ * Or expression for search.
+ * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
+ * @version $Id$
+ * @since 0.2.0
+ */
+public final class Or implements Query {
+
+    /**
+     * Queries.
+     */
+    private final Iterable<Query> queries;
+
+    /**
+     * Ctor.
+     * @param queries Queries
+     */
+    public Or(final Query... queries) {
+        this(new IterableOf<>(queries));
+    }
+
+    /**
+     * Ctor.
+     * @param queries Queries
+     */
+    public Or(final Iterable<Query> queries) {
+        this.queries = new StickyIterable<>(queries);
+    }
+
+    @Override
+    public String value() throws Exception {
+        return new JoinedText(
+            " or ",
+            new Mapped<>(
+                Query::value,
+                this.queries
+            )
+        ).asString();
+    }
+}

src/main/java/com/github/smallcreep/jb/hub/api/query/package-info.java

@@ -0,0 +1,33 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Ilia Rogozhin (ilia.rogozhin@gmail.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Different query syntax from JetBrains Hub.
+ *
+ * <p><a href="https://www.jetbrains.com/help/hub/Query-Syntax.html">Query Syntax</a></p>
+ * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
+ * @version $Id$
+ * @since 0.2.0
+ */
+package com.github.smallcreep.jb.hub.api.query;

src/test/java/com/github/smallcreep/jb/hub/api/ProjectsITCase.java

@@ -4,6 +4,7 @@
 import com.github.smallcreep.jb.hub.api.fields.NestedField;
 import com.github.smallcreep.jb.hub.api.fields.SubFields;
 import com.github.smallcreep.jb.hub.api.integration.DefaultAuthByPass;
+import com.github.smallcreep.jb.hub.api.query.Or;
 import com.github.smallcreep.jb.hub.api.sort.AscSort;
 import com.github.smallcreep.json.ObjectHasJson;
 import javax.json.Json;
@@ -38,6 +39,22 @@ public void integrationCheckProjects() throws Exception {
                     "key"
                 )
             )
+            .search(
+                new Or(
+                    new com.github.smallcreep.jb.hub.api.query.Field(
+                        "key",
+                        "AP"
+                    ),
+                    new com.github.smallcreep.jb.hub.api.query.Field(
+                        "key",
+                        "GLBL"
+                    ),
+                    new com.github.smallcreep.jb.hub.api.query.Field(
+                        "id",
+                        "a5d71886-3b1e-40eb-a266-2f53e331a576"
+                    )
+                )
+            )
             .fields(
                 new MultipleFields(
                     new Field.Simple(
@@ -213,59 +230,13 @@ public void integrationCheckProjects() throws Exception {
                 )
                 .build()
         );
-        final ObjectHasJson fourth = new ObjectHasJson(
-            Json.createObjectBuilder()
-                .add(
-                    "id",
-                    "77a3ea4f-9748-4e97-a7e7-d8bc8a8b88ed"
-                )
-                .add(
-                    "key",
-                    "TYA"
-                )
-                .add(
-                    "resources",
-                    Json.createArrayBuilder()
-                        .add(
-                            Json.createObjectBuilder()
-                                .add(
-                                    "id",
-                                    "4774a74d-9515-4f5c-af99-37e4da426208"
-                                )
-                                .add(
-                                    "key",
-                                    "TYA"
-                                )
-                        )
-                        .add(
-                            Json.createObjectBuilder()
-                                .add(
-                                    "id",
-                                    "d8a6bec7-8fd1-4916-8475-a946c07ac8e2"
-                                )
-                                .add(
-                                    "key",
-                                    "adminTestYoutrackApi"
-                                )
-                        )
-                )
-                .add(
-                    "team",
-                    Json.createObjectBuilder().add(
-                        "type",
-                        "projectTeam"
-                    )
-                )
-                .build()
-        );
         MatcherAssert.assertThat(
             "Integration request for get projects doesn't correct!",
             projects,
             Matchers.contains(
                 first,
                 second,
-                third,
-                fourth
+                third
             )
         );
     }