diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java index 480d62b1784..6699225310a 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java @@ -82,12 +82,13 @@ public Mono> restartWithConfig(Mono rest .build(); return validateAccess(context) .then(restartRequestDto) - .>map(dto -> { - dynamicConfigOperations.persist(MAPPER.fromDto(dto.getConfig().getProperties())); - restarter.requestRestart(); - return ResponseEntity.ok().build(); + .doOnNext(restartDto -> { + var newConfig = MAPPER.fromDto(restartDto.getConfig().getProperties()); + dynamicConfigOperations.persist(newConfig); }) - .doOnEach(sig -> audit(context, sig)); + .doOnEach(sig -> audit(context, sig)) + .doOnSuccess(dto -> restarter.requestRestart()) + .map(dto -> ResponseEntity.ok().build()); } @Override @@ -116,8 +117,8 @@ public Mono> validateConfig(Mono< return validateAccess(context) .then(configDto) .flatMap(config -> { - PropertiesStructure propertiesStructure = MAPPER.fromDto(config.getProperties()); - ClustersProperties clustersProperties = propertiesStructure.getKafka(); + PropertiesStructure newConfig = MAPPER.fromDto(config.getProperties()); + ClustersProperties clustersProperties = newConfig.getKafka(); return validateClustersConfig(clustersProperties) .map(validations -> new ApplicationConfigValidationDTO().clusters(validations)); })