Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a172883

Browse files
author
Alexander Idelberger
committedMar 22, 2021
Do not create objectmapper bean
1 parent e8fe5f2 commit a172883

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed
 

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ public class Operator {
2828
private final ObjectMapper objectMapper;
2929

3030
public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) {
31-
this.k8sClient = k8sClient;
32-
this.configurationService = configurationService;
33-
objectMapper = new ObjectMapper();
31+
this(k8sClient, configurationService, new ObjectMapper());
3432
}
3533

3634
public Operator(

‎operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,16 @@ public boolean checkCRDAndValidateLocalModel() {
5757
return configuration.getCheckCrdAndValidateLocalModel();
5858
}
5959

60-
@Bean
61-
@ConditionalOnMissingBean
62-
public ObjectMapper objectMapper() {
63-
return new ObjectMapper().findAndRegisterModules();
64-
}
65-
6660
@Bean
6761
@ConditionalOnMissingBean(Operator.class)
6862
public Operator operator(
6963
KubernetesClient kubernetesClient,
7064
List<ResourceController<?>> resourceControllers,
71-
ObjectMapper objectMapper) {
72-
Operator operator = new Operator(kubernetesClient, this, objectMapper);
65+
Optional<ObjectMapper> objectMapper) {
66+
Operator operator =
67+
objectMapper
68+
.map(x -> new Operator(kubernetesClient, this, x))
69+
.orElse(new Operator(kubernetesClient, this));
7370
resourceControllers.forEach(r -> operator.register(processController(r)));
7471
return operator;
7572
}

0 commit comments

Comments
 (0)
Please sign in to comment.