upgrade to apache cayenne 4.1

Author: andponlin

haikudepotserver-core/pom.xml

@@ -111,6 +111,12 @@
             <artifactId>cayenne-server</artifactId>
         </dependency>
 
+        <!-- required for some of the more complex SQL queries -->
+        <dependency>
+            <groupId>org.apache.cayenne</groupId>
+            <artifactId>cayenne-velocity</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/api1/UserApiImpl.java

@@ -12,7 +12,7 @@
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.configuration.server.ServerRuntime;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.api1.model.user.*;
 import org.haiku.haikudepotserver.api1.support.*;
 import org.haiku.haikudepotserver.captcha.model.CaptchaService;

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/api1/UserRatingApiImpl.java

@@ -10,7 +10,7 @@
 import com.googlecode.jsonrpc4j.spring.AutoJsonRpcServiceImpl;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.api1.model.userrating.*;
 import org.haiku.haikudepotserver.api1.support.AuthorizationFailureException;
 import org.haiku.haikudepotserver.api1.support.ObjectNotFoundException;

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/naturallanguage/NaturalLanguageServiceImpl.java

@@ -173,7 +173,7 @@ private Map<String, Boolean> assembleNaturalLanguageCodeUseMap(Query codeQuery)
 
     private Map<String, Boolean> assembleNaturalLanguageCodeUseMap(String ejbqlCodeQuery) {
         EJBQLQuery query = new EJBQLQuery(ejbqlCodeQuery);
-        query.setCacheGroups(HaikuDepot.CacheGroup.NATURAL_LANGUAGE.name());
+        query.setCacheGroup(HaikuDepot.CacheGroup.NATURAL_LANGUAGE.name());
         query.setCacheStrategy(QueryCacheStrategy.SHARED_CACHE);
         return assembleNaturalLanguageCodeUseMap(query);
     }

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/pkg/PkgImportServiceImpl.java

@@ -10,7 +10,7 @@
 import com.google.common.collect.ImmutableList;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.dataobjects.*;
 import org.haiku.haikudepotserver.pkg.model.PkgImportService;
 import org.haiku.haikudepotserver.pkg.model.PkgLocalizationService;

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/pkg/PkgLocalizationServiceImpl.java

@@ -8,7 +8,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import org.apache.cayenne.ObjectContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.dataobjects.*;
 import org.haiku.haikudepotserver.pkg.model.PkgLocalizationService;
 import org.haiku.haikudepotserver.pkg.model.ResolvedPkgVersionLocalization;

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/pkg/PkgServiceImpl.java

@@ -82,7 +82,7 @@ public Optional<PkgVersion> getLatestPkgVersionForPkg(
                 repository,
                 Collections.singletonList(Architecture.getByCode(context, defaultArchitectureCode)));
 
-        if(!pkgVersionOptional.isPresent()) {
+        if(pkgVersionOptional.isEmpty()) {
             List<Architecture> architectures = Architecture.getAllExceptByCode(
                     context,
                     ImmutableList.of(Architecture.CODE_SOURCE, defaultArchitectureCode));
@@ -188,18 +188,15 @@ public Optional<PkgVersion> getCorrespondingSourcePkgVersion(
 
         Optional<Pkg> pkgSourceOptional = Pkg.tryGetByName(context, pkgVersion.getPkg().getName() + SUFFIX_PKG_SOURCE);
 
-        if(pkgSourceOptional.isPresent()) {
-            return Optional.ofNullable(ObjectSelect.query(PkgVersion.class)
-                    .where(PkgVersion.PKG.eq(pkgSourceOptional.get()))
-                    .and(PkgVersion.REPOSITORY_SOURCE.dot(RepositorySource.REPOSITORY)
-                            .eq(pkgVersion.getRepositorySource().getRepository()))
-                    .and(PkgVersion.ACTIVE.isTrue())
-                    .and(PkgVersion.ARCHITECTURE.eq(Architecture.getByCode(context, Architecture.CODE_SOURCE)))
-                    .and(ExpressionHelper.toExpression(pkgVersion.toVersionCoordinates(), null))
-                    .selectOne(context));
-        }
+        return pkgSourceOptional.map(pkg -> ObjectSelect.query(PkgVersion.class)
+                .where(PkgVersion.PKG.eq(pkg))
+                .and(PkgVersion.REPOSITORY_SOURCE.dot(RepositorySource.REPOSITORY)
+                        .eq(pkgVersion.getRepositorySource().getRepository()))
+                .and(PkgVersion.ACTIVE.isTrue())
+                .and(PkgVersion.ARCHITECTURE.eq(Architecture.getByCode(context, Architecture.CODE_SOURCE)))
+                .and(ExpressionHelper.toExpression(pkgVersion.toVersionCoordinates(), null))
+                .selectOne(context));
 
-        return Optional.empty();
     }
 
     // ------------------------------
@@ -510,7 +507,7 @@ public PkgProminence ensurePkgProminence(
         Preconditions.checkArgument(null != pkg, "the pkg must be provided");
         Optional<PkgProminence> pkgProminenceOptional = pkg.getPkgProminence(repository);
 
-        if (!pkgProminenceOptional.isPresent()) {
+        if (pkgProminenceOptional.isEmpty()) {
             PkgProminence pkgProminence = objectContext.newObject(PkgProminence.class);
             pkg.addToManyTarget(Pkg.PKG_PROMINENCES.getName(), pkgProminence, true);
             pkgProminence.setRepository(repository);

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgCategoryCoverageImportSpreadsheetJobRunner.java

@@ -31,7 +31,7 @@
 public class PkgCategoryCoverageImportSpreadsheetJobRunner
         extends AbstractPkgCategorySpreadsheetJobRunner<PkgCategoryCoverageImportSpreadsheetJobSpecification> {
 
-    private static Logger LOGGER = LoggerFactory.getLogger(PkgCategoryCoverageImportSpreadsheetJobRunner.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PkgCategoryCoverageImportSpreadsheetJobRunner.class);
 
     /**
      * <p>For the import process, this enum describes the action that was taken for a given import line.</p>
@@ -71,7 +71,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());
         }
 
@@ -178,7 +178,7 @@ public void run(
                             rowOutput.remove(rowOutput.size() - 1);
                             rowOutput.add(action.name());
 
-                            writer.writeNext(rowOutput.toArray(new String[rowOutput.size()]));
+                            writer.writeNext(rowOutput.toArray(new String[0]));
                         }
 
                     }

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/pkg/job/PkgIconExportArchiveJobRunner.java

@@ -11,7 +11,7 @@
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.query.SQLTemplate;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.dataobjects.PkgIcon;
 import org.haiku.haikudepotserver.pkg.model.PkgIconExportArchiveJobSpecification;
 import org.haiku.haikudepotserver.support.RuntimeInformationService;

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/support/ContributorsService.java

@@ -4,7 +4,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.haiku.haikudepotserver.support.model.Contributor;
 import org.springframework.stereotype.Service;