SO-5834: generic dependency model

commons/com.b2international.index.tests/src/com/b2international/index/QueryStringQueryTest.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright 2023 B2i Healthcare Pte Ltd, http://b2i.sg
+ * 
+ * Licensed 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 com.b2international.index;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collection;
+
+import org.elasticsearch.core.List;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.b2international.index.Fixtures.Data;
+import com.b2international.index.query.Expressions;
+import com.b2international.index.query.Query;
+
+/**
+ * @since 8.12
+ */
+public class QueryStringQueryTest extends BaseIndexTest {
+
+	private static final String KEY3 = "key3";
+
+	private Data data1;
+	private Data data2;
+	private Data data3;
+
+	@Override
+	protected Collection<Class<?>> getTypes() {
+		return List.of(Data.class);
+	}
+
+	@Before
+	public void setup() {
+		data1 = new Data(KEY1);
+		data1.setField1("value1");
+		data1.setField2("value2");
+
+		data2 = new Data(KEY2);
+		data2.setField1("value2");
+		data2.setField2("value1");
+
+		data3 = new Data(KEY3);
+		data3.setField1("field1");
+		data3.setField2("field2");
+
+		indexDocuments(
+			data1,
+			data2,
+			data3
+		);
+	}
+
+	@Test
+	public void without_defaultField() throws Exception {
+		Hits<String> hits = search(Query.select(String.class)
+				.from(Data.class)
+				.fields("id")
+				.where(Expressions.queryString("value1"))
+				.build());
+
+		assertThat(hits).containsOnly(KEY1, KEY2);
+	}
+
+	@Test
+	public void with_defaultField() throws Exception {
+		Hits<String> hits = search(Query.select(String.class)
+				.from(Data.class)
+				.fields("id")
+				.where(Expressions.queryString("value1", "field1"))
+				.build());
+
+		assertThat(hits).containsOnly(KEY1);
+	}
+
+	@Test
+	public void explicit_fields() throws Exception {
+		Hits<String> hits = search(Query.select(String.class)
+				.from(Data.class)
+				.fields("id")
+				.where(Expressions.queryString("field1:value1"))
+				.build());
+
+		assertThat(hits).containsOnly(KEY1);
+	}
+
+	@Test
+	public void prefix() throws Exception {
+		Hits<String> hits = search(Query.select(String.class)
+				.from(Data.class)
+				.fields("id")
+				.where(Expressions.queryString("field1:value*"))
+				.build());
+
+		assertThat(hits).containsOnly(KEY1, KEY2);
+	}
+
+	@Test
+	public void fuzzy() throws Exception {
+		Hits<String> hits = search(Query.select(String.class)
+				.from(Data.class)
+				.fields("id")
+				.where(Expressions.queryString("field1:valeu1~1"))
+				.build());
+
+		assertThat(hits).containsOnly(KEY1);
+	}
+
+}

commons/com.b2international.index/src/com/b2international/index/es/query/Es8QueryBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2022-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -152,6 +152,8 @@ private void visit(Expression expression) {
 			visit((ScriptQueryExpression) expression);
 		} else if (expression instanceof MoreLikeThisPredicate){
 			visit((MoreLikeThisPredicate) expression);
+		} else if (expression instanceof QueryStringExpression){
+			visit((QueryStringExpression) expression);
 		} else {
 			throw new IllegalArgumentException("Unexpected expression: " + expression);
 		}
@@ -549,5 +551,11 @@ private void visit(MoreLikeThisPredicate mlt) {
 			)
 		);
 	}
+
+	private void visit(QueryStringExpression qs) {
+		deque.push(
+			QueryBuilders.queryString(q -> q.query(qs.getQuery()).defaultField(qs.getDefaultField()))
+		);
+	}
 
 }

commons/com.b2international.index/src/com/b2international/index/es/query/EsQueryBuilder.java

@@ -142,6 +142,8 @@ private void visit(Expression expression) {
 			visit((ScriptQueryExpression)expression);
 		} else if (expression instanceof MoreLikeThisPredicate) {
 			visit((MoreLikeThisPredicate) expression);
+		} else if (expression instanceof QueryStringExpression) {
+			visit((QueryStringExpression) expression);
 		} else {
 			throw new IllegalArgumentException("Unexpected expression: " + expression);
 		}
@@ -433,4 +435,11 @@ private void visit(MoreLikeThisPredicate mlt) {
 		);
 	}
 
+	private void visit(QueryStringExpression qs) {
+		deque.push(
+			QueryBuilders.queryStringQuery(qs.getQuery())
+				.defaultField(qs.getDefaultField())
+		);
+	}
+
 }

