From 052ffcf5ccf5b860c978efecbe1793a2a2aecaed Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 21 Jun 2022 14:16:34 +0200 Subject: [PATCH 1/8] Drop legacy --- pom.xml | 66 +++++++++++-- .../io/filemappers/DefaultFileMapper.java | 27 ++++++ .../io/filemappers/FileExtensionMapper.java | 2 + .../io/filemappers/FlattenFileMapper.java | 2 + .../io/filemappers/IdentityMapper.java | 2 + .../io/filemappers/MergeFileMapper.java | 2 + .../io/filemappers/PrefixFileMapper.java | 2 + .../io/filemappers/RegExpFileMapper.java | 3 + .../io/filemappers/SuffixFileMapper.java | 2 + .../fileselectors/AllFilesFileSelector.java | 2 + .../io/fileselectors/DefaultFileSelector.java | 27 ++++++ .../IncludeExcludeFileSelector.java | 2 + ...DefaultPlexusIoFileResourceCollection.java | 47 +++++++++ .../PlexusIoFileResourceCollection.java | 3 + .../resources/META-INF/plexus/components.xml | 95 ------------------- .../io/filemappers/FileMapperTest.java | 4 +- .../io/filemappers/FileSelectorTest.java | 3 +- .../io/filemappers/ResourcesTest.java | 3 +- .../io/filemappers/TestSupport.java | 33 +++++++ 19 files changed, 216 insertions(+), 111 deletions(-) create mode 100644 src/main/java/org/codehaus/plexus/components/io/filemappers/DefaultFileMapper.java create mode 100644 src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java create mode 100644 src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java delete mode 100644 src/main/resources/META-INF/plexus/components.xml create mode 100644 src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java diff --git a/pom.xml b/pom.xml index 682abcba..b94ff65e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,22 +30,25 @@ - true 8 + 0.3.5 + 1.7.36 + true 2022-05-02T06:11:29Z + - org.codehaus.plexus - plexus-utils - 3.4.2 + javax.inject + javax.inject + 1 + org.codehaus.plexus - plexus-container-default - test - 2.1.1 + plexus-utils + 3.4.2 com.google.code.findbugs @@ -58,17 +61,62 @@ commons-io 2.11.0 + + junit junit 4.13.2 test + + + org.hamcrest + hamcrest-core + + + + + org.hamcrest + hamcrest + 2.2 + test + + + org.slf4j + slf4j-simple + ${slf4jVersion} + + + + org.eclipse.sisu + org.eclipse.sisu.plexus + ${sisuVersion} + test + + + com.google.inject + guice + 5.1.0 + test - + + org.eclipse.sisu + sisu-maven-plugin + ${sisuVersion} + + + index-project + + main-index + test-index + + + + org.apache.maven.plugins maven-scm-publish-plugin @@ -128,7 +176,7 @@ org.codehaus.mojo.signature - java17 + java18 1.0 diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/DefaultFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/DefaultFileMapper.java new file mode 100644 index 00000000..2cecc8df --- /dev/null +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/DefaultFileMapper.java @@ -0,0 +1,27 @@ +package org.codehaus.plexus.components.io.filemappers; + +/* + * Copyright 2007 The Codehaus Foundation. + * + * Licensed 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. + */ + +import javax.inject.Named; + +/** + * Alias for {@link IdentityMapper} + */ +@Named +public class DefaultFileMapper extends IdentityMapper +{ +} \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/FileExtensionMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/FileExtensionMapper.java index ca4709ca..934b7b9f 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/FileExtensionMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/FileExtensionMapper.java @@ -17,10 +17,12 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * An implementation of {@link FileMapper}, which changes the files extension. */ +@Named( FileExtensionMapper.ROLE_HINT ) public class FileExtensionMapper extends AbstractFileMapper { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/FlattenFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/FlattenFileMapper.java index 249c9fc4..93cfab98 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/FlattenFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/FlattenFileMapper.java @@ -17,10 +17,12 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * Implementation of a flattening file mapper: Removes all directory parts. */ +@Named( FlattenFileMapper.ROLE_HINT ) public class FlattenFileMapper extends AbstractFileMapper { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/IdentityMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/IdentityMapper.java index f4533d69..80a025e0 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/IdentityMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/IdentityMapper.java @@ -17,10 +17,12 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * Default implementation of {@link FileMapper}, which performs the identity mapping: All names are left unchanged. */ +@Named( IdentityMapper.ROLE_HINT ) public class IdentityMapper extends AbstractFileMapper { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/MergeFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/MergeFileMapper.java index a4227490..80eb1f93 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/MergeFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/MergeFileMapper.java @@ -17,10 +17,12 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * A file mapper, which maps to a constant target name. */ +@Named( MergeFileMapper.ROLE_HINT ) public class MergeFileMapper extends AbstractFileMapper { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java index 389a39c7..3f9112e7 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java @@ -17,10 +17,12 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * A file mapper, which maps by adding a prefix. */ +@Named( PrefixFileMapper.ROLE_HINT ) public class PrefixFileMapper extends AbstractFileMapper { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java index 7e0382d7..1890e59a 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java @@ -17,12 +17,15 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; + import java.util.regex.Matcher; import java.util.regex.Pattern; /** * Implementation of a file mapper, which uses regular expressions. */ +@Named( RegExpFileMapper.ROLE_HINT ) public class RegExpFileMapper extends AbstractFileMapper { diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/SuffixFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/SuffixFileMapper.java index 2372d840..3f5964a5 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/SuffixFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/SuffixFileMapper.java @@ -15,12 +15,14 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * A file mapper, which maps by adding a suffix to the filename. * If the filename contains dot, the suffix will be added before. * Example: {@code directory/archive.tar.gz => directory/archivesuffix.tar.gz} */ +@Named( SuffixFileMapper.ROLE_HINT ) public class SuffixFileMapper extends AbstractFileMapper { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java index 0bcfb5b6..3528d14d 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java @@ -17,10 +17,12 @@ */ import javax.annotation.Nonnull; +import javax.inject.Named; /** * The default file selector: Selects all files. */ +@Named( AllFilesFileSelector.ROLE_HINT ) public class AllFilesFileSelector implements FileSelector { /** diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java new file mode 100644 index 00000000..ab3ab2a5 --- /dev/null +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java @@ -0,0 +1,27 @@ +package org.codehaus.plexus.components.io.fileselectors; + +/* + * Copyright 2007 The Codehaus Foundation. + * + * Licensed 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. + */ + +import javax.inject.Named; + +/** + * Alias for {@link AllFilesFileSelector} + */ +@Named +public class DefaultFileSelector extends AllFilesFileSelector +{ +} \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java index 309dba64..47b3f1c9 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java @@ -24,11 +24,13 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import javax.inject.Named; /** * This file selector uses a set of patterns for including/excluding * files. */ +@Named( IncludeExcludeFileSelector.ROLE_HINT ) public class IncludeExcludeFileSelector implements FileSelector { diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java new file mode 100644 index 00000000..484be64d --- /dev/null +++ b/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java @@ -0,0 +1,47 @@ +package org.codehaus.plexus.components.io.resources; + +/* + * Copyright 2007 The Codehaus Foundation. + * + * Licensed 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. + */ + +import javax.inject.Named; + +import java.io.Closeable; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; + +import org.codehaus.plexus.components.io.attributes.FileAttributes; +import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; +import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes; +import org.codehaus.plexus.components.io.functions.PlexusIoResourceConsumer; +import org.codehaus.plexus.util.DirectoryScanner; +import org.codehaus.plexus.util.StringUtils; + +/** + * Alias for {@link PlexusIoFileResourceCollection} + */ +@Named +public class DefaultPlexusIoFileResourceCollection + extends PlexusIoFileResourceCollection +{ +} diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java index 2293de96..a641818e 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java @@ -16,6 +16,8 @@ * limitations under the License. */ +import javax.inject.Named; + import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes; @@ -39,6 +41,7 @@ * Implementation of {@link PlexusIoResourceCollection} for the set * of files in a common directory. */ +@Named( PlexusIoFileResourceCollection.ROLE_HINT ) public class PlexusIoFileResourceCollection extends AbstractPlexusIoResourceCollectionWithAttributes { diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index 544289a7..00000000 --- a/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - identity - org.codehaus.plexus.components.io.filemappers.IdentityMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - default - org.codehaus.plexus.components.io.filemappers.IdentityMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - fileExtension - org.codehaus.plexus.components.io.filemappers.FileExtensionMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - flatten - org.codehaus.plexus.components.io.filemappers.FlattenFileMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - merge - org.codehaus.plexus.components.io.filemappers.MergeFileMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - prefix - org.codehaus.plexus.components.io.filemappers.PrefixFileMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - suffix - org.codehaus.plexus.components.io.filemappers.SuffixFileMapper - per-lookup - - - - org.codehaus.plexus.components.io.filemappers.FileMapper - regexp - org.codehaus.plexus.components.io.filemappers.RegExpFileMapper - per-lookup - - - - - org.codehaus.plexus.components.io.fileselectors.FileSelector - default - org.codehaus.plexus.components.io.fileselectors.AllFilesFileSelector - singleton - - - - org.codehaus.plexus.components.io.fileselectors.FileSelector - all - org.codehaus.plexus.components.io.fileselectors.AllFilesFileSelector - singleton - - - - org.codehaus.plexus.components.io.fileselectors.FileSelector - standard - org.codehaus.plexus.components.io.fileselectors.IncludeExcludeFileSelector - singleton - - - - - org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection - default - org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection - per-lookup - - - org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection - files - org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection - per-lookup - - - diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java index a19a683c..a96f7afb 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java @@ -19,12 +19,10 @@ import java.lang.reflect.UndeclaredThrowableException; import java.util.Arrays; -import org.codehaus.plexus.PlexusTestCase; - /** * Test case for the various file mappers. */ -public class FileMapperTest extends PlexusTestCase +public class FileMapperTest extends TestSupport { protected void testFileMapper( FileMapper pMapper, String[] pInput, String[] pOutput ) { diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java index 1aed4169..93c4ee23 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java @@ -20,7 +20,6 @@ import java.io.InputStream; import java.net.URL; -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.components.io.fileselectors.AllFilesFileSelector; import org.codehaus.plexus.components.io.fileselectors.FileSelector; import org.codehaus.plexus.components.io.fileselectors.IncludeExcludeFileSelector; @@ -32,7 +31,7 @@ /** * Test case for implementations of {@link FileSelector}. */ -public class FileSelectorTest extends PlexusTestCase +public class FileSelectorTest extends TestSupport { protected void testFileSelector( FileSelector pSelector, String[] pInput, boolean[] pOutput) throws IOException diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java index 0d59eb9c..ba4794f4 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java @@ -27,7 +27,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection; import org.codehaus.plexus.components.io.resources.PlexusIoFileResource; import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection; @@ -39,7 +38,7 @@ /** * Test case for resource collections. */ -public class ResourcesTest extends PlexusTestCase +public class ResourcesTest extends TestSupport { private static final String X_PATH = "x"; private static final String A_PATH = X_PATH + "/a"; diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java new file mode 100644 index 00000000..6cad38fd --- /dev/null +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java @@ -0,0 +1,33 @@ +package org.codehaus.plexus.components.io.filemappers; + +/* + * Copyright 2007 The Codehaus Foundation. + * + * Licensed 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. + */ + +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusTestCase; + +/** + * Support for componentized testing. + */ +public abstract class TestSupport extends PlexusTestCase +{ + @Override + protected void customizeContainerConfiguration( ContainerConfiguration configuration ) + { + configuration.setAutoWiring( true ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ); + } +} \ No newline at end of file From 09ca9e38000d61ce83333bcd837a96357999e313 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 21 Jun 2022 14:37:02 +0200 Subject: [PATCH 2/8] Move to junit 4 where applicable --- .../AbstractResourceAttributesTCK.java | 11 ++++++++-- .../io/attributes/AttributeUtilsTest.java | 11 ++++++++-- .../io/attributes/FileAttributesTest.java | 6 ++++-- .../PlexusIoResourceAttributeUtilsTest.java | 20 +++++++++++++++++-- ...bstractPlexusIoResourceCollectionTest.java | 6 ++++-- ...sIoFileSupplierResourceCollectionTest.java | 6 ++++-- .../PlexusIoPlexusIoFileResourceTest.java | 7 +++++-- .../PlexusIoProxyResourceCollectionTest.java | 10 +++++++--- .../io/resources/proxy/ProxyFactoryTest.java | 15 +++++++++++--- 9 files changed, 72 insertions(+), 20 deletions(-) diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java b/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java index 0e0351ba..5364426f 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java @@ -16,10 +16,11 @@ * limitations under the License. */ -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; public abstract class AbstractResourceAttributesTCK - extends TestCase { protected AbstractResourceAttributesTCK() @@ -31,6 +32,7 @@ protected AbstractResourceAttributesTCK() protected abstract PlexusIoResourceAttributes newAttributes( String mode ); + @Test public final void testSetOctalModeString_OwnerModes() { verifyStringOctalModeSet( "700", new boolean[] { true, true, true, false, false, false, false, false, false } ); @@ -39,6 +41,7 @@ public final void testSetOctalModeString_OwnerModes() verifyStringOctalModeSet( "200", new boolean[] { false, true, false, false, false, false, false, false, false } ); } + @Test public final void testSetOctalModeString_GroupModes() { verifyStringOctalModeSet( "070", new boolean[] { false, false, false, true, true, true, false, false, false } ); @@ -47,6 +50,7 @@ public final void testSetOctalModeString_GroupModes() verifyStringOctalModeSet( "020", new boolean[] { false, false, false, false, true, false, false, false, false } ); } + @Test public final void testSetOctalModeString_WorldModes() { verifyStringOctalModeSet( "007", new boolean[] { false, false, false, false, false, false, true, true, true } ); @@ -55,6 +59,7 @@ public final void testSetOctalModeString_WorldModes() verifyStringOctalModeSet( "002", new boolean[] { false, false, false, false, false, false, false, true, false } ); } + @Test public final void testSetOctalMode_OwnerModes() { verifyOctalModeSet( "700", new boolean[] { true, true, true, false, false, false, false, false, false } ); @@ -63,6 +68,7 @@ public final void testSetOctalMode_OwnerModes() verifyOctalModeSet( "200", new boolean[] { false, true, false, false, false, false, false, false, false } ); } + @Test public final void testSetOctalMode_GroupModes() { verifyOctalModeSet( "070", new boolean[] { false, false, false, true, true, true, false, false, false } ); @@ -71,6 +77,7 @@ public final void testSetOctalMode_GroupModes() verifyOctalModeSet( "020", new boolean[] { false, false, false, false, true, false, false, false, false } ); } + @Test public final void testSetOctalMode_WorldModes() { verifyOctalModeSet( "007", new boolean[] { false, false, false, false, false, false, true, true, true } ); diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java index dee75ad5..9e26e6ce 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java @@ -1,7 +1,7 @@ package org.codehaus.plexus.components.io.attributes; -import junit.framework.TestCase; import org.codehaus.plexus.util.Os; +import org.junit.Test; import java.io.File; import java.io.IOException; @@ -9,12 +9,15 @@ import java.util.HashMap; import java.util.Set; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * @author Kristian Rosenvold */ public class AttributeUtilsTest - extends TestCase { + @Test public void testMiscPatterns() throws Exception { @@ -24,6 +27,7 @@ public void testMiscPatterns() assertTrue( permissions.contains( PosixFilePermission.OTHERS_READ ) ); } + @Test public void testMorePatterns() throws Exception { final Set permissions = AttributeUtils.getPermissions( 0241 ); @@ -32,6 +36,7 @@ public void testMorePatterns() throws Exception assertTrue( permissions.contains( PosixFilePermission.OTHERS_EXECUTE ) ); } + @Test public void testEvenMorePatterns() throws Exception { final Set permissions = AttributeUtils.getPermissions( 0412 ); @@ -40,6 +45,7 @@ public void testEvenMorePatterns() throws Exception assertTrue( permissions.contains( PosixFilePermission.OTHERS_WRITE ) ); } + @Test public void test777() throws Exception { @@ -47,6 +53,7 @@ public void test777() assertTrue( permissions.size() == 9 ); } + @Test public void testChmodBackAndForth() throws IOException { diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java index 8e5073c8..017bde88 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java @@ -21,14 +21,16 @@ import java.util.Map; import org.codehaus.plexus.util.Os; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; /** * @author Kristian Rosenvold */ public class FileAttributesTest - extends TestCase { + @Test public void testGetPosixFileAttributes() throws Exception { diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java index 573fb2d8..ba0c0023 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java @@ -27,14 +27,21 @@ import java.net.URL; import java.util.Map; -import junit.framework.TestCase; +import org.junit.Test; import static org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils.getFileAttributes; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class PlexusIoResourceAttributeUtilsTest - extends TestCase { + @Test public void testGetAttributesForThisTestClass() throws IOException { @@ -67,6 +74,7 @@ public void testGetAttributesForThisTestClass() assertEquals( System.getProperty( "user.name" ), fileAttrs.getUserName() ); } + @Test public void testDirectory() throws IOException, CommandLineException { @@ -112,6 +120,7 @@ public void testDirectory() assertNotNull( fileAttrs ); } + @Test public void testSrcResource() throws IOException { @@ -134,6 +143,8 @@ public void testSrcResource() assertTrue( pr.getOctalMode() > 0 ); } + + @Test public void testNonExistingDirectory() { File dir = new File( "src/test/noSuchDirectory" ); @@ -148,6 +159,7 @@ public void testNonExistingDirectory() } } + @Test public void testMergeAttributesWithNullBase() { PlexusIoResourceAttributes override = @@ -162,6 +174,7 @@ public void testMergeAttributesWithNullBase() assertEquals( Integer.valueOf( 1001 ), attributes.getUserId() ); } + @Test public void testMergeAttributesWithNullOverrideGroup() { final PlexusIoResourceAttributes override = @@ -176,6 +189,7 @@ public void testMergeAttributesWithNullOverrideGroup() assertEquals( attributes.getUserId(), Integer.valueOf( 1001 ) ); } + @Test public void testMergeAttributesOverride() { final PlexusIoResourceAttributes blank = new SimpleResourceAttributes(); @@ -285,6 +299,7 @@ public void testMergeAttributesOverride() assertEquals( 0111, attributes.getOctalMode() ); } + @Test public void testFileAttributes() throws IOException { @@ -299,6 +314,7 @@ public void testFileAttributes() } } + @Test public void testMergeAttributesDefault() { final PlexusIoResourceAttributes blank = new SimpleResourceAttributes( null, null, null, null, 0 ); diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java index f3e46263..4abda75d 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java @@ -1,7 +1,7 @@ package org.codehaus.plexus.components.io.resources; -import junit.framework.TestCase; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; +import org.junit.Test; import javax.annotation.Nonnull; import java.io.ByteArrayInputStream; @@ -11,13 +11,15 @@ import java.util.Arrays; import java.util.Iterator; +import static org.junit.Assert.assertEquals; + /** * @author Kristian Rosenvold */ public class AbstractPlexusIoResourceCollectionTest - extends TestCase { @SuppressWarnings( "ResultOfMethodCallIgnored" ) + @Test public void testGetIncludes() throws Exception { diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java index d45762d0..954748d2 100755 --- a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java @@ -1,16 +1,18 @@ package org.codehaus.plexus.components.io.resources; -import junit.framework.TestCase; +import org.junit.Test; import java.io.File; import java.util.Iterator; +import static org.junit.Assert.assertTrue; + /** * @author Kristian Rosenvold */ public class PlexusIoFileSupplierResourceCollectionTest - extends TestCase { + @Test public void testGetName() throws Exception { diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java index f636277a..58977713 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java @@ -6,13 +6,16 @@ import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; -import junit.framework.TestCase; import org.codehaus.plexus.components.io.attributes.SymlinkUtils; import org.codehaus.plexus.util.Os; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; public class PlexusIoPlexusIoFileResourceTest - extends TestCase { +{ + @Test public void testRealSymlink() throws IOException { diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java index a7f4b6d3..b4c14420 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java @@ -16,11 +16,11 @@ * limitations under the License. */ -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource; import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection; import org.codehaus.plexus.components.io.resources.PlexusIoResource; import org.codehaus.plexus.components.io.resources.Stream; +import org.junit.Test; import javax.annotation.Nonnull; import java.io.Closeable; @@ -29,17 +29,20 @@ import java.net.URL; import java.util.Iterator; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test case for {@link PlexusIoProxyResourceCollection}. */ public class PlexusIoProxyResourceCollectionTest - extends PlexusTestCase { private final String[] SAMPLE_INCLUDES = { "junk.*", "test/**", "dir*/file.xml" }; private final String[] SAMPLE_EXCLUDES = { "*.junk", "somwhere/**" }; + @Test public void testGetDefaultFileSelector() throws Exception { @@ -103,7 +106,8 @@ public void remove() throw new UnsupportedOperationException(); } } - + + @Test public void testClosing() throws IOException { diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java index 380585fd..035fcb31 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java @@ -1,6 +1,5 @@ package org.codehaus.plexus.components.io.resources.proxy; -import junit.framework.TestCase; import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes; @@ -12,6 +11,7 @@ import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier; import org.codehaus.plexus.components.io.resources.PlexusIoFileResource; import org.codehaus.plexus.components.io.resources.PlexusIoResource; +import org.junit.Test; import javax.annotation.Nonnull; import java.io.ByteArrayInputStream; @@ -19,10 +19,15 @@ import java.io.IOException; import java.io.InputStream; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + public class ProxyFactoryTest - extends TestCase { + @Test public void testCreateProxy() throws Exception { @@ -32,6 +37,7 @@ public void testCreateProxy() assertFalse( proxy instanceof SymlinkDestinationSupplier ); } + @Test public void testCreateProxyWithNameOverride() throws Exception { @@ -46,6 +52,7 @@ public String getName() assertEquals( "fred", proxy.getName() ); } + @Test public void testCreateProxyWithResourceAttributeOverride() throws Exception { @@ -61,6 +68,7 @@ public PlexusIoResourceAttributes getAttributes() assertSame( s, ( (ResourceAttributeSupplier) proxy ).getAttributes() ); } + @Test public void testCreateProxyWithSizeSupplierOverride() throws Exception { @@ -76,7 +84,7 @@ public long getSize() assertEquals( 42, proxy.getSize() ); } - + @Test public void testCreateProxyWithContentSupplierOverride() throws Exception { @@ -94,6 +102,7 @@ public InputStream getContents() assertEquals( s, proxy.getContents() ); } + @Test public void testCreateProxyWithSymlinkDestinationSupplierOverride() throws Exception { From 0a2604337ee7f33a6d17e2c190e698dee285fb5a Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 21 Jun 2022 15:12:37 +0200 Subject: [PATCH 3/8] Fix scope --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b94ff65e..73db69e1 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,7 @@ org.slf4j slf4j-simple ${slf4jVersion} + test From 3c0b59a07a16a85336018d9ac978853f76b26ac8 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 Jun 2022 09:31:29 +0200 Subject: [PATCH 4/8] Drop unused imports --- ...DefaultPlexusIoFileResourceCollection.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java index 484be64d..44634f4c 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/DefaultPlexusIoFileResourceCollection.java @@ -18,25 +18,6 @@ import javax.inject.Named; -import java.io.Closeable; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; - -import org.codehaus.plexus.components.io.attributes.FileAttributes; -import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; -import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes; -import org.codehaus.plexus.components.io.functions.PlexusIoResourceConsumer; -import org.codehaus.plexus.util.DirectoryScanner; -import org.codehaus.plexus.util.StringUtils; - /** * Alias for {@link PlexusIoFileResourceCollection} */ From 4f3f2eeba88ce8044efca028a9c0f1538d48a759 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 Jun 2022 09:42:19 +0200 Subject: [PATCH 5/8] Tidy up --- .../components/io/filemappers/FileMapper.java | 12 +---------- .../fileselectors/AllFilesFileSelector.java | 2 ++ .../io/fileselectors/DefaultFileSelector.java | 2 ++ .../io/fileselectors/FileSelector.java | 10 ---------- .../functions/SymlinkDestinationSupplier.java | 2 +- .../io/resources/EncodingSupported.java | 2 +- .../io/resources/PlexusIoResource.java | 4 ++-- .../resources/PlexusIoResourceCollection.java | 13 +----------- .../io/resources/PlexusIoURLResource.java | 4 +--- .../components/io/resources/Stream.java | 2 +- .../io/filemappers/FileMapperTest.java | 20 +++++++++---------- .../io/filemappers/FileSelectorTest.java | 6 +++--- .../io/filemappers/ResourcesTest.java | 5 ++--- 13 files changed, 27 insertions(+), 57 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/FileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/FileMapper.java index a14b808c..d0478f80 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/FileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/FileMapper.java @@ -21,16 +21,6 @@ */ public interface FileMapper { - /** - * Role used to register component implementations with the container. - */ - public static final String ROLE = FileMapper.class.getName(); - - /** - * The default role-hint: "default". - */ - public static final String DEFAULT_ROLE_HINT = "default"; - /** * Maps the given source name to a target name. * @@ -40,5 +30,5 @@ public interface FileMapper * @throws IllegalArgumentException * The source name is null or empty. */ - public String getMappedFileName( String pName ); + String getMappedFileName( String pName ); } \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java index 3528d14d..90110616 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java @@ -18,10 +18,12 @@ import javax.annotation.Nonnull; import javax.inject.Named; +import javax.inject.Singleton; /** * The default file selector: Selects all files. */ +@Singleton @Named( AllFilesFileSelector.ROLE_HINT ) public class AllFilesFileSelector implements FileSelector { diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java index ab3ab2a5..c1292ec0 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/DefaultFileSelector.java @@ -17,10 +17,12 @@ */ import javax.inject.Named; +import javax.inject.Singleton; /** * Alias for {@link AllFilesFileSelector} */ +@Singleton @Named public class DefaultFileSelector extends AllFilesFileSelector { diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java index e5cf7cf0..d0ad4af0 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java @@ -24,16 +24,6 @@ */ public interface FileSelector { - /** - * Role used to register component implementations with the container. - */ - public static final String ROLE = FileSelector.class.getName(); - - /** - * The default role-hint: "default". - */ - public static final String DEFAULT_ROLE_HINT = "default"; - /** * Returns, whether the given file is selected. * @param fileInfo An instance of FileInfo with the files meta data. diff --git a/src/main/java/org/codehaus/plexus/components/io/functions/SymlinkDestinationSupplier.java b/src/main/java/org/codehaus/plexus/components/io/functions/SymlinkDestinationSupplier.java index 8aa8dfbb..9f5932ad 100644 --- a/src/main/java/org/codehaus/plexus/components/io/functions/SymlinkDestinationSupplier.java +++ b/src/main/java/org/codehaus/plexus/components/io/functions/SymlinkDestinationSupplier.java @@ -23,6 +23,6 @@ */ public interface SymlinkDestinationSupplier { - public String getSymlinkDestination() + String getSymlinkDestination() throws IOException; } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java b/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java index ffaa6dcc..74b1a20b 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java @@ -27,5 +27,5 @@ public interface EncodingSupported * Supplies the encoding to be used for decoding filenames/paths * @param charset The charset to use */ - public void setEncoding( Charset charset ); + void setEncoding( Charset charset ); } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResource.java index 887e84f7..db1aaf17 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResource.java @@ -36,12 +36,12 @@ public interface PlexusIoResource extends FileInfo, SizeSupplier, ContentSupplie /** * Unknown resource size. */ - public static final long UNKNOWN_RESOURCE_SIZE = -1; + long UNKNOWN_RESOURCE_SIZE = -1; /** * Unknown modification date */ - public static final long UNKNOWN_MODIFICATION_DATE = 0; + long UNKNOWN_MODIFICATION_DATE = 0; /** * Returns the date, when the resource was last modified, if known. diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java index 3100d4d8..8ef060ab 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java @@ -25,17 +25,6 @@ */ public interface PlexusIoResourceCollection extends Iterable { - /** - * Role of the ResourceCollection component. - */ - public static final String ROLE = PlexusIoResourceCollection.class.getName(); - - /** - * Role hint of the default resource collection, which is a set - * of files in a base directory. - */ - public static final String DEFAULT_ROLE_HINT = "default"; - /** * Returns an iterator over the resources in the collection. * @return An iterator @@ -47,7 +36,7 @@ public interface PlexusIoResourceCollection extends Iterable * Returns the resources as a stream. * @return A stream for functional iteration */ - public Stream stream(); + Stream stream(); /** * Returns the resources suggested name. This is used for diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java index d840b9e7..c8c3df5b 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java @@ -44,9 +44,7 @@ public InputStream getContents() } catch ( IOException e ) { - IOException ex = new IOException( getDescriptionForError( url ) ); - ex.initCause( e ); - throw ex; + throw new IOException( getDescriptionForError( url ), e ); } } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java b/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java index e3576d1f..8a4fb5b8 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java @@ -26,6 +26,6 @@ public interface Stream * @param resourceConsumer The consumer of the resource * @throws java.io.IOException . */ - public void forEach( PlexusIoResourceConsumer resourceConsumer ) throws IOException; + void forEach( PlexusIoResourceConsumer resourceConsumer ) throws IOException; } diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java index a96f7afb..01ce9e28 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java @@ -88,9 +88,9 @@ private String[] getIdentityResults() public void testDefaultMapper() throws Exception { final String[] results = getIdentityResults(); - testFileMapper( (FileMapper) lookup( FileMapper.ROLE ), SAMPLES, results ); - testFileMapper( (FileMapper) lookup( FileMapper.ROLE, IdentityMapper.ROLE_HINT ), SAMPLES, results ); - testFileMapper( (FileMapper) lookup( FileMapper.ROLE, FileMapper.DEFAULT_ROLE_HINT ), SAMPLES, results ); + testFileMapper( (FileMapper) lookup( FileMapper.class ), SAMPLES, results ); + testFileMapper( (FileMapper) lookup( FileMapper.class, IdentityMapper.ROLE_HINT ), SAMPLES, results ); + testFileMapper( (FileMapper) lookup( FileMapper.class ), SAMPLES, results ); } public void testFileExtensionMapper() throws Exception @@ -105,7 +105,7 @@ public void testFileExtensionMapper() throws Exception results[i] = results[i].substring( 0, results[i].length() - ".gif".length() ) + ".png"; } testFileExtensionMapper( results, new FileExtensionMapper() ); - testFileExtensionMapper( results, (FileExtensionMapper) lookup( FileMapper.ROLE, FileExtensionMapper.ROLE_HINT ) ); + testFileExtensionMapper( results, (FileExtensionMapper) lookup( FileMapper.class, FileExtensionMapper.ROLE_HINT ) ); } private void testFileExtensionMapper( final String[] results, final FileExtensionMapper mapper ) @@ -122,7 +122,7 @@ public void testFlattenMapper() throws Exception results[4] = results[6] = results[8] = results[10] = results[2]; results[5] = results[7] = results[9] = results[11] = results[3]; testFileMapper( new FlattenFileMapper(), SAMPLES, results ); - testFileMapper( (FileMapper) lookup( FileMapper.ROLE, FlattenFileMapper.ROLE_HINT ), SAMPLES, results ); + testFileMapper( (FileMapper) lookup( FileMapper.class, FlattenFileMapper.ROLE_HINT ), SAMPLES, results ); } private void testMergeMapper( String pTargetName, String[] pResults, MergeFileMapper pMapper ) @@ -140,7 +140,7 @@ public void testMergeMapper() throws Exception results[i] = targetName; } testMergeMapper( targetName, results, new MergeFileMapper() ); - testMergeMapper( targetName, results, (MergeFileMapper) lookup( FileMapper.ROLE, MergeFileMapper.ROLE_HINT ) ); + testMergeMapper( targetName, results, (MergeFileMapper) lookup( FileMapper.class, MergeFileMapper.ROLE_HINT ) ); } public void testPrefixMapper() throws Exception @@ -148,7 +148,7 @@ public void testPrefixMapper() throws Exception final String prefix = "x7Rtf"; final String[] results = getIdentityResults(); testFileMapper( new PrefixFileMapper(), SAMPLES, results ); - testFileMapper( (PrefixFileMapper) lookup( FileMapper.ROLE, PrefixFileMapper.ROLE_HINT ), SAMPLES, results ); + testFileMapper( (PrefixFileMapper) lookup( FileMapper.class, PrefixFileMapper.ROLE_HINT ), SAMPLES, results ); for ( int i = 0; i < results.length; i++ ) { if ( results[i] != null ) @@ -159,7 +159,7 @@ public void testPrefixMapper() throws Exception PrefixFileMapper mapper = new PrefixFileMapper(); mapper.setPrefix( prefix ); testFileMapper( mapper, SAMPLES, results ); - mapper = (PrefixFileMapper) lookup( FileMapper.ROLE, PrefixFileMapper.ROLE_HINT ); + mapper = (PrefixFileMapper) lookup( FileMapper.class, PrefixFileMapper.ROLE_HINT ); mapper.setPrefix( prefix ); testFileMapper( mapper, SAMPLES, results ); } @@ -176,7 +176,7 @@ public void testSuffixMapper() throws Exception SuffixFileMapper mapper = new SuffixFileMapper(); mapper.setSuffix( suffix ); testFileMapper( mapper, samples, results ); - mapper = (SuffixFileMapper) lookup( FileMapper.ROLE, SuffixFileMapper.ROLE_HINT ); + mapper = (SuffixFileMapper) lookup( FileMapper.class, SuffixFileMapper.ROLE_HINT ); mapper.setSuffix( suffix ); testFileMapper( mapper, samples, results ); } @@ -198,7 +198,7 @@ public void testRegExpFileMapper() throws Exception results[11] = "c.c\\xyz.jpg"; testFileMapper( configure(new RegExpFileMapper(), "\\.gif$", ".jpg"), SAMPLES, results ); testFileMapper( configure(new RegExpFileMapper(), "^(.*)\\.gif$", "$1.jpg"), SAMPLES, results ); - testFileMapper( configure((RegExpFileMapper) lookup( FileMapper.ROLE, RegExpFileMapper.ROLE_HINT ), "\\.gif$", ".jpg"), SAMPLES, results ); + testFileMapper( configure((RegExpFileMapper) lookup( FileMapper.class, RegExpFileMapper.ROLE_HINT ), "\\.gif$", ".jpg"), SAMPLES, results ); final RegExpFileMapper mapper = configure( new RegExpFileMapper(), "c", "f" ); mapper.setReplaceAll( true ); final String[] fResults = getIdentityResults(); diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java index 93c4ee23..de18e322 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java @@ -89,8 +89,8 @@ private boolean[] getAllTrues() public void testAllFilesFileSelector() throws Exception { testFileSelector( new AllFilesFileSelector() ); - testFileSelector( (AllFilesFileSelector) lookup( FileSelector.ROLE, FileSelector.DEFAULT_ROLE_HINT ) ); - testFileSelector( (AllFilesFileSelector) lookup( FileSelector.ROLE, AllFilesFileSelector.ROLE_HINT ) ); + testFileSelector( (AllFilesFileSelector) lookup( FileSelector.class ) ); + testFileSelector( (AllFilesFileSelector) lookup( FileSelector.class, AllFilesFileSelector.ROLE_HINT ) ); } protected boolean[] getIncludeGifs( String[] pSamples ) @@ -129,7 +129,7 @@ protected void testFileSelector( IncludeExcludeFileSelector pSelector ) throws E public void testIncludeExcludeFileSelector() throws Exception { testFileSelector( new IncludeExcludeFileSelector() ); - testFileSelector( (IncludeExcludeFileSelector) lookup( FileSelector.ROLE, + testFileSelector( (IncludeExcludeFileSelector) lookup( FileSelector.class, IncludeExcludeFileSelector.ROLE_HINT ) ); } diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java index ba4794f4..65e30beb 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java @@ -233,9 +233,8 @@ private void testFileResourceCollection( PlexusIoFileResourceCollection resource public void testFileCollection() throws Exception { createFiles(); - testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.ROLE, - PlexusIoResourceCollection.DEFAULT_ROLE_HINT ) ); - testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.ROLE, + testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.class ) ); + testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.class, PlexusIoFileResourceCollection.ROLE_HINT ) ); } From 936aa3224f54e86d29dc651c1624be38b8a2bed7 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 Jun 2022 10:09:18 +0200 Subject: [PATCH 6/8] Drop plexus alltogether, no need for it. --- pom.xml | 2 +- .../components/io/filemappers/FileMapperTest.java | 12 ++++++++++++ .../components/io/filemappers/FileSelectorTest.java | 9 ++++++++- .../components/io/filemappers/ResourcesTest.java | 7 +++++++ .../components/io/filemappers/TestSupport.java | 11 ++--------- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 73db69e1..f79c6931 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.eclipse.sisu - org.eclipse.sisu.plexus + org.eclipse.sisu.inject ${sisuVersion} test diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java index 01ce9e28..0e398e70 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java @@ -19,6 +19,10 @@ import java.lang.reflect.UndeclaredThrowableException; import java.util.Arrays; +import org.junit.Test; + +import static org.junit.Assert.fail; + /** * Test case for the various file mappers. */ @@ -71,6 +75,7 @@ protected void testFileMapper( FileMapper pMapper, String[] pInput, String[] pOu new String[] { null, "", "a", "xyz.gif", "b/a", "b/xyz.gif", "b\\a", "b\\xyz.gif", "c.c/a", "c.c/xyz.gif", "c.c\\a", "c.c\\xyz.gif" }; + @Test public void testIdentityMapper() throws Exception { final String[] results = getIdentityResults(); @@ -85,6 +90,7 @@ private String[] getIdentityResults() return results; } + @Test public void testDefaultMapper() throws Exception { final String[] results = getIdentityResults(); @@ -93,6 +99,7 @@ public void testDefaultMapper() throws Exception testFileMapper( (FileMapper) lookup( FileMapper.class ), SAMPLES, results ); } + @Test public void testFileExtensionMapper() throws Exception { final String[] results = getIdentityResults(); @@ -116,6 +123,7 @@ private void testFileExtensionMapper( final String[] results, final FileExtensio testFileMapper( mapper, SAMPLES, results ); } + @Test public void testFlattenMapper() throws Exception { final String[] results = getIdentityResults(); @@ -131,6 +139,7 @@ private void testMergeMapper( String pTargetName, String[] pResults, MergeFileMa testFileMapper( pMapper, SAMPLES, pResults ); } + @Test public void testMergeMapper() throws Exception { final String[] results = getIdentityResults(); @@ -143,6 +152,7 @@ public void testMergeMapper() throws Exception testMergeMapper( targetName, results, (MergeFileMapper) lookup( FileMapper.class, MergeFileMapper.ROLE_HINT ) ); } + @Test public void testPrefixMapper() throws Exception { final String prefix = "x7Rtf"; @@ -164,6 +174,7 @@ public void testPrefixMapper() throws Exception testFileMapper( mapper, SAMPLES, results ); } + @Test public void testSuffixMapper() throws Exception { final String suffix = "suffix"; @@ -188,6 +199,7 @@ private RegExpFileMapper configure( RegExpFileMapper pMapper, String pPattern, S return pMapper; } + @Test public void testRegExpFileMapper() throws Exception { final String[] results = getIdentityResults(); diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java index de18e322..6ec4a98f 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java @@ -24,9 +24,13 @@ import org.codehaus.plexus.components.io.fileselectors.FileSelector; import org.codehaus.plexus.components.io.fileselectors.IncludeExcludeFileSelector; import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource; +import org.junit.Test; import javax.annotation.Nonnull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Test case for implementations of {@link FileSelector}. @@ -86,6 +90,7 @@ private boolean[] getAllTrues() return trues; } + @Test public void testAllFilesFileSelector() throws Exception { testFileSelector( new AllFilesFileSelector() ); @@ -126,13 +131,15 @@ protected void testFileSelector( IncludeExcludeFileSelector pSelector ) throws E testFileSelector( pSelector, SAMPLES, getExcludeBar( SAMPLES, getAllTrues() ) ); } + @Test public void testIncludeExcludeFileSelector() throws Exception { testFileSelector( new IncludeExcludeFileSelector() ); testFileSelector( (IncludeExcludeFileSelector) lookup( FileSelector.class, IncludeExcludeFileSelector.ROLE_HINT ) ); } - + + @Test public void testIncludeExcludeFileSelector_SetExcludes() throws Exception { IncludeExcludeFileSelector selector = new IncludeExcludeFileSelector(); diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java index 65e30beb..f89d4d1a 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java @@ -33,6 +33,12 @@ import org.codehaus.plexus.components.io.resources.PlexusIoResource; import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection; import org.codehaus.plexus.util.FileUtils; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** @@ -230,6 +236,7 @@ private void testFileResourceCollection( PlexusIoFileResourceCollection resource testPlexusIoResourceCollection( resourceCollection ); } + @Test public void testFileCollection() throws Exception { createFiles(); diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java index 6cad38fd..4ca439d6 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/TestSupport.java @@ -16,18 +16,11 @@ * limitations under the License. */ -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusTestCase; +import org.eclipse.sisu.launch.InjectedTest; /** * Support for componentized testing. */ -public abstract class TestSupport extends PlexusTestCase +public abstract class TestSupport extends InjectedTest { - @Override - protected void customizeContainerConfiguration( ContainerConfiguration configuration ) - { - configuration.setAutoWiring( true ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ); - } } \ No newline at end of file From 8be41fe8858f65ea6238d25aea0155f8793597c6 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 22 Jun 2022 10:49:01 +0200 Subject: [PATCH 7/8] Update comment, there is no more plexus --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f79c6931..462db8ff 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ ${slf4jVersion} test - + org.eclipse.sisu org.eclipse.sisu.inject From ff6625bfee0479d7a8ab56863224a562bed029e3 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 23 Jun 2022 10:03:58 +0200 Subject: [PATCH 8/8] Update new bits --- .../io/resources/PlexusIoPlexusIoFileResourceTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java index bd8817cd..96e9141e 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java @@ -10,6 +10,8 @@ import org.codehaus.plexus.util.Os; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class PlexusIoPlexusIoFileResourceTest @@ -31,6 +33,7 @@ public void testRealSymlink() assertTrue( target.getName().endsWith( "targetDir" ) ); } + @Test public void testSymSymlinkFile() throws IOException { @@ -48,6 +51,7 @@ public void testSymSymlinkFile() assertFalse( rTT instanceof PlexusIoSymlinkResource ); } + @Test public void testSymlinkFile() throws IOException {