Skip to content

Commit b90b120

Browse files
cmarkcmark
authored
Merge pull request #856 from b2ihealthcare/improvement/SO-4370-consolidate-rf2-properties
SO-4370: consolidate rf2 property names on index models
2 parents c35a624 + 9c0e300 commit b90b120

File tree

118 files changed

+656
-744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+656
-744
lines changed

‎fhir/com.b2international.snowowl.fhir.rest.tests/src/com/b2international/snowowl/fhir/rest/tests/conceptmap/TestMapTypeReferenceSetCreator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private static void createSimpleMapping(String branchPath, String refsetId, Stri
126126
.setId(UUID.randomUUID().toString())
127127
.setModuleId(Concepts.MODULE_SCT_CORE)
128128
.setActive(true)
129-
.setReferenceSetId(refsetId)
129+
.setRefsetId(refsetId)
130130
.setProperties(properties)
131131
.setReferencedComponentId(referencedConceptId)
132132
.build(branchPath, RestExtensions.USER, "FHIR Automated Test Simple Map Type Refset Member")
@@ -149,7 +149,7 @@ private static void createComplexMapping(String branchPath, String refsetId, Str
149149
.setId(UUID.randomUUID().toString())
150150
.setModuleId(Concepts.MODULE_SCT_CORE)
151151
.setActive(true)
152-
.setReferenceSetId(refsetId)
152+
.setRefsetId(refsetId)
153153
.setProperties(properties)
154154
.setReferencedComponentId(referencedConceptId)
155155
.build(branchPath, RestExtensions.USER, "FHIR Automated Test Complex Map Type Refset Member")
@@ -173,7 +173,7 @@ private static void createComplexBlockMapping(String branchPath, String refsetId
173173
.setId(UUID.randomUUID().toString())
174174
.setModuleId(Concepts.MODULE_SCT_CORE)
175175
.setActive(true)
176-
.setReferenceSetId(refsetId)
176+
.setRefsetId(refsetId)
177177
.setProperties(properties)
178178
.setReferencedComponentId(referencedConceptId)
179179
.build(branchPath, RestExtensions.USER, "FHIR Automated Test Complex Block Map Type Refset Member")
@@ -197,7 +197,7 @@ private static void createExtendedMapping(String branchPath, String refsetId, St
197197
.setId(UUID.randomUUID().toString())
198198
.setModuleId(Concepts.MODULE_SCT_CORE)
199199
.setActive(true)
200-
.setReferenceSetId(refsetId)
200+
.setRefsetId(refsetId)
201201
.setProperties(properties)
202202
.setReferencedComponentId(referencedConceptId)
203203
.build(branchPath, RestExtensions.USER, "FHIR Automated Test Extended Map Type Refset Member")

‎fhir/com.b2international.snowowl.fhir.rest.tests/src/com/b2international/snowowl/fhir/rest/tests/valueset/TestReferenceSetCreator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private static void createMember(String branchPath, String refsetId, String refe
8080
.setId(UUID.randomUUID().toString())
8181
.setModuleId(Concepts.MODULE_SCT_CORE)
8282
.setActive(true)
83-
.setReferenceSetId(refsetId)
83+
.setRefsetId(refsetId)
8484
.setReferencedComponentId(referencedConceptId)
8585
.build(branchPath, RestExtensions.USER, "FHIR Automated Test Simple Type Refset Member")
8686
.execute(Services.bus())
@@ -164,7 +164,7 @@ private static String createQueryTypeReferenceset(String branchPath, String refs
164164
memberMap.put(SnomedRf2Headers.FIELD_QUERY, "<<410607006"); //Organism (SNOMED MINI)
165165

166166
String memberId = SnomedRequests.prepareNewMember()
167-
.setReferenceSetId(refsetId)
167+
.setRefsetId(refsetId)
168168
.setModuleId(Concepts.MODULE_SCT_CORE)
169169
.setActive(true)
170170
.setProperties(memberMap)

‎snomed/com.b2international.snowowl.snomed.common/src/com/b2international/snowowl/snomed/common/SnomedRf2Headers.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,8 @@ public abstract class SnomedRf2Headers {
6565
// Field names introduced in attribute value type reference set files
6666
public static final String FIELD_VALUE_ID = "valueId";
6767

68-
/*
69-
* Field names introduced in association type reference set files
70-
* (Used throughout Snow Owl's codebase)
71-
*/
72-
public static final String FIELD_TARGET_COMPONENT = "targetComponent";
73-
7468
/*
75-
* Alternative column name for association type reference set files
76-
* (Used only in RF2 import/export parts)
69+
* RF2 column name for association type reference set file target components
7770
*/
7871
public static final String FIELD_TARGET_COMPONENT_ID = "targetComponentId";
7972

@@ -143,7 +136,7 @@ public abstract class SnomedRf2Headers {
143136
FIELD_CHARACTERISTIC_TYPE_ID,
144137
FIELD_TYPE_ID,
145138
// association
146-
FIELD_TARGET_COMPONENT,
139+
FIELD_TARGET_COMPONENT_ID,
147140
// ext. map
148141
FIELD_MAP_CATEGORY_ID,
149142
// MRCM attribute domain

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/io/SnomedRefSetDSVExportTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ private void addMember(String branchPath, String refsetId, String referencedComp
201201
SnomedRequests.prepareNewMember()
202202
.setModuleId(Concepts.MODULE_SCT_CORE)
203203
.setActive(true)
204-
.setReferenceSetId(refsetId)
204+
.setRefsetId(refsetId)
205205
.setReferencedComponentId(referencedComponentId)
206206
.setProperties(properties)
207207
.setId(UUID.randomUUID().toString())

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/request/ConceptMapSearchMappingRequestSnomedMapTypeReferenceSetTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private static SnomedRelationshipCreateRequestBuilder createIsaRelationship(fina
283283
private void createSimpleMapTypeRefSetMember(final String rfId, final String sourceCode, final String targetCode) {
284284
SnomedRequests.prepareNewMember()
285285
.setId(UUID.randomUUID().toString())
286-
.setReferenceSetId(rfId)
286+
.setRefsetId(rfId)
287287
.setReferencedComponentId(sourceCode)
288288
.setActive(true)
289289
.setModuleId(Concepts.MODULE_SCT_CORE)

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/request/ValueSetMemberSearchSnomedReferenceSetTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private static SnomedRelationshipCreateRequestBuilder createIsaRelationship(fina
159159
private void createSimpleMapTypeRefSetMember(final String rfId, final String sourceCode, final String targetCode) {
160160
SnomedRequests.prepareNewMember()
161161
.setId(UUID.randomUUID().toString())
162-
.setReferenceSetId(rfId)
162+
.setRefsetId(rfId)
163163
.setReferencedComponentId(sourceCode)
164164
.setActive(true)
165165
.setModuleId(Concepts.MODULE_SCT_CORE)

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/Issue3019FixDeletionOfReferringMembersTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testDeletionOfRefsetMember() {
4242

4343
final Map<?, ?> memberRequest = ImmutableMap.<String, Object>builder()
4444
.put(SnomedRf2Headers.FIELD_MODULE_ID, Concepts.MODULE_SCT_CORE)
45-
.put("referenceSetId", queryRefsetId)
45+
.put(SnomedRf2Headers.FIELD_REFSET_ID, queryRefsetId)
4646
.put(SnomedRf2Headers.FIELD_REFERENCED_COMPONENT_ID, queryMemberRefsetId)
4747
.put(SnomedRf2Headers.FIELD_QUERY, "<" + Concepts.REFSET_ROOT_CONCEPT)
4848
.put("commitComment", "Created new query reference set member")

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/SnomedReferenceSetDeletionPerformanceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private void createMembers(final String refSetId, final BulkRequestBuilder<Trans
101101
.setActive(true)
102102
.setModuleId(Concepts.MODULE_SCT_CORE)
103103
.setReferencedComponentId(referencedComponentId)
104-
.setReferenceSetId(refSetId);
104+
.setRefsetId(refSetId);
105105

106106
bulk.add(memberCreateReqBuilder);
107107
}

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/SnomedRestFixtures.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,14 @@ public static Json createRelationshipRequestBody(String sourceId, String typeId,
226226
return createRelationshipRequestBody(sourceId, typeId, destinationId, moduleId, characteristicTypeId, 0);
227227
}
228228

229-
public static Json createRelationshipRequestBody(String sourceId, String typeId, String destinationId, String moduleId, String characteristicTypeId, int group) {
229+
public static Json createRelationshipRequestBody(String sourceId, String typeId, String destinationId, String moduleId, String characteristicTypeId, int relationshipGroup) {
230230
return Json.object(
231231
"moduleId", moduleId,
232232
"sourceId", sourceId,
233233
"typeId", typeId,
234234
"destinationId", destinationId,
235235
"characteristicTypeId", characteristicTypeId,
236-
"group", group
236+
"relationshipGroup", relationshipGroup
237237
);
238238
}
239239

@@ -276,7 +276,7 @@ public static Json createConcreteValueRequestBody(String sourceId, String typeId
276276
"typeId", typeId,
277277
"value", value.toLiteral(),
278278
"characteristicTypeId", characteristicTypeId,
279-
"group", relationshipGroup
279+
"relationshipGroup", relationshipGroup
280280
);
281281
}
282282

@@ -347,7 +347,7 @@ public static String createNewLanguageRefSetMember(IBranchPath memberPath, Strin
347347
public static Json createRefSetMemberRequestBody(String refSetId, String referencedComponentId) {
348348
return Json.object(
349349
"moduleId", Concepts.MODULE_SCT_CORE,
350-
"referenceSetId", refSetId,
350+
"refsetId", refSetId,
351351
"referencedComponentId", referencedComponentId
352352
);
353353
}
@@ -487,7 +487,7 @@ public static void changeRelationshipGroup(IBranchPath relationshipPath, String
487487
SnomedComponentType.RELATIONSHIP,
488488
relationshipId,
489489
Json.object(
490-
"group", 99,
490+
"relationshipGroup", 99,
491491
"commitComment", "Changed group on relationship"
492492
)
493493
).statusCode(204);
@@ -592,7 +592,7 @@ public static Json getValidProperties(SnomedRefSetType refSetType, String refere
592592
switch (refSetType) {
593593
case ASSOCIATION:
594594
return Json.object(
595-
SnomedRf2Headers.FIELD_TARGET_COMPONENT, Json.object("id", Concepts.ROOT_CONCEPT)
595+
SnomedRf2Headers.FIELD_TARGET_COMPONENT_ID, Concepts.ROOT_CONCEPT
596596
);
597597
case ATTRIBUTE_VALUE:
598598
return Json.object(

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/branches/SnomedMergeApiTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -643,14 +643,14 @@ public void rebaseStaleBranchWithChangesOnNewContent() throws Exception {
643643
.body("caseSignificanceId", equalTo(Concepts.ONLY_INITIAL_CHARACTER_CASE_INSENSITIVE));
644644
getComponent(a, SnomedComponentType.RELATIONSHIP, relationshipId)
645645
.statusCode(200)
646-
.body("group", equalTo(0));
646+
.body("relationshipGroup", equalTo(0));
647647

648648
// "b" should be STALE at this point, try to rebase it, it should pass and the components should still exist with changed content
649649
merge(a, b, "Rebased changed components over new components").body("status", equalTo(Merge.Status.COMPLETED.name()));
650650

651651
// Verify that the two components have the modified values
652652
getComponent(b, SnomedComponentType.DESCRIPTION, descriptionId).statusCode(200).body("caseSignificanceId", equalTo(Concepts.ENTIRE_TERM_CASE_SENSITIVE));
653-
getComponent(b, SnomedComponentType.RELATIONSHIP, relationshipId).statusCode(200).body("group", equalTo(99));
653+
getComponent(b, SnomedComponentType.RELATIONSHIP, relationshipId).statusCode(200).body("relationshipGroup", equalTo(99));
654654
}
655655

656656
@Test
@@ -681,7 +681,7 @@ public void rebaseStaleBranchWithDeleteOnChangedContent() throws Exception {
681681

682682
// Verify that the relationship has the modified values, and the description stayed deleted
683683
getComponent(b, SnomedComponentType.DESCRIPTION, descriptionId).statusCode(404);
684-
getComponent(b, SnomedComponentType.RELATIONSHIP, relationshipId).statusCode(200).body("group", equalTo(99));
684+
getComponent(b, SnomedComponentType.RELATIONSHIP, relationshipId).statusCode(200).body("relationshipGroup", equalTo(99));
685685
}
686686

687687
@Test

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/compare/ConceptMapCompareSnomedMapTypeReferenceSetTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private static SnomedRelationshipCreateRequestBuilder createIsaRelationship(fina
195195

196196
private String createSimpleMapTypeRefSetMember(ComponentURI containerURI, String sourceCode, String targetCode) {
197197
return SnomedRequests.prepareNewMember()
198-
.setReferenceSetId(containerURI.identifier())
198+
.setRefsetId(containerURI.identifier())
199199
.setReferencedComponentId(sourceCode)
200200
.setActive(true)
201201
.setModuleId(Concepts.MODULE_SCT_CORE)

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/components/SnomedComponentInactivationApiTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void reuseConceptAndDescriptionInactivationIndicators() throws Exception
124124
private SnomedReferenceSetMember getIndicatorMember(SnomedCoreComponent component, String inactivationIndicatorRefSetId) {
125125
List<SnomedReferenceSetMember> members = component.getMembers()
126126
.stream()
127-
.filter(member -> inactivationIndicatorRefSetId.equals(member.getReferenceSetId()))
127+
.filter(member -> inactivationIndicatorRefSetId.equals(member.getRefsetId()))
128128
.collect(Collectors.toList());
129129
if (members.size() != 1) {
130130
fail("Missing or duplicate inactivation member detected for component: " + component.getId() + ", " + members);

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/components/SnomedConceptApiTest.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ public void updateInactivationIndicatorOnActiveConcept() throws Exception {
364364
public void updateInactivationIndicatorOnActiveConceptWithAssociationTargets() throws Exception {
365365
String conceptId = createNewConcept(branchPath);
366366
Map<?, ?> requestBody = createRefSetMemberRequestBody(Concepts.REFSET_POSSIBLY_EQUIVALENT_TO_ASSOCIATION, conceptId)
367-
.with(SnomedRf2Headers.FIELD_TARGET_COMPONENT, Concepts.ROOT_CONCEPT)
367+
.with(SnomedRf2Headers.FIELD_TARGET_COMPONENT_ID, Concepts.ROOT_CONCEPT)
368368
.with("commitComment", "Created new reference set member");
369369

370370
final String associationMemberId = lastPathSegment(createComponent(branchPath, SnomedComponentType.MEMBER, requestBody)
@@ -469,19 +469,19 @@ public void forceDeleteConcept() {
469469

470470
@Test
471471
public void createConceptWithMember() throws Exception {
472-
String refSetId = createNewRefSet(branchPath);
472+
String refsetId = createNewRefSet(branchPath);
473473

474474
Map<?, ?> conceptRequestBody = createConceptRequestBody(Concepts.ROOT_CONCEPT)
475475
.with("members", Json.array(Json.object(
476476
"moduleId", Concepts.MODULE_SCT_CORE,
477-
"referenceSetId", refSetId
477+
"refsetId", refsetId
478478
)))
479479
.with("commitComment", "Created concept with reference set member");
480480

481481
String conceptId = assertCreated(createComponent(branchPath, SnomedComponentType.CONCEPT, conceptRequestBody));
482482

483483
getComponent(branchPath, SnomedComponentType.CONCEPT, conceptId, "members()").statusCode(200)
484-
.body("members.items[0].referenceSetId", equalTo(refSetId));
484+
.body("members.items[0].refsetId", equalTo(refsetId));
485485
}
486486

487487
@Test
@@ -539,7 +539,7 @@ public void addRelationshipViaConceptUpdate() throws Exception {
539539
newRelationship.setTypeId(Concepts.PART_OF);
540540
newRelationship.setDestinationId(Concepts.NAMESPACE_ROOT);
541541
newRelationship.setModuleId(Concepts.MODULE_SCT_CORE);
542-
newRelationship.setGroup(0);
542+
newRelationship.setRelationshipGroup(0);
543543
newRelationship.setUnionGroup(0);
544544
newRelationship.setModifierId(Concepts.EXISTENTIAL_RESTRICTION_MODIFIER);
545545

@@ -575,7 +575,7 @@ public void addMemberViaConceptUpdate() throws Exception {
575575
SnomedReferenceSetMember newMember = new SnomedReferenceSetMember();
576576
newMember.setId(UUID.randomUUID().toString());
577577
newMember.setActive(true);
578-
newMember.setReferenceSetId(refSetId);
578+
newMember.setRefsetId(refSetId);
579579
newMember.setModuleId(Concepts.MODULE_SCT_CORE);
580580

581581
final List<SnomedReferenceSetMember> changedMembers = ImmutableList.<SnomedReferenceSetMember>builder()
@@ -741,7 +741,7 @@ public void createConceptWithOwlAxiomMemberWithSubClassOfExpression() throws Exc
741741
"id", conceptId,
742742
"members", Json.array(Json.object(
743743
"moduleId", Concepts.MODULE_SCT_CORE,
744-
"referenceSetId", Concepts.REFSET_OWL_AXIOM,
744+
"refsetId", Concepts.REFSET_OWL_AXIOM,
745745
SnomedRf2Headers.FIELD_OWL_EXPRESSION, owlSubclassOfExpression
746746
)),
747747
"commitComment", "Created concept with owl axiom reference set member"
@@ -772,7 +772,7 @@ public void createConceptWithOwlAxiomMemberWithEquivalentClassesExpression() thr
772772
"id", conceptId,
773773
"members", Json.array(Json.object(
774774
"moduleId", Concepts.MODULE_SCT_CORE,
775-
"referenceSetId", Concepts.REFSET_OWL_AXIOM,
775+
"refsetId", Concepts.REFSET_OWL_AXIOM,
776776
SnomedRf2Headers.FIELD_OWL_EXPRESSION, owlEquivalentClassesExpression
777777
)),
778778
"commitComment", "Created concept with owl axiom reference set member"
@@ -798,7 +798,7 @@ public void createConceptWithOwlAxiomMemberWithComplexSubClassOfExpressionShould
798798
final String owlSubClassOfExpression = "SubClassOf(ObjectIntersectionOf(:73211009 ObjectSomeValuesFrom(:609096000 ObjectSomeValuesFrom(:100106001 :100102001))) :"+conceptId+")";
799799
final Map<?, ?> memberRequestBody = Json.object(
800800
"moduleId", Concepts.MODULE_SCT_CORE,
801-
"referenceSetId", Concepts.REFSET_OWL_AXIOM,
801+
"refsetId", Concepts.REFSET_OWL_AXIOM,
802802
SnomedRf2Headers.FIELD_OWL_EXPRESSION, owlSubClassOfExpression
803803
);
804804

@@ -872,7 +872,7 @@ public void testUpdateConceptDefinitionStatusWithAxiomMembersShouldNotChange() {
872872
final SnomedReferenceSetMember newMember = new SnomedReferenceSetMember();
873873
newMember.setId(UUID.randomUUID().toString());
874874
newMember.setActive(true);
875-
newMember.setReferenceSetId(Concepts.REFSET_OWL_AXIOM);
875+
newMember.setRefsetId(Concepts.REFSET_OWL_AXIOM);
876876
newMember.setProperties(
877877
Json.object(SnomedRf2Headers.FIELD_OWL_EXPRESSION, String.format("EquivalentClasses(:%s ObjectIntersectionOf(:%s :%s))", conceptId, Concepts.AMBIGUOUS, Concepts.NAMESPACE_ROOT))
878878
);
@@ -905,7 +905,7 @@ public void testUpdateConceptDefinitionStatusWithEquivalentClassesAxiomMember()
905905
final SnomedReferenceSetMember newMember = new SnomedReferenceSetMember();
906906
newMember.setId(UUID.randomUUID().toString());
907907
newMember.setActive(true);
908-
newMember.setReferenceSetId(Concepts.REFSET_OWL_AXIOM);
908+
newMember.setRefsetId(Concepts.REFSET_OWL_AXIOM);
909909
newMember.setProperties(
910910
Json.object(SnomedRf2Headers.FIELD_OWL_EXPRESSION, String.format("EquivalentClasses(:%s ObjectIntersectionOf(:%s :%s))", conceptId, Concepts.AMBIGUOUS, Concepts.NAMESPACE_ROOT))
911911
);
@@ -944,7 +944,7 @@ public void testUpdateConceptDefinitionStatusWithSubClassOfAxiomMemberShouldChan
944944
final SnomedReferenceSetMember newMember = new SnomedReferenceSetMember();
945945
newMember.setId(UUID.randomUUID().toString());
946946
newMember.setActive(true);
947-
newMember.setReferenceSetId(Concepts.REFSET_OWL_AXIOM);
947+
newMember.setRefsetId(Concepts.REFSET_OWL_AXIOM);
948948
newMember.setProperties(
949949
Json.object(SnomedRf2Headers.FIELD_OWL_EXPRESSION, String.format("SubClassOf(:%s :%s)", conceptId, Concepts.AMBIGUOUS))
950950
);
@@ -1071,7 +1071,7 @@ public void reactivateConceptWithExistingOWLAxiom() throws Exception {
10711071
"id", owlAxiomMemberId,
10721072
"active", true,
10731073
"moduleId", Concepts.MODULE_SCT_CORE,
1074-
"referenceSetId", Concepts.REFSET_OWL_AXIOM,
1074+
"refsetId", Concepts.REFSET_OWL_AXIOM,
10751075
SnomedRf2Headers.FIELD_OWL_EXPRESSION, owlSubclassOfExpression
10761076
)),
10771077
"commitComment", "Created concept with owl axiom reference set member"

‎snomed/com.b2international.snowowl.snomed.core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/components/SnomedConcreteValueApiTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -227,30 +227,30 @@ Concepts.ROOT_CONCEPT, Concepts.PART_OF, new RelationshipValue(5))
227227
public void updateGroup() {
228228
String relationshipId = createNewConcreteValue(branchPath);
229229
Json requestBody = Json.object(
230-
"group", 99,
230+
"relationshipGroup", 99,
231231
"commitComment", "Updated concrete value group");
232232

233233
updateComponent(branchPath, SnomedComponentType.RELATIONSHIP, relationshipId, requestBody)
234234
.statusCode(204);
235235

236236
getComponent(branchPath, SnomedComponentType.RELATIONSHIP, relationshipId)
237237
.statusCode(200)
238-
.body("group", equalTo(99));
238+
.body("relationshipGroup", equalTo(99));
239239
}
240240

241241
@Test
242242
public void updateGroupToInvalidValue() {
243243
String relationshipId = createNewConcreteValue(branchPath);
244244
Json requestBody = Json.object(
245-
"group", -5,
245+
"relationshipGroup", -5,
246246
"commitComment", "Updated concrete value group to invalid value");
247247

248248
updateComponent(branchPath, SnomedComponentType.RELATIONSHIP, relationshipId, requestBody)
249249
.statusCode(400);
250250

251251
getComponent(branchPath, SnomedComponentType.RELATIONSHIP, relationshipId)
252252
.statusCode(200)
253-
.body("group", equalTo(0));
253+
.body("relationshipGroup", equalTo(0));
254254
}
255255

256256
@Test

0 commit comments

Comments
 (0)