This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
The following commit(s) were added to refs/heads/master by this push:
new 7b89456 [MINDEXER-255] fix relevant codebase modernizer issues (#427)
7b89456 is described below
commit 7b89456531b70d528fdf7c5c423fe4fbc1c9bd1f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri May 30 20:55:07 2025 +0200
[MINDEXER-255] fix relevant codebase modernizer issues (#427)
For the rest see MINDEXER-252
---
https://issues.apache.org/jira/browse/MINDEXER-255
---
indexer-examples/pom.xml | 8 +++++
.../maven/index/reader/CachingResourceHandler.java | 3 ++
.../apache/maven/index/reader/ChunkReaderTest.java | 11 ++++---
.../index/reader/DirectoryResourceHandler.java | 34 ++++++++++++----------
.../maven/index/reader/HttpResourceHandler.java | 2 ++
.../apache/maven/index/reader/IndexReaderTest.java | 6 ++--
.../org/apache/maven/index/reader/TestSupport.java | 20 ++++++-------
.../apache/maven/index/reader/TransformTest.java | 2 --
pom.xml | 2 --
.../internal/IndexerCoreSearchBackendImplTest.java | 12 ++++----
10 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/indexer-examples/pom.xml b/indexer-examples/pom.xml
index f299963..d8c5d7f 100644
--- a/indexer-examples/pom.xml
+++ b/indexer-examples/pom.xml
@@ -40,6 +40,14 @@ under the License.
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <configuration>
+ <!-- TODO: https://issues.apache.org/jira/browse/MINDEXER-252 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/CachingResourceHandler.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/CachingResourceHandler.java
index 052879a..9bc9145 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/CachingResourceHandler.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/CachingResourceHandler.java
@@ -47,6 +47,7 @@ public class CachingResourceHandler implements
ResourceHandler {
this.notFoundResources = new HashSet<>();
}
+ @Override
public Resource locate(final String name) {
if (notFoundResources.contains(name)) {
return NOT_EXISTING_RESOURCE;
@@ -62,6 +63,7 @@ public class CachingResourceHandler implements
ResourceHandler {
this.name = name;
}
+ @Override
public InputStream read() throws IOException {
InputStream inputStream = local.locate(name).read();
if (inputStream != null) {
@@ -93,6 +95,7 @@ public class CachingResourceHandler implements
ResourceHandler {
}
}
+ @Override
public void close() throws IOException {
remote.close();
local.close();
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
index 2d89bf8..f913f63 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
@@ -18,10 +18,9 @@
*/
package org.apache.maven.index.reader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -55,20 +54,20 @@ public class ChunkReaderTest extends TestSupport {
@Test
public void roundtrip() throws IOException {
final Date published;
- File tempChunkFile = createTempFile("nexus-maven-repository-index.gz");
+ Path tempChunkFile = createTempFile("nexus-maven-repository-index.gz");
{
try (WritableResourceHandler resource =
testResourceHandler("simple");
ChunkReader chunkReader = new ChunkReader(
"full",
resource.locate("nexus-maven-repository-index.gz").read());
ChunkWriter chunkWriter = new ChunkWriter(
- chunkReader.getName(), new
FileOutputStream(tempChunkFile), 1, new Date())) {
+ chunkReader.getName(),
Files.newOutputStream(tempChunkFile), 1, new Date())) {
chunkWriter.writeChunk(chunkReader.iterator());
published = chunkWriter.getTimestamp();
}
}
- try (ChunkReader chunkReader = new ChunkReader("full", new
FileInputStream(tempChunkFile))) {
+ try (ChunkReader chunkReader = new ChunkReader("full",
Files.newInputStream(tempChunkFile))) {
assertThat(chunkReader.getVersion(), equalTo(1));
assertThat(chunkReader.getTimestamp().getTime(),
equalTo(published.getTime()));
final Map<Type, List<Record>> recordTypes =
loadRecordsByType(chunkReader);
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/DirectoryResourceHandler.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/DirectoryResourceHandler.java
index 56a4e64..7aebfb2 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/DirectoryResourceHandler.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/DirectoryResourceHandler.java
@@ -20,56 +20,58 @@ package org.apache.maven.index.reader;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
/**
- * A trivial {@link File} directory handler that does not perform any locking
or extra bits, and just serves up files
+ * A trivial {@link Path} directory handler that does not perform any locking
or extra bits, and just serves up files
* by name from specified existing directory.
*/
public class DirectoryResourceHandler implements WritableResourceHandler {
- private final File rootDirectory;
+ private final Path rootDirectory;
- public DirectoryResourceHandler(final File rootDirectory) {
+ public DirectoryResourceHandler(final Path rootDirectory) {
if (rootDirectory == null) {
throw new NullPointerException("null rootDirectory");
}
- if (!rootDirectory.isDirectory()) {
+ if (!Files.isDirectory(rootDirectory)) {
throw new IllegalArgumentException("rootDirectory exists and is
not a directory");
}
this.rootDirectory = rootDirectory;
}
- public File getRootDirectory() {
+ public Path getRootDirectory() {
return rootDirectory;
}
+ @Override
public WritableResource locate(final String name) {
- return new FileResource(new File(rootDirectory, name));
+ return new PathResource(rootDirectory.resolve(name));
}
- private static class FileResource implements WritableResource {
- private final File file;
+ private static class PathResource implements WritableResource {
+ private final Path file;
- private FileResource(final File file) {
+ private PathResource(final Path file) {
this.file = file;
}
+ @Override
public InputStream read() throws IOException {
try {
- return new BufferedInputStream(new FileInputStream(file));
- } catch (FileNotFoundException e) {
+ return new BufferedInputStream(Files.newInputStream(file));
+ } catch (NoSuchFileException e) {
return null;
}
}
+ @Override
public OutputStream write() throws IOException {
- return new BufferedOutputStream(new FileOutputStream(file));
+ return new BufferedOutputStream(Files.newOutputStream(file));
}
}
}
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/HttpResourceHandler.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/HttpResourceHandler.java
index 2c4d77f..d30a8b7 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/HttpResourceHandler.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/HttpResourceHandler.java
@@ -41,6 +41,7 @@ public class HttpResourceHandler implements ResourceHandler {
this.root = requireNonNull(root);
}
+ @Override
public Resource locate(final String name) {
return new HttpResource(name);
}
@@ -52,6 +53,7 @@ public class HttpResourceHandler implements ResourceHandler {
this.name = name;
}
+ @Override
public InputStream read() throws IOException {
HttpRequest request =
HttpRequest.newBuilder().uri(root.resolve(name)).GET().build();
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
index 6e9ef70..fac3fc6 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
@@ -18,10 +18,10 @@
*/
package org.apache.maven.index.reader;
-import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URI;
+import java.nio.file.Path;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -152,9 +152,9 @@ public class IndexReaderTest extends TestSupport {
@Ignore("For eyes only")
public void central() throws Exception {
// local index location, against which we perform incremental updates
- final File indexDir = createTempDirectory();
+ final Path indexDir = createTempDirectory();
// cache of remote, to not rely on HTTP transport possible failures,
or, to detect them early
- final File cacheDir = createTempDirectory();
+ final Path cacheDir = createTempDirectory();
final PrintWriter writer = new PrintWriter(System.out, true);
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
index 097744c..f892768 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
@@ -18,9 +18,9 @@
*/
package org.apache.maven.index.reader;
-import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -42,7 +42,7 @@ public class TestSupport {
@Rule
public TestName testName = new TestName();
- private File tempDir;
+ private Path tempDir;
private List<DirectoryResourceHandler> directoryResourceHandlers;
@@ -51,8 +51,7 @@ public class TestSupport {
*/
@Before
public void setup() throws IOException {
- this.tempDir =
- Files.createTempDirectory(getClass().getSimpleName() +
".temp").toFile();
+ this.tempDir = Files.createTempDirectory(getClass().getSimpleName() +
".temp");
this.directoryResourceHandlers = new ArrayList<>();
}
@@ -70,18 +69,17 @@ public class TestSupport {
/**
* Creates a temp file within {@link #tempDir} with given name.
*/
- protected File createTempFile(final String name) throws IOException {
- File file = new File(tempDir, name);
- file.deleteOnExit();
+ protected Path createTempFile(final String name) throws IOException {
+ Path file = tempDir.resolve(name);
+ file.toFile().deleteOnExit();
return file;
}
/**
* Creates a temp directory within {@link #tempDir}.
*/
- protected File createTempDirectory() throws IOException {
- return Files.createTempDirectory(tempDir.toPath(),
testName.getMethodName() + "-dir")
- .toFile();
+ protected Path createTempDirectory() throws IOException {
+ return Files.createTempDirectory(tempDir, testName.getMethodName() +
"-dir");
}
/**
@@ -98,7 +96,7 @@ public class TestSupport {
* name.
*/
protected DirectoryResourceHandler testResourceHandler(final String name)
throws IOException {
- DirectoryResourceHandler result = new DirectoryResourceHandler(new
File("src/test/resources/" + name));
+ DirectoryResourceHandler result = new
DirectoryResourceHandler(Path.of("src/test/resources/" + name));
directoryResourceHandlers.add(result);
return result;
}
diff --git
a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
index 4fe29e1..c3e8dc2 100644
---
a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
+++
b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
@@ -52,11 +52,9 @@ public class TransformTest extends TestSupport {
.map(compactFunction)
.collect(Collectors.toList());
- ;
try (WritableResourceHandler writableResourceHandler =
createWritableResourceHandler()) {
try (IndexWriter indexWriter = new
IndexWriter(writableResourceHandler, indexId, false)) {
indexWriter.writeChunk(iterable.iterator());
- indexWriter.close();
}
try (IndexReader indexReader = new IndexReader(null,
writableResourceHandler)) {
diff --git a/pom.xml b/pom.xml
index 4bc1626..1f7f589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,8 +302,6 @@ under the License.
<version>3.1.0</version>
<configuration>
<javaVersion>${javaVersion}</javaVersion>
- <!-- TODO: https://issues.apache.org/jira/browse/MINDEXER-252 -->
- <includeTestClasses>false</includeTestClasses>
</configuration>
<executions>
<execution>
diff --git
a/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
b/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
index 9173a7e..994bf20 100644
---
a/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
+++
b/search-backend-indexer/src/test/java/org/apache/maven/search/backend/indexer/internal/IndexerCoreSearchBackendImplTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.search.backend.indexer.internal;
import javax.inject.Inject;
-import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -29,6 +28,7 @@ import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
+import java.nio.file.Path;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@@ -132,8 +132,8 @@ public class IndexerCoreSearchBackendImplTest extends
InjectedTest {
@Before
public void prepareAndUpdateBackend() throws Exception {
// Files where local cache is (if any) and Lucene Index should be
located
- File centralLocalCache = new File("target/central-cache");
- File centralIndexDir = new File("target/central-index");
+ Path centralLocalCache = Path.of("target/central-cache");
+ Path centralIndexDir = Path.of("target/central-index");
// Creators we want to use (search for fields it defines)
List<IndexCreator> indexers = new ArrayList<>();
@@ -145,8 +145,8 @@ public class IndexerCoreSearchBackendImplTest extends
InjectedTest {
centralContext = indexer.createIndexingContext(
"central-context",
"central",
- centralLocalCache,
- centralIndexDir,
+ centralLocalCache.toFile(),
+ centralIndexDir.toFile(),
"https://repo1.maven.org/maven2";,
null,
true,
@@ -164,7 +164,7 @@ public class IndexerCoreSearchBackendImplTest extends
InjectedTest {
Date centralContextCurrentTimestamp = centralContext.getTimestamp();
IndexUpdateRequest updateRequest = new
IndexUpdateRequest(centralContext, new Java11HttpClient());
- updateRequest.setLocalIndexCacheDir(centralLocalCache);
+ updateRequest.setLocalIndexCacheDir(centralLocalCache.toFile());
updateRequest.setThreads(4);
IndexUpdateResult updateResult =
indexUpdater.fetchAndUpdateIndex(updateRequest);
if (updateResult.isFullUpdate()) {
