Skip to content

Commit

Permalink
Add BooleanQuery.hasClauses() (#525)
Browse files Browse the repository at this point in the history
  • Loading branch information
swallez authored Mar 6, 2023
1 parent ecd0d6b commit 89af2bc
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,16 @@ public BoolQuery build() {

return new BoolQuery(this);
}

/**
* Returns <code>true</code> if this query has at least one should, must, must
* not or filter clause.
*/
public boolean hasClauses() {
return !(this.must == null || this.must.isEmpty()) || !(this.mustNot == null || this.mustNot.isEmpty())
|| !(this.should == null || this.should.isEmpty())
|| !(this.filter == null || this.filter.isEmpty());
}
}

// ---------------------------------------------------------------------------------------------
Expand All @@ -351,4 +361,12 @@ protected static void setupBoolQueryDeserializer(ObjectDeserializer<BoolQuery.Bu

}

/**
* Returns <code>true</code> if this query has at least one should, must, must
* not or filter clause.
*/
public boolean hasClauses() {
return !(this.must == null || this.must.isEmpty()) || !(this.mustNot == null || this.mustNot.isEmpty())
|| !(this.should == null || this.should.isEmpty()) || !(this.filter == null || this.filter.isEmpty());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you 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 co.elastic.clients.elasticsearch.model;

import co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class CodeAdditionsTests extends Assertions {

@Test
public void testHasClauses() {

{
BoolQuery.Builder builder = new BoolQuery.Builder();
assertFalse(builder.hasClauses());

BoolQuery query = builder.build();
assertFalse(query.hasClauses());
}

{
BoolQuery.Builder builder = new BoolQuery.Builder();
builder.must(QueryBuilders.matchAll(b -> b));
assertTrue(builder.hasClauses());

BoolQuery query = builder.build();
assertTrue(query.hasClauses());
}
}
}

0 comments on commit 89af2bc

Please sign in to comment.