upgrade libraries and adjust code to suit

haiku · Mar 14, 2022 · 705b4e6 · 705b4e6
1 parent 5334e1a
commit 705b4e6
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 79 deletions.
diff --git a/haikudepotserver-api2/pom.xml b/haikudepotserver-api2/pom.xml
@@ -36,7 +36,7 @@
             <artifactId>validation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
         <dependency>

diff --git a/haikudepotserver-core/src/main/java/db/haikudepot/support/EnsureScreenshotHash.java b/haikudepotserver-core/src/main/java/db/haikudepot/support/EnsureScreenshotHash.java
@@ -1,13 +1,14 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
 package db.haikudepot.support;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +24,7 @@
  * changes and would get complicated.</p>
  */
 
-public abstract class EnsureScreenshotHash implements JdbcMigration {
+public abstract class EnsureScreenshotHash extends BaseJavaMigration {
 
     protected static final Logger LOGGER = LoggerFactory.getLogger(EnsureScreenshotHash.class);
 
@@ -36,7 +37,11 @@ public abstract class EnsureScreenshotHash implements JdbcMigration {
     public abstract String createScreenshotIdStatement();
 
     @Override
-    public void migrate(Connection connection) throws Exception {
+    public void migrate(Context context) throws Exception {
+        migrate(context.getConnection());
+    }
+
+    protected void migrate(Connection connection) throws Exception {
 
         int total = countScreenshotsWithoutHash(connection);
 

diff --git a/...ava/org/haiku/haikudepotserver/pkg/job/PkgCategoryCoverageExportSpreadsheetJobRunner.java b/...ava/org/haiku/haikudepotserver/pkg/job/PkgCategoryCoverageExportSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -70,7 +70,7 @@ public void run(
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
 
             // headers

diff --git a/...ava/org/haiku/haikudepotserver/pkg/job/PkgCategoryCoverageImportSpreadsheetJobRunner.java b/...ava/org/haiku/haikudepotserver/pkg/job/PkgCategoryCoverageImportSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -9,6 +9,7 @@
 import com.google.common.net.MediaType;
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
+import com.opencsv.exceptions.CsvValidationException;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.haiku.haikudepotserver.dataobjects.Pkg;
@@ -78,7 +79,7 @@ public void run(
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',');
+                CSVWriter writer = new CSVWriter(outputStreamWriter);
                 InputStream inputStream = jobDataWithByteSourceOptional.get().getByteSource().openStream();
                 InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
                 CSVReader reader = new CSVReader(inputStreamReader);
@@ -190,6 +191,8 @@ public void run(
                 return null;
             });
 
+        } catch (CsvValidationException e) {
+            throw new JobRunnerException("unable to validate the csv data", e);
         }
 
     }

diff --git a/...-core/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgIconImportArchiveJobRunner.java b/...-core/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgIconImportArchiveJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -101,7 +101,7 @@ public void run(
 
         Optional<JobDataWithByteSource> jobDataWithByteSourceOptional = jobService.tryObtainData(specification.getInputDataGuid());
 
-        if(!jobDataWithByteSourceOptional.isPresent()) {
+        if(jobDataWithByteSourceOptional.isEmpty()) {
             throw new IllegalStateException("the job data was not able to be found for guid; " + specification.getInputDataGuid());
         }
 
@@ -110,7 +110,7 @@ public void run(
             try (
                     OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                     OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                    CSVWriter writer = new CSVWriter(outputStreamWriter, ',')) {
+                    CSVWriter writer = new CSVWriter(outputStreamWriter)) {
 
                 String[] headings = new String[]{"path", "action", "message"};
                 writer.writeNext(headings);
@@ -238,7 +238,7 @@ private ArchiveEntryResult processMatchingFileEntryFromArchive(
             Optional<org.haiku.haikudepotserver.dataobjects.MediaType> mediaType =
                     org.haiku.haikudepotserver.dataobjects.MediaType.getByExtension(context, leafnameExtension);
 
-            if (!mediaType.isPresent()) {
+            if (mediaType.isEmpty()) {
                 return new ArchiveEntryResult(Action.INVALID, "unknown file-extension");
             }
 

diff --git a/...er-core/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgIconSpreadsheetJobRunner.java b/...er-core/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgIconSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -77,7 +77,7 @@ public void run(
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
             final List<PkgIconConfiguration> pkgIconConfigurations = pkgIconService.getInUsePkgIconConfigurations(context);
 

diff --git a/...org/haiku/haikudepotserver/pkg/job/PkgLocalizationCoverageExportSpreadsheetJobRunner.java b/...org/haiku/haikudepotserver/pkg/job/PkgLocalizationCoverageExportSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -35,11 +35,11 @@
 public class PkgLocalizationCoverageExportSpreadsheetJobRunner
         extends AbstractJobRunner<PkgLocalizationCoverageExportSpreadsheetJobSpecification> {
 
-    private static Logger LOGGER = LoggerFactory.getLogger(PkgLocalizationCoverageExportSpreadsheetJobRunner.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(PkgLocalizationCoverageExportSpreadsheetJobRunner.class);
 
-    private ServerRuntime serverRuntime;
-    private PkgService pkgService;
-    private NaturalLanguageService naturalLanguageService;
+    final private ServerRuntime serverRuntime;
+    final private PkgService pkgService;
+    final private NaturalLanguageService naturalLanguageService;
 
     public PkgLocalizationCoverageExportSpreadsheetJobRunner(
             ServerRuntime serverRuntime,
@@ -92,7 +92,7 @@ public void run(
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
 
             final String[] cells = new String[1 + naturalLanguages.size()];

diff --git a/...va/org/haiku/haikudepotserver/pkg/job/PkgProminenceAndUserRatingSpreadsheetJobRunner.java b/...va/org/haiku/haikudepotserver/pkg/job/PkgProminenceAndUserRatingSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -68,7 +68,7 @@ public void run(JobService jobService, PkgProminenceAndUserRatingSpreadsheetJobS
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
 
             writer.writeNext(new String[]{

diff --git a/...src/main/java/org/haiku/haikudepotserver/pkg/job/PkgScreenshotImportArchiveJobRunner.java b/...src/main/java/org/haiku/haikudepotserver/pkg/job/PkgScreenshotImportArchiveJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -106,7 +106,7 @@ public void run(
             try (
                     OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                     OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                    CSVWriter writer = new CSVWriter(outputStreamWriter, ',')) {
+                    CSVWriter writer = new CSVWriter(outputStreamWriter)) {
 
                 Map<String, ScreenshotImportMetadatas> metadatas = new HashMap<>();
 

diff --git a/...e/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgScreenshotSpreadsheetJobRunner.java b/...e/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgScreenshotSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -66,7 +66,7 @@ public void run(
         try (
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
             String[] headings = new String[]{
                     "pkg-name",

diff --git a/...ku/haikudepotserver/pkg/job/PkgVersionLocalizationCoverageExportSpreadsheetJobRunner.java b/...ku/haikudepotserver/pkg/job/PkgVersionLocalizationCoverageExportSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -103,7 +103,7 @@ public void run(
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
 
             final String[] cells = new String[4 + naturalLanguages.size()];

diff --git a/.../java/org/haiku/haikudepotserver/security/job/AuthorizationRulesSpreadsheetJobRunner.java b/.../java/org/haiku/haikudepotserver/security/job/AuthorizationRulesSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020, Andrew Lindesay
+ * Copyright 2016-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -23,7 +23,6 @@
 import org.haiku.haikudepotserver.support.DateTimeHelper;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -59,7 +58,7 @@ public void run(
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
 
             writer.writeNext(new String[]{

diff --git a/...r-core/src/main/java/org/haiku/haikudepotserver/support/db/migration/ManagedDatabase.java b/...r-core/src/main/java/org/haiku/haikudepotserver/support/db/migration/ManagedDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -65,11 +65,15 @@ private void migrate() {
             Preconditions.checkNotNull(getDataSource());
             Preconditions.checkState(!Strings.isNullOrEmpty(getSchema()));
 
-            Flyway flyway = new Flyway();
-            flyway.setSchemas(getSchema());
-            flyway.setLocations(String.format("db/%s/migration", getSchema()));
-            flyway.setValidateOnMigrate(null==validateOnMigrate || validateOnMigrate);
-            flyway.setDataSource(dataSource);
+            Flyway flyway = Flyway
+                    .configure()
+                    .schemas(getSchema())
+                    .dataSource(dataSource)
+                    .locations(String.format("db/%s/migration", getSchema()))
+                    .validateOnMigrate(null == validateOnMigrate || validateOnMigrate)
+                    .table("schema_version")
+                        // ^ note this was an older Flyway table name
+                    .load();
 
             LOGGER.info("will migrate database to latest version...");
             flyway.migrate();

diff --git a/...c/main/java/org/haiku/haikudepotserver/userrating/job/UserRatingSpreadsheetJobRunner.java b/...c/main/java/org/haiku/haikudepotserver/userrating/job/UserRatingSpreadsheetJobRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -75,7 +75,7 @@ public void run(JobService jobService, UserRatingSpreadsheetJobSpecification spe
         try(
                 OutputStream outputStream = jobDataWithByteSink.getByteSink().openBufferedStream();
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                CSVWriter writer = new CSVWriter(outputStreamWriter, ',')
+                CSVWriter writer = new CSVWriter(outputStreamWriter)
         ) {
 
             Optional<Pkg> paramPkgOptional = Optional.empty();

diff --git a/...ava/org/haiku/haikudepotserver/userrating/model/UserRatingDerivationJobSpecification.java b/...ava/org/haiku/haikudepotserver/userrating/model/UserRatingDerivationJobSpecification.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2016, Andrew Lindesay
+ * Copyright 2014-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
 package org.haiku.haikudepotserver.userrating.model;
 
-import org.flywaydb.core.internal.util.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.job.model.AbstractJobSpecification;
 import org.haiku.haikudepotserver.job.model.JobSpecification;
 
@@ -50,7 +50,7 @@ public boolean appliesToAllPkgs() {
     public boolean isEquivalent(JobSpecification other) {
         if(super.isEquivalent(other)) {
             UserRatingDerivationJobSpecification other2 = (UserRatingDerivationJobSpecification) other;
-            return ObjectUtils.nullSafeEquals(other2.getPkgName(), getPkgName());
+            return StringUtils.equals(other2.getPkgName(), getPkgName());
         }
 
         return false;