Skip to content

Commit d3b76ff

Browse files
ahrytsiukahrytsiuk
authored
Merge pull request #94 from Backbase/BEFOUND-1804
BEFOUND-1804: Align property names
2 parents 3450612 + c40279d commit d3b76ff

File tree

52 files changed

+148
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+148
-146
lines changed

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>service-sdk-starter-core</artifactId>
1111
<groupId>com.backbase.buildingblocks</groupId>
12-
<version>16.0.0</version>
12+
<version>16.0.1</version>
1313
<relativePath />
1414
</parent>
1515

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backbase.example;
22

3-
import org.springframework.boot.autoconfigure.SpringBootApplication;
43
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.autoconfigure.domain.EntityScan;
66
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
77
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Message.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.fasterxml.jackson.annotation.JsonInclude;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
7-
87
import jakarta.annotation.Generated;
98
import jakarta.validation.constraints.NotNull;
109
import jakarta.validation.constraints.Size;

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/api/ExampleController.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
import com.backbase.example.domain.Greeting;
55
import com.backbase.example.mapper.GreetingsMapper;
66
import com.backbase.example.service.GreetingsService;
7-
import org.springframework.beans.factory.annotation.Autowired;
8-
import org.springframework.http.HttpStatus;
9-
import org.springframework.web.bind.annotation.*;
10-
117
import java.util.List;
128
import java.util.UUID;
9+
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.http.HttpStatus;
11+
import org.springframework.web.bind.annotation.PathVariable;
12+
import org.springframework.web.bind.annotation.RequestBody;
13+
import org.springframework.web.bind.annotation.RequestMapping;
14+
import org.springframework.web.bind.annotation.RequestMethod;
15+
import org.springframework.web.bind.annotation.ResponseStatus;
16+
import org.springframework.web.bind.annotation.RestController;
1317

