Skip to content

Commit 6d62fe0

Browse files
vishnu-alapatiVishnu
vishnu-alapati
and
Vishnu
authored
Uplift spring-boot version to 2.7.5 (#210)
* Uplift spring-boot version to 2.7.5 * Provided the proper remrem-parent version * changed the remrem-parent version --------- Co-authored-by: Vishnu <vishnu.alapati@ericsson.com>
1 parent 889a10e commit 6d62fe0

File tree

11 files changed

+90
-26
lines changed

11 files changed

+90
-26
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 2.1.8
2+
- Uplifted eiffel-remrem-parent version to 2.0.10 to inherit the latest spring-boot version.
3+
14
## 2.1.7
25
- Degraded the spring-boot-maven-plugin version to 2.7.5
36
- Updated the eiffel-remrem-parent version to 2.0.9

‎cli/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@
5858
<dependency>
5959
<groupId>org.springframework.boot</groupId>
6060
<artifactId>spring-boot-starter-test</artifactId>
61+
<exclusions>
62+
<exclusion>
63+
<groupId>org.junit.jupiter</groupId>
64+
<artifactId>junit-jupiter</artifactId>
65+
</exclusion>
66+
</exclusions>
6167
</dependency>
6268
<dependency>
6369
<groupId>commons-cli</groupId>
@@ -75,7 +81,7 @@
7581
<plugin>
7682
<groupId>org.springframework.boot</groupId>
7783
<artifactId>spring-boot-maven-plugin</artifactId>
78-
<version>2.7.5</version>
84+
<version>${springboot.version}</version>
7985
<configuration>
8086
<mainClass>com.ericsson.eiffel.remrem.generate.cli.CLI</mainClass>
8187
<fork>true</fork>

‎cli/src/main/java/com/ericsson/eiffel/remrem/generate/cli/CLI.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.boot.Banner;
2929
import org.springframework.boot.CommandLineRunner;
3030
import org.springframework.boot.SpringApplication;
31+
import org.springframework.boot.WebApplicationType;
3132
import org.springframework.boot.autoconfigure.SpringBootApplication;
3233
import org.springframework.context.annotation.ComponentScan;
3334

@@ -226,7 +227,7 @@ public static void main(String[] args) throws Exception {
226227
application.addInitializers(new SpringLoggingInitializer());
227228
application.setBannerMode(Banner.Mode.OFF);
228229
application.setLogStartupInfo(false);
229-
application.setWebEnvironment(false);
230+
application.setWebApplicationType(WebApplicationType.NONE);
230231
CLIOptions.parse(args);
231232
application.run(args);
232233
}

‎cli/src/test/java/com/ericsson/eiffel/remrem/generate/cli/CliUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class CliUnitTests {
5757

5858
Mockito.when(msgService.generateMsg(
5959
Mockito.anyString(),
60-
Mockito.anyObject()
60+
Mockito.any()
6161
)).thenReturn("{ \"service\":\"msgService\" }");
6262
}
6363

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>com.github.eiffel-community</groupId>
88
<artifactId>eiffel-remrem-parent</artifactId>
9-
<version>2.0.9</version>
9+
<version>2.0.10</version>
1010
</parent>
1111

1212
<properties>
13-
<eiffel-remrem-generate.version>2.1.7</eiffel-remrem-generate.version>
13+
<eiffel-remrem-generate.version>2.1.8</eiffel-remrem-generate.version>
1414
<eiffel-remrem-semantics.version>2.2.4</eiffel-remrem-semantics.version>
1515
</properties>
1616
<artifactId>eiffel-remrem-generate</artifactId>
@@ -46,7 +46,7 @@
4646
<plugin>
4747
<groupId>org.springframework.boot</groupId>
4848
<artifactId>spring-boot-maven-plugin</artifactId>
49-
<version>2.7.5</version>
49+
<version>${springboot.version}</version>
5050
<configuration>
5151
<skip>true</skip>
5252
</configuration>

‎service/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
<dependency>
4141
<groupId>org.springframework.boot</groupId>
4242
<artifactId>spring-boot-starter-test</artifactId>
43+
<exclusions>
44+
<exclusion>
45+
<groupId>org.junit.jupiter</groupId>
46+
<artifactId>junit-jupiter</artifactId>
47+
</exclusion>
48+
</exclusions>
4349
</dependency>
4450
<dependency>
4551
<groupId>org.springframework.security</groupId>
@@ -91,7 +97,7 @@
9197
<plugin>
9298
<groupId>org.springframework.boot</groupId>
9399
<artifactId>spring-boot-maven-plugin</artifactId>
94-
<version>2.7.5</version>
100+
<version>${springboot.version}</version>
95101
<configuration>
96102
<mainClass>com.ericsson.eiffel.remrem.generate.App</mainClass>
97103
<fork>true</fork>

‎service/src/main/java/com/ericsson/eiffel/remrem/generate/App.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import org.springframework.boot.Banner;
1818
import org.springframework.boot.SpringApplication;
19+
import org.springframework.boot.WebApplicationType;
1920
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2021
import org.springframework.boot.autoconfigure.SpringBootApplication;
2122
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@@ -38,7 +39,7 @@ private static void startService(String[] args) {
3839
SpringApplication application = new SpringApplication(App.class);
3940
application.setBannerMode(Banner.Mode.OFF);
4041
application.setLogStartupInfo(false);
41-
application.setWebEnvironment(true);
42+
application.setWebApplicationType(WebApplicationType.SERVLET);
4243
ApplicationContext ctx = application.run(args);
4344
}
4445
}