commons/com.b2international.index/src/com/b2international/index/query/Expressions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2011-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -303,5 +303,14 @@ public static Expression matchAnyObject(String field, Iterable<?> values) {
 	public static MoreLikeThisPredicate moreLikeThis(Iterable<String> fields, Iterable<String> likeTexts, Iterable<String> unlikeTexts) {
 		return new MoreLikeThisPredicate(fields, likeTexts, unlikeTexts);
 	}
+
+	public static QueryStringExpression queryString(String query) {
+		return queryString(query, null);
+	}
+
+	public static QueryStringExpression queryString(String query, String defaultField) {
+		return new QueryStringExpression(query, defaultField);
+	}
+
 
 }

commons/com.b2international.index/src/com/b2international/index/query/QueryStringExpression.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023 B2i Healthcare Pte Ltd, http://b2i.sg
+ * 
+ * Licensed 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 com.b2international.index.query;
+
+import java.util.Objects;
+
+/**
+ * @since 8.12
+ */
+public final class QueryStringExpression implements Expression {
+
+	private final String query;
+	private final String defaultField;
+
+	public QueryStringExpression(String query, String defaultField) {
+		this.query = query;
+		this.defaultField = defaultField;
+	}
+
+	public String getQuery() {
+		return query;
+	}
+
+	public String getDefaultField() {
+		return defaultField;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(query, defaultField);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) return true;
+		if (obj == null) return false;
+		if (getClass() != obj.getClass()) return false;
+		QueryStringExpression predicate = (QueryStringExpression) obj;
+		return Objects.equals(query, predicate.query) 
+				&& Objects.equals(defaultField, predicate.defaultField);
+	}
+
+	@Override
+	public String toString() {
+		return String.format("QUERY_STRING(%s)[defaultField:'%s']", query, defaultField);
+	}
+
+}

core/com.b2international.snowowl.core.rest.tests/src/com/b2international/snowowl/core/bundle/BaseBundleApiTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2021-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,8 @@ public void cleanUp() {
 			.execute(Services.bus())
 			.getSync(1, TimeUnit.MINUTES)
 			.forEach(bundle -> {
-				ResourceRequests.prepareDelete(bundle.getId())
+				ResourceRequests.prepareDelete(bundle.getResourceURI())
+					.force(true)
 					.build(USER, String.format("Delete bundle: %s", bundle.getId()))
 					.execute(Services.bus())
 					.getSync(1, TimeUnit.MINUTES);

core/com.b2international.snowowl.core.rest.tests/src/com/b2international/snowowl/core/rest/AllSnowOwlApiTests.java

@@ -25,6 +25,7 @@
 import com.b2international.snowowl.core.rest.auth.AuthorizationTest;
 import com.b2international.snowowl.core.rest.auth.BasicAuthenticationTest;
 import com.b2international.snowowl.core.rest.bundle.BundleRestApiTest;
+import com.b2international.snowowl.core.rest.codesystem.CodeSystemApiDependencyTest;
 import com.b2international.snowowl.core.rest.codesystem.CodeSystemApiTest;
 import com.b2international.snowowl.core.rest.rate.RateLimitTest;
 import com.b2international.snowowl.core.rest.resource.ResourceApiTest;
@@ -40,6 +41,7 @@
 	AuthorizationTest.class,
 	RateLimitTest.class,
 	CodeSystemApiTest.class,
+	CodeSystemApiDependencyTest.class,
 	ResourceApiTest.class,
 	BundleApiTest.class,
 	BundleRestApiTest.class,

core/com.b2international.snowowl.core.rest.tests/src/com/b2international/snowowl/core/rest/BaseResourceApiTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 B2i Healthcare Pte Ltd, http://b2i.sg
+ * Copyright 2021-2023 B2i Healthcare Pte Ltd, http://b2i.sg
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,10 +38,11 @@ public void after() {
 			.getSync(1, TimeUnit.MINUTES)
 			.forEach(resource -> {
 				ResourceRequests
-				.prepareDelete(resource.getId())
-				.build(RestExtensions.USER, "Delete " + resource.getId())
-				.execute(Services.bus())
-				.getSync(1, TimeUnit.MINUTES); 
+					.prepareDelete(resource.getResourceURI())
+					.force(true)
+					.build(RestExtensions.USER, "Delete " + resource.getId())
+					.execute(Services.bus())
+					.getSync(1, TimeUnit.MINUTES); 
 			});
 	}