Light refactoring

michelin · Nov 28, 2023 · 61a084d · 61a084d
1 parent 0976934
commit 61a084d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/com/michelin/ns4kafka/controllers/SchemaController.java b/src/main/java/com/michelin/ns4kafka/controllers/SchemaController.java
@@ -116,10 +116,6 @@ public Mono<HttpResponse<Schema>> apply(String namespace, @Valid @Body Schema sc
                         schema.getSpec().setCompatibility(latestSubjectOptional.get().getSpec().getCompatibility());
                     }
 
-                    schema.getMetadata().setCreationTimestamp(Date.from(Instant.now()));
-                    schema.getMetadata().setCluster(ns.getMetadata().getCluster());
-                    schema.getMetadata().setNamespace(ns.getMetadata().getName());
-
                     return schemaService
                             .validateSchemaCompatibility(ns.getMetadata().getCluster(), schema)
                             .flatMap(validationErrors -> {
@@ -130,6 +126,10 @@ public Mono<HttpResponse<Schema>> apply(String namespace, @Valid @Body Schema sc
                                             schema.getMetadata().getName()));
                                 }
 
+                                schema.getMetadata().setCreationTimestamp(Date.from(Instant.now()));
+                                schema.getMetadata().setCluster(ns.getMetadata().getCluster());
+                                schema.getMetadata().setNamespace(ns.getMetadata().getName());
+
                                 if (dryrun) {
                                     return Mono.just(formatHttpResponse(schema,
                                             latestSubjectOptional.isPresent()

diff --git a/src/test/java/com/michelin/ns4kafka/controllers/SchemaControllerTest.java b/src/test/java/com/michelin/ns4kafka/controllers/SchemaControllerTest.java
@@ -82,8 +82,7 @@ void applyChanged() {
 
         when(namespaceService.findByName("myNamespace")).thenReturn(Optional.of(namespace));
         when(schemaService.isNamespaceOwnerOfSubject(namespace, schema.getMetadata().getName())).thenReturn(true);
-        when(schemaService.validateSchemaCompatibility(eq("local"), any(Schema.class)))
-            .thenReturn(Mono.just(List.of()));
+        when(schemaService.validateSchemaCompatibility("local", schemaV2)).thenReturn(Mono.just(List.of()));
         when(schemaService.getLatestSubject(namespace, schema.getMetadata().getName()))
             .thenReturn(Mono.just(schema));
         when(schemaService.register(namespace, schemaV2)).thenReturn(Mono.just(2));
@@ -186,8 +185,7 @@ void applyDryRunChanged() {
         when(namespaceService.findByName("myNamespace")).thenReturn(Optional.of(namespace));
         when(schemaService.isNamespaceOwnerOfSubject(namespace, schema.getMetadata().getName()))
             .thenReturn(true);
-        when(schemaService.validateSchemaCompatibility(eq("local"), any(Schema.class)))
-            .thenReturn(Mono.just(List.of()));
+        when(schemaService.validateSchemaCompatibility("local", schemaV2)).thenReturn(Mono.just(List.of()));
         when(schemaService.getLatestSubject(namespace, schema.getMetadata().getName())).thenReturn(Mono.just(schema));
 
         StepVerifier.create(schemaController.apply("myNamespace", schemaV2, true))
@@ -198,7 +196,7 @@ void applyDryRunChanged() {
             })
             .verifyComplete();
 
-        verify(schemaService, never()).register(namespace, schema);
+        verify(schemaService, never()).register(namespace, schemaV2);
     }
 
     @Test