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

Retrieves file resources via classpath:* ; fixes gh-591

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-04-03 15:52:24 +02:00
parent 497ae30ed4
commit 2c40b3215c
5 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-contract-wiremock/pom.xml
View File

@@ -84,5 +84,18 @@
<artifactId>spring-cloud-contract-verifier</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.spring.initializr</groupId>
<artifactId>initializr-web</artifactId>
<version>0.4.0.BUILD-SNAPSHOT</version>
<classifier>stubs</classifier>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

12
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
View File

@@ -16,13 +16,17 @@
package org.springframework.cloud.contract.wiremock;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.common.Slf4jNotifier;
import com.github.tomakehurst.wiremock.core.Options;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.PostConstruct;
import com.github.tomakehurst.wiremock.common.Slf4jNotifier;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -36,10 +40,6 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.core.Options;
/**
* Configuration and lifecycle for a Spring Application context that wants to run a
* WireMock server. Can be used by adding
@@ -120,7 +120,7 @@ public class WireMockConfiguration implements SmartLifecycle {
private void registerFiles(com.github.tomakehurst.wiremock.core.WireMockConfiguration factory) throws IOException {
List<Resource> resources = new ArrayList<>();
for (String files : this.wireMock.getServer().getFiles()) {
for (String files : this.wireMock.getServer().getFiles()) {
if (StringUtils.hasText(files)) {
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(
this.resourceLoader);

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

@@ -16,22 +16,25 @@
package org.springframework.cloud.contract.wiremock.file;
import com.github.tomakehurst.wiremock.common.BinaryFile;
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 java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import com.github.tomakehurst.wiremock.common.BinaryFile;
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.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import static java.util.Arrays.asList;
/**
* @author Dave Syer
* @author Pei-Tang Huang
@@ -61,8 +64,7 @@ public class ResourcesFileSource implements FileSource {
sources[i] = new SingleRootFileSource(files.getFile());
}
else if (resource instanceof UrlResource) {
UrlResource files = (UrlResource) resource;
sources[i] = new SingleRootFileSource(getFile(files));
sources[i] = fileOrFallbackToClasspath(resource);
}
else {
throw new IllegalArgumentException("Unsupported resource type for file source: " + resource.getClass());
@@ -71,9 +73,31 @@ public class ResourcesFileSource implements FileSource {
return sources;
}
private static File getFile(UrlResource files) {
private static FileSource fileOrFallbackToClasspath(Resource resource) {
UrlResource file = (UrlResource) resource;
try {
return files.getFile();
URI uri = file.getURI();
if (compressedResource(uri)) {
return new ClasspathFileSource(pathFromCompressed(uri));
}
return new SingleRootFileSource(getFile(file));
} catch (IOException e) {
throw new IllegalStateException(e);
}
}
private static String pathFromCompressed(URI pathUri) {
String path = pathUri.getSchemeSpecificPart().split("!")[1];
return path.startsWith("/") ? path.substring(1) : path;
}
private static boolean compressedResource(URI pathUri) {
return asList("jar", "war", "ear", "zip").contains(pathUri.getScheme());
}
private static File getFile(UrlResource file) {
try {
return file.getFile();
}
catch (IOException e) {
throw new IllegalStateException(e);
@@ -199,4 +223,4 @@ public class ResourcesFileSource implements FileSource {
}
}
}

5
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithUrlResourceTests.java
View File

@@ -13,7 +13,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(classes=WiremockTestsApplication.class, properties="app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment=WebEnvironment.NONE)
@DirtiesContext
@AutoConfigureWireMock(port=0, files="classpath*:root")
// resource from a Initilizr stubs jar
@AutoConfigureWireMock(port=0, files="classpath*:META-INF/io.spring.initializr/initializr-web/0.4.0.BUILD-SNAPSHOT")
public class AutoConfigureWireMockFilesApplicationWithUrlResourceTests {
@Autowired
@@ -21,7 +22,7 @@ public class AutoConfigureWireMockFilesApplicationWithUrlResourceTests {
@Test
public void contextLoads() throws Exception {
assertThat(this.service.go()).isEqualTo("{\"message\":\"Hello Root\"}");
assertThat(this.service.pom()).contains("<artifactId>spring-boot-starter-parent</artifactId>");
}
}

18
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java
View File

@@ -1,11 +1,16 @@
package org.springframework.cloud.contract.wiremock;
import java.net.URI;
import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.http.MediaType;
import org.springframework.http.RequestEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -58,6 +63,19 @@ class Service {
return this.restTemplate.getForEntity(this.base + "/test", String.class).getBody();
}
public String pom() {
return this.restTemplate.exchange(
RequestEntity.get(URI.create(this.base + "/pom.xml"))
.accept(mediaTypes()).build(), String.class).getBody();
}
private MediaType[] mediaTypes() {
return Stream
.of("text/plain", "text/plain", "application/json", "application/json",
"application/*+json", "application/*+json", "*/*", "*/*")
.map(MediaType::valueOf).toArray(MediaType[]::new);
}
public void setBase(String base) {
this.base = base;
}