Skip to content

Commit 194cd50

Browse files
jmpavlecjmpavlec
committed
Update spring boot to 3.x and java to 17
1 parent 03ad68c commit 194cd50

File tree

8 files changed

+53
-79
lines changed

8 files changed

+53
-79
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ orbs:
77
context: dev-context
88
executor:
99
name: onegini-build/maven-builder
10-
tag: "11.0"
10+
tag: "17.0-browsers"
1111

1212
.component-type-application: &component-type-application
1313
component_type: application

‎pom.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<docker.groupName>onegini</docker.groupName>
2929
<docker.imageName>example-resource-gateway</docker.imageName>
3030

31-
<maven.compiler.release>11</maven.compiler.release>
31+
<maven.compiler.release>17</maven.compiler.release>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3333

3434
<!-- Resource Gateway dependencies -->
@@ -38,7 +38,7 @@
3838
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
3939
<onegini-communication-resiliency-starter.version>3.2.2</onegini-communication-resiliency-starter.version>
4040
<snakeyaml.version>2.0</snakeyaml.version>
41-
<spring-boot.version>2.7.9</spring-boot.version>
41+
<spring-boot.version>3.0.4</spring-boot.version>
4242
</properties>
4343

4444
<licenses>
@@ -191,6 +191,9 @@
191191
<groupId>com.google.cloud.tools</groupId>
192192
<artifactId>jib-maven-plugin</artifactId>
193193
<configuration>
194+
<from>
195+
<image>gcr.io/distroless/java17-debian11:nonroot</image>
196+
</from>
194197
<to>
195198
<image>snapshot.onegini.com/${docker.groupName}/${docker.imageName}</image>
196199
<tags>${project.version},${git.commit.id.describe}</tags>

‎src/main/java/com/onegini/examples/resourcegateway/config/ResourceGatewayConfig.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
package com.onegini.examples.resourcegateway.config;
22

3+
import com.fasterxml.jackson.annotation.JsonInclude;
4+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
35
import org.springframework.boot.web.client.RestTemplateBuilder;
46
import org.springframework.context.annotation.Bean;
57
import org.springframework.context.annotation.Configuration;
68
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
79
import org.springframework.web.client.RestTemplate;
810

9-
import com.fasterxml.jackson.annotation.JsonInclude;
10-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
11-
1211
@Configuration
1312
public class ResourceGatewayConfig {
1413

15-
@Bean
16-
public Jackson2ObjectMapperBuilder jacksonBuilder() {
17-
final Jackson2ObjectMapperBuilder b = new Jackson2ObjectMapperBuilder();
18-
b.propertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
19-
.serializationInclusion(JsonInclude.Include.NON_NULL);
20-
return b;
21-
}
14+
@Bean
15+
public Jackson2ObjectMapperBuilder jacksonBuilder() {
16+
final Jackson2ObjectMapperBuilder b = new Jackson2ObjectMapperBuilder();
17+
b.propertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
18+
.serializationInclusion(JsonInclude.Include.NON_NULL);
19+
return b;
20+
}
2221

23-
@Bean
24-
public RestTemplate restTemplate(final RestTemplateBuilder builder) {
25-
return builder
26-
.build();
27-
}
22+
@Bean
23+
public RestTemplate restTemplate(final RestTemplateBuilder builder) {
24+
return builder
25+
.build();
26+
}
2827

2928
}

‎src/main/java/com/onegini/examples/resourcegateway/service/DeviceApiRequestService.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package com.onegini.examples.resourcegateway.service;
22

3-
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
4-
import static org.springframework.http.HttpStatus.OK;
5-
6-
import javax.annotation.Resource;
7-
3+
import com.onegini.examples.resourcegateway.config.DeviceApiConfig;
4+
import com.onegini.examples.resourcegateway.model.DeviceList;
5+
import com.onegini.examples.resourcegateway.util.BasicAuthenticationHeaderBuilder;
6+
import jakarta.annotation.Resource;
87
import org.springframework.http.HttpEntity;
98
import org.springframework.http.HttpHeaders;
109
import org.springframework.http.HttpMethod;
1110
import org.springframework.http.ResponseEntity;
1211
import org.springframework.stereotype.Service;
1312
import org.springframework.web.client.RestTemplate;
1413

15-
import com.onegini.examples.resourcegateway.config.DeviceApiConfig;
16-
import com.onegini.examples.resourcegateway.model.DeviceList;
17-
import com.onegini.examples.resourcegateway.util.BasicAuthenticationHeaderBuilder;
14+
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
15+
import static org.springframework.http.HttpStatus.OK;
1816

1917
@Service
2018
public class DeviceApiRequestService {

‎src/main/java/com/onegini/examples/resourcegateway/service/tokenintrospection/TokenIntrospectionRequestExecutor.java‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
package com.onegini.examples.resourcegateway.service.tokenintrospection;
22

3-
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
4-
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
5-
6-
import javax.annotation.Resource;
7-
8-
import org.springframework.http.HttpEntity;
9-
import org.springframework.http.HttpHeaders;
10-
import org.springframework.http.HttpMethod;
11-
import org.springframework.http.MediaType;
12-
import org.springframework.http.ResponseEntity;
3+
import com.onegini.examples.resourcegateway.config.TokenServerConfig;
4+
import com.onegini.examples.resourcegateway.model.TokenIntrospectionResult;
5+
import com.onegini.examples.resourcegateway.model.exception.TokenServerException;
6+
import com.onegini.examples.resourcegateway.util.BasicAuthenticationHeaderBuilder;
7+
import jakarta.annotation.Resource;
8+
import org.springframework.http.*;
139
import org.springframework.stereotype.Service;
1410
import org.springframework.util.LinkedMultiValueMap;
1511
import org.springframework.util.MultiValueMap;
1612
import org.springframework.web.client.RestClientException;
1713
import org.springframework.web.client.RestTemplate;
1814

19-
import com.onegini.examples.resourcegateway.config.TokenServerConfig;
20-
import com.onegini.examples.resourcegateway.model.TokenIntrospectionResult;
21-
import com.onegini.examples.resourcegateway.model.exception.TokenServerException;
22-
import com.onegini.examples.resourcegateway.util.BasicAuthenticationHeaderBuilder;
15+
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
16+
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
2317

2418
@Service
2519
public class TokenIntrospectionRequestExecutor {

‎src/main/java/com/onegini/examples/resourcegateway/service/tokenintrospection/TokenIntrospectionService.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.onegini.examples.resourcegateway.service.tokenintrospection;
22

33

4-
import javax.annotation.Resource;
5-
6-
import org.springframework.stereotype.Service;
7-
84
import com.onegini.examples.resourcegateway.model.TokenIntrospectionResult;
95
import com.onegini.examples.resourcegateway.model.exception.InvalidAccessTokenException;
6+
import jakarta.annotation.Resource;
7+
import org.springframework.stereotype.Service;
108

119
@Service
1210
public class TokenIntrospectionService {

‎src/main/java/com/onegini/examples/resourcegateway/web/ResourcesController.java‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,27 @@
11
package com.onegini.examples.resourcegateway.web;
22

3-
import static com.onegini.examples.resourcegateway.service.ScopeValidationService.SCOPE_APPLICATION_DETAILS;
4-
import static com.onegini.examples.resourcegateway.service.ScopeValidationService.SCOPE_READ;
5-
import static com.onegini.examples.resourcegateway.service.ScopeValidationService.SCOPE_WRITE;
6-
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
7-
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
8-
import static org.springframework.http.HttpStatus.OK;
9-
import static org.springframework.web.bind.annotation.RequestMethod.GET;
10-
import static org.springframework.web.bind.annotation.RequestMethod.POST;
11-
12-
import com.onegini.examples.resourcegateway.model.ApplicationDetails;
13-
import com.onegini.examples.resourcegateway.model.DecoratedUser;
14-
import com.onegini.examples.resourcegateway.model.DeviceList;
15-
import com.onegini.examples.resourcegateway.model.FormDataWithFiles;
16-
import com.onegini.examples.resourcegateway.model.MultipartResponse;
17-
import com.onegini.examples.resourcegateway.model.TokenIntrospectionResult;
18-
import com.onegini.examples.resourcegateway.service.AccessTokenExtractor;
19-
import com.onegini.examples.resourcegateway.service.DeviceApiRequestService;
20-
import com.onegini.examples.resourcegateway.service.MultipartService;
21-
import com.onegini.examples.resourcegateway.service.ScopeValidationService;
22-
import com.onegini.examples.resourcegateway.service.TokenTypeValidationService;
3+
import com.onegini.examples.resourcegateway.model.*;
4+
import com.onegini.examples.resourcegateway.service.*;
235
import com.onegini.examples.resourcegateway.service.tokenintrospection.TokenIntrospectionService;
246
import com.onegini.examples.resourcegateway.util.DecoratedUserIdBuilder;
7+
import jakarta.servlet.http.HttpServletRequest;
8+
import jakarta.servlet.http.HttpServletResponse;
259
import lombok.RequiredArgsConstructor;
2610
import lombok.extern.slf4j.Slf4j;
2711
import org.springframework.http.ResponseEntity;
28-
import org.springframework.web.bind.annotation.GetMapping;
29-
import org.springframework.web.bind.annotation.ModelAttribute;
30-
import org.springframework.web.bind.annotation.PostMapping;
31-
import org.springframework.web.bind.annotation.RequestHeader;
32-
import org.springframework.web.bind.annotation.RequestMapping;
33-
import org.springframework.web.bind.annotation.RestController;
34-
35-
import javax.servlet.http.HttpServletRequest;
36-
import javax.servlet.http.HttpServletResponse;
12+
import org.springframework.web.bind.annotation.*;
13+
3714
import java.io.IOException;
3815
import java.io.InputStream;
3916
import java.io.OutputStream;
4017

18+
import static com.onegini.examples.resourcegateway.service.ScopeValidationService.*;
19+
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
20+
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
21+
import static org.springframework.http.HttpStatus.OK;
22+
import static org.springframework.web.bind.annotation.RequestMethod.GET;
23+
import static org.springframework.web.bind.annotation.RequestMethod.POST;
24+
4125
@Slf4j
4226
@RestController
4327
@RequestMapping(value = "/resources")

‎src/test/java/com/onegini/examples/resourcegateway/SpringContextTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package com.onegini.examples.resourcegateway;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_CLASS;
5-
6-
import javax.annotation.Resource;
7-
3+
import com.onegini.examples.resourcegateway.web.ResourcesController;
4+
import jakarta.annotation.Resource;
85
import org.junit.jupiter.api.Test;
96
import org.junit.jupiter.api.extension.ExtendWith;
107
import org.springframework.boot.test.context.SpringBootTest;
118
import org.springframework.test.annotation.DirtiesContext;
129
import org.springframework.test.context.junit.jupiter.SpringExtension;
1310

14-
import com.onegini.examples.resourcegateway.web.ResourcesController;
11+
import static org.assertj.core.api.Assertions.assertThat;
12+
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_CLASS;
1513

1614
@ExtendWith(SpringExtension.class)
1715
@DirtiesContext(classMode = AFTER_CLASS)

0 commit comments

Comments
 (0)