From afc034d2d8e5c17615c18eba1ab3d2529b6758a6 Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Sun, 29 Sep 2024 12:13:20 +0200 Subject: [PATCH] chore: restructuring project to make rootProject main artifact --- build.gradle | 171 +++++++----------- gradle.properties | 4 +- settings.gradle | 4 +- .../wiremock/spring/ConfigureWireMock.java | 0 .../org/wiremock/spring/EnableWireMock.java | 0 .../org/wiremock/spring/InjectWireMock.java | 0 .../WireMockConfigurationCustomizer.java | 0 .../spring/internal/Slf4jNotifier.java | 0 .../org/wiremock/spring/internal/Store.java | 0 .../internal/WireMockContextCustomizer.java | 0 .../WireMockContextCustomizerFactory.java | 0 .../internal/WireMockServerCreator.java | 0 .../internal/WireMockSpringExtension.java | 0 .../main/resources/META-INF/spring.factories | 0 .../main/resources/application.properties | 0 .../app/MultiplePropertiesBindingTest.java | 0 ...estedClassWireMockSpringExtensionTest.java | 0 .../java/app/SinglePropertyBindingTest.java | 0 .../java/app/WireMockSpringExtensionTest.java | 0 .../WireMockConfigurationCustomizerTest.java | 0 .../src/main/java/app/App.java | 0 .../java/app/controller/TodoController.java | 0 .../src/main/java/app/controller/TodoDTO.java | 0 .../src/main/java/app/todoclient/Todo.java | 0 .../main/java/app/todoclient/TodoClient.java | 0 .../src/main/java/app/userclient/User.java | 0 .../main/java/app/userclient/UserClient.java | 0 .../src/main/resources/application.properties | 0 .../test/java/app/CustomPropertiesTest.java | 0 .../test/java/app/DefaultPropertiesTest.java | 0 .../java/app/FilesUnderClasspathTest.java | 0 .../java/app/FilesUnderDirectoryTests.java | 0 .../src/test/java/app/JavaStubbingTest.java | 0 .../test/java/app/MultipleWireMocksTest.java | 0 .../src/test/java/app/SingleWireMockTest.java | 0 .../custom-location/mappings/todos.json | 4 +- .../user-client/mappings/get-users.json | 4 +- .../test/wiremock-mappings/mappings/get.json | 4 +- 38 files changed, 78 insertions(+), 113 deletions(-) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/ConfigureWireMock.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/EnableWireMock.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/InjectWireMock.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/internal/Slf4jNotifier.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/internal/Store.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/internal/WireMockServerCreator.java (100%) rename {wiremock-spring-boot/src => src}/main/java/org/wiremock/spring/internal/WireMockSpringExtension.java (100%) rename {wiremock-spring-boot/src => src}/main/resources/META-INF/spring.factories (100%) rename {wiremock-spring-boot/src => src}/main/resources/application.properties (100%) rename {wiremock-spring-boot/src => src}/test/java/app/MultiplePropertiesBindingTest.java (100%) rename {wiremock-spring-boot/src => src}/test/java/app/NestedClassWireMockSpringExtensionTest.java (100%) rename {wiremock-spring-boot/src => src}/test/java/app/SinglePropertyBindingTest.java (100%) rename {wiremock-spring-boot/src => src}/test/java/app/WireMockSpringExtensionTest.java (100%) rename {wiremock-spring-boot/src => src}/test/java/org/wiremock/spring/WireMockConfigurationCustomizerTest.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/App.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/controller/TodoController.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/controller/TodoDTO.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/todoclient/Todo.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/todoclient/TodoClient.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/userclient/User.java (100%) rename {example => wiremock-spring-boot-example}/src/main/java/app/userclient/UserClient.java (100%) rename {example => wiremock-spring-boot-example}/src/main/resources/application.properties (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/CustomPropertiesTest.java (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/DefaultPropertiesTest.java (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/FilesUnderClasspathTest.java (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/FilesUnderDirectoryTests.java (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/JavaStubbingTest.java (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/MultipleWireMocksTest.java (100%) rename {example => wiremock-spring-boot-example}/src/test/java/app/SingleWireMockTest.java (100%) rename {example => wiremock-spring-boot-example}/src/test/resources/custom-location/mappings/todos.json (82%) rename {example => wiremock-spring-boot-example}/src/test/resources/wiremock/user-client/mappings/get-users.json (71%) rename {example => wiremock-spring-boot-example}/src/test/wiremock-mappings/mappings/get.json (65%) diff --git a/build.gradle b/build.gradle index 82ac03e..1c1bfac 100644 --- a/build.gradle +++ b/build.gradle @@ -1,119 +1,76 @@ buildscript { - repositories { - maven { url "https://oss.sonatype.org" } - maven { url "https://plugins.gradle.org/m2/" } - mavenCentral() - } - dependencies { - classpath "org.wiremock.tools.gradle:extension-convention-plugin:0.3.0" - classpath 'se.bjurr.gitchangelog:git-changelog-lib:1.175.2' - } + repositories { + maven { url "https://oss.sonatype.org" } + maven { url "https://plugins.gradle.org/m2/" } + mavenCentral() + mavenLocal() + } + dependencies { + classpath 'se.bjurr.gitchangelog:git-changelog-lib:1.175.2' + classpath "org.wiremock.tools.gradle:gradle-wiremock-extension-plugins:latest-SNAPSHOT" + classpath "se.bjurr.gradle:java-convention-gradle-plugin:latest-SNAPSHOT" + classpath "se.bjurr.gradle:update-versions-gradle-plugin:latest-SNAPSHOT" + } } -plugins { - id 'idea' - id 'eclipse' - id 'project-report' - id 'com.diffplug.spotless' version '6.25.0' - id 'org.wiremock.tools.gradle.wiremock-extension-convention' version '0.3.0' -} - -def bumpVersionTo(version) { - def propertyFile = new File("$projectDir/gradle.properties") - def gradleProps = new Properties() - propertyFile.withReader { gradleProps.load(it) } - def currentVersion = gradleProps.getProperty("version") - if (currentVersion == version) { - logger.lifecycle("Version not changed (${currentVersion})") - } else { - logger.lifecycle("Version changed (${currentVersion} -> ${version})") - gradleProps.setProperty('version', version) - propertyFile.withWriter { gradleProps.store(it, null) } - } -} - -task setConventionalVersion() { - doFirst { - def nextVersion = se.bjurr.gitchangelog.api.GitChangelogApi.gitChangelogApiBuilder() - .withFromRepo(file('.')) - .withSemanticMajorVersionPattern("^[Bb]reak") - .withSemanticMinorVersionPattern("^[Ff]eat") - .getNextSemanticVersion() - .getVersion(); - def nextSnapshot = "${nextVersion}-SNAPSHOT" - bumpVersionTo(nextSnapshot) - } -} -build.dependsOn setConventionalVersion +apply plugin: 'project-report' +apply plugin: 'org.wiremock.tools.gradle.wiremock-extension-convention' allprojects { - repositories { - mavenLocal() - mavenCentral() - } - - apply plugin: 'java-library' - sourceCompatibility = 17 - targetCompatibility = 17 + apply plugin: 'se.bjurr.gradle.java-convention' + apply plugin: 'se.bjurr.gradle.update-versions' - apply plugin: 'com.diffplug.spotless' - spotless { - java { - target 'src/**/*.java' - googleJavaFormat('1.17.0') - ratchetFrom 'origin/main' - trimTrailingWhitespace() - endWithNewline() - targetExclude '**/Tmp*.java' - } - groovyGradle { - target '**/*.gradle' - greclipse() - indentWithSpaces(2) - trimTrailingWhitespace() - endWithNewline() - } - json { - target 'src/**/*.json' - targetExclude '**/tmp*.json', 'src/test/resources/sample.json', 'src/main/resources/swagger/*.json', 'src/test/resources/filesource/subdir/deepfile.json', 'src/test/resources/schema-validation/*.json' - simple().indentWithSpaces(2) - } - } - - test { - useJUnitPlatform() - testLogging { - events "PASSED", "FAILED", "SKIPPED" - exceptionFormat "full" - } - } + dependencies { + testImplementation "org.springframework.boot:spring-boot-starter-test:3.3.4" + testImplementation 'org.assertj:assertj-core:3.26.3' + testImplementation platform('org.junit:junit-bom:5.10.2') + testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.junit.platform:junit-platform-launcher' + } +} - dependencies { - testImplementation "org.springframework.boot:spring-boot-starter-test:3.3.4" - testImplementation 'org.assertj:assertj-core:3.26.3' - testImplementation platform('org.junit:junit-bom:5.10.2') - testImplementation 'org.junit.jupiter:junit-jupiter' - testImplementation 'org.junit.platform:junit-platform-launcher' - } +dependencies { + api 'org.wiremock:wiremock-standalone:3.9.1' + api "org.springframework.boot:spring-boot-test:3.3.4" + api "org.springframework:spring-test:6.1.13" + api "org.slf4j:slf4j-api:2.0.16" + api "org.junit.jupiter:junit-jupiter-api:5.11.0" } -project('wiremock-spring-boot', { - dependencies { - api 'org.wiremock:wiremock-standalone:3.9.1' - api "org.springframework.boot:spring-boot-test:3.3.4" - api "org.springframework:spring-test:6.1.13" - api "org.slf4j:slf4j-api:2.0.16" - api "org.junit.jupiter:junit-jupiter-api:5.11.0" - compileOnly "com.github.spotbugs:spotbugs-annotations:4.8.6" - } +project('wiremock-spring-boot-example', { + dependencies { + implementation "org.springframework.boot:spring-boot-starter-web:3.3.4" + implementation "org.springframework.boot:spring-boot-starter-webflux:3.3.4" + + testImplementation rootProject + testImplementation 'io.rest-assured:rest-assured:5.5.0' + } }) -project('example', { - dependencies { - implementation "org.springframework.boot:spring-boot-starter-web:3.3.4" - implementation "org.springframework.boot:spring-boot-starter-webflux:3.3.4" +def bumpVersionTo(version) { + def propertyFile = new File("$projectDir/gradle.properties") + def gradleProps = new Properties() + propertyFile.withReader { gradleProps.load(it) } + def currentVersion = gradleProps.getProperty("version") + if (currentVersion == version) { + logger.lifecycle("Version not changed (${currentVersion})") + } else { + logger.lifecycle("Version changed (${currentVersion} -> ${version})") + gradleProps.setProperty('version', version) + propertyFile.withWriter { gradleProps.store(it, null) } + } +} - testImplementation project(':wiremock-spring-boot') - testImplementation 'io.rest-assured:rest-assured:5.5.0' - } -}) +task setConventionalVersion() { + doFirst { + def nextVersion = se.bjurr.gitchangelog.api.GitChangelogApi.gitChangelogApiBuilder() + .withFromRepo(file('.')) + .withSemanticMajorVersionPattern("^[Bb]reak") + .withSemanticMinorVersionPattern("^[Ff]eat") + .getNextSemanticVersion() + .getVersion(); + def nextSnapshot = "${nextVersion}-SNAPSHOT" + bumpVersionTo(nextSnapshot) + } +} +build.dependsOn setConventionalVersion diff --git a/gradle.properties b/gradle.properties index 05d9f0f..69c25a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,6 @@ description=WireMock integration for Spring Boot. developer.name=Tomas Bjerre developer.email=tomas.bjerre85@gmail.com version=3.0.0-SNAPSHOT -group=org.wiremock.spring +sourceCompatibility=17 +targetCompatibility=17 +useShadow=false \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0be3915..0c2de6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'wiremock-spring-boot-parent' -include 'wiremock-spring-boot', 'example' +rootProject.name = 'wiremock-spring-boot' +include 'wiremock-spring-boot-example' diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/ConfigureWireMock.java b/src/main/java/org/wiremock/spring/ConfigureWireMock.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/ConfigureWireMock.java rename to src/main/java/org/wiremock/spring/ConfigureWireMock.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/EnableWireMock.java b/src/main/java/org/wiremock/spring/EnableWireMock.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/EnableWireMock.java rename to src/main/java/org/wiremock/spring/EnableWireMock.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/InjectWireMock.java b/src/main/java/org/wiremock/spring/InjectWireMock.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/InjectWireMock.java rename to src/main/java/org/wiremock/spring/InjectWireMock.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java b/src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java rename to src/main/java/org/wiremock/spring/WireMockConfigurationCustomizer.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java b/src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java rename to src/main/java/org/wiremock/spring/internal/Slf4jNotifier.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Store.java b/src/main/java/org/wiremock/spring/internal/Store.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/Store.java rename to src/main/java/org/wiremock/spring/internal/Store.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java b/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java rename to src/main/java/org/wiremock/spring/internal/WireMockContextCustomizer.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java b/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java rename to src/main/java/org/wiremock/spring/internal/WireMockContextCustomizerFactory.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java b/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java rename to src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringExtension.java b/src/main/java/org/wiremock/spring/internal/WireMockSpringExtension.java similarity index 100% rename from wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringExtension.java rename to src/main/java/org/wiremock/spring/internal/WireMockSpringExtension.java diff --git a/wiremock-spring-boot/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories similarity index 100% rename from wiremock-spring-boot/src/main/resources/META-INF/spring.factories rename to src/main/resources/META-INF/spring.factories diff --git a/wiremock-spring-boot/src/main/resources/application.properties b/src/main/resources/application.properties similarity index 100% rename from wiremock-spring-boot/src/main/resources/application.properties rename to src/main/resources/application.properties diff --git a/wiremock-spring-boot/src/test/java/app/MultiplePropertiesBindingTest.java b/src/test/java/app/MultiplePropertiesBindingTest.java similarity index 100% rename from wiremock-spring-boot/src/test/java/app/MultiplePropertiesBindingTest.java rename to src/test/java/app/MultiplePropertiesBindingTest.java diff --git a/wiremock-spring-boot/src/test/java/app/NestedClassWireMockSpringExtensionTest.java b/src/test/java/app/NestedClassWireMockSpringExtensionTest.java similarity index 100% rename from wiremock-spring-boot/src/test/java/app/NestedClassWireMockSpringExtensionTest.java rename to src/test/java/app/NestedClassWireMockSpringExtensionTest.java diff --git a/wiremock-spring-boot/src/test/java/app/SinglePropertyBindingTest.java b/src/test/java/app/SinglePropertyBindingTest.java similarity index 100% rename from wiremock-spring-boot/src/test/java/app/SinglePropertyBindingTest.java rename to src/test/java/app/SinglePropertyBindingTest.java diff --git a/wiremock-spring-boot/src/test/java/app/WireMockSpringExtensionTest.java b/src/test/java/app/WireMockSpringExtensionTest.java similarity index 100% rename from wiremock-spring-boot/src/test/java/app/WireMockSpringExtensionTest.java rename to src/test/java/app/WireMockSpringExtensionTest.java diff --git a/wiremock-spring-boot/src/test/java/org/wiremock/spring/WireMockConfigurationCustomizerTest.java b/src/test/java/org/wiremock/spring/WireMockConfigurationCustomizerTest.java similarity index 100% rename from wiremock-spring-boot/src/test/java/org/wiremock/spring/WireMockConfigurationCustomizerTest.java rename to src/test/java/org/wiremock/spring/WireMockConfigurationCustomizerTest.java diff --git a/example/src/main/java/app/App.java b/wiremock-spring-boot-example/src/main/java/app/App.java similarity index 100% rename from example/src/main/java/app/App.java rename to wiremock-spring-boot-example/src/main/java/app/App.java diff --git a/example/src/main/java/app/controller/TodoController.java b/wiremock-spring-boot-example/src/main/java/app/controller/TodoController.java similarity index 100% rename from example/src/main/java/app/controller/TodoController.java rename to wiremock-spring-boot-example/src/main/java/app/controller/TodoController.java diff --git a/example/src/main/java/app/controller/TodoDTO.java b/wiremock-spring-boot-example/src/main/java/app/controller/TodoDTO.java similarity index 100% rename from example/src/main/java/app/controller/TodoDTO.java rename to wiremock-spring-boot-example/src/main/java/app/controller/TodoDTO.java diff --git a/example/src/main/java/app/todoclient/Todo.java b/wiremock-spring-boot-example/src/main/java/app/todoclient/Todo.java similarity index 100% rename from example/src/main/java/app/todoclient/Todo.java rename to wiremock-spring-boot-example/src/main/java/app/todoclient/Todo.java diff --git a/example/src/main/java/app/todoclient/TodoClient.java b/wiremock-spring-boot-example/src/main/java/app/todoclient/TodoClient.java similarity index 100% rename from example/src/main/java/app/todoclient/TodoClient.java rename to wiremock-spring-boot-example/src/main/java/app/todoclient/TodoClient.java diff --git a/example/src/main/java/app/userclient/User.java b/wiremock-spring-boot-example/src/main/java/app/userclient/User.java similarity index 100% rename from example/src/main/java/app/userclient/User.java rename to wiremock-spring-boot-example/src/main/java/app/userclient/User.java diff --git a/example/src/main/java/app/userclient/UserClient.java b/wiremock-spring-boot-example/src/main/java/app/userclient/UserClient.java similarity index 100% rename from example/src/main/java/app/userclient/UserClient.java rename to wiremock-spring-boot-example/src/main/java/app/userclient/UserClient.java diff --git a/example/src/main/resources/application.properties b/wiremock-spring-boot-example/src/main/resources/application.properties similarity index 100% rename from example/src/main/resources/application.properties rename to wiremock-spring-boot-example/src/main/resources/application.properties diff --git a/example/src/test/java/app/CustomPropertiesTest.java b/wiremock-spring-boot-example/src/test/java/app/CustomPropertiesTest.java similarity index 100% rename from example/src/test/java/app/CustomPropertiesTest.java rename to wiremock-spring-boot-example/src/test/java/app/CustomPropertiesTest.java diff --git a/example/src/test/java/app/DefaultPropertiesTest.java b/wiremock-spring-boot-example/src/test/java/app/DefaultPropertiesTest.java similarity index 100% rename from example/src/test/java/app/DefaultPropertiesTest.java rename to wiremock-spring-boot-example/src/test/java/app/DefaultPropertiesTest.java diff --git a/example/src/test/java/app/FilesUnderClasspathTest.java b/wiremock-spring-boot-example/src/test/java/app/FilesUnderClasspathTest.java similarity index 100% rename from example/src/test/java/app/FilesUnderClasspathTest.java rename to wiremock-spring-boot-example/src/test/java/app/FilesUnderClasspathTest.java diff --git a/example/src/test/java/app/FilesUnderDirectoryTests.java b/wiremock-spring-boot-example/src/test/java/app/FilesUnderDirectoryTests.java similarity index 100% rename from example/src/test/java/app/FilesUnderDirectoryTests.java rename to wiremock-spring-boot-example/src/test/java/app/FilesUnderDirectoryTests.java diff --git a/example/src/test/java/app/JavaStubbingTest.java b/wiremock-spring-boot-example/src/test/java/app/JavaStubbingTest.java similarity index 100% rename from example/src/test/java/app/JavaStubbingTest.java rename to wiremock-spring-boot-example/src/test/java/app/JavaStubbingTest.java diff --git a/example/src/test/java/app/MultipleWireMocksTest.java b/wiremock-spring-boot-example/src/test/java/app/MultipleWireMocksTest.java similarity index 100% rename from example/src/test/java/app/MultipleWireMocksTest.java rename to wiremock-spring-boot-example/src/test/java/app/MultipleWireMocksTest.java diff --git a/example/src/test/java/app/SingleWireMockTest.java b/wiremock-spring-boot-example/src/test/java/app/SingleWireMockTest.java similarity index 100% rename from example/src/test/java/app/SingleWireMockTest.java rename to wiremock-spring-boot-example/src/test/java/app/SingleWireMockTest.java diff --git a/example/src/test/resources/custom-location/mappings/todos.json b/wiremock-spring-boot-example/src/test/resources/custom-location/mappings/todos.json similarity index 82% rename from example/src/test/resources/custom-location/mappings/todos.json rename to wiremock-spring-boot-example/src/test/resources/custom-location/mappings/todos.json index 92ab4b1..6c437a6 100644 --- a/example/src/test/resources/custom-location/mappings/todos.json +++ b/wiremock-spring-boot-example/src/test/resources/custom-location/mappings/todos.json @@ -4,7 +4,9 @@ "url": "/" }, "response": { - "headers": {"Content-Type": "application/json"}, + "headers": { + "Content-Type": "application/json" + }, "jsonBody": [ { "id": 1, diff --git a/example/src/test/resources/wiremock/user-client/mappings/get-users.json b/wiremock-spring-boot-example/src/test/resources/wiremock/user-client/mappings/get-users.json similarity index 71% rename from example/src/test/resources/wiremock/user-client/mappings/get-users.json rename to wiremock-spring-boot-example/src/test/resources/wiremock/user-client/mappings/get-users.json index 402f0e0..0e47318 100644 --- a/example/src/test/resources/wiremock/user-client/mappings/get-users.json +++ b/wiremock-spring-boot-example/src/test/resources/wiremock/user-client/mappings/get-users.json @@ -4,7 +4,9 @@ "url": "/1" }, "response": { - "headers": {"Content-Type": "application/json"}, + "headers": { + "Content-Type": "application/json" + }, "jsonBody": { "name": "Jenna", "id": 1 diff --git a/example/src/test/wiremock-mappings/mappings/get.json b/wiremock-spring-boot-example/src/test/wiremock-mappings/mappings/get.json similarity index 65% rename from example/src/test/wiremock-mappings/mappings/get.json rename to wiremock-spring-boot-example/src/test/wiremock-mappings/mappings/get.json index 41c4a46..c6e2780 100644 --- a/example/src/test/wiremock-mappings/mappings/get.json +++ b/wiremock-spring-boot-example/src/test/wiremock-mappings/mappings/get.json @@ -4,7 +4,9 @@ "url": "/wiremockmappingsmock" }, "response": { - "jsonBody": {"wiremockmappingsmock": "yes"}, + "jsonBody": { + "wiremockmappingsmock": "yes" + }, "status": 200 } }