WIP [HTM-1076][HTM-1077] TMFeatureType event handler to propagate cha…

…nges to solr indexes

fix PMD style

fixup after API changes in #876

move testcases and remove now useless test, use solr service inject

fix rebase issues

src/main/java/org/tailormap/api/configuration/dev/PopulateTestData.java

@@ -19,9 +19,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.concurrent.TimeUnit;
-import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -77,6 +74,7 @@
 import org.tailormap.api.repository.UserRepository;
 import org.tailormap.api.security.InternalAdminAuthentication;
 import org.tailormap.api.solr.SolrHelper;
+import org.tailormap.api.solr.SolrService;
 import org.tailormap.api.viewer.model.AppStyling;
 import org.tailormap.api.viewer.model.Component;
 import org.tailormap.api.viewer.model.ComponentConfig;
@@ -107,16 +105,13 @@ public class PopulateTestData {
   @Value("${MAP5_URL:#{null}}")
   private String map5url;
 
-  @Value("${tailormap-api.solr-core-name:tailormap}")
-  private String solrCoreName;
-
   private final ApplicationContext appContext;
   private final UserRepository userRepository;
   private final GroupRepository groupRepository;
   private final CatalogRepository catalogRepository;
   private final GeoServiceRepository geoServiceRepository;
   private final GeoServiceHelper geoServiceHelper;
-
+  private final SolrService solrService;
   private final FeatureSourceRepository featureSourceRepository;
   private final ApplicationRepository applicationRepository;
   private final ConfigurationRepository configurationRepository;
@@ -136,6 +131,7 @@ public PopulateTestData(
       ConfigurationRepository configurationRepository,
       FeatureSourceFactoryHelper featureSourceFactoryHelper,
       SearchIndexRepository searchIndexRepository,
+      SolrService solrService,
       UploadRepository uploadRepository) {
     this.appContext = appContext;
     this.userRepository = userRepository;
@@ -148,6 +144,7 @@ public PopulateTestData(
     this.configurationRepository = configurationRepository;
     this.featureSourceFactoryHelper = featureSourceFactoryHelper;
     this.searchIndexRepository = searchIndexRepository;
+    this.solrService = solrService;
     this.uploadRepository = uploadRepository;
   }
 
@@ -169,7 +166,7 @@ public void populate() throws Exception {
       InternalAdminAuthentication.clearSecurityContextAuthentication();
     }
     if (exit) {
-      // Exit after transaction is completed - for 'mvn verify' to populate testdata before
+      // Exit after transaction is completed — for 'mvn verify' to populate testdata before
       // integration tests
       new Thread(
               () -> {
@@ -1344,23 +1341,9 @@ public void createSolrIndex() throws Exception {
       logger.info("Creating Solr index");
       @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
       final String solrUrl =
-          "http://"
-              + (connectToSpatialDbsAtLocalhost ? "127.0.0.1" : "solr")
-              + ":8983/solr/"
-              + solrCoreName;
-      SolrHelper solrHelper =
-          new SolrHelper(
-              new ConcurrentUpdateHttp2SolrClient.Builder(
-                      solrUrl,
-                      new Http2SolrClient.Builder()
-                          .useHttp1_1(true)
-                          .withFollowRedirects(true)
-                          .withConnectionTimeout(10000, TimeUnit.MILLISECONDS)
-                          .withRequestTimeout(60000, TimeUnit.MILLISECONDS)
-                          .build())
-                  .withQueueSize(SolrHelper.SOLR_BATCH_SIZE * 2)
-                  .withThreadCount(10)
-                  .build());
+          "http://" + (connectToSpatialDbsAtLocalhost ? "127.0.0.1" : "solr") + ":8983/solr/";
+      this.solrService.setSolrUrl(solrUrl);
+      SolrHelper solrHelper = new SolrHelper(this.solrService.getSolrClientForIndexing());
 
       GeoService geoService = geoServiceRepository.findById("snapshot-geoserver").orElseThrow();
       Application defaultApp = applicationRepository.findByName("default");

src/main/java/org/tailormap/api/controller/SearchController.java

@@ -12,10 +12,8 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.invoke.MethodHandles;
-import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.common.SolrException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,6 +35,7 @@
 import org.tailormap.api.persistence.json.AppTreeLayerNode;
 import org.tailormap.api.repository.SearchIndexRepository;
 import org.tailormap.api.solr.SolrHelper;
+import org.tailormap.api.solr.SolrService;
 import org.tailormap.api.viewer.model.SearchResponse;
 
 @AppRestController
@@ -50,17 +49,14 @@ public class SearchController {
 
   private final SearchIndexRepository searchIndexRepository;
 
-  @Value("${tailormap-api.solr-url}")
-  private String solrUrl;
-
-  @Value("${tailormap-api.solr-core-name:tailormap}")
-  private String solrCoreName;
-
   @Value("${tailormap-api.pageSize:100}")
   private int numResultsToReturn;
 
-  public SearchController(SearchIndexRepository searchIndexRepository) {
+  private final SolrService solrService;
+
+  public SearchController(SearchIndexRepository searchIndexRepository, SolrService solrService) {
     this.searchIndexRepository = searchIndexRepository;
+    this.solrService = solrService;
   }
 
   @Transactional(readOnly = true)
@@ -92,7 +88,7 @@ public ResponseEntity<Serializable> search(
                         "Layer '%s' does not have a search index"
                             .formatted(appTreeLayerNode.getLayerName())));
 
-    try (SolrClient solrClient = getSolrClient();
+    try (SolrClient solrClient = solrService.getSolrClientForSearching();
         SolrHelper solrHelper = new SolrHelper(solrClient)) {
       final SearchResponse searchResponse =
           solrHelper.findInIndex(searchIndex, solrQuery, start, numResultsToReturn);
@@ -109,11 +105,4 @@ public ResponseEntity<Serializable> search(
           HttpStatus.BAD_REQUEST, "Error while searching with given query", e);
     }
   }
-
-  private SolrClient getSolrClient() {
-    return new Http2SolrClient.Builder(solrUrl + solrCoreName)
-        .withConnectionTimeout(10, TimeUnit.SECONDS)
-        .withFollowRedirects(true)
-        .build();
-  }
 }

src/main/java/org/tailormap/api/controller/admin/SolrAdminController.java

@@ -14,16 +14,12 @@
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.NoSuchElementException;
-import java.util.concurrent.TimeUnit;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.response.SolrPingResponse;
 import org.apache.solr.common.SolrException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -41,37 +37,34 @@
 import org.tailormap.api.repository.FeatureTypeRepository;
 import org.tailormap.api.repository.SearchIndexRepository;
 import org.tailormap.api.solr.SolrHelper;
+import org.tailormap.api.solr.SolrService;
 import org.tailormap.api.viewer.model.ErrorResponse;
 
 /** Admin controller for Solr. */
 @RestController
 public class SolrAdminController {
-  @Value("${tailormap-api.solr-url}")
-  private String solrUrl;
-
-  @Value("${tailormap-api.solr-core-name:tailormap}")
-  private String solrCoreName;
-
   private static final Logger logger =
       LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final FeatureSourceFactoryHelper featureSourceFactoryHelper;
-
   private final FeatureTypeRepository featureTypeRepository;
   private final SearchIndexRepository searchIndexRepository;
+  private final SolrService solrService;
 
   public SolrAdminController(
       FeatureSourceFactoryHelper featureSourceFactoryHelper,
       FeatureTypeRepository featureTypeRepository,
-      SearchIndexRepository searchIndexRepository) {
+      SearchIndexRepository searchIndexRepository,
+      SolrService solrService) {
     this.featureSourceFactoryHelper = featureSourceFactoryHelper;
     this.featureTypeRepository = featureTypeRepository;
     this.searchIndexRepository = searchIndexRepository;
+    this.solrService = solrService;
   }
 
   /**
    * Ping solr.
    *
-   * @return the response entity (ok or an error response)
+   * @return the response entity (OK or an error response)
    */
   @Operation(summary = "Ping Solr", description = "Ping Solr to check if it is available")
   @ApiResponse(
@@ -92,7 +85,7 @@ public SolrAdminController(
       path = "${tailormap-api.admin.base-path}/index/ping",
       produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<?> pingSolr() {
-    try (SolrClient solrClient = getSolrClient()) {
+    try (SolrClient solrClient = solrService.getSolrClientForIndexing()) {
       final SolrPingResponse ping = solrClient.ping();
       logger.info("Solr ping status {}", ping.getResponse().get("status"));
       return ResponseEntity.ok(
@@ -111,24 +104,6 @@ public ResponseEntity<?> pingSolr() {
     }
   }
 
-  /**
-   * Get a concurrent update Solr client for bulk operations.
-   *
-   * @return the Solr client
-   */
-  private SolrClient getSolrClient() {
-    return new ConcurrentUpdateHttp2SolrClient.Builder(
-            solrUrl + solrCoreName,
-            new Http2SolrClient.Builder()
-                .withFollowRedirects(true)
-                .withConnectionTimeout(10000, TimeUnit.MILLISECONDS)
-                .withRequestTimeout(60000, TimeUnit.MILLISECONDS)
-                .build())
-        .withQueueSize(SolrHelper.SOLR_BATCH_SIZE * 2)
-        .withThreadCount(10)
-        .build();
-  }
-
   /**
    * (re-) Index a layer.
    *
@@ -195,7 +170,7 @@ public ResponseEntity<?> index(@PathVariable Long searchIndexId) {
     boolean createNewIndex =
         (null == searchIndex.getLastIndexed()
             || searchIndex.getStatus() == SearchIndex.Status.INITIAL);
-    try (SolrClient solrClient = getSolrClient();
+    try (SolrClient solrClient = solrService.getSolrClientForIndexing();
         SolrHelper solrHelper = new SolrHelper(solrClient)) {
       solrHelper.addFeatureTypeIndex(searchIndex, indexingFT, featureSourceFactoryHelper);
       searchIndexRepository.save(searchIndex);
@@ -244,7 +219,7 @@ public ResponseEntity<?> index(@PathVariable Long searchIndexId) {
       produces = MediaType.APPLICATION_JSON_VALUE)
   @Transactional
   public ResponseEntity<?> clearIndex(@PathVariable Long searchIndexId) {
-    try (SolrClient solrClient = getSolrClient();
+    try (SolrClient solrClient = solrService.getSolrClientForIndexing();
         SolrHelper solrHelper = new SolrHelper(solrClient)) {
       solrHelper.clearIndexForLayer(searchIndexId);
       // do not delete the SearchIndex metadata object

src/main/java/org/tailormap/api/repository/ApplicationRepository.java

@@ -5,8 +5,11 @@
  */
 package org.tailormap.api.repository;
 
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.lang.NonNull;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.tailormap.api.persistence.Application;
@@ -21,4 +24,17 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>
   @Override
   @NonNull
   Optional<Application> findById(@NonNull Long aLong);
+
+  /**
+   * Find all applications that have a layer that is linked to a specific (Solr) index.
+   *
+   * @param indexId The index id to search for
+   */
+  @NonNull
+  @PreAuthorize("permitAll()")
+  @Query(
+      value =
+          "select * from application app, lateral jsonb_path_query(app.settings, ('$.layerSettings.**{1}.searchIndexId ? (@ == '||:indexId||')')::jsonpath)",
+      nativeQuery = true)
+  List<Application> findByIndexId(@Param("indexId") @NonNull Long indexId);
 }