1418
@RestController
1519
public class ExampleController {

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/domain/Greeting.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package com.backbase.example.domain;
22

3-
import jakarta.persistence.*;
3+
import jakarta.persistence.Column;
4+
import jakarta.persistence.Entity;
5+
import jakarta.persistence.Id;
6+
import jakarta.persistence.Table;
47

58
@Entity
69
@Table(name = "greetings")

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import com.backbase.example.Message;
44
import com.backbase.example.domain.Greeting;
5+
import java.util.List;
56
import org.mapstruct.Mapper;
67
import org.mapstruct.ReportingPolicy;
78
import org.mapstruct.factory.Mappers;
89

9-
import java.util.List;
10-
1110
@Mapper(unmappedTargetPolicy= ReportingPolicy.ERROR)
1211
public interface GreetingsMapper {
1312

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.backbase.example.repository;
22

33
import com.backbase.example.domain.Greeting;
4+
import java.util.List;
45
import org.springframework.data.repository.CrudRepository;
56
import org.springframework.stereotype.Repository;
67

7-
import java.util.List;
8-
98
@Repository
109
public interface GreetingsRepository extends CrudRepository<Greeting, String> {
1110

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.backbase.example.service;
22

33
import com.backbase.example.domain.Greeting;
4-
54
import java.util.List;
65

76
public interface GreetingsService {

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.security.access.prepost.PreAuthorize;
99
import org.springframework.stereotype.Service;
10+
import org.springframework.transaction.annotation.Transactional;
1011

1112
import java.util.List;
12-
import org.springframework.transaction.annotation.Transactional;
1313

1414
@Service
1515
@Transactional(readOnly=true)

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-1.0.0.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<databaseChangeLog
4-
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
7-
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
8-
http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
4+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
97

108
<property dbms="mssql" name="varcharDataType" value="NVARCHAR"/>
119
<property dbms="mysql" name="varcharDataType" value="VARCHAR"/>

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-persistence.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<databaseChangeLog
4-
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
7-
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
8-
http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
4+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
97

108
<include file="db.changelog-1.0.0.xml" relativeToChangelogFile="true"/>
119

‎service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/test/java/com/backbase/example/ExampleControllerIT.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
package com.backbase.example;
22

33

4+
import static org.assertj.core.api.Assertions.assertThat;
5+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
6+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
7+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
8+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
9+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
10+
411
import com.fasterxml.jackson.core.type.TypeReference;
512
import com.fasterxml.jackson.databind.ObjectMapper;
13+
import java.util.List;
14+
import org.junit.jupiter.api.Test;
15+
import org.springframework.beans.factory.annotation.Autowired;
616
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
717
import org.springframework.boot.test.context.SpringBootTest;
18+
import org.springframework.http.MediaType;
819
import org.springframework.mock.web.MockHttpServletRequest;
920
import org.springframework.security.web.csrf.CsrfToken;
1021
import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
1122
import org.springframework.test.annotation.DirtiesContext;
1223
import org.springframework.test.annotation.DirtiesContext.ClassMode;
1324
import org.springframework.test.context.ActiveProfiles;
14-
15-
import org.springframework.beans.factory.annotation.Autowired;
1625
import org.springframework.test.web.servlet.MockMvc;
17-
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
1826
import org.springframework.test.web.servlet.MvcResult;
1927
import org.springframework.test.web.servlet.ResultActions;
20-
import org.springframework.http.MediaType;
21-
22-
import org.junit.jupiter.api.Test;
23-
24-
import java.util.List;
25-
26-
import static org.assertj.core.api.Assertions.assertThat;
27-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
28-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
29-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
30-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
31-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
28+
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
3229

3330

3431
/**

‎service-sdk/16.0.0/create-core-service/example-core-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>service-sdk-starter-core</artifactId>
1111
<groupId>com.backbase.buildingblocks</groupId>
12-
<version>16.0.0</version>
12+
<version>16.0.1</version>
1313
<relativePath />
1414
</parent>
1515

‎service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backbase.example;
22

3-
import org.springframework.boot.autoconfigure.SpringBootApplication;
43
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
66
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
77

‎service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/api/ExampleController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.backbase.example.Message;
44
import org.springframework.http.HttpStatus;
5-
import org.springframework.web.bind.annotation.RestController;
65
import org.springframework.web.bind.annotation.RequestMapping;
7-
import org.springframework.web.bind.annotation.ResponseStatus;
86
import org.springframework.web.bind.annotation.RequestMethod;
7+
import org.springframework.web.bind.annotation.ResponseStatus;
8+
import org.springframework.web.bind.annotation.RestController;
99

1010
@RestController
1111
public class ExampleController {

‎service-sdk/16.0.0/create-core-service/example-core-service/src/test/java/com/backbase/example/ExampleControllerIT.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package com.backbase.example;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
5+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
6+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
7+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
8+
39
import org.junit.jupiter.api.Test;
10+
import org.springframework.beans.factory.annotation.Autowired;
411
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
512
import org.springframework.boot.test.context.SpringBootTest;
613
import org.springframework.context.ApplicationContext;
14+
import org.springframework.http.MediaType;
715
import org.springframework.test.annotation.DirtiesContext;
816
import org.springframework.test.annotation.DirtiesContext.ClassMode;
917
import org.springframework.test.context.ActiveProfiles;
10-
import org.springframework.beans.factory.annotation.Autowired;
1118
import org.springframework.test.web.servlet.MockMvc;
12-
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
1319
import org.springframework.test.web.servlet.MvcResult;
1420
import org.springframework.test.web.servlet.ResultActions;
15-
import org.springframework.http.MediaType;
16-
17-
import static org.assertj.core.api.Assertions.assertThat;
18-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
19-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
20-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
21-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
21+
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
2222

2323
/**
2424
* A wrapper annotation for use with integration tests.

‎service-sdk/16.0.0/create-openapi-client/banking-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.backbase.buildingblocks</groupId>
1212
<artifactId>service-sdk-starter-core</artifactId>
13-
<version>16.0.0</version>
13+
<version>16.0.1</version>
1414
<relativePath/>
1515
</parent>
1616

‎service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backbase.banking;
22

3-
import org.springframework.boot.autoconfigure.SpringBootApplication;
43
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
66
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
77

‎service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/api/ExampleController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import com.backbase.messaging.api.client.v2.MessageApi;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.http.HttpStatus;
7-
import org.springframework.web.bind.annotation.RestController;
87
import org.springframework.web.bind.annotation.RequestMapping;
9-
import org.springframework.web.bind.annotation.ResponseStatus;
108
import org.springframework.web.bind.annotation.RequestMethod;
9+
import org.springframework.web.bind.annotation.ResponseStatus;
10+
import org.springframework.web.bind.annotation.RestController;
1111

1212
@RestController
1313
public class ExampleController {

‎service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
import com.backbase.buildingblocks.communication.http.HttpCommunicationConfiguration;
55
import com.backbase.messaging.api.client.ApiClient;
66
import com.backbase.messaging.api.client.v2.MessageApi;
7-
import org.springframework.context.annotation.*;
87
import org.springframework.boot.context.properties.ConfigurationProperties;
8+
import org.springframework.context.annotation.Bean;
9+
import org.springframework.context.annotation.Configuration;
910
import org.springframework.validation.annotation.Validated;
1011

1112
// tag::MessagingServiceRestClientConfiguration[]
1213
@Configuration
13-
@ConfigurationProperties("backbase.communication.services.name")
14+
@ConfigurationProperties("backbase.communication.services.messaging-service")
1415
@Validated
1516
public class MessagingServiceRestClientConfiguration extends ApiClientConfig {
1617

17-
public static final String MESSAGING_SERVICE_ID = "messaging-service";
18+
public static final String SERVICE_ID = "messaging-service";
1819

1920
public MessagingServiceRestClientConfiguration() {
20-
super(MESSAGING_SERVICE_ID);
21+
super(SERVICE_ID);
2122
}
2223

2324
/**
@@ -26,7 +27,7 @@ public MessagingServiceRestClientConfiguration() {
2627
* @return the client.
2728
*/
2829
@Bean
29-
public MessageApi createGeneratedClassApiClient() {
30+
public MessageApi messageApiClient() {
3031
return new MessageApi(createApiClient());
3132
}
3233

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package com.backbase.banking;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
5+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
6+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
7+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
8+
39
import org.junit.jupiter.api.Test;
10+
import org.springframework.beans.factory.annotation.Autowired;
411
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
512
import org.springframework.boot.test.context.SpringBootTest;
613
import org.springframework.context.ApplicationContext;
14+
import org.springframework.http.MediaType;
715
import org.springframework.test.annotation.DirtiesContext;
816
import org.springframework.test.annotation.DirtiesContext.ClassMode;
917
import org.springframework.test.context.ActiveProfiles;
10-
import org.springframework.beans.factory.annotation.Autowired;
1118
import org.springframework.test.web.servlet.MockMvc;
12-
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
1319
import org.springframework.test.web.servlet.MvcResult;
1420
import org.springframework.test.web.servlet.ResultActions;
15-
import org.springframework.http.MediaType;
16-
17-
import static org.assertj.core.api.Assertions.assertThat;
18-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
19-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
20-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
21-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
21+
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
2222

2323
/**
2424
* A wrapper annotation for use with integration tests.

‎service-sdk/16.0.0/create-openapi-spec-project/messaging-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.backbase.buildingblocks</groupId>
88
<artifactId>backbase-openapi-spec-starter-parent</artifactId>
9-
<version>16.0.0</version>
9+
<version>16.0.1</version>
1010
</parent>
1111

1212
<groupId>com.backbase.message</groupId>

‎service-sdk/16.0.0/create-openapi-spec-project/messaging-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.backbase.buildingblocks</groupId>
1212
<artifactId>service-sdk-starter-core</artifactId>
13-
<version>16.0.0</version>
13+
<version>16.0.1</version>
1414
<relativePath/>
1515
</parent>
1616

‎service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.backbase.message;
22

3-
import org.springframework.boot.autoconfigure.SpringBootApplication;
43
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
66
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
77

‎service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/api/ExampleController.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import com.backbase.dbs.messaging_service.api.service.v2.MessageApi;
44
import com.backbase.dbs.messaging_service.api.service.v2.model.MessagePostResponseBody;
5-
import org.springframework.http.ResponseEntity;
6-
import org.springframework.web.bind.annotation.RestController;
7-
85
import jakarta.validation.Valid;
96
import jakarta.validation.constraints.NotNull;
107
import java.util.List;
8+
import org.springframework.http.ResponseEntity;
9+
import org.springframework.web.bind.annotation.RestController;
1110

1211

1312
@RestController

0 commit comments

Comments
 (0)