Update to Java 17

juseppe-cli/pom.xml

@@ -45,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>

juseppe-cli/src/main/java/ru/lanwen/jenkins/juseppe/JuseppeCli.java

@@ -31,8 +31,8 @@ public static void main(String[] args) {
         Runnable parse = builder.build().parse(args);
         parse.run();
 
-        if (parse instanceof JuseppeCommand) {
-            System.exit(((JuseppeCommand) parse).getExitCode());
+        if (parse instanceof JuseppeCommand command) {
+            System.exit(command.getExitCode());
         }
     }
 

juseppe-cli/src/main/java/ru/lanwen/jenkins/juseppe/cli/EnvCommand.java

@@ -3,7 +3,6 @@
 import io.airlift.airline.Command;
 import ru.lanwen.jenkins.juseppe.props.JuseppeEnvVars.JuseppeEnvEnum;
 
-import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Stream.of;
 
@@ -16,7 +15,7 @@ public class EnvCommand implements Runnable {
     @Override
     public void run() {
         System.out.println(of(JuseppeEnvEnum.values())
-                        .map(env -> format("\t%s (%s) %n\t\t- %s%n\t\tresolved: %s%n",
+                        .map(env -> "\t%s (%s) %n\t\t- %s%n\t\tresolved: %s%n".formatted(
                                 env.name(), env.mapping(), env.description(), env.resolved()))
                         .collect(joining("\n"))
         );

juseppe-cli/src/main/java/ru/lanwen/jenkins/juseppe/cli/PrintCertCommand.java

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -23,7 +23,7 @@ public class PrintCertCommand implements Runnable {
     @Override
     public void run() {
         try {
-            Files.readAllLines(Paths.get(Props.populated().getCertPath()), UTF_8).forEach(System.out::println);
+            Files.readAllLines(Path.of(Props.populated().getCertPath()), UTF_8).forEach(System.out::println);
         } catch (IOException e) {
             LOG.error("Can't read certificate {}", Props.populated().getCertPath(), e);
         }

juseppe-cli/src/main/java/ru/lanwen/jenkins/juseppe/files/WatchFiles.java

@@ -7,7 +7,6 @@
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
@@ -19,7 +18,6 @@
 import ru.lanwen.jenkins.juseppe.gen.UpdateSiteGen;
 import ru.lanwen.jenkins.juseppe.props.Props;
 
-import static java.lang.String.format;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
@@ -45,9 +43,9 @@ private WatchFiles() {
 
     public WatchFiles configureFor(Props props) throws IOException {
         this.props = props;
-        path = Paths.get(props.getPluginsDir());
+        path = Path.of(props.getPluginsDir());
         this.keys = new HashMap<>();
-        setName(format("file-watcher-%s", path.getFileName()));
+        setName("file-watcher-%s".formatted(path.getFileName()));
 
         watcher = this.path.getFileSystem().newWatchService();
         walkAndRegisterDirectories(path);

juseppe-cli/src/test/java/ru/lanwen/jenkins/juseppe/cli/ServeCommandTest.java

@@ -4,7 +4,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 
 /**
  * @author lanwen (Merkushev Kirill)
@@ -21,7 +21,7 @@ public void shouldFetchUpdateCenter() throws Exception {
                 .log().all()
                 .expect()
                 .log().status()
-                .get("update-center.json").then().assertThat().statusCode(200);
+                .when().get("update-center.json").then().assertThat().statusCode(200);
     }
 
     @Test(timeout = 10000)
@@ -31,7 +31,7 @@ public void shouldFetchHpi() throws Exception {
                 .log().all()
                 .expect()
                 .log().status()
-                .get("clang-scanbuild-plugin.hpi").then().assertThat().statusCode(200);
+                .when().get("clang-scanbuild-plugin.hpi").then().assertThat().statusCode(200);
     }
 
     @Test(timeout = 10000)
@@ -41,6 +41,6 @@ public void shouldFetchJpi() throws Exception {
                 .log().all()
                 .expect()
                 .log().status()
-                .get("sample-pipeline-dsl-ext-plugin-0.1.0.jpi").then().assertThat().statusCode(200);
+                .when().get("sample-pipeline-dsl-ext-plugin-0.1.0.jpi").then().assertThat().statusCode(200);
     }
 }

juseppe-cli/src/test/java/ru/lanwen/jenkins/juseppe/cli/ServeRule.java

@@ -11,7 +11,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import static com.google.common.io.Resources.getResource;
-import static java.lang.String.format;
 
 /**
  * @author lanwen (Merkushev Kirill)
@@ -45,7 +44,7 @@ protected void after() {
     }
 
     public URI uri() {
-        return URI.create(format("http://localhost:%s", port));
+        return URI.create("http://localhost:%s".formatted(port));
     }
 
     private Integer findRandomOpenPortOnAllLocalInterfaces() throws IOException {

juseppe-cli/src/test/resources/serve/cert/uc.crt

@@ -1,19 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDDjCCAfYCCQCxvzbj/rKRGTANBgkqhkiG9w0BAQsFADBJMQswCQYDVQQGEwJF
-TjEWMBQGA1UECAwNVXBkYXRlLUNlbnRlcjEQMA4GA1UEBwwHSnVzZXBwZTEQMA4G
-A1UECgwHSnVzZXBwZTAeFw0xODA2MTUwNDA1MzlaFw0yMTA1MDYwNDA1MzlaMEkx
-CzAJBgNVBAYTAkVOMRYwFAYDVQQIDA1VcGRhdGUtQ2VudGVyMRAwDgYDVQQHDAdK
-dXNlcHBlMRAwDgYDVQQKDAdKdXNlcHBlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAoAhYmHhRmtI+afJtctDoyiXDnyfj6UHxqWnYXBO39xMCDHTjWmYd
-kCLjzzNRl8d+MmfmX8XHfJy3iOpFa9sxACf12lQ/kd1PuYkNbJ9mQCmVJD3XG6wo
-MrKKex4ot7DMnkIDCf5Q+zPwlo/GEkiMQSZy8JWpBLPVm4GTodAwQhgGojGwz2Tl
-NO675wEnoe+Y0jXpInDiBbPSwero0ZFKL2t+tl4jATStT6u6BnDdiwpnEC7fwXZt
-4lf4MgTVmo+C7cxeCM0QEso7UqFA8i+ZouBJ6QXJpdjHvNs/aMJD/Z+UrZa/BI1p
-XH0xkrXWJnOqFZYt8HjyuFTuC4DA/Yp66QIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQCb6+8/joVAUiwStLlzvBm3fHNErlQeiVSAh3T6pneGxYIkwTQlVLMND5ilsPlU
-S00+/mmKZurQGRVFY8xgHaJjh5/qo8joFSKdvc7H551VdxEcvkdw0SLgUKzCklmt
-1Wzup4dgwGEFtvWm9H52BS/rNZhWtnSe1HjgAUOPjUjxdJUqQCM2PFdaDDsAV6sR
-X7fZg3ZfaAKV3E+5Lq6gQ/69Q16apVNoX3izxDV3aJBPepOzFX9s3CtEaD+nPoAI
-VX9sAN6BzqJk2YUP3pvOCpXbwP/dOu14ciRLGA+l9GX2HYA2egXi5FALmuM73+5e
-zRkwxOCpTGDLCA9qijsalmC5
+MIIDczCCAlugAwIBAgIUPvoodXR8zVWtqT8O3VwATjUnydYwDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCRU4xFjAUBgNVBAgMDVVwZGF0ZS1DZW50ZXIxEDAOBgNV
+BAcMB0p1c2VwcGUxEDAOBgNVBAoMB0p1c2VwcGUwHhcNMjQxMjAyMjEyMTEzWhcN
+MjcxMDI0MjEyMTEzWjBJMQswCQYDVQQGEwJFTjEWMBQGA1UECAwNVXBkYXRlLUNl
+bnRlcjEQMA4GA1UEBwwHSnVzZXBwZTEQMA4GA1UECgwHSnVzZXBwZTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMai9O9VeGikL5YabJTgFLecZAPCCdse
+JwJTsg2Q1p4v8jkNFpNwvn/Ot0BpI/DIkxuj3nKKsTK4YIrAx+nja48jIwzJb8+2
+ta1Zk8kA0gXZ80oP/Y3T61RyUMrA+31cobMV9XRhtKhzaZqfRqO0myjpyfPQSmKY
+p2BU8AliMHXgSqVLrAw1hvJCRW0IOdWeZ9wMulMQ5OSKELeJRpGsALQvElFF4E2/
+uXkE/tLyNjVMaTM/OJrrfyfmtcQPD2z84MYZBnVT5zyv2S+M0UZMWV2m78691Gsf
+ig20QSsZHz1cM0i/88Q1AewPJM4s6BJnJdJ4OfGMDLpEoWOafBfXyFkCAwEAAaNT
+MFEwHQYDVR0OBBYEFFWgxzAg/uEI5abnyPAw5e5WwERlMB8GA1UdIwQYMBaAFFWg
+xzAg/uEI5abnyPAw5e5WwERlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBADtexTuCwtzmd7JonEVLTuLGOd05Q4SyTvc/ccpyiv6xCWEDpVMZCz6Z
+7wloTLArKq43kkWHf0h0sKQ4PaXc5z8t6lCfb+1E/PVmie6fs4e/5zz52z7ALlB7
+I6qKZobyb997JbtZhlNdIYFlQW6SShGKntWYyfjS3SCK0Je3ObQruN0/fd1B1Ld2
+4n0MKR7uswYoaJC3xiOcSFUSQq9LbnGsxSyZzHNTaPHVmFxXxGESfFueO0SyjG/Q
+xUiOM3gKu/HPPjqhKiT4bg76RBt0uRchcozViKWkvnHZh6rR5OOX+CLMegTXIVsh
+QV2VZkuOb0ZMPC/7I9rY/S8PLMdt4ps=
 -----END CERTIFICATE-----

juseppe-cli/src/test/resources/serve/cert/uc.key

@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAoAhYmHhRmtI+afJtctDoyiXDnyfj6UHxqWnYXBO39xMCDHTj
-WmYdkCLjzzNRl8d+MmfmX8XHfJy3iOpFa9sxACf12lQ/kd1PuYkNbJ9mQCmVJD3X
-G6woMrKKex4ot7DMnkIDCf5Q+zPwlo/GEkiMQSZy8JWpBLPVm4GTodAwQhgGojGw
-z2TlNO675wEnoe+Y0jXpInDiBbPSwero0ZFKL2t+tl4jATStT6u6BnDdiwpnEC7f
-wXZt4lf4MgTVmo+C7cxeCM0QEso7UqFA8i+ZouBJ6QXJpdjHvNs/aMJD/Z+UrZa/
-BI1pXH0xkrXWJnOqFZYt8HjyuFTuC4DA/Yp66QIDAQABAoIBAFogeSzdTjAgSfBH
-DObFyuTV4dcHky6x6dTcfHJW1Jt8hAHZ7pThv7KGQ8BUiZYuTt86bp7vdwqyBBdC
-wPgeSPlqh+Z+3hJbDmRSUFIlb2OhR5JSlYvLKBRtQtpVwN663nIegTGmnZrrxIo2
-zHlNjFfAvKjL0JWKZjme/zL5WcROeWF0O3lYJyUt8gNEWC61/LhiEgpXVUYr99PJ
-WolguCTZqDpPn9YTnf6ST6/x3Xa8hDBFgTpFIpnsV9FupB5CcBuiAHxPiwdAB8Du
-SC4qHQ/zpj5DaZw8CeMwupEGvsKOJezFlJJoA/rRnBJJ4eqJHPskAJEbvBdouWt8
-GuZm3DUCgYEA1LurnLNnp5d+MF9JACUpH8qoo2gWXqPhSAwVvuhfo5FCwJcWpe8n
-7ZoyZUJV0aKllfeTB/HVBgd5iwDEIl0ZI9T7j4o5+psszhP8zkT7aFRwmEm5+b0I
-zQF2tNa0tKK+mNmBMNY5h01NeJTruL3+cHLAmkP2I7SDddWeX/UNNJsCgYEAwJS6
-/l4z4QDmorrCPG0+lIHcwXhJKX0ER50DtXUskCtF4xkdO8qJZtnLqMzx+ASmsDNE
-Ds0Rj7OlcwNjjLRZHrImBzUvTO+Jn97kFbQhgWjX9D/2qPdjKPc0T2iINBNQZmEm
-y7zkgmZDdpK54Fc+G7gtKNMJyc/a7KvJC9I3jMsCgYBx/WHWpLddMSr35obqYf8o
-PuKgNM0Px0aW4YrhcgiVT+fx5MPJBF5jzeVFJwdvPnT15+RMNIROJ8Ez/6QZOcOX
-1K87Wfj5VR7sCf/D02jXna97mr3hmS5XE3q1KftIc5AnvRyhu5i17HEftMSeiIgH
-XyXfQ51nwnlSsbWce2WpEwKBgDcZltL2owNKnbKLms1tOE2HRmE4iD5Nna7bttbx
-OpnZN7q9UcbssRlzUTjvwn+C3Spm0J8nf1HNRZY9rvrwEtucfxLq3ai2lHrgbAPl
-sPx0we0JbAp2FbH/4MCjmOzFZeiU/WOnnP3OQpkna/VLIOMPdCRNFWzfgrTahcBT
-Gj+3AoGAQh6pc46FUFLVltoQKnH//PoYTjBZSPcfbqACw0Oy0T1eKpRWAbkatEQc
-aS+R6CF+pj7VpVyL0QTKdRLOMIw7baotYY1/TVYY8S9IXJyRdDoVFQ4KZaZ7+13p
-Eeyf8mOChZgcfVI7gVq14WoTL1V5NX8oYmu8qZdzUldOYwPFx3Y=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGovTvVXhopC+W
+GmyU4BS3nGQDwgnbHicCU7INkNaeL/I5DRaTcL5/zrdAaSPwyJMbo95yirEyuGCK
+wMfp42uPIyMMyW/PtrWtWZPJANIF2fNKD/2N0+tUclDKwPt9XKGzFfV0YbSoc2ma
+n0ajtJso6cnz0EpimKdgVPAJYjB14EqlS6wMNYbyQkVtCDnVnmfcDLpTEOTkihC3
+iUaRrAC0LxJRReBNv7l5BP7S8jY1TGkzPzia638n5rXEDw9s/ODGGQZ1U+c8r9kv
+jNFGTFldpu/OvdRrH4oNtEErGR89XDNIv/PENQHsDyTOLOgSZyXSeDnxjAy6RKFj
+mnwX18hZAgMBAAECggEAE+UWazJAURrAuWQEJBUdfhZn3gh9PDkU5yLC3qD3Hfjn
+Zddtv263Zc2qhQUC2Ib+VPJgwVAq102oPb15SG/Cwh9ez1UNodxG7gnex28Rmgxu
+VaisWJw1IcwhU21owvGYMHuuje2LTqPgm+AADz1znPFtjMH78Uwg14EqWYZAHE4h
+e37WLVG2GgnoM8rWuaCr4xB6Q1cEKdU2zJ7WyvWo4+q7pv3Jgbr2sglRmycClTr+
+QinTdNXsGJSDWsJ+VDME1/rD3jMpKlCdbGC1Q3c5zCt24pycr1MevIwZ8YePk2Q/
+wtfFe5DyoHUN8phh9oFjbmptepX1JTfi5oVORjq0AQKBgQDnwppcbBsDJTnJp1ql
+ZU8tkGTc2GQe/TyPt091dcd3QkK0nvD49xP4jm8tx60rMxH3LKN1BLSa2svYKHUJ
+t2u9OIwpTcmK1rCuA+TjSkegttNsiWdLrlUh6iyZNnGSxmVb6ThslkN1gsmPW8KM
+KlUZkuM/RpKHgttXmYb0Prjf+QKBgQDbaXdecIb1iVPmuTw5UKoeObODeRCiTUZN
+msKnYtsuvwDRsfaopPc9/cXhGAmxxBPuyFw1NXBrnRxFsJcEC1DTQDA0UnqhI1B0
+w9TLWFpRPuEfMTu6qSRW/dKYmpUY6GKEGnBFX00xQEFvFYDNNSk3d/t6FRQNIHBN
+wGVmo0MDYQKBgQCZnUxRPDp/UDpIZgvYGxlrGw0vsKJURAfTPm6FbYbDjoDGVZ9l
+deef1VDt6C7otlYPHmBNnMvU5Hc+lDpXMWNRLV0Bt5SB2SGMhfo9iSuG5AepJj34
+VNoKu7vJ5eNLpQLj8+a5WrPl/MV6pxiBbUGwzMKhWzaeaWbXXmSsGbLSiQKBgDKF
+HDkgi9KpZiov6JAB5MnE23KgQ5Y7WL6xrbRA7Nrcm+GsqnC2Wz9o2VE06baGwVgv
+xhtyTIpayJG7UWpa+KdLlk3V1+qWaQYZuTuBAnrGkatO+MPIAlgNZZpBraboixaD
+x+oRQYLfmrFrMBcP8IeXFs5LYCyNlY4xiKeTW/DBAoGAUFt40V1zJslr/K/d8J6Z
+sPZPixpJIQMHVnFio7cx7bNIi6zqLk1501LKGtdUiKQ2020QpiMltkFCDcZfuOuo
+dECVfd6v4R0ylXseMzQeGOXpfG/Tgpk42XreykPPz/q47nJRnHfuCB6hKbt56JJW
+ZryGBu5iFCJPyASvqd0sJvQ=
+-----END PRIVATE KEY-----

juseppe-core/pom.xml

@@ -77,6 +77,13 @@
             <artifactId>guava</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -86,16 +93,20 @@
             <plugin>
                 <groupId>org.jsonschema2pojo</groupId>
                 <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-                <version>0.4.7</version>
+                <version>1.2.2</version>
                 <configuration>
                     <sourceDirectory>${project.basedir}/src/main/resources/jsonschema</sourceDirectory>
                     <outputDirectory>${project.build.directory}/generated-sources/java-gen</outputDirectory>
                     <targetPackage>ru.lanwen.jenkins.juseppe.beans</targetPackage>
                     <annotationStyle>gson</annotationStyle>
                     <includeToString>false</includeToString>
                     <includeHashcodeAndEquals>false</includeHashcodeAndEquals>
+                    <includeJsr303Annotations>true</includeJsr303Annotations>
+                    <includeJsr305Annotations>false</includeJsr305Annotations>
+                    <useJakartaValidation>true</useJakartaValidation>
                     <sourceType>jsonschema</sourceType>
                     <generateBuilders>true</generateBuilders>
+                    <includeGeneratedAnnotation>false</includeGeneratedAnnotation>
                 </configuration>
                 <executions>
                     <execution>

juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/SavableSite.java

@@ -34,7 +34,7 @@ public Path save() {
         try {
             return Files.write(whereToSave, Collections.singleton(view.content()));
         } catch (IOException e) {
-            throw new RuntimeException(String.format("Can't save json to file %s", whereToSave.toAbsolutePath()), e);
+            throw new RuntimeException("Can't save json to file %s".formatted(whereToSave.toAbsolutePath()), e);
         }
     }
 }

juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/Signer.java

@@ -102,8 +102,14 @@ public Signature sign(UpdateSite site) throws GeneralSecurityException, IOExcept
         X509Certificate signer = certs.get(0); // the first one is the signer, and the rest is the chain to a root CA.
 
         Object o = new PEMParser(new FileReader(privateKey)).readObject();
-        isInstanceOf(PEMKeyPair.class, o, "File %s is not rsa private key!", privateKey);
-        PrivateKeyInfo key = ((PEMKeyPair) o).getPrivateKeyInfo();
+        PrivateKeyInfo key;
+        if(o instanceof PEMKeyPair keyPair) {
+            key = keyPair.getPrivateKeyInfo();
+        } else if(o instanceof PrivateKeyInfo) {
+            key = (PrivateKeyInfo) o;
+        } else {
+            throw new IllegalArgumentException(String.format("File %s is not rsa private key!", privateKey));
+        }
 
         SignatureGenerator signatureGenerator = new SignatureGenerator(signer, key);
 

juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/UpdateSiteGen.java

@@ -9,15 +9,14 @@
 import ru.lanwen.jenkins.juseppe.props.Props;
 
 import java.io.IOException;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
 import static ru.lanwen.jenkins.juseppe.props.Props.populated;
@@ -54,11 +53,11 @@ public UpdateSiteGen withDefaults() {
                 site -> site.withUpdateCenterVersion(Props.UPDATE_CENTER_VERSION)
                         .withId(props.getUcId())
         ).register(
-                site -> Collections.singleton(new PathPluginSource(Paths.get(props.getPluginsDir()), props.getRecursiveWatch()))
+                site -> Collections.singleton(new PathPluginSource(Path.of(props.getPluginsDir()), props.getRecursiveWatch()))
                         .forEach(source -> site.getPlugins().addAll(source.plugins()))
         ).register(
                 site -> site.getPlugins()
-                        .forEach(plugin -> plugin.setUrl(format("%s/%s", props.getBaseurl(), plugin.getUrl())))
+                        .forEach(plugin -> plugin.setUrl("%s/%s".formatted(props.getBaseurl(), plugin.getUrl())))
         ).register(
                 site -> {
                     try {
@@ -86,7 +85,7 @@ public SavableSitesCollection toSave() {
                 new JsonpUpdateSite(filled, props.getUcJsonName()),
                 new ReleaseHistoryUpdateSite(filled, props.getReleaseHistoryJsonName())
         )
-                .map(view -> new SavableSite(Paths.get(props.getSaveto()), view))
+                .map(view -> new SavableSite(Path.of(props.getSaveto()), view))
                 .collect(toList());
 
         return new SavableSitesCollection(files);

juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/source/PathPluginSource.java

@@ -16,8 +16,6 @@
 import ru.lanwen.jenkins.juseppe.beans.Plugin;
 import ru.lanwen.jenkins.juseppe.gen.HPI;
 
-import static java.lang.String.format;
-
 /**
  * @author lanwen (Merkushev Kirill)
  */
@@ -50,7 +48,7 @@ public List<Plugin> plugins() {
                 }
             }).filter(Objects::nonNull).collect(Collectors.toList());
         } catch (IOException e) {
-            throw new RuntimeException(format("Can't read path %s", pluginsDir.toAbsolutePath()), e);
+            throw new RuntimeException("Can't read path %s".formatted(pluginsDir.toAbsolutePath()), e);
         }
     }
 }

juseppe-core/src/main/java/ru/lanwen/jenkins/juseppe/gen/view/JsonpUpdateSite.java

@@ -25,7 +25,7 @@ public JsonpUpdateSite(UpdateSite site, String name) {
     @Override
     public String content() {
         String json = UpdateSiteSerializer.serializer().toJson(site);
-        return String.format("updateCenter.post(%n%s%n);", json);
+        return "updateCenter.post(%n%s%n);".formatted(json);
     }
 
     @Override

juseppe-core/src/test/java/ru/lanwen/jenkins/juseppe/gen/source/PathPluginSourceTest.java

@@ -3,7 +3,7 @@
 import org.junit.Test;
 import ru.lanwen.jenkins.juseppe.beans.Plugin;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.List;
 
 import static com.google.common.io.Resources.getResource;
@@ -21,7 +21,7 @@ public class PathPluginSourceTest {
     @Test
     public void shouldFindAllPlugins() throws Exception {
         boolean recursiveWatch = false;
-        List<Plugin> plugins = new PathPluginSource(Paths.get(getResource(PLUGINS_DIR_CLASSPATH).getFile()),
+        List<Plugin> plugins = new PathPluginSource(Path.of(getResource(PLUGINS_DIR_CLASSPATH).getFile()),
                                                     recursiveWatch)
                 .plugins();
 
@@ -33,7 +33,7 @@ public void shouldFindAllPlugins() throws Exception {
     @Test
     public void shouldFindAllPluginsRecursively() throws Exception {
         boolean recursiveWatch = true;
-        List<Plugin> plugins = new PathPluginSource(Paths.get(getResource(PLUGINS_DIR_CLASSPATH).getFile()),
+        List<Plugin> plugins = new PathPluginSource(Path.of(getResource(PLUGINS_DIR_CLASSPATH).getFile()),
                                                     recursiveWatch)
                  .plugins();