This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 25b593976c Upgrading modernizer-maven-plugin
25b593976c is described below
commit 25b593976cb2983910cf0de4ca7745810ecd83ee
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Dec 30 09:26:14 2024 +0100
Upgrading modernizer-maven-plugin
---
.../apache/syncope/core/rest/cxf/JavaDocUtils.java | 3 ++-
.../persistence/jpa/inner/ConnInstanceTest.java | 4 +--
.../core/provisioning/api/utils/URIUtils.java | 5 ++--
.../provisioning/java/ConnectorFacadeProxy.java | 5 ++--
.../java/DefaultConnIdBundleManager.java | 3 ++-
.../org/apache/syncope/fit/core/AuditITCase.java | 5 ++--
.../apache/syncope/fit/core/PullTaskITCase.java | 29 ++++++----------------
pom.xml | 2 +-
8 files changed, 22 insertions(+), 34 deletions(-)
diff --git
a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/JavaDocUtils.java
b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/JavaDocUtils.java
index 05a3377820..b6969b8d58 100644
---
a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/JavaDocUtils.java
+++
b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/JavaDocUtils.java
@@ -23,6 +23,7 @@ import java.lang.management.ManagementFactory;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -42,7 +43,7 @@ public final class JavaDocUtils {
private static URL toURL(final String classPathEntry) {
try {
- return new File(classPathEntry).toURI().toURL();
+ return Path.of(classPathEntry).toUri().toURL();
} catch (MalformedURLException e) {
throw new IllegalArgumentException("URL could not be created from
'" + classPathEntry + "'", e);
}
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
index d3f7d319a3..81d74818aa 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import java.io.File;
+import java.nio.file.Path;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -93,7 +93,7 @@ public class ConnInstanceTest extends AbstractTest {
public void save() throws ClassNotFoundException {
ConnInstance connInstance =
entityFactory.newEntity(ConnInstance.class);
- connInstance.setLocation(new
File(System.getProperty("java.io.tmpdir")).toURI().toString());
+
connInstance.setLocation(Path.of(System.getProperty("java.io.tmpdir")).toUri().toString());
// set connector version
connInstance.setVersion("1.0");
diff --git
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/URIUtils.java
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/URIUtils.java
index 143a14c00d..dc57a2d6ff 100644
---
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/URIUtils.java
+++
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/utils/URIUtils.java
@@ -18,11 +18,10 @@
*/
package org.apache.syncope.core.provisioning.api.utils;
-import java.io.File;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
+import java.nio.file.Path;
public final class URIUtils {
@@ -51,7 +50,7 @@ public final class URIUtils {
URI uri;
if (candidate.startsWith("file:")) {
- uri = new File(new
URL(candidate).getFile()).getAbsoluteFile().toURI();
+ uri = Path.of(new
URI(candidate)).toAbsolutePath().toFile().toURI();
} else {
uri = new URI(candidate);
}
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
index d38a8b472c..5cb0c6dbd3 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.provisioning.java;
import java.io.File;
import java.net.URI;
+import java.nio.file.Path;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
@@ -239,7 +240,7 @@ public class ConnectorFacadeProxy implements Connector {
if
(connInstance.getCapabilities().contains(ConnectorCapability.UPDATE_DELTA)) {
propagationAttempted.set(true);
- Future<Set<AttributeDelta>> future =
+ Future<Set<AttributeDelta>> future =
asyncFacade.updateDelta(connector, objectClass, uid,
modifications, options);
try {
@@ -520,7 +521,7 @@ public class ConnectorFacadeProxy implements Connector {
} else if (URI.class.equals(propertySchemaClass)) {
value = URI.create(values.get(0).toString());
} else if (File.class.equals(propertySchemaClass)) {
- value = new File(values.get(0).toString());
+ value = Path.of(values.get(0).toString()).toFile();
} else if (String[].class.equals(propertySchemaClass)) {
value = values.toArray(String[]::new);
} else {
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnIdBundleManager.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnIdBundleManager.java
index 9e18cfdb9c..e20eb9ece7 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnIdBundleManager.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultConnIdBundleManager.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
+import java.nio.file.Path;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -83,7 +84,7 @@ public class DefaultConnIdBundleManager implements
ConnIdBundleManager {
protected void initLocal(final URI location) {
// 1. Find bundles inside local directory
- File bundleDirectory = new File(location);
+ File bundleDirectory = Path.of(location).toFile();
String[] bundleFiles = bundleDirectory.list();
if (bundleFiles == null) {
throw new NotFoundException("Local bundles directory " + location);
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
index 7e900a4786..98d1680387 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AuditITCase.java
@@ -34,7 +34,6 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.time.OffsetDateTime;
import java.util.HashSet;
@@ -472,11 +471,11 @@ public class AuditITCase extends AbstractITCase {
Properties props = new Properties();
props.load(propStream);
- Path auditFilePath = Paths.get(props.getProperty("test.log.dir")
+ Path auditFilePath = Path.of(props.getProperty("test.log.dir")
+ File.separator + "audit_for_Master_file.log");
Files.write(auditFilePath, new byte[0],
StandardOpenOption.TRUNCATE_EXISTING);
- Path auditNoRewriteFilePath =
Paths.get(props.getProperty("test.log.dir")
+ Path auditNoRewriteFilePath =
Path.of(props.getProperty("test.log.dir")
+ File.separator + "audit_for_Master_norewrite_file.log");
Files.write(auditNoRewriteFilePath, new byte[0],
StandardOpenOption.TRUNCATE_EXISTING);
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index e227108086..10ae357ead 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -28,12 +28,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.time.OffsetDateTime;
import java.util.Collections;
import java.util.Date;
@@ -237,29 +237,16 @@ public class PullTaskITCase extends AbstractTaskITCase {
// Attemp to reset CSV content
Properties props = new Properties();
- InputStream propStream = null;
- InputStream srcStream = null;
- OutputStream dstStream = null;
- try {
- propStream = getClass().getResourceAsStream("/test.properties");
+ try (InputStream propStream =
getClass().getResourceAsStream("/test.properties")) {
props.load(propStream);
- srcStream = new FileInputStream(props.getProperty("test.csv.src"));
- dstStream = new
FileOutputStream(props.getProperty("test.csv.dst"));
+ try (InputStream src =
Files.newInputStream(Path.of(props.getProperty("test.csv.src")));
+ OutputStream dst =
Files.newOutputStream(Path.of(props.getProperty("test.csv.dst")))) {
- IOUtils.copy(srcStream, dstStream);
- } catch (IOException e) {
- fail(e::getMessage);
- } finally {
- if (propStream != null) {
- propStream.close();
- }
- if (srcStream != null) {
- srcStream.close();
- }
- if (dstStream != null) {
- dstStream.close();
+ IOUtils.copy(src, dst);
}
+ } catch (IOException e) {
+ fail(e.getMessage(), e);
}
// -----------------------------
diff --git a/pom.xml b/pom.xml
index 566c2d29d7..dbe8778a91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1834,7 +1834,7 @@ under the License.
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>2.9.0</version>
+ <version>3.0.0</version>
<configuration>
<javaVersion>${targetJdk}</javaVersion>
<ignorePackages>
