fixes query

Author: otaviojava

hazelcast-driver/src/main/java/org/jnosql/diana/hazelcast/key/DefaultHazelcastBucketManager.java

@@ -99,14 +99,14 @@ public void close() {
     }
 
     @Override
-    public Collection<Value> query(String query) throws NullPointerException {
-        requireNonNull(query, "query is required");
-        return query(new SqlPredicate(query));
+    public Collection<Value> sql(String query) throws NullPointerException {
+        requireNonNull(query, "sql is required");
+        return sql(new SqlPredicate(query));
     }
 
     @Override
-    public Collection<Value> query(String query, Map<String, Object> params) throws NullPointerException {
-        requireNonNull(query, "query is required");
+    public Collection<Value> sql(String query, Map<String, Object> params) throws NullPointerException {
+        requireNonNull(query, "sql is required");
         requireNonNull(params, "params is required");
         final StringBuilder finalQuery = new StringBuilder(query);
         final Consumer<Map.Entry<String, Object>> consumer = e -> {
@@ -115,11 +115,11 @@ public Collection<Value> query(String query, Map<String, Object> params) throws
             finalQuery.replace(indexOf, indexOf + key.length(), e.getValue().toString());
         };
         params.entrySet().forEach(consumer);
-        return query(new SqlPredicate(finalQuery.toString()));
+        return sql(new SqlPredicate(finalQuery.toString()));
     }
 
     @Override
-    public <K, V> Collection<Value> query(Predicate<K, V> predicate) throws NullPointerException {
+    public <K, V> Collection<Value> sql(Predicate<K, V> predicate) throws NullPointerException {
         requireNonNull(predicate, "predicate is required");
         Collection<V> values = map.values(predicate);
         return values.stream().map(Value::of).collect(toList());

hazelcast-driver/src/main/java/org/jnosql/diana/hazelcast/key/HazelcastBucketManager.java

@@ -29,34 +29,34 @@ public interface HazelcastBucketManager extends BucketManager {
 
 
     /**
-     * Executes hazelcast query
+     * Executes hazelcast sql
      *
-     * @param query the query
-     * @return the result query
-     * @throws NullPointerException when there is null query
+     * @param query the sql
+     * @return the result sql
+     * @throws NullPointerException when there is null sql
      */
-    Collection<Value> query(String query);
+    Collection<Value> sql(String query);
 
     /**
-     * Executes hazelcast query with named query.
-     * E.g.:  bucketManager.query("name = :name", singletonMap("name", "Matrix"))
+     * Executes hazelcast sql with named sql.
+     * E.g.:  bucketManager.sql("name = :name", singletonMap("name", "Matrix"))
      *
-     * @param query  the query
+     * @param query  the sql
      * @param params the params to bind
-     * @return the result query
-     * @throws NullPointerException when there is null query
+     * @return the result sql
+     * @throws NullPointerException when there is null sql
      */
-    Collection<Value> query(String query, Map<String, Object> params);
+    Collection<Value> sql(String query, Map<String, Object> params);
 
     /**
-     * Executes hazelcast query
+     * Executes hazelcast sql
      *
      * @param predicate the hazelcast predicate
      * @param <K>       the key type
      * @param <V>       the value type
-     * @return the result query
+     * @return the result sql
      * @throws NullPointerException when there is null predicate
      */
-    <K, V> Collection<Value> query(Predicate<K, V> predicate);
+    <K, V> Collection<Value> sql(Predicate<K, V> predicate);
 
 }

hazelcast-driver/src/main/java/org/jnosql/diana/hazelcast/package-info.java

@@ -20,7 +20,7 @@
  * scaling of processing and available storage. Backups are also distributed among nodes to protect against failure
  * of any single node. Hazelcast provides central, predictable scaling of applications through in-memory
  * access to frequently used data and across an elastically scalable data grid. These techniques reduce
- * the query load on databases and improve speed.
+ * the sql load on databases and improve speed.
  * Hazelcast can run on-premise, in the cloud (Amazon Web Services,
  * Microsoft Azure, Cloud Foundry, OpenShift), virtually (VMWare),
  * and in Docker containers. Hazelcast offers technology integrations for multiple cloud configuration and deployment

hazelcast-driver/src/test/java/org/jnosql/diana/hazelcast/key/HazelcastBucketManagerQueryTest.java

@@ -60,51 +60,51 @@ public void shouldReturnWhenStringQueryIsNull() {
 
     @Test
     public void shouldReturnWhenPredicateQueryIsNull() {
-        assertThrows(NullPointerException.class, () -> bucketManager.query((Predicate<? extends Object, ? extends Object>) null));
+        assertThrows(NullPointerException.class, () -> bucketManager.sql((Predicate<? extends Object, ? extends Object>) null));
     }
 
     @Test
     public void shouldReturnActive() {
-        Collection<Value> result = bucketManager.query("active");
+        Collection<Value> result = bucketManager.sql("active");
         assertEquals(2, result.size());
     }
 
     @Test
     public void shouldReturnActiveAndGreaterThan2000() {
-        Collection<Value> result = bucketManager.query("NOT active AND year > 1990");
+        Collection<Value> result = bucketManager.sql("NOT active AND year > 1990");
         assertEquals(2, result.size());
     }
 
     @Test
     public void shouldReturnEqualsMatrix() {
-        Collection<Value> result = bucketManager.query("name = Matrix");
+        Collection<Value> result = bucketManager.sql("name = Matrix");
         assertEquals(1, result.size());
     }
 
 
     @Test
     public void shouldReturnActivePredicate() {
-        Collection<Value> result = bucketManager.query(equal("active", true));
+        Collection<Value> result = bucketManager.sql(equal("active", true));
         assertEquals(2, result.size());
     }
 
     @Test
     public void shouldReturnActiveAndGreaterThan2000Predicate() {
         Predicate predicate = and(equal("active", false), greaterEqual("year", 1990));
-        Collection<Value> result = bucketManager.query(predicate);
+        Collection<Value> result = bucketManager.sql(predicate);
         assertEquals(2, result.size());
     }
 
     @Test
     public void shouldReturnEqualsMatrixPredicate() {
         Predicate predicate = equal("name", "Matrix");
-        Collection<Value> result = bucketManager.query(predicate);
+        Collection<Value> result = bucketManager.sql(predicate);
         assertEquals(1, result.size());
     }
 
     @Test
     public void shouldReturnEqualsNameParam() {
-        Collection<Value> result = bucketManager.query("name = :name", singletonMap("name", "Matrix"));
+        Collection<Value> result = bucketManager.sql("name = :name", singletonMap("name", "Matrix"));
         assertEquals(1, result.size());
     }
 
@@ -113,14 +113,14 @@ public void shouldReturnNameAndYearParam() {
         Map<String, Object> params = new HashMap<>();
         params.put("name", "Matrix");
         params.put("year", 1900);
-        Collection<Value> result = bucketManager.query("name = :name AND year > :year", params);
+        Collection<Value> result = bucketManager.sql("name = :name AND year > :year", params);
 
         assertEquals(1, result.size());
     }
 
     @Test
     public void shouldReturnLikeNameParam() {
-        Collection<Value> result = bucketManager.query("name like :name", singletonMap("name", "Mat%"));
+        Collection<Value> result = bucketManager.sql("name like :name", singletonMap("name", "Mat%"));
         assertEquals(1, result.size());
     }