From 847562926a0a3061c24f5a697d32c906f1a5a33d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 1 Sep 2022 12:49:06 +0200 Subject: [PATCH] Updated code to remove checkstyle issues --- .../wiremock/file/ResourcesFileSource.java | 6 ++++-- .../wiremock/file/ResourcesFileSourceTest.java | 17 ++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java index 56388ff9f4..ef4a0a2fb7 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java @@ -123,9 +123,11 @@ public class ResourcesFileSource implements FileSource { return resource.getBinaryFileNamed(name); } } - } catch (RuntimeException e) { + } + catch (RuntimeException e) { // Ignore - find next stub file - } catch (IOException e) { + } + catch (IOException e) { // Ignore - find next stub file } } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSourceTest.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSourceTest.java index 911b03f0a4..8b9c063802 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSourceTest.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSourceTest.java @@ -16,25 +16,23 @@ 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 java.io.File; import java.net.URI; import java.net.URISyntaxException; + +import com.github.tomakehurst.wiremock.common.BinaryFile; +import com.github.tomakehurst.wiremock.common.ClasspathFileSource; +import com.github.tomakehurst.wiremock.common.FileSource; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; + +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.assertj.core.api.Assertions.assertThat; - -@ExtendWith(MockitoExtension.class) class ResourcesFileSourceTest { @DisplayName("find all files in the multiple files directories.") @@ -80,7 +78,8 @@ class ResourcesFileSourceTest { ClasspathFileSource classpathFileSource1 = mock(ClasspathFileSource.class); when(classpathFileSource1.getUri()).thenReturn(new URI(bannerStubPathInJar)); when(classpathFileSource1.exists()).thenReturn(true); - when(classpathFileSource1.getBinaryFileNamed(bannerStubFilename)).thenReturn(new BinaryFile(new URI(bannerStubPathInJar + "/response-bannerList-success.json"))); + when(classpathFileSource1.getBinaryFileNamed(bannerStubFilename)) + .thenReturn(new BinaryFile(new URI(bannerStubPathInJar + "/response-bannerList-success.json"))); ResourcesFileSource resourcesFileSource = new ResourcesFileSource(classpathFileSource1); // when & then