Skip to content

Commit

Permalink
spring-cloudgh-89 List maven repositories that were used when resolut…
Browse files Browse the repository at this point in the history
…ion of artifact fails

- Add `ResourceNotResolvedException` to `DelegatingResourceLoader`
  • Loading branch information
markpollack authored and donovanmuller committed Nov 12, 2016
1 parent e07162e commit f1d6c4c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,19 @@ Resource resolve(MavenResource resource) {
resolvedArtifact = results.get(results.size() - 1);
}
catch (ArtifactResolutionException e) {
final StringBuilder errorMessage = new StringBuilder("failed to resolve MavenResource: %s. Configured remote ");

if (properties.getRemoteRepositories().size() > 1) {
errorMessage.append("repositories: ");
}
else {
errorMessage.append("repository: ");
}

errorMessage.append(StringUtils.collectionToCommaDelimitedString(properties.getRemoteRepositories().keySet()));

throw new IllegalStateException(
String.format("failed to resolve MavenResource: %s", resource.toString()), e);
String.format(errorMessage.toString(), resource.toString()), e);
}
return toResource(resolvedArtifact);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
Expand Down Expand Up @@ -137,12 +136,10 @@ public Resource getResource(String location) {
return new FileSystemResource(cachedResource);
}
}
catch (URISyntaxException e) {
throw new IllegalArgumentException(e);
}
catch (IOException e) {
throw new IllegalStateException(e);
catch (Exception e) {
throw new ResourceNotResolvedException(e.getMessage(), e);
}

}

@Override
Expand Down Expand Up @@ -187,4 +184,5 @@ private static boolean existsAsFile(Resource resource) {
}
return false;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 2016 the original author or authors.
*
* 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 org.springframework.cloud.deployer.resource.support;

/**
* Thrown to indicate failure resolving a {@link org.springframework.core.io.Resource}.
*
* @author Mark Pollack
*/
@SuppressWarnings("serial")
public class ResourceNotResolvedException extends RuntimeException {

/**
* Create a new {@link ResourceNotResolvedException} with the specified options.
* @param message the exception message to display to the user
* @param cause the underlying cause
*/
public ResourceNotResolvedException(String message, Throwable cause) {
super(message, cause);
}
}

0 comments on commit f1d6c4c

Please sign in to comment.