Skip to content

Commit 2986073

Browse files
committed
Updates during team code review.
1 parent 243c54c commit 2986073

31 files changed

+64
-66
lines changed

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/Error.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232
@XmlType ( name = "Error" )
3333
@JsonInclude( JsonInclude.Include.NON_NULL )
3434
@SuppressWarnings("gedcomx:no_id")
35-
@Schema(description = "The error code. Interpreted per RFC 2616, Section 10 (HTTP Status Code Definitions).")
35+
@Schema(description = "A common representation of an error on the FamilySearch platform.")
3636
public class Error {
3737

38+
// TODO: Fix links to RFC 2616 and RFC 2616, Section 10 (HTTP Status Code Definitions)
3839
@Schema(description = "The error code. Interpreted per RFC 2616, Section 10 (HTTP Status Code Definitions).")
3940
private Integer code;
4041

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/Feature.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public class Feature {
3737
@Schema(description = "A description of the feature.")
3838
private String description;
3939

40-
@Schema(description = "Whether the feature is enabled for the current request.")
40+
@Schema(description = "True if the feature is enabled for the current request: false otherwise.")
4141
private Boolean enabled;
4242

43-
@Schema(description = "The date that this feature is scheduled to activate permanently.")
43+
@Schema(description = "The date that this feature is scheduled to be enabled permanently.")
4444
private Date activationDate;
4545

4646
/**

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/ChangeInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class ChangeInfo {
4545
@Schema(description = "The type of the object to which the operation applies.")
4646
private URI objectType;
4747

48-
@Schema(description = "An optional modifier for the object to which the operation applies.")
48+
@Schema(description = "An optional modifier for the object to which the operation applies. For example, if the object is a Fact, a modifier could be applied to indicate that fact applies to a person, couple, or child-and-parents relationship.")
4949
private URI objectModifier;
5050

5151
@Schema(description = "The reason for the change.")

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/ChildAndParentsRelationship.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public class ChildAndParentsRelationship extends Subject {
5252
@Schema(description = "The child in the relationship.")
5353
private ResourceReference child;
5454

55-
@Schema(description = "The fact conclusions for the parent1.")
55+
@Schema(description = "The fact conclusions for parent1.")
5656
private List<Fact> parent1Facts;
5757

58-
@Schema(description = "The fact conclusions for the parent2.")
58+
@Schema(description = "The fact conclusions for parent2.")
5959
private List<Fact> parent2Facts;
6060

6161
/**

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/DiscussionReference.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
@JsonElementWrapper (name = "discussion-references")
3838
@XmlType ( name = "DiscussionReference" )
3939
@JsonInclude ( JsonInclude.Include.NON_NULL )
40-
@Schema(description = "An data type that supports hypermedia controls (i.e. links).")
40+
@Schema(description = "A discussion reference")
4141
public final class DiscussionReference extends HypermediaEnabledData {
4242

43-
@Schema(description = "The URI to the resource. For more information, see Architecture of the World Wide Web, Volume One, Section 2")
43+
@Schema(description = "The URI to the resource.")
4444
private URI resource;
4545

4646
@Schema(description = "The attribution metadata for this discussion reference.")

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/MatchInfo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ public class MatchInfo {
4444
@Schema(description = "The way this match has been resolved.")
4545
private URI status;
4646

47-
@Schema(description = "tells if the match would add a person to the target system")
47+
@Schema(description = "True if the match would add a person to the target system; false otherwise.")
4848
private Boolean addsPerson;
4949

50-
@Schema(description = "tells if the match would add a person to the target system who passes the 110-year rule")
50+
@Schema(description = "True if the match would add a person to the target system who passes the 110-year rule; false otherwise.")
5151
private Boolean addsPerson110YearRule;
5252

53-
@Schema(description = "tells if the match would add a vital fact to the target system")
53+
@Schema(description = "True if the match would add a vital fact to the target system; false otherwise.")
5454
private Boolean addsFact;
5555

56-
@Schema(description = "tells if the match would add a date or place to an existing vital fact")
56+
@Schema(description = "True if the match would add a date or place to an existing vital fact; false otherwise.")
5757
private Boolean addsDateOrPlace;
5858

59-
@Schema(description = "tells if the destination has four or more people in the immediate family")
59+
@Schema(description = "True if the destination has four or more people in the immediate family; false otherwise.")
6060
private Boolean hasFourOrMorePeople;
6161

6262
public MatchInfo() {

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/Merge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@JsonElementWrapper ( name = "merge" )
3636
@XmlType ( name = "Merge", propOrder = {"resourcesToDelete", "resourcesToCopy"} )
3737
@JsonInclude ( JsonInclude.Include.NON_NULL )
38-
@Schema(description = "The Merge")
38+
@Schema(description = "A merge.")
3939
public class Merge {
4040

4141
@Schema(description = "List of resources to remove from the survivor person.")

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/MergeAnalysis.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
@JsonElementWrapper ( name = "mergeAnalysis" )
3636
@XmlType ( name = "MergeAnalysis", propOrder = {"survivorResources", "duplicateResources", "conflictingResources", "survivor", "duplicate"} )
3737
@JsonInclude ( JsonInclude.Include.NON_NULL )
38-
@Schema(description = "The Merge Analysis")
38+
@Schema(description = "A merge analysis.")
3939
public class MergeAnalysis {
4040

41-
@Schema(description = "List of resources to remove from the survivor person.")
41+
@Schema(description = "List of survivor resources.")
4242
private List<ResourceReference> survivorResources;
4343

44-
@Schema(description = "List of resources to copy from the duplicate person to survivor person.")
44+
@Schema(description = "List of duplicate resources.")
4545
private List<ResourceReference> duplicateResources;
4646

4747
@Schema(description = "List of resources that are in conflict.")

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/MergeConflict.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
@JsonElementWrapper ( name = "mergeConflict" )
3333
@XmlType ( name = "MergeConflict", propOrder = {"survivorResource", "duplicateResource"} )
3434
@JsonInclude ( JsonInclude.Include.NON_NULL )
35-
@Schema(description = "The Merge Conflict")
35+
@Schema(description = "A merge conflict.")
3636
public class MergeConflict {
3737

38-
@Schema(description = "The survivor resource.")
38+
@Schema(description = "The surviving person.")
3939
private ResourceReference survivorResource;
4040

41-
@Schema(description = "The duplicate resource.")
41+
@Schema(description = "The duplicate person.")
4242
private ResourceReference duplicateResource;
4343

4444
public MergeConflict() {

extensions/familysearch/familysearch-api-model/src/main/java/org/familysearch/platform/ct/PersonInfo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
@Schema(description = "Extra information about a person.")
3535
public class PersonInfo {
3636

37-
@Schema(description = "The person is editable by the current user.")
37+
@Schema(description = "True if the person is editable by the current user; false otherwise.")
3838
private Boolean canUserEdit = false;
3939

40-
@Schema(description = "The person is visible to all sessions authenticated from any client.")
40+
@Schema(description = "True if the person is visible to all sessions authenticated from any client; false otherwise.")
4141
private Boolean visibleToAll = true;
4242

43-
@Schema(description = "The person is only visible to sessions authenticated from a FamilySearch client.")
43+
@Schema(description = "True if the person is only visible to sessions authenticated from a FamilySearch client; false otherwise.")
4444
private Boolean visibleToAllWhenUsingFamilySearchApps = true;
4545

4646
// The treeId attribute is prototype only and may be removed or changed at any time
47-
@Schema(description = "The tree id for this person.")
47+
@Schema(description = "The tree id for this person. This attribute is prototype only and may be removed or changed at any time.")
4848
private String treeId;
4949

5050
public PersonInfo() {

0 commit comments

Comments
 (0)