Skip to content

Commit 3ca6ade

Browse files
committed
remove search query
Signed-off-by: Otavio Santana <[email protected]>
1 parent 5967ab6 commit 3ca6ade

File tree

2 files changed

+16
-29
lines changed

2 files changed

+16
-29
lines changed

jnosql-couchbase-driver/src/main/java/org/eclipse/jnosql/communication/couchbase/document/CouchbaseDocumentManager.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public interface CouchbaseDocumentManager extends DocumentManager {
3030
/**
3131
* Executes the N1QL with params and then result que result
3232
*
33-
* @param n1ql the query
34-
* @param params the params
33+
* @param n1ql the query
34+
* @param params the params
3535
* @return the query result
3636
* @throws NullPointerException when either n1ql or params are null
3737
*/
@@ -47,13 +47,4 @@ public interface CouchbaseDocumentManager extends DocumentManager {
4747
*/
4848
Stream<DocumentEntity> n1qlQuery(String n1ql) throws NullPointerException;
4949

50-
51-
/**
52-
* Searches in Couchbase using Full Text Search
53-
*
54-
* @param query the query to be used
55-
* @return the elements from the query
56-
* @throws NullPointerException when either the query or index are null
57-
*/
58-
Stream<DocumentEntity> search(SearchQuery query) throws NullPointerException;
5950
}

jnosql-couchbase-driver/src/main/java/org/eclipse/jnosql/communication/couchbase/document/DefaultCouchbaseDocumentManager.java

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import com.couchbase.client.java.query.QueryOptions;
2626
import com.couchbase.client.java.query.QueryResult;
2727
import com.couchbase.client.java.search.SearchQuery;
28+
import com.couchbase.client.java.search.result.SearchResult;
29+
import com.couchbase.client.java.search.result.SearchRow;
2830
import jakarta.nosql.document.Document;
2931
import jakarta.nosql.document.DocumentDeleteQuery;
3032
import jakarta.nosql.document.DocumentEntity;
@@ -136,18 +138,18 @@ public void delete(DocumentDeleteQuery query) {
136138

137139
Collection collection = bucket.collection(query.getDocumentCollection());
138140

139-
// QueryConverter.QueryConverterResult delete = QueryConverter.delete(query, database);
140-
// if (nonNull(delete.getStatement())) {
141-
// ParameterizedN1qlQuery n1qlQuery = N1qlQuery.parameterized(delete.getStatement(), delete.getParams());
142-
// bucket.query(n1qlQuery);
143-
// }
144-
//
145-
// if (!delete.getKeys().isEmpty()) {
146-
// delete.getKeys()
147-
// .stream()
148-
// .map(s -> getPrefix(query.getDocumentCollection(), s))
149-
// .forEach(bucket::remove);
150-
// }
141+
QueryConverter.QueryConverterResult delete = QueryConverter.delete(query, database);
142+
if (nonNull(delete.getStatement())) {
143+
ParameterizedN1qlQuery n1qlQuery = N1qlQuery.parameterized(delete.getStatement(), delete.getParams());
144+
bucket.query(n1qlQuery);
145+
}
146+
147+
if (!delete.getKeys().isEmpty()) {
148+
delete.getKeys()
149+
.stream()
150+
.map(s -> getPrefix(query.getDocumentCollection(), s))
151+
.forEach(bucket::remove);
152+
}
151153

152154
}
153155

@@ -207,12 +209,6 @@ public Stream<DocumentEntity> n1qlQuery(String n1ql) throws NullPointerException
207209
}
208210

209211

210-
@Override
211-
public Stream<DocumentEntity> search(SearchQuery query) throws NullPointerException {
212-
requireNonNull(query, "query is required");
213-
214-
return null;
215-
}
216212

217213
@Override
218214
public void close() {

0 commit comments

Comments
 (0)