Skip to content

Commit 11ca5d7

Browse files
author
Loïc GREFFIER
authored
Fixed logs when a schema is applied (#205)
1 parent 6f7f578 commit 11ca5d7

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

api/src/main/java/com/michelin/ns4kafka/controllers/SchemaController.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import javax.inject.Inject;
1919
import javax.validation.Valid;
20+
import java.time.Instant;
21+
import java.util.Date;
2022
import java.util.List;
2123
import java.util.Optional;
2224

@@ -103,6 +105,10 @@ public Single<HttpResponse<Schema>> apply(String namespace, @Valid @Body Schema
103105
.map(id -> {
104106
ApplyStatus status;
105107

108+
schema.getMetadata().setCreationTimestamp(Date.from(Instant.now()));
109+
schema.getMetadata().setCluster(ns.getMetadata().getCluster());
110+
schema.getMetadata().setNamespace(ns.getMetadata().getName());
111+
106112
if (latestSubjectOptional.isEmpty()) {
107113
status = ApplyStatus.created;
108114
sendEventLog(schema.getKind(), schema.getMetadata(), status, null, schema.getSpec());

api/src/main/java/com/michelin/ns4kafka/services/executors/ConnectorAsyncExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private List<Connector> collectNs4KafkaConnectors(String connectCluster) {
163163
.stream()
164164
.filter(connector -> connector.getSpec().getConnectCluster().equals(connectCluster))
165165
.collect(Collectors.toList());
166-
log.debug("Connectors found on Ns4kafka for Connect Cluster {} : {}", connectCluster, connectorList.size());
166+
log.debug("Connectors found on Ns4kafka for Connect Cluster {}: {}", connectCluster, connectorList.size());
167167
return connectorList;
168168
}
169169

api/src/main/java/com/michelin/ns4kafka/services/executors/TopicAsyncExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ private void alterTopics(Map<ConfigResource, Collection<AlterConfigOp>> toUpdate
200200
updatedTopic.getMetadata().setCreationTimestamp(Date.from(Instant.now()));
201201
updatedTopic.getMetadata().setGeneration(updatedTopic.getMetadata().getGeneration()+1);
202202
updatedTopic.setStatus(Topic.TopicStatus.ofSuccess("Topic configs updated"));
203-
log.info("Success updating topic configs {} on {} : [{}]",
203+
log.info("Success updating topic configs {} on {}: [{}]",
204204
mapEntry.getKey().name(),
205-
this.kafkaAsyncExecutorConfig.getName(),
206-
ops.stream().map(alterConfigOp -> alterConfigOp.toString()).collect(Collectors.joining(",")));
205+
kafkaAsyncExecutorConfig.getName(),
206+
ops.stream().map(AlterConfigOp::toString).collect(Collectors.joining(",")));
207207
} catch (InterruptedException e) {
208208
log.error("Error", e);
209209
Thread.currentThread().interrupt();

0 commit comments

Comments
 (0)