Merge pull request #77 from jfisbein/feat/migrate_to_java_17

Feat/migrate to java 17

Author: jfisbein

.github/workflows/maven.yml

@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2.4.0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 11
-          distribution: 'adopt'
+          java-version: 17
+          distribution: 'temurin'
 
       - name: Cache Maven packages
         uses: actions/cache@v2.1.7

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

Dockerfile

@@ -1,8 +1,8 @@
-FROM maven:3.6-jdk-11 as maven
+FROM maven:3.8-eclipse-temurin-17 as maven
 COPY ./pom.xml ./pom.xml
 COPY ./src ./src
 RUN mvn package --batch-mode
 
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:17
 COPY --from=maven target/imapcopy-*.jar /imapcopy.jar
 ENTRYPOINT ["java", "-jar", "/imapcopy.jar"]

mvnw

@@ -13,7 +13,7 @@
   </scm>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>${java.version}</maven.compiler.source>

mvnw.cmd

@@ -1,5 +1,6 @@
 package com.fisbein.joan.model;
 
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.collections4.Predicate;
@@ -59,11 +60,7 @@ public static void main(String[] args) {
     private void init() throws MessagingException {
         openSourceConnection(imapSource);
         openTargetConnection(imapTarget);
-        if (toDate != null) {
-            toDate = toDate.plusDays(1);
-        } else {
-            toDate = LocalDate.now().plusDays(1);
-        }
+        toDate = Objects.requireNonNullElseGet(toDate, LocalDate::now).plusDays(1);
 
         Set<String> aux = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
         aux.addAll(filteredFolders);
@@ -383,7 +380,7 @@ public void run() {
         }
     }
 
-    class MessageFilterPredicate implements Predicate<Message> {
+    static class MessageFilterPredicate implements Predicate<Message> {
         Set<String> messagesId = new HashSet<>();
 
         MessageFilterPredicate(Message[] filterMessages) {