fix: NPE in GenericViewDefinitionParserService when StepID is null

api/src/main/java/io/kaoto/backend/api/service/viewdefinition/parser/GenericViewDefinitionParserService.java

@@ -5,9 +5,9 @@
 import io.kaoto.backend.model.step.Step;
 import io.kaoto.backend.model.view.ViewDefinition;
 import io.kaoto.backend.model.view.ViewDefinitionConstraint;
-
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -135,7 +135,7 @@ private boolean containsStepIdentifier(final List<Step> steps,
                                            final boolean includeBranch) {
         boolean res = false;
         for (Step s : steps) {
-            if (s.getId().equalsIgnoreCase(c.getParameter())) {
+            if (s.getId() != null && s.getId().equalsIgnoreCase(c.getParameter())) {
                 res = true;
                 break;
             }

api/src/test/java/io/kaoto/backend/api/resource/v1/ViewDefinitionResourceTest.java

@@ -8,6 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import io.kaoto.backend.model.view.ViewDefinition;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -26,8 +27,8 @@
 import jakarta.ws.rs.core.Response;
 
 import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
 
 @QuarkusTest
 @TestHTTPEndpoint(ViewDefinitionResource.class)
@@ -67,15 +68,17 @@ void testViews() throws JsonProcessingException {
 
         final var mapper = new ObjectMapper();
         final var json = mapper.writeValueAsString(steps);
-        var res = given()
+        ViewDefinition[] viewDefinitions = given()
                 .when().body(json)
                 .contentType(MediaType.APPLICATION_JSON).post()
                 .then()
-                .statusCode(Response.Status.OK.getStatusCode());
-        res.body("$.size()", is(1));
-        assertEquals(res.extract().path("type"), Arrays.asList(new String[]{
-                "generic"}));
-
+                .statusCode(Response.Status.OK.getStatusCode())
+                .extract().as(ViewDefinition[].class);
+        assertThat(viewDefinitions)
+                .isNotEmpty()
+                .hasSize(1)
+                .extracting(ViewDefinition::getType)
+                .containsExactlyInAnyOrder("generic");
     }
 
     @Test
@@ -101,15 +104,17 @@ void testNestedSteps() throws JsonProcessingException {
                 .statusCode(Response.Status.OK.getStatusCode())
                 .extract().body().as(Integration.class);
 
-        var res = given()
+        ViewDefinition[] viewDefinitions = given()
                 .when().body((new ObjectMapper()).writeValueAsString(integration.getSteps()))
                 .contentType(MediaType.APPLICATION_JSON).post()
                 .then()
                 .log().body()
-                .statusCode(Response.Status.OK.getStatusCode());
-        res.body("$.size()", is(4));
-        assertEquals(res.extract().path("type"), Arrays.asList(new String[]{
-                "step", "step", "generic", "step"}));
-
+                .statusCode(Response.Status.OK.getStatusCode())
+                .extract().as(ViewDefinition[].class);
+        assertThat(viewDefinitions)
+                .isNotEmpty()
+                .hasSize(4)
+                .extracting(ViewDefinition::getType)
+                .containsExactlyInAnyOrder("step", "step", "generic", "step");
     }
 }

api/src/test/java/io/kaoto/backend/api/service/parser/viewdefinition/GenericViewDefinitionParserServiceTest.java

@@ -17,6 +17,8 @@
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @QuarkusTest
 class GenericViewDefinitionParserServiceTest {
 
@@ -45,21 +47,36 @@ void checkConstraintsBySize() {
         List<Step> steps = new ArrayList<>();
         List<ViewDefinition> views =
                 viewDefinitionParserService.parse(steps);
-        Assertions.assertEquals(0, views.size());
+        assertThat(views).isNotNull().isEmpty();
 
-        steps.add(new Step());
+        steps.add(new Step("id-1",
+                "connector-1", "icon",
+                new ArrayList<>()));
         views = viewDefinitionParserService.parse(steps);
-        Assertions.assertEquals(0, views.size());
+        assertThat(views).isNotNull().isEmpty();
 
-        Step s = new Step();
+        Step s = new Step("id-2",
+                "connector-1", "icon",
+                new ArrayList<>());
         s.setKind("KAMELET");
         steps.add(s);
         views = viewDefinitionParserService.parse(steps);
-        Assertions.assertEquals(2, views.size());
+        assertThat(views).isNotNull().hasSize(2);
 
-        steps.add(new Step());
+        steps.add(new Step("id-3",
+                "connector-1", "icon",
+                new ArrayList<>()));
         views = viewDefinitionParserService.parse(steps);
-        Assertions.assertEquals(2, views.size());
+        assertThat(views).isNotNull().hasSize(2);
+    }
+
+    @Test
+    // reproducer for gh-819
+    void checkStepIdIsNull() {
+        List<Step> steps = new ArrayList<>();
+        steps.add(new Step());
+        List<ViewDefinition> views = viewDefinitionParserService.parse(steps);
+        assertThat(views).isNotNull().isEmpty();
     }
 
     @Test

api/src/test/resources/application.yaml

@@ -12,7 +12,7 @@ repository:
     git:
       -
         url: "https://github.com/KaotoIO/kaoto-viewdefinition-catalog.git"
-        tag: "test-202302"
+        tag: "main"
 
 crd:
   default: "KameletBinding"