changed version of of springboot to 2.7

springboot rollback because of bugs with WireMock

Author: osik2000

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.0.6'
-	id 'io.spring.dependency-management' version '1.1.0'
+	id 'org.springframework.boot' version '2.7.11'
+	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
 }
 
 group = 'pl.pawelosinski'
@@ -14,9 +14,10 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation "com.github.tomakehurst:wiremock-jre8:2.35.0"
-	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
+	testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
+	testImplementation 'junit:junit:4.13.2'
 }
 
 tasks.named('test') {

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'dynatrace.nbp.task'
+rootProject.name = 'dynatrace.nbp.task.backend'

src/main/java/pl/pawelosinski/dynatrace/nbp/task/Application.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/Application.java

@@ -1,4 +1,4 @@
-package pl.pawelosinski.dynatrace.nbp.task.controller;
+package pl.pawelosinski.dynatrace.nbp.task.backend.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -7,10 +7,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
-import pl.pawelosinski.dynatrace.nbp.task.model.CurrencyRateTable;
-import pl.pawelosinski.dynatrace.nbp.task.model.MinMaxRate;
-import pl.pawelosinski.dynatrace.nbp.task.model.Rate;
-import pl.pawelosinski.dynatrace.nbp.task.service.CurrencyService;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.CurrencyRateTable;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.MinMaxRate;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.Rate;
+import pl.pawelosinski.dynatrace.nbp.task.backend.service.CurrencyService;
 
 import java.util.Optional;
 

src/main/java/pl/pawelosinski/dynatrace/nbp/task/controller/CurrencyController.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/controller/CurrencyController.java

@@ -1,4 +1,4 @@
-package pl.pawelosinski.dynatrace.nbp.task.model;
+package pl.pawelosinski.dynatrace.nbp.task.backend.model;
 
 import java.util.List;
 

src/main/java/pl/pawelosinski/dynatrace/nbp/task/model/CurrencyRateTable.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/CurrencyRateTable.java

@@ -1,4 +1,4 @@
-package pl.pawelosinski.dynatrace.nbp.task.model;
+package pl.pawelosinski.dynatrace.nbp.task.backend.model;
 
 public class MinMaxRate {
     private Rate min;

src/main/java/pl/pawelosinski/dynatrace/nbp/task/model/MinMaxRate.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/MinMaxRate.java

@@ -1,4 +1,4 @@
-package pl.pawelosinski.dynatrace.nbp.task.model;
+package pl.pawelosinski.dynatrace.nbp.task.backend.model;
 
 public class Rate {
     private String no;

src/main/java/pl/pawelosinski/dynatrace/nbp/task/model/Rate.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/model/Rate.java

@@ -1,22 +1,18 @@
-package pl.pawelosinski.dynatrace.nbp.task.service;
+package pl.pawelosinski.dynatrace.nbp.task.backend.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
-import pl.pawelosinski.dynatrace.nbp.task.model.CurrencyRateTable;
-import pl.pawelosinski.dynatrace.nbp.task.model.MinMaxRate;
-import pl.pawelosinski.dynatrace.nbp.task.model.Rate;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.CurrencyRateTable;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.MinMaxRate;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.Rate;
 
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
 import static java.lang.Math.abs;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
 
 @Service
 public class CurrencyService {
@@ -31,6 +27,7 @@ public CurrencyService(RestTemplateBuilder builder) {
     public CurrencyRateTable getRateFromDay(String currency, String date) throws Exception {
         CurrencyRateTable currencyRateTable;
         String url = "http://api.nbp.pl/api/exchangerates/rates/a/" + currency + "/" + date + "/?format=json";
+        System.out.println(url);
 
         currencyRateTable = restTemplate.getForObject(url, CurrencyRateTable.class);
         if (currencyRateTable == null) {

src/main/java/pl/pawelosinski/dynatrace/nbp/task/service/CurrencyService.java renamed to src/main/java/pl/pawelosinski/dynatrace/nbp/task/backend/service/CurrencyService.java

@@ -1,4 +1,4 @@
-package pl.pawelosinski.dynatrace.nbp.task;
+package pl.pawelosinski.dynatrace.nbp.task.backend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

src/test/java/pl/pawelosinski/dynatrace/nbp/task/ApplicationTests.java renamed to src/test/java/pl/pawelosinski/dynatrace/nbp/task/backend/ApplicationTests.java

@@ -1,17 +1,26 @@
-package pl.pawelosinski.dynatrace.nbp.task.service;
+package pl.pawelosinski.dynatrace.nbp.task.backend.service;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.junit.Rule;
 import org.junit.jupiter.api.*;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.client.HttpClientErrorException;
-import pl.pawelosinski.dynatrace.nbp.task.model.CurrencyRateTable;
+import org.springframework.web.context.WebApplicationContext;
+import pl.pawelosinski.dynatrace.nbp.task.backend.model.CurrencyRateTable;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class CurrencyServiceTests {
@@ -22,14 +31,14 @@ public class CurrencyServiceTests {
     @Autowired
     private TestRestTemplate restTemplate;
 
-
-    public WireMockServer wireMockServer = new WireMockServer(8123);
+    private final WireMockServer wireMockServer = new WireMockServer(8080);
 
     @BeforeAll
     void startWireMock() {
         wireMockServer.start();
     }
 
+
     @AfterEach
     protected void clearAfterEach() {
         wireMockServer.resetMappings();
@@ -44,9 +53,11 @@ void stopWireMock() {
     @Test
     public void shouldGetRateFromDay() throws Exception {
         // given
-        String currency = "GBP";
+        String currency = "gbp";
         String date = "2012-01-02";
 
+        configureFor("localhost", 8080);
+
         stubFor(get(urlPathEqualTo("http://api.nbp.pl/api/exchangerates/rates/a/gbp/2012-01-02/?format=json"))
                 .willReturn(aResponse()
                         .withHeader("Content-Type", "application/json")
@@ -55,6 +66,8 @@ public void shouldGetRateFromDay() throws Exception {
         // when
         CurrencyRateTable result = currencyService.getRateFromDay(currency, date);
 
+        System.out.println(result.getCurrency());
+
         // then
         assertEquals(1, result.getRates().size());
         assertEquals("GBP", result.getCode());

src/test/java/pl/pawelosinski/dynatrace/nbp/task/service/CurrencyServiceTests.java renamed to src/test/java/pl/pawelosinski/dynatrace/nbp/task/backend/service/CurrencyServiceTests.java

@@ -0,0 +1 @@
+{"table":"A","currency":"funtt szterling","code":"GBBP","rates":[{"no":"1/A/NBP/2012","effectiveDate":"2012-01-02","mid":5.348,"bid":0.0,"ask":0.0}]}