From e5e454853e5e205d1e6437663c531c357cf3561d Mon Sep 17 00:00:00 2001 From: Marie Salm Date: Tue, 22 Jun 2021 06:24:38 +0200 Subject: [PATCH] rename algoRelationType to algorithmRelationType (#192) --- .../org/planqk/atlas/web/dtos/AlgorithmRelationDto.java | 2 +- .../web/controller/AlgorithmRelationControllerTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.planqk.atlas.web/src/main/java/org/planqk/atlas/web/dtos/AlgorithmRelationDto.java b/org.planqk.atlas.web/src/main/java/org/planqk/atlas/web/dtos/AlgorithmRelationDto.java index 44fa271b..471979db 100644 --- a/org.planqk.atlas.web/src/main/java/org/planqk/atlas/web/dtos/AlgorithmRelationDto.java +++ b/org.planqk.atlas.web/src/main/java/org/planqk/atlas/web/dtos/AlgorithmRelationDto.java @@ -51,7 +51,7 @@ public class AlgorithmRelationDto implements Identifyable { message = "Target Algorithm id must not be null!") private UUID targetAlgorithmId; - @JsonProperty("algoRelationType") + @JsonProperty("algorithmRelationType") @RequiresID(groups = {ValidationGroups.Update.class, ValidationGroups.Create.class}, message = "AlgorithmRelationType must have a type with an ID!") @NotNull(groups = {ValidationGroups.Update.class, ValidationGroups.Create.class}, diff --git a/org.planqk.atlas.web/src/test/java/org/planqk/atlas/web/controller/AlgorithmRelationControllerTest.java b/org.planqk.atlas.web/src/test/java/org/planqk/atlas/web/controller/AlgorithmRelationControllerTest.java index fc08ef78..fbcc70d4 100644 --- a/org.planqk.atlas.web/src/test/java/org/planqk/atlas/web/controller/AlgorithmRelationControllerTest.java +++ b/org.planqk.atlas.web/src/test/java/org/planqk/atlas/web/controller/AlgorithmRelationControllerTest.java @@ -185,7 +185,7 @@ void createAlgorithmRelation_returnCreated() { ).andExpect(jsonPath("$.id").isEmpty()) .andExpect(jsonPath("$.sourceAlgorithmId").value(sourceAlgorithm.getId().toString())) .andExpect(jsonPath("$.targetAlgorithmId").value(targetAlgorithm.getId().toString())) - .andExpect(jsonPath("$.algoRelationType.id").value(type.getId().toString())) + .andExpect(jsonPath("$.algorithmRelationType.id").value(type.getId().toString())) .andExpect(status().isCreated()); } @@ -263,7 +263,7 @@ void updateAlgorithmRelation_returnOk() { ).andExpect(jsonPath("$.id").value(algorithmRelation.getId().toString())) .andExpect(jsonPath("$.sourceAlgorithmId").value(sourceAlgorithm.getId().toString())) .andExpect(jsonPath("$.targetAlgorithmId").value(targetAlgorithm.getId().toString())) - .andExpect(jsonPath("$.algoRelationType.id").value(type.getId().toString())) + .andExpect(jsonPath("$.algorithmRelationType.id").value(type.getId().toString())) .andExpect(status().isOk()); } @@ -365,7 +365,7 @@ void getAlgorithmRelation_returnOk() { .andExpect(jsonPath("$.id").value(algorithmRelation.getId().toString())) .andExpect(jsonPath("$.sourceAlgorithmId").value(sourceAlgorithm.getId().toString())) .andExpect(jsonPath("$.targetAlgorithmId").value(targetAlgorithm.getId().toString())) - .andExpect(jsonPath("$.algoRelationType.id").value(type.getId().toString())) + .andExpect(jsonPath("$.algorithmRelationType.id").value(type.getId().toString())) .andExpect(status().isOk()); }