Skip to content

Commit

Permalink
Merge pull request quarkusio#2748 from lburgazzoli/github-2747
Browse files Browse the repository at this point in the history
StringIndexOutOfBoundsException in ApplicationArchiveBuildStep
  • Loading branch information
stuartwdouglas authored Jun 11, 2019
2 parents cb48004 + 09fca84 commit e6b47d6
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,17 @@ private static Collection<? extends Path> 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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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"));
}
}

0 comments on commit e6b47d6

Please sign in to comment.