Finalizing externalizing Vocabulary Search Apache Solr implementation (…

…#2308)

Referring common Vocabulary Search classes from Standardized Analysis API (org.ohdsi:standardized-analysis-specs:1.5.0)
Adding webapi-solr profile and referencing a new webapi-solr repository (org.ohdsi:webapi-solr:1.0.0)
Finalizing externalizing the Vocabulary Search Apache Solr implementation

=====================================
Additionally fixing a failing unit test CohortResultsServiceTest.prepareGetTimeToEventDrilldown

pom.xml

@@ -66,10 +66,6 @@
     <cdm.version>5</cdm.version>
     <!-- Person properties -->
     <person.viewDates>false</person.viewDates>
-    <!-- Full Text Search With SOLR Settings -->
-    <solr.endpoint></solr.endpoint>
-    <solr.query.prefix>{!complexphrase inOrder=true}</solr.query.prefix>
-    <solr.version>8.11.2</solr.version>
     <!-- Heracles properties -->
     <heracles.smallcellcount>5</heracles.smallcellcount>
 
@@ -1131,7 +1127,7 @@
     <dependency>
       <groupId>org.ohdsi</groupId>
       <artifactId>standardized-analysis-specs</artifactId>
-      <version>1.4.0</version>
+      <version>1.5.0</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -1197,12 +1193,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-        <groupId>org.apache.solr</groupId>
-        <artifactId>solr-solrj</artifactId>
-      <version>${solr.version}</version>
-      <type>jar</type>
-    </dependency>
     <dependency>
       <groupId>com.qmino</groupId>
       <artifactId>miredot-annotations</artifactId>
@@ -1851,5 +1841,27 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>webapi-solr</id>
+      <properties>
+        <!-- Full Text Search With SOLR Settings -->
+        <solr.endpoint></solr.endpoint>
+        <solr.query.prefix>{!complexphrase inOrder=true}</solr.query.prefix>
+        <solr.version>8.11.2</solr.version>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.ohdsi</groupId>
+          <artifactId>webapi-solr</artifactId>
+          <version>1.0.0</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.solr</groupId>
+          <artifactId>solr-solrj</artifactId>
+          <version>${solr.version}</version>
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>

src/main/java/org/ohdsi/webapi/cohortanalysis/HeraclesConfigurationInfo.java

@@ -1,6 +1,6 @@
 package org.ohdsi.webapi.cohortanalysis;
 
-import org.ohdsi.webapi.info.ConfigurationInfo;
+import org.ohdsi.info.ConfigurationInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

src/main/java/org/ohdsi/webapi/conceptset/ConceptSetExport.java

@@ -6,9 +6,11 @@
 package org.ohdsi.webapi.conceptset;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.Collection;
+
 import org.ohdsi.circe.vocabulary.ConceptSetExpression;
-import org.ohdsi.webapi.vocabulary.Concept;
+import org.ohdsi.vocabulary.Concept;
 
 /**
  *

src/main/java/org/ohdsi/webapi/info/InfoService.java

@@ -24,7 +24,7 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ohdsi.webapi.info.ConfigurationInfo;
+import org.ohdsi.info.ConfigurationInfo;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Controller;
 

src/main/java/org/ohdsi/webapi/person/PersonConfigurationInfo.java

@@ -1,6 +1,6 @@
 package org.ohdsi.webapi.person;
 
-import org.ohdsi.webapi.info.ConfigurationInfo;
+import org.ohdsi.info.ConfigurationInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

src/main/java/org/ohdsi/webapi/plugins/PluginsConfigurationInfo.java

@@ -1,6 +1,6 @@
 package org.ohdsi.webapi.plugins;
 
-import org.ohdsi.webapi.info.ConfigurationInfo;
+import org.ohdsi.info.ConfigurationInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

src/main/java/org/ohdsi/webapi/security/SecurityConfigurationInfo.java

@@ -1,9 +1,9 @@
 package org.ohdsi.webapi.security;
 
+import org.ohdsi.info.ConfigurationInfo;
 import org.ohdsi.webapi.Constants;
 import org.ohdsi.webapi.shiro.management.AtlasRegularSecurity;
 import org.ohdsi.webapi.shiro.management.Security;
-import org.ohdsi.webapi.info.ConfigurationInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

src/main/java/org/ohdsi/webapi/service/ConceptSetService.java

@@ -19,13 +19,15 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
+
 import javax.transaction.Transactional;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.shiro.authz.UnauthorizedException;
 import org.ohdsi.circe.vocabulary.ConceptSetExpression;
+import org.ohdsi.vocabulary.Concept;
 import org.ohdsi.webapi.check.CheckResult;
 import org.ohdsi.webapi.check.checker.conceptset.ConceptSetChecker;
 import org.ohdsi.webapi.conceptset.ConceptSet;
@@ -56,7 +58,6 @@
 import org.ohdsi.webapi.versioning.dto.VersionDTO;
 import org.ohdsi.webapi.versioning.dto.VersionUpdateDTO;
 import org.ohdsi.webapi.versioning.service.VersionService;
-import org.ohdsi.webapi.vocabulary.Concept;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.convert.support.GenericConversionService;

src/main/java/org/ohdsi/webapi/service/VocabularyService.java

@@ -2,8 +2,10 @@
 
 import static org.ohdsi.webapi.service.cscompare.ConceptSetCompareService.CONCEPT_SET_COMPARISON_ROW_MAPPER;
 import static org.ohdsi.webapi.util.SecurityUtils.whitelist;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
@@ -34,6 +36,8 @@
 import org.ohdsi.circe.vocabulary.ConceptSetExpressionQueryBuilder;
 import org.ohdsi.sql.SqlRender;
 import org.ohdsi.sql.SqlTranslate;
+import org.ohdsi.vocabulary.Concept;
+import org.ohdsi.vocabulary.SearchProviderConfig;
 import org.ohdsi.webapi.activity.Activity.ActivityType;
 import org.ohdsi.webapi.activity.Tracker;
 import org.ohdsi.webapi.conceptset.ConceptSetComparison;
@@ -49,7 +53,6 @@
 import org.ohdsi.webapi.source.SourceInfo;
 import org.ohdsi.webapi.util.PreparedSqlRender;
 import org.ohdsi.webapi.util.PreparedStatementRenderer;
-import org.ohdsi.webapi.vocabulary.Concept;
 import org.ohdsi.webapi.vocabulary.ConceptRecommendedNotInstalledException;
 import org.ohdsi.webapi.vocabulary.ConceptRelationship;
 import org.ohdsi.webapi.vocabulary.ConceptSearch;
@@ -58,7 +61,6 @@
 import org.ohdsi.webapi.vocabulary.RecommendedConcept;
 import org.ohdsi.webapi.vocabulary.RelatedConcept;
 import org.ohdsi.webapi.vocabulary.RelatedConceptSearch;
-import org.ohdsi.webapi.vocabulary.SearchProviderConfig;
 import org.ohdsi.webapi.vocabulary.Vocabulary;
 import org.ohdsi.webapi.vocabulary.VocabularyInfo;
 import org.ohdsi.webapi.vocabulary.VocabularySearchService;

src/main/java/org/ohdsi/webapi/vocabulary/DatabaseSearchProvider.java

@@ -2,6 +2,9 @@
 
 import java.util.Collection;
 
+import org.ohdsi.vocabulary.Concept;
+import org.ohdsi.vocabulary.SearchProvider;
+import org.ohdsi.vocabulary.SearchProviderConfig;
 import org.ohdsi.webapi.service.VocabularyService;
 import org.ohdsi.webapi.source.Source;
 import org.ohdsi.webapi.source.SourceRepository;

src/main/java/org/ohdsi/webapi/vocabulary/RelatedConcept.java

@@ -6,6 +6,8 @@
 
 import java.util.ArrayList;
 
+import org.ohdsi.vocabulary.Concept;
+
 /**
  *
  * @author fdefalco

src/main/java/org/ohdsi/webapi/vocabulary/VocabularySearchService.java

@@ -1,5 +1,8 @@
 package org.ohdsi.webapi.vocabulary;
 
+import org.ohdsi.vocabulary.SearchProvider;
+import org.ohdsi.vocabulary.SearchProviderConfig;
+
 public interface VocabularySearchService {
     SearchProvider getSearchProvider(SearchProviderConfig config);
 }

src/main/java/org/ohdsi/webapi/vocabulary/VocabularySearchServiceImpl.java

@@ -3,6 +3,8 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
+import org.ohdsi.vocabulary.SearchProvider;
+import org.ohdsi.vocabulary.SearchProviderConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;