diff --git a/packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/generator/Util.java b/packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/generator/Util.java index 378a4d2f6..0ae89cfdb 100644 --- a/packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/generator/Util.java +++ b/packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/generator/Util.java @@ -19,8 +19,6 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.commons.io.FilenameUtils; - public class Util { public static String generateHash(byte[] content) throws Exception { if (content == null) @@ -44,8 +42,7 @@ public static String getNormalizedFolder(String folder) { // Resolve the relative path Path absolutePath = currentDirectory.resolve(folder); - String normalizedfolder = FilenameUtils.separatorsToUnix(absolutePath.toString()); - return normalizedfolder; + return absolutePath.toString(); } } diff --git a/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandOptionsTest.java b/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandOptionsTest.java index 3db10ba2d..421cdec1d 100644 --- a/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandOptionsTest.java +++ b/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandOptionsTest.java @@ -41,7 +41,7 @@ public void testConfigureWithAllRequiredOptions() throws ParseException { generateCommandOptions.configure(args); String outputDir = Util.getNormalizedFolder("outputDir"); - assertEquals(outputDir, configBean.getOutputFolder().toString()); + assertEquals(outputDir, configBean.getOutputFolder().toPath().toString()); assertEquals("catalogName", configBean.getCatalogsName()); assertEquals("kameletsVersion", configBean.getKameletsVersion()); } diff --git a/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandTest.java b/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandTest.java index d569d79c7..f0b365e41 100644 --- a/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandTest.java +++ b/packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCommandTest.java @@ -24,6 +24,7 @@ import org.junit.jupiter.api.io.TempDir; import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -84,7 +85,8 @@ void testGeneratorCalledWithCorrectParameters() { File expectedFolder = new File(tempDir, "camel-main/4.8.0"); verify(builder, times(1)).withOutputDirectory(expectedFolder); - assertEquals(catalogDefinition.getFileName(), "camel-main/4.8.0/index.json"); + String expectedFile = Path.of("camel-main", "4.8.0", "index.json").toString(); + assertEquals(catalogDefinition.getFileName(), expectedFile); } } @@ -123,7 +125,9 @@ void testCatalogLibraryOutput() { assertEquals(catalogLibraryEntry.name(), "test-camel-catalog"); assertEquals(catalogLibraryEntry.version(), "4.8.0"); assertEquals(catalogLibraryEntry.runtime(), "Main"); - assertEquals(catalogLibraryEntry.fileName(), "camel-main/4.8.0/index.json"); + + String expectedFile = Path.of("camel-main", "4.8.0", "index.json").toString(); + assertEquals(catalogLibraryEntry.fileName(), expectedFile); } } -} \ No newline at end of file +}