SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improving observability when debugging broken wiremock configurations (#1891)

Browse Source
This commit is contained in:
geirhede
2023-04-20 13:02:56 +02:00
committed by GitHub
parent 81e3d65346
commit ccabfb3dec
1 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java
View File

@@ -27,6 +27,8 @@ import com.github.tomakehurst.wiremock.common.ClasspathFileSource;
import com.github.tomakehurst.wiremock.common.FileSource;
import com.github.tomakehurst.wiremock.common.SingleRootFileSource;
import com.github.tomakehurst.wiremock.common.TextFile;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
@@ -42,6 +44,8 @@ import static java.util.Arrays.asList;
*/
public class ResourcesFileSource implements FileSource {
private static final Log log = LogFactory.getLog(ResourcesFileSource.class);
private final FileSource[] sources;
public ResourcesFileSource(Resource... resources) {
@@ -109,6 +113,9 @@ public class ResourcesFileSource implements FileSource {
@Override
public BinaryFile getBinaryFileNamed(String name) {
for (FileSource resource : this.sources) {
if (log.isDebugEnabled()) {
log.debug("Trying FileSource with path " + resource.getPath());
}
try {
if (resource instanceof ClasspathFileSource) {
ClasspathFileSource classpathFileSource = (ClasspathFileSource) resource;
@@ -125,25 +132,36 @@ public class ResourcesFileSource implements FileSource {
}
}
catch (RuntimeException e) {
// Ignore - find next stub file
if (log.isDebugEnabled()) {
log.debug("Caught exception while trying to create file handle for file " + name
+ ", trying next FileSource", e);
}
}
catch (IOException e) {
// Ignore - find next stub file
if (log.isDebugEnabled()) {
log.debug("Caught exception while trying to create file handle for file " + name
+ ", trying next FileSource", e);
}
}
}
throw new IllegalStateException("Cannot create file for " + name);
throw new IllegalStateException("Cannot create file handler for " + name);
}
@Override
public TextFile getTextFileNamed(String name) {
for (FileSource resource : this.sources) {
if (log.isDebugEnabled()) {
log.debug("Trying FileSource with path " + resource.getPath());
}
TextFile file = resource.getTextFileNamed(name);
try {
file.readContentsAsString();
return file;
}
catch (RuntimeException e) {
// Ignore
if (log.isDebugEnabled()) {
log.debug("Caught exception while trying to create file handler for " + name, e);
}
}
}
return null;
@@ -158,6 +176,9 @@ public class ResourcesFileSource implements FileSource {
public FileSource child(String subDirectoryName) {
List<FileSource> childSources = new ArrayList<>();
for (FileSource resource : this.sources) {
if (log.isDebugEnabled()) {
log.debug("Trying FileSource with path " + resource.getPath());
}
try {
UrlResource uri = new UrlResource(resource.child(subDirectoryName).getUri());
if (uri.exists()) {
@@ -166,7 +187,10 @@ public class ResourcesFileSource implements FileSource {
}
}
catch (IOException e) {
// Ignore
if (log.isDebugEnabled()) {
log.debug("Caught exception while trying to create file source for " + subDirectoryName
+ ", continuing with next source", e);
}
}
}
if (!childSources.isEmpty()) {
@@ -178,6 +202,9 @@ public class ResourcesFileSource implements FileSource {
@Override
public String getPath() {
for (FileSource resource : this.sources) {
if (log.isDebugEnabled()) {
log.debug("Trying FileSource with path " + resource.getPath());
}
try {
UrlResource uri = new UrlResource(resource.getUri());
if (uri.exists()) {
@@ -185,7 +212,10 @@ public class ResourcesFileSource implements FileSource {
}
}
catch (IOException e) {
// Ignore
if (log.isDebugEnabled()) {
log.debug("Caught exception while trying to create URL file handler for " + resource.getPath()
+ ", continuing with next source", e);
}
}
}
return this.sources[0].getPath();
@@ -194,6 +224,9 @@ public class ResourcesFileSource implements FileSource {
@Override
public URI getUri() {
for (FileSource resource : this.sources) {
if (log.isDebugEnabled()) {
log.debug("Trying FileSource with path " + resource.getPath());
}
try {
UrlResource uri = new UrlResource(resource.getUri());
if (uri.exists()) {
@@ -201,7 +234,10 @@ public class ResourcesFileSource implements FileSource {
}
}
catch (IOException e) {
// Ignore
if (log.isDebugEnabled()) {
log.debug("Caught exception while trying to create URL file handler for " + resource.getPath()
+ ", continuing with next source", e);
}
}
}
return this.sources[0].getUri();