diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/configs/OParlServiceProperties.java b/oparl-server/src/main/java/de/twomartens/oparlservice/configs/OParlServiceProperties.java index 31b53ca..b58c0d6 100644 --- a/oparl-server/src/main/java/de/twomartens/oparlservice/configs/OParlServiceProperties.java +++ b/oparl-server/src/main/java/de/twomartens/oparlservice/configs/OParlServiceProperties.java @@ -9,11 +9,5 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = "de.twomartens.oparlservice") public class OParlServiceProperties { - private final Template template = new Template(); private String url; - - @Data - public static class Template { - private String greeting; - } } diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/control/GreetingController.java b/oparl-server/src/main/java/de/twomartens/oparlservice/control/GreetingController.java deleted file mode 100644 index 9449f4a..0000000 --- a/oparl-server/src/main/java/de/twomartens/oparlservice/control/GreetingController.java +++ /dev/null @@ -1,24 +0,0 @@ -package de.twomartens.oparlservice.control; - -import de.twomartens.oparlservice.entity.Greeting; -import de.twomartens.oparlservice.service.GreetingService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class GreetingController { - - private final GreetingService service; - - GreetingController(GreetingService service) { - this.service = service; - } - - @GetMapping("/greeting") - @ResponseBody - public Greeting greeting(@RequestParam(value = "name", defaultValue = "World") String name) { - return Greeting.builder().message(service.createGreeting(name)).build(); - } -} diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/service/GreetingService.java b/oparl-server/src/main/java/de/twomartens/oparlservice/service/GreetingService.java deleted file mode 100644 index 20bfdb7..0000000 --- a/oparl-server/src/main/java/de/twomartens/oparlservice/service/GreetingService.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.twomartens.oparlservice.service; - -import de.twomartens.oparlservice.configs.OParlServiceProperties; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.MeterRegistry; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class GreetingService { - - private final MeterRegistry meterRegistry; - private final OParlServiceProperties properties; - private final Counter counter; - - public GreetingService(MeterRegistry meterRegistry, OParlServiceProperties properties) { - this.meterRegistry = meterRegistry; - this.properties = properties; - counter = meterRegistry.counter("infodb.callCounter"); - } - - public String createGreeting(String name) { - log.info("Create greeting for '{}'", name); - counter.increment(); - meterRegistry.gauge("infodb.nameLength", name.length()); - String greeting = properties.getTemplate().getGreeting(); - return String.format(greeting, name); - } -} diff --git a/oparl-server/src/main/resources/application-prod.yaml b/oparl-server/src/main/resources/application-prod.yaml index 55c0c9c..5ee6551 100644 Binary files a/oparl-server/src/main/resources/application-prod.yaml and b/oparl-server/src/main/resources/application-prod.yaml differ diff --git a/oparl-server/src/main/resources/application-qs.yaml b/oparl-server/src/main/resources/application-qs.yaml index 55c0c9c..5ee6551 100644 Binary files a/oparl-server/src/main/resources/application-qs.yaml and b/oparl-server/src/main/resources/application-qs.yaml differ diff --git a/oparl-server/src/main/resources/application-test.yaml b/oparl-server/src/main/resources/application-test.yaml index 55c0c9c..5ee6551 100644 Binary files a/oparl-server/src/main/resources/application-test.yaml and b/oparl-server/src/main/resources/application-test.yaml differ diff --git a/oparl-server/src/main/resources/application.yaml b/oparl-server/src/main/resources/application.yaml index 6ebbbd3..f3a9ff9 100644 Binary files a/oparl-server/src/main/resources/application.yaml and b/oparl-server/src/main/resources/application.yaml differ diff --git a/oparl-server/src/test/java/de/twomartens/oparlservice/control/GreetingControllerTests.java b/oparl-server/src/test/java/de/twomartens/oparlservice/control/GreetingControllerTests.java deleted file mode 100644 index 8c6429c..0000000 --- a/oparl-server/src/test/java/de/twomartens/oparlservice/control/GreetingControllerTests.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.twomartens.oparlservice.control; - -import de.twomartens.oparlservice.service.GreetingService; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; -import org.mockito.BDDMockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; - -@WebMvcTest(GreetingController.class) -class GreetingControllerTests { - - @Autowired - private MockMvc mvc; - - @MockBean - private GreetingService service; - - @Test - void testGreetingRest() throws Exception { - BDDMockito.given(service.createGreeting("Template")) - .willReturn("Hello Template!"); - - mvc.perform(MockMvcRequestBuilders.get("/greeting") - .param("name", "Template") - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.jsonPath("$", Matchers.aMapWithSize(1))) - .andExpect(MockMvcResultMatchers.jsonPath("$.message", Matchers.is("Hello Template!"))) - .andReturn(); - } -} diff --git a/oparl-server/src/test/java/de/twomartens/oparlservice/service/GreetingServiceTest.java b/oparl-server/src/test/java/de/twomartens/oparlservice/service/GreetingServiceTest.java deleted file mode 100644 index 433fcb7..0000000 --- a/oparl-server/src/test/java/de/twomartens/oparlservice/service/GreetingServiceTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.twomartens.oparlservice.service; - -import de.twomartens.oparlservice.configs.OParlServiceProperties; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import static org.mockito.BDDMockito.given; - -@ExtendWith(MockitoExtension.class) -class GreetingServiceTest { - - private GreetingService service; - - @Mock - private OParlServiceProperties properties; - - @Mock - private OParlServiceProperties.Template template; - - @BeforeEach - void beforeEach() { - given(template.getGreeting()).willReturn("Hello %s"); - given(properties.getTemplate()).willReturn(template); - service = new GreetingService(new SimpleMeterRegistry(), properties); - } - - @Test - void createGreeting() { - String result = service.createGreeting("Test"); - Assertions.assertThat(result).isEqualTo("Hello Test"); - } -}