Skip to content

Commit 1c979b8

Browse files
author
bnasslahsen
committed
project review
1 parent a5d15bf commit 1c979b8

File tree

8 files changed

+11
-575
lines changed

8 files changed

+11
-575
lines changed

springdoc-openapi-data-rest/src/main/java/org/springdoc/core/HalProvider.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.springdoc.core;
2020

2121
import javax.annotation.PostConstruct;
22+
import javax.annotation.PreDestroy;
2223

2324
import io.swagger.v3.core.converter.ModelConverters;
2425
import io.swagger.v3.core.util.Json;
@@ -36,11 +37,18 @@ public HalProvider(RepositoryRestConfiguration repositoryRestConfiguration) {
3637
}
3738

3839
@PostConstruct
39-
private void init(){
40-
if(repositoryRestConfiguration.useHalAsDefaultJsonMediaType()) {
41-
Json.mapper().registerModule(new Jackson2HalModule());
40+
private void init() {
41+
if (repositoryRestConfiguration.useHalAsDefaultJsonMediaType()) {
42+
if (!Jackson2HalModule.isAlreadyRegisteredIn(Json.mapper()))
43+
Json.mapper().registerModule(new Jackson2HalModule());
4244
ModelConverters.getInstance()
4345
.addConverter(CollectionModelContentConverter.getConverter());
4446
}
4547
}
48+
49+
@PreDestroy
50+
private void reset() {
51+
ModelConverters.getInstance()
52+
.removeConverter(CollectionModelContentConverter.getConverter());
53+
}
4654
}

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/DatabaseLoader.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/Employee.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/EmployeeController.java

Lines changed: 0 additions & 128 deletions
This file was deleted.

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/EmployeeRepository.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/SpringDocApp1Test.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/SpringDocTestApp.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)