Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SO-4264: use JSON patch to apply property conflicts during merge #680

Merged
merged 13 commits into from
Sep 27, 2020
Merged

SO-4264: use JSON patch to apply property conflicts during merge #680

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c96f0e8
SO-4264: add test for nested prop change tracking issue
cmark Sep 10, 2020
397d59c
SO-4264: support one-level deep nested automatic property updates
cmark Sep 10, 2020
b725804
SO-4264: changes due to revision document level API changes
cmark Sep 10, 2020
1ed95d6
SO-4264: add test case to verify merging of nested property on rebase
cmark Sep 11, 2020
0397790
Merge remote-tracking branch 'origin/7.x' into issue/SO-4264-nested-p…
cmark Sep 27, 2020
22ad463
SO-4264: upgrade zjsonpatch to 0.4.11
cmark Sep 27, 2020
518f760
SO-4264: support document deserialization into JsonNode
cmark Sep 27, 2020
0225e4d
SO-4264 #resolve
cmark Sep 27, 2020
4b0818a
SO-4264: revert getSelf() method visibility changes
cmark Sep 27, 2020
6a1bdd9
SO-4264: remove unnecessary jar inclusion in commons/build.properties
cmark Sep 27, 2020
c769a83
SO-4264: remove unused Mutables type
cmark Sep 27, 2020
a92cbde
SO-4264: revert toBuilder() method visibility changes
cmark Sep 27, 2020
e405673
SO-4264: revert toBuilder() method visibility changes (index.tests)
cmark Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SO-4264: changes due to revision document level API changes
  • Loading branch information
@cmark
cmark committed Sep 10, 2020
commit b725804b2a421d584896d2576cda2d988f461d1d
2 changes: 1 addition & 1 deletion ...atastore/src/com/b2international/snowowl/snomed/core/version/SnomedVersioningRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected void doVersionComponents(TransactionContext context) throws Exception
}

// stage update on components based on actual type
final SnomedDocument.Builder updatedComponent;
final SnomedDocument.Builder<?, ?> updatedComponent;
if (componentToVersion instanceof SnomedConceptDocument) {
final SnomedConceptDocument concept = (SnomedConceptDocument) componentToVersion;
componentIdsByReferringModule.put(concept.getModuleId(), concept.isPrimitive() ? Concepts.PRIMITIVE : Concepts.FULLY_DEFINED);
Expand Down
4 changes: 2 additions & 2 deletions ...m/b2international/snowowl/snomed/datastore/index/constraint/SnomedConstraintDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public SnomedConstraintDocument build() {
}

@Override
protected Builder getSelf() {
public Builder getSelf() {
return this;
}

Expand Down Expand Up @@ -316,7 +316,7 @@ private SnomedConstraintDocument(
}

@Override
protected Revision.Builder<?, ? extends Revision> toBuilder() {
public Revision.Builder<?, ? extends Revision> toBuilder() {
return builder(this);
}

Expand Down
4 changes: 2 additions & 2 deletions ...e/src/com/b2international/snowowl/snomed/datastore/index/entry/SnomedConceptDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ private Builder() {
}

@Override
protected Builder getSelf() {
public Builder getSelf() {
return this;
}

Expand Down Expand Up @@ -489,7 +489,7 @@ private SnomedConceptDocument(final String id,
}

@Override
protected Revision.Builder<?, ? extends Revision> toBuilder() {
public Revision.Builder<?, ? extends Revision> toBuilder() {
return builder(this);
}

Expand Down
4 changes: 2 additions & 2 deletions ...com/b2international/snowowl/snomed/datastore/index/entry/SnomedDescriptionIndexEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ private Builder() {
}

@Override
protected Builder getSelf() {
public Builder getSelf() {
return this;
}

Expand Down Expand Up @@ -437,7 +437,7 @@ private SnomedDescriptionIndexEntry(final String id,
}

@Override
protected Revision.Builder<?, ? extends Revision> toBuilder() {
public Revision.Builder<?, ? extends Revision> toBuilder() {
return builder(this);
}

Expand Down
4 changes: 2 additions & 2 deletions ...om/b2international/snowowl/snomed/datastore/index/entry/SnomedRefSetMemberIndexEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ public Builder field(String fieldName, Object value) {
}

@Override
protected Builder getSelf() {
public Builder getSelf() {
return this;
}

Expand Down Expand Up @@ -1088,7 +1088,7 @@ private SnomedRefSetMemberIndexEntry(final String id,
}

@Override
protected Revision.Builder<?, ? extends Revision> toBuilder() {
public Revision.Builder<?, ? extends Revision> toBuilder() {
return builder(this);
}

Expand Down
4 changes: 2 additions & 2 deletions ...om/b2international/snowowl/snomed/datastore/index/entry/SnomedRelationshipIndexEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ private Builder() {
}

@Override
protected Builder getSelf() {
public Builder getSelf() {
return this;
}

Expand Down Expand Up @@ -337,7 +337,7 @@ private SnomedRelationshipIndexEntry(final String id,
}

@Override
protected Revision.Builder<?, ? extends Revision> toBuilder() {
public Revision.Builder<?, ? extends Revision> toBuilder() {
return builder(this);
}

Expand Down