Merge branch 'master' into geometries

Author: azahnen

gradle/libs.versions.toml

@@ -4,10 +4,10 @@ xsom = '20140925'
 aalto = '1.3.3'
 staxmate = '2.4.1'
 rxjava-jdbc = '0.1.4-ii.1'
-hikaricp = '7.0.1'
+hikaricp = '7.0.2'
 postgresql = '42.7.7'
 sqlite = '3.50.3.0'
-schemacrawler = '16.26.3'
+schemacrawler = '16.27.1'
 jsqlparser = '5.3'
 jts = '1.20.0'
 commonmark = '0.25.1'

settings.gradle

@@ -20,7 +20,7 @@ buildscript {
 }
 
 plugins {
-    id "de.interactive_instruments.xtraplatform-settings" version "6.1.7"
+    id "de.interactive_instruments.xtraplatform-settings" version "6.1.8"
 }
 
 def versions =  xtraplatform.getCatalogVersions(file("gradle/layers.versions.toml"))

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/app/TileSeedingJobCreator.java

@@ -59,14 +59,19 @@ public String getJobType() {
     return TileSeedingJobSet.TYPE_SETUP;
   }
 
+  @Override
+  public int getPriority() {
+    // should be higher than for the processors of the created jobs (VectorSeedingJobProcessor)
+    return 1001;
+  }
+
   @Override
   public int getConcurrency(JobSet jobSet) {
     return concurrency;
   }
 
   @Override
   public JobResult process(Job job, JobSet jobSet, Consumer<Job> pushJob) {
-
     TileSeedingJobSet seedingJobSet = getSetDetails(jobSet);
     boolean isCleanup = getDetails(job);
 
@@ -101,13 +106,11 @@ public JobResult process(Job job, JobSet jobSet, Consumer<Job> pushJob) {
         if (LOGGER.isInfoEnabled() || LOGGER.isInfoEnabled(MARKER.JOBS)) {
           LOGGER.info(
               MARKER.JOBS,
-              "{} started (Tilesets: {})",
+              "{} scheduled (Tilesets: {})",
               jobSet.getLabel(),
               seedingJobSet.getTileSets().keySet());
         }
 
-        jobSet.start();
-
         Map<String, Map<String, Set<TileMatrixSetLimits>>> coverage =
             tileProvider.seeding().get().getCoverage(seedingJobSet.getTileSetParameters());
         Map<String, Map<String, Set<TileMatrixSetLimits>>> rasterCoverage =
@@ -173,6 +176,7 @@ public JobResult process(Job job, JobSet jobSet, Consumer<Job> pushJob) {
                   Job job2 =
                       isRaster
                           ? TileSeedingJob.raster(
+                              jobSet.getPriority(),
                               tileProvider.getId(),
                               tileSet,
                               tileMatrixSet,
@@ -184,6 +188,7 @@ public JobResult process(Job job, JobSet jobSet, Consumer<Job> pushJob) {
                                   .get()
                                   .getRasterStorageInfo(tileSet, tileMatrixSet, subMatrix))
                           : TileSeedingJob.of(
+                              jobSet.getPriority(),
                               tileProvider.getId(),
                               tileSet,
                               tileMatrixSet,

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/app/VectorSeedingJobProcessor.java

@@ -48,6 +48,11 @@ public String getJobType() {
     return TileSeedingJob.TYPE_MVT;
   }
 
+  @Override
+  public int getPriority() {
+    return 1000;
+  }
+
   @Override
   public int getConcurrency(JobSet jobSet) {
     return concurrency;

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/domain/SeedingOptions.java

@@ -117,23 +117,19 @@ default boolean shouldPurge() {
   }
 
   /**
-   * @langEn The maximum number of threads the seeding is allowed to use. The actual number of
-   *     threads used depends on the number of available background task threads when the seeding is
-   *     about to start. If you want to allow more than thread, first check if sufficient background
-   *     task threads are configured. Take into account that the seeding for multiple APIs will
-   *     compete for the available background task threads.
-   * @langDe Die maximale Anzahl an Threads, die für das Seeding verwendet werden darf. Die
-   *     tatsächlich verwendete Zahl der Threads hängt davon ab, wie viele Threads für
-   *     [Hintergrundprozesse](../../application/20-configuration/90-background-tasks.md) zur
-   *     Verfügung stehen, wenn das Seeding startet. Wenn mehr als ein Thread erlaubt sein soll, ist
-   *     zunächst zu prüfen, ob genügend Threads fürHintergrundprozesse konfiguriert sind. Es ist zu
-   *     berücksichtigen, dass alle APIs um die vorhandenen Threads für Hintergrundprozesse
-   *     konkurrieren.
+   * @langEn *Deprecated* This option has no effect anymore. All available background task threads
+   *     will be used for seeding. You can control the order of execution by setting the `priority`
+   *     of the seeding job.
+   * @langDe *Deprecated* Diese Option hat keine Auswirkung mehr. Alle verfügaren Threads für
+   *     Hintergrundprozesse werden für das Seeding verwendet. Die Reihenfolge der Ausführung kann
+   *     über die `priority` des Seeding-Jobs gesteuert werden.
    * @default 1
    */
+  @Deprecated(since = "v4.5", forRemoval = true)
   @Nullable
   Integer getMaxThreads();
 
+  @Deprecated(since = "v4.5", forRemoval = true)
   @Value.Lazy
   @JsonIgnore
   default int getEffectiveMaxThreads() {
@@ -156,4 +152,23 @@ default int getEffectiveMaxThreads() {
   default int getEffectiveJobSize() {
     return Objects.requireNonNullElse(getJobSize(), JobSize.M).getNumberOfTiles();
   }
+
+  /**
+   * @langEn The priority of the seeding job. This controls the order in which this seeding job is
+   *     executed compared to other seeding jobs. A higher number means that the seeding job is
+   *     executed earlier.
+   * @langDe Die Priorität des Seeding-Jobs. Diese steuert die Reihenfolge, in der dieser
+   *     Seeding-Job im Vergleich zu anderen Seeding-Jobs ausgeführt wird. Eine höhere Zahl
+   *     bedeutet, dass der Seeding-Job früher ausgeführt wird.
+   * @since v4.5
+   * @default 1000
+   */
+  @Nullable
+  Integer getPriority();
+
+  @Value.Lazy
+  @JsonIgnore
+  default int getEffectivePriority() {
+    return Objects.requireNonNullElse(getPriority(), 1000);
+  }
 }

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/domain/TileSeedingJob.java

@@ -25,6 +25,7 @@ public interface TileSeedingJob {
   String TYPE_PNG = TileSeedingJobSet.type("raster", "png");
 
   static Job of(
+      int priority,
       String tileProvider,
       String tileSet,
       String tileMatrixSet,
@@ -43,10 +44,11 @@ static Job of(
             .addAllSubMatrices(subMatrices)
             .build();
 
-    return Job.of(TYPE_MVT, details, jobSetId, (int) details.getNumberOfTiles());
+    return Job.of(TYPE_MVT, priority, details, jobSetId, (int) details.getNumberOfTiles());
   }
 
   static Job raster(
+      int priority,
       String tileProvider,
       String tileSet,
       String tileMatrixSet,
@@ -65,7 +67,7 @@ static Job raster(
             .storage(storageInfo)
             .build();
 
-    return Job.of(TYPE_PNG, details, jobSetId, (int) details.getNumberOfTiles());
+    return Job.of(TYPE_PNG, priority, details, jobSetId, (int) details.getNumberOfTiles());
   }
 
   String getTileProvider();

xtraplatform-tiles/src/main/java/de/ii/xtraplatform/tiles/domain/TileSeedingJobSet.java

@@ -34,9 +34,13 @@ static String type(String... parts) {
   }
 
   static JobSet of(
-      String tileProvider, Map<String, TileGenerationParameters> tileSets, boolean reseed) {
+      String tileProvider,
+      Map<String, TileGenerationParameters> tileSets,
+      boolean reseed,
+      int priority) {
     return JobSet.of(
             TYPE,
+            priority,
             tileProvider,
             LABEL,
             String.format(" (Tilesets: %s)", tileSets.keySet()),
@@ -45,7 +49,7 @@ static JobSet of(
                 .tileSets(TilesetDetails.of(tileSets))
                 .isReseed(reseed)
                 .build())
-        .with(Job.of(TYPE_SETUP, false), Job.of(TYPE_SETUP, true));
+        .with(Job.of(TYPE_SETUP, priority, false), Job.of(TYPE_SETUP, priority, true));
   }
 
   static JobSet with(JobSet jobSet, Map<String, TileGenerationParameters> tileSets) {
@@ -61,6 +65,13 @@ static JobSet with(JobSet jobSet, Map<String, TileGenerationParameters> tileSets
 
   Map<String, TilesetDetails> getTileSets();
 
+  @JsonIgnore
+  @Value.Lazy
+  @Override
+  default String getLabel() {
+    return "Tilesets: " + getTileSets().keySet();
+  }
+
   @JsonIgnore
   @Value.Lazy
   default Map<String, TileGenerationParameters> getTileSetParameters() {