diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java index c33022643f064..ebb8b9d64efc8 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java @@ -180,13 +180,17 @@ private static Collection getMarkerFilePaths(ClassLoader classLo return ret; } - private static Path urlToPath(URL url) { + // package protected for testing purpose + static Path urlToPath(URL url) { try { if (url.getProtocol().equals("jar")) { String jarPath = url.getPath().substring(0, url.getPath().lastIndexOf('!')); return Paths.get(new URI(jarPath)); } else if (url.getProtocol().equals("file")) { int index = url.getPath().lastIndexOf("/META-INF"); + if (index == -1) { + return Paths.get(url.getPath()); + } String pathString = url.getPath().substring(0, index); Path path = Paths.get(new URI(url.getProtocol(), url.getHost(), pathString, null)); return path; diff --git a/core/deployment/src/test/java/io/quarkus/deployment/index/ApplicationArchiveBuildStepTestCase.java b/core/deployment/src/test/java/io/quarkus/deployment/index/ApplicationArchiveBuildStepTestCase.java new file mode 100644 index 0000000000000..15daa24bf5cf4 --- /dev/null +++ b/core/deployment/src/test/java/io/quarkus/deployment/index/ApplicationArchiveBuildStepTestCase.java @@ -0,0 +1,40 @@ +/* + * Copyright 2018 Red Hat, Inc. + * + * 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. + */ + +package io.quarkus.deployment.index; + +import static io.quarkus.deployment.index.ApplicationArchiveBuildStep.urlToPath; +import static org.junit.Assert.assertEquals; + +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.file.Paths; + +import org.junit.Test; + +public class ApplicationArchiveBuildStepTestCase { + @Test + public void testUrlToPath() throws MalformedURLException { + assertEquals(Paths.get("/a/path"), urlToPath(new URL("jar:file:/a/path!/META-INF/services/my.Service"))); + assertEquals(Paths.get("/a/path"), urlToPath(new URL("file:/a/path/META-INF/services/my.Service"))); + assertEquals(Paths.get("/a/path"), urlToPath(new URL("file:/a/path"))); + } + + @Test(expected = RuntimeException.class) + public void testUrlToPathWithWrongProtocol() throws MalformedURLException { + urlToPath(new URL("http://a/path")); + } +}