Merge pull request #17 from Backbase/feature/openapi-client-12.2.0

Using a new openapi client base config class from ssdk 12.2.0

Author: SteveWyatt74

service-sdk/12.0.0/create-openapi-client/banking-service/pom.xml

@@ -9,7 +9,7 @@
         can declare it as a dependency instead, see pom-as-dependency.xml -->
     <parent>
         <groupId>com.backbase.buildingblocks</groupId>
-        <version>12.1.0</version>
+        <version>12.2.0</version>
         <artifactId>service-sdk-starter-core</artifactId>
         <relativePath/>
     </parent>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1</version>
         </dependency>
 
         <dependency>
@@ -62,7 +62,7 @@
 
     </dependencies>
 
-    <!-- tag::openapi-generator-plugin[] -->
+    <!-- tag::boat-maven-plugin[] -->
     <build>
         <plugins>
             <plugin>
@@ -89,6 +89,6 @@
         </plugins>
 
     </build>
-    <!-- end::openapi-generator-plugin[] -->
+    <!-- end::boat-maven-plugin[] -->
 
 </project>

service-sdk/12.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/ExampleController.java

@@ -1,5 +1,7 @@
 package com.backbase.banking;
 
+import com.backbase.messaging.api.client.v2.MessageApi;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,6 +11,9 @@
 @RestController
 public class ExampleController  {
 
+    @Autowired
+    private MessageApi messageApi;
+
     @RequestMapping(method = RequestMethod.GET, value = "/message", produces = {
                     "application/json"
     })

service-sdk/12.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/MessagingServiceRestClientConfiguration.java

@@ -1,41 +1,37 @@
 package com.backbase.banking;
 
+import com.backbase.buildingblocks.communication.client.ApiClientConfig;
 import com.backbase.buildingblocks.communication.http.HttpCommunicationConfiguration;
 import com.backbase.messaging.api.client.ApiClient;
 import com.backbase.messaging.api.client.v2.MessageApi;
-import org.springframework.beans.factory.annotation.*;
 import org.springframework.context.annotation.*;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import javax.validation.constraints.Pattern;
 
 // tag::MessagingServiceRestClientConfiguration[]
 @Configuration
 @ConfigurationProperties("backbase.communication.services.name")
-public class MessagingServiceRestClientConfiguration {
+public class MessagingServiceRestClientConfiguration extends ApiClientConfig {
 
-    private String serviceId = "messaging-service";
-    private String serviceUrl = "/service-api/v2";
-    public static final String INTERCEPTORS_ENABLED_HEADER = "INTERCEPTORS_ENABLED_HEADER";
+    public static final String MESSAGING_SERVICE_ID = "messaging-service";
 
-    @Value("${backbase.communication.http.default-scheme:http}")
-    @Pattern(regexp = "https?")
-    private String scheme;
+    public MessagingServiceRestClientConfiguration() {
+        super(MESSAGING_SERVICE_ID);
+    }
 
     /**
      * Creates a REST client.
      *
-     * @param restTemplate the RestTemplate for the client.
      * @return the client.
      */
     @Bean
-    public MessageApi createGeneratedClassApiClient(
-            @Qualifier(HttpCommunicationConfiguration.INTER_SERVICE_REST_TEMPLATE_BEAN_NAME) RestTemplate restTemplate) {
-        ApiClient apiClient = new ApiClient(restTemplate);
-        apiClient.setBasePath(scheme + "://" + serviceId + serviceUrl);
-        apiClient.addDefaultHeader(HttpCommunicationConfiguration.INTERCEPTORS_ENABLED_HEADER,
-                Boolean.TRUE.toString());
-        return new MessageApi(apiClient);
+    public MessageApi createGeneratedClassApiClient() {
+        return new MessageApi(createaApiClient());
+    }
+
+    private ApiClient createApiClient() {
+        return new ApiClient(getRestTemplate())
+            .setBasePath(createBasePath())
+            .addDefaultHeader(HttpCommunicationConfiguration.INTERCEPTORS_ENABLED_HEADER, Boolean.TRUE.toString());
     }
 }
 // end::MessagingServiceRestClientConfiguration[]

service-sdk/12.0.0/create-openapi-client/banking-service/src/test/java/com/backbase/banking/ExampleControllerIT.java

@@ -1,32 +1,25 @@
 package com.backbase.banking;
 
 
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.http.MediaType;
-import org.junit.runner.RunWith;
-import org.junit.Test;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
 
 /**
  * A wrapper annotation for use with integration tests.
@@ -37,7 +30,6 @@
  */
 @SpringBootTest(classes = Application.class)
 @DirtiesContext(classMode = ClassMode.AFTER_CLASS)
-@RunWith(SpringJUnit4ClassRunner.class)
 @AutoConfigureMockMvc
 @ActiveProfiles("it")
 public class ExampleControllerIT {

service-sdk/12.0.0/create-openapi-client/banking-service/src/test/resources/application.yml

@@ -0,0 +1,3 @@
+eureka:
+  client:
+    enabled: false