‎service/src/main/java/com/ericsson/eiffel/remrem/generate/config/SwaggerConfig.java

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,28 @@
1616

1717
import com.ericsson.eiffel.remrem.generate.constants.RemremGenerateServiceConstants;
1818
import io.swagger.annotations.Api;
19+
20+
import java.util.ArrayList;
21+
import java.util.Collection;
22+
import java.util.List;
23+
24+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties;
25+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
26+
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
27+
import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
28+
import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver;
29+
import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
30+
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
31+
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
32+
import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
33+
import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
34+
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
35+
import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
1936
import org.springframework.context.annotation.Bean;
2037
import org.springframework.context.annotation.Configuration;
38+
import org.springframework.core.env.Environment;
39+
import org.springframework.util.StringUtils;
40+
2141
import springfox.documentation.builders.ApiInfoBuilder;
2242
import springfox.documentation.builders.PathSelectors;
2343
import springfox.documentation.builders.RequestHandlerSelectors;
@@ -48,6 +68,31 @@ public UiConfiguration uiConfig() {
4868
null);
4969
}
5070

71+
@Bean
72+
public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpointsSupplier webEndpointsSupplier,
73+
ServletEndpointsSupplier servletEndpointsSupplier, ControllerEndpointsSupplier controllerEndpointsSupplier,
74+
EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties,
75+
WebEndpointProperties webEndpointProperties, Environment environment) {
76+
List<ExposableEndpoint<?>> allEndpoints = new ArrayList();
77+
Collection<ExposableWebEndpoint> webEndpoints = webEndpointsSupplier.getEndpoints();
78+
allEndpoints.addAll(webEndpoints);
79+
allEndpoints.addAll(servletEndpointsSupplier.getEndpoints());
80+
allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints());
81+
String basePath = webEndpointProperties.getBasePath();
82+
EndpointMapping endpointMapping = new EndpointMapping(basePath);
83+
boolean shouldRegisterLinksMapping = this.shouldRegisterLinksMapping(webEndpointProperties, environment,
84+
basePath);
85+
return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes,
86+
corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath),
87+
shouldRegisterLinksMapping, null);
88+
}
89+
90+
private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment,
91+
String basePath) {
92+
return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath)
93+
|| ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT));
94+
}
95+
5196
private ApiInfo metaData() {
5297
final StringBuilder remremDescription = new StringBuilder();
5398
remremDescription.append("REMReM (REST Mailbox for Registered Messages) Generate "

‎service/src/main/resources/application.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ server.port=8080
44

55
debug: false
66

7+
spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
8+
79
#Logging configurations
810

911
logging.level.root: INFO

‎service/src/test/java/com/ericsson/eiffel/remrem/generate/service/EiffelRemERLookupControllerUnitTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class EiffelRemERLookupControllerUnitTest {
7272
@SuppressWarnings("resource")
7373
@Before
7474
public void setUp() throws Exception {
75-
MockitoAnnotations.initMocks(this);
75+
MockitoAnnotations.openMocks(this);
7676
unit.setRestTemplate(restTemplate);
7777

7878
msgServices.add(service);
@@ -138,37 +138,37 @@ public void setUp() throws Exception {
138138
String erlookupOptionsWithNoneFoundOutput = FileUtils
139139
.readFileToString(new File(TEST_RESOURCES_PATH+"ErlookupOptionsWithNoneFoundOutput.json"), ENCODING);
140140

141-
Mockito.when(service.generateMsg(Mockito.eq("eiffelConfidenceLevelModified"), Mockito.anyObject(), Mockito.anyBoolean()))
141+
Mockito.when(service.generateMsg(Mockito.eq("eiffelConfidenceLevelModified"), Mockito.any(), Mockito.anyBoolean()))
142142
.thenReturn(erlookupOptionsWithNoneFoundOutput);
143143

144-
Mockito.when(service.generateMsg(Mockito.eq("eiffelconfidencelevel"), Mockito.anyObject(), Mockito.anyBoolean()))
144+
Mockito.when(service.generateMsg(Mockito.eq("eiffelconfidencelevel"), Mockito.any(), Mockito.anyBoolean()))
145145
.thenReturn(confidenceLevelOutput);
146146

147-
Mockito.when(service.generateMsg(Mockito.eq("eiffelartifactpublished"), Mockito.anyObject(), Mockito.anyBoolean()))
147+
Mockito.when(service.generateMsg(Mockito.eq("eiffelartifactpublished"), Mockito.any(), Mockito.anyBoolean()))
148148
.thenReturn(artifactPublishedOutput);
149149

150-
Mockito.when(service.generateMsg(Mockito.eq("eiffelcompositiondefined"), Mockito.anyObject(), Mockito.anyBoolean()))
150+
Mockito.when(service.generateMsg(Mockito.eq("eiffelcompositiondefined"), Mockito.any(), Mockito.anyBoolean()))
151151
.thenReturn(compositionDefinedOutput);
152152

153-
Mockito.when(service.generateMsg(Mockito.eq("eiffelCompositionDefined"), Mockito.anyObject(), Mockito.anyBoolean()))
153+
Mockito.when(service.generateMsg(Mockito.eq("eiffelCompositionDefined"), Mockito.any(), Mockito.anyBoolean()))
154154
.thenReturn(compositionDefinedSCCreatedOutput);
155155

156-
Mockito.when(service.generateMsg(Mockito.eq("eiffelCompositionDefinedEvent"), Mockito.anyObject(), Mockito.anyBoolean()))
156+
Mockito.when(service.generateMsg(Mockito.eq("eiffelCompositionDefinedEvent"), Mockito.any(), Mockito.anyBoolean()))
157157
.thenReturn(compositionDefinedSCSubmittedOutput);
158158

159-
Mockito.when(service.generateMsg(Mockito.eq("eiffelSCSubmitted"), Mockito.anyObject(), Mockito.anyBoolean()))
159+
Mockito.when(service.generateMsg(Mockito.eq("eiffelSCSubmitted"), Mockito.any(), Mockito.anyBoolean()))
160160
.thenReturn(SCSubmittedOutput);
161161

162-
Mockito.when(service.generateMsg(Mockito.eq("eiffelEnvironmentDefined"), Mockito.anyObject(), Mockito.anyBoolean()))
162+
Mockito.when(service.generateMsg(Mockito.eq("eiffelEnvironmentDefined"), Mockito.any(), Mockito.anyBoolean()))
163163
.thenReturn(erLookupWithOptionsOutput);
164164

165-
Mockito.when(service.generateMsg(Mockito.eq("eiffelEnvironmentDefinedEvent"), Mockito.anyObject(), Mockito.anyBoolean()))
165+
Mockito.when(service.generateMsg(Mockito.eq("eiffelEnvironmentDefinedEvent"), Mockito.any(), Mockito.anyBoolean()))
166166
.thenReturn(erlookupOptionsWithEmptyResponseOutput);
167167

168-
Mockito.when(service.generateMsg(Mockito.eq("eiffelCompositionDefinedEventt"), Mockito.anyObject(), Mockito.anyBoolean()))
168+
Mockito.when(service.generateMsg(Mockito.eq("eiffelCompositionDefinedEventt"), Mockito.any(), Mockito.anyBoolean()))
169169
.thenReturn(compositionDefinedOutput);
170170

171-
Mockito.when(service.generateMsg(Mockito.eq("eiffelTestCaseStarted"), Mockito.anyObject(), Mockito.anyBoolean()))
171+
Mockito.when(service.generateMsg(Mockito.eq("eiffelTestCaseStarted"), Mockito.any(), Mockito.anyBoolean()))
172172
.thenReturn(ErlookupFailedWithOptionsOutput);
173173

174174
ResponseEntity erresponse = new ResponseEntity(response, HttpStatus.OK);

0 commit comments

Comments
 (0)