Merge pull request #61 from JoergHoffmannatGitHub/master

The Issues #43 and #48 can be closed.
FamilySearch · Apr 2, 2023 · 049cbb8 · 049cbb8
2 parents 827bafd + 8c9e8b0
commit 049cbb8
Show file tree

Hide file tree

Showing 28 changed files with 962 additions and 885 deletions.
diff --git a/FamilySearch.Api/DiscussionsState.cs b/FamilySearch.Api/DiscussionsState.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 using FamilySearch.Api.Util;
 
 using Gx.Fs;
 using Gx.Fs.Discussions;
-using Gx.Links;
 using Gx.Rs.Api;
 using Gx.Rs.Api.Util;
 
@@ -26,7 +24,7 @@ public class DiscussionsState : GedcomxApplicationState<FamilySearchPlatform>
         /// <param name="client">The REST API client to use for API calls.</param>
         /// <param name="accessToken">The access token to use for subsequent invocations of the REST API client.</param>
         /// <param name="stateFactory">The state factory to use for state instantiation.</param>
-        public DiscussionsState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken, FamilySearchStateFactory stateFactory)
+        public DiscussionsState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken, FamilySearchStateFactory stateFactory)
             : base(request, response, client, accessToken, stateFactory)
         {
         }
@@ -40,7 +38,7 @@ public DiscussionsState(IRestRequest request, IRestResponse response, IFilterabl
         /// <returns>A cloned instance of the current state instance.</returns>
         protected override GedcomxApplicationState Clone(IRestRequest request, IRestResponse response, IFilterableRestClient client)
         {
-            return new DiscussionsState(request, response, client, this.CurrentAccessToken, (FamilySearchStateFactory)this.stateFactory);
+            return new DiscussionsState(request, response, client, CurrentAccessToken, (FamilySearchStateFactory)stateFactory);
         }
 
         /// <summary>
@@ -66,14 +64,14 @@ public List<Discussion> Discussions
         /// </returns>
         public CollectionState ReadCollection(params IStateTransitionOption[] options)
         {
-            Link link = GetLink(Rel.COLLECTION);
+            var link = GetLink(Rel.COLLECTION);
             if (link == null || link.Href == null)
             {
                 return null;
             }
 
-            IRestRequest request = CreateAuthenticatedGedcomxRequest().Build(link.Href, Method.GET);
-            return ((FamilySearchStateFactory)this.stateFactory).NewCollectionStateInt(request, Invoke(request, options), this.Client, this.CurrentAccessToken);
+            var request = CreateAuthenticatedGedcomxRequest().Build(link.Href, Method.GET);
+            return ((FamilySearchStateFactory)stateFactory).NewCollectionStateInt(request, Invoke(request, options), Client, CurrentAccessToken);
         }
 
         /// <summary>
@@ -86,10 +84,10 @@ public CollectionState ReadCollection(params IStateTransitionOption[] options)
         /// </returns>
         public DiscussionState AddDiscussion(Discussion discussion, params IStateTransitionOption[] options)
         {
-            FamilySearchPlatform entity = new FamilySearchPlatform();
+            var entity = new FamilySearchPlatform();
             entity.AddDiscussion(discussion);
-            IRestRequest request = RequestUtil.ApplyFamilySearchConneg(CreateAuthenticatedGedcomxRequest()).SetEntity(entity).Build(GetSelfUri(), Method.POST);
-            return ((FamilySearchStateFactory)this.stateFactory).NewDiscussionState(request, Invoke(request, options), this.Client, this.CurrentAccessToken);
+            var request = RequestUtil.ApplyFamilySearchConneg(CreateAuthenticatedGedcomxRequest()).SetEntity(entity).Build(GetSelfUri(), Method.POST);
+            return ((FamilySearchStateFactory)stateFactory).NewDiscussionState(request, Invoke(request, options), Client, CurrentAccessToken);
         }
     }
 }
diff --git a/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs b/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs
@@ -1,11 +1,7 @@
 using Gx.Rs.Api;
-using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Gx.Rs.Api.Util;
-using Gx.Links;
+
+using RestSharp;
 
 namespace FamilySearch.Api
 {
@@ -22,7 +18,7 @@ public class FamilySearchPlaceDescriptionState : PlaceDescriptionState
         /// <param name="client">The REST API client to use for API calls.</param>
         /// <param name="accessToken">The access token to use for subsequent invocations of the REST API client.</param>
         /// <param name="stateFactory">The state factory to use for state instantiation.</param>
-        protected internal FamilySearchPlaceDescriptionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken, FamilySearchStateFactory stateFactory)
+        protected internal FamilySearchPlaceDescriptionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken, FamilySearchStateFactory stateFactory)
             : base(request, response, client, accessToken, stateFactory)
         {
         }
@@ -36,7 +32,7 @@ protected internal FamilySearchPlaceDescriptionState(IRestRequest request, IRest
         /// <returns>A cloned instance of the current state instance.</returns>
         protected override GedcomxApplicationState Clone(IRestRequest request, IRestResponse response, IFilterableRestClient client)
         {
-            return new FamilySearchPlaceDescriptionState(request, response, client, this.CurrentAccessToken, (FamilySearchStateFactory)this.stateFactory);
+            return new FamilySearchPlaceDescriptionState(request, response, client, CurrentAccessToken, (FamilySearchStateFactory)stateFactory);
         }
 
         /// <summary>
@@ -48,15 +44,15 @@ protected override GedcomxApplicationState Clone(IRestRequest request, IRestResp
         /// </returns>
         public FamilySearchPlaceState ReadPlace(params IStateTransitionOption[] options)
         {
-            Link link = this.GetLink(Rel.PLACE);
-            link = link == null ? this.GetLink(Rel.SELF) : link;
+            var link = GetLink(Rel.PLACE);
+            link = link ?? GetLink(Rel.SELF);
             if (link == null || link.Href == null)
             {
                 return null;
             }
 
-            IRestRequest request = CreateAuthenticatedGedcomxRequest().Build(link.Href, Method.GET);
-            return ((FamilySearchStateFactory)this.stateFactory).NewPlaceState(request, Invoke(request, options), this.Client, this.CurrentAccessToken);
+            var request = CreateAuthenticatedGedcomxRequest().Build(link.Href, Method.GET);
+            return ((FamilySearchStateFactory)stateFactory).NewPlaceState(request, Invoke(request, options), Client, CurrentAccessToken);
         }
     }
 }
diff --git a/FamilySearch.Api/FamilySearchPlaceState.cs b/FamilySearch.Api/FamilySearchPlaceState.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 
 using Gedcomx.Model;
 
@@ -24,7 +23,7 @@ public class FamilySearchPlaceState : GedcomxApplicationState<Gx.Gedcomx>
         /// <param name="client">The REST API client to use for API calls.</param>
         /// <param name="accessToken">The access token to use for subsequent invocations of the REST API client.</param>
         /// <param name="stateFactory">The state factory to use for state instantiation.</param>
-        protected internal FamilySearchPlaceState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken, StateFactory stateFactory)
+        protected internal FamilySearchPlaceState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken, StateFactory stateFactory)
             : base(request, response, client, accessToken, stateFactory)
         {
         }
@@ -35,7 +34,7 @@ protected internal FamilySearchPlaceState(IRestRequest request, IRestResponse re
         /// <value>
         /// The rel name for the current state instance
         /// </value>
-        public override String SelfRel
+        public override string SelfRel
         {
             get
             {
@@ -52,7 +51,7 @@ public override String SelfRel
         /// <returns>A cloned instance of the current state instance.</returns>
         protected override GedcomxApplicationState Clone(IRestRequest request, IRestResponse response, IFilterableRestClient client)
         {
-            return new FamilySearchPlaceState(request, response, client, this.CurrentAccessToken, this.stateFactory);
+            return new FamilySearchPlaceState(request, response, client, CurrentAccessToken, stateFactory);
         }
 
         /// <summary>

diff --git a/FamilySearch.Api/FamilySearchStateFactory.cs b/FamilySearch.Api/FamilySearchStateFactory.cs
@@ -1,14 +1,14 @@
-using Gx.Rs.Api;
-using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Gx.Rs.Api.Util;
+using System;
+
 using FamilySearch.Api.Util;
+
 using Gedcomx.Support;
 
+using Gx.Rs.Api;
+using Gx.Rs.Api.Util;
+
+using RestSharp;
+
 namespace FamilySearch.Api
 {
     /// <summary>
@@ -26,7 +26,7 @@ public class FamilySearchStateFactory : StateFactory
         /// <returns>
         /// A <see cref="DiscussionsState"/> instance containing the REST API response.
         /// </returns>
-        protected internal DiscussionsState NewDiscussionsState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal DiscussionsState NewDiscussionsState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new DiscussionsState(request, response, client, accessToken, this);
         }
@@ -41,7 +41,7 @@ protected internal DiscussionsState NewDiscussionsState(IRestRequest request, IR
         /// <returns>
         /// A <see cref="DiscussionState"/> instance containing the REST API response.
         /// </returns>
-        protected internal DiscussionState NewDiscussionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal DiscussionState NewDiscussionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new DiscussionState(request, response, client, accessToken, this);
         }
@@ -56,7 +56,7 @@ protected internal DiscussionState NewDiscussionState(IRestRequest request, IRes
         /// <returns>
         /// A <see cref="UserState"/> instance containing the REST API response.
         /// </returns>
-        protected internal UserState NewUserState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal UserState NewUserState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new UserState(request, response, client, accessToken, this);
         }
@@ -71,7 +71,7 @@ protected internal UserState NewUserState(IRestRequest request, IRestResponse re
         /// <returns>
         /// A <see cref="PersonMergeState"/> instance containing the REST API response.
         /// </returns>
-        protected internal PersonMergeState NewPersonMergeState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal PersonMergeState NewPersonMergeState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new PersonMergeState(request, response, client, accessToken, this);
         }
@@ -86,7 +86,7 @@ protected internal PersonMergeState NewPersonMergeState(IRestRequest request, IR
         /// <returns>
         /// A <see cref="PersonMatchResultsState"/> instance containing the REST API response.
         /// </returns>
-        protected internal PersonMatchResultsState NewPersonMatchResultsState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal PersonMatchResultsState NewPersonMatchResultsState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new PersonMatchResultsState(request, response, client, accessToken, this);
         }
@@ -127,7 +127,7 @@ public FamilySearchPlaces NewPlacesState(Uri discoveryUri, IFilterableRestClient
         /// </returns>
         public FamilySearchPlaces NewPlacesState(Uri discoveryUri, IFilterableRestClient client, Method method)
         {
-            IRestRequest request = new RedirectableRestRequest().Accept(MediaTypes.GEDCOMX_JSON_MEDIA_TYPE).Build(discoveryUri, method);
+            var request = new RedirectableRestRequest().Accept(MediaTypes.GEDCOMX_JSON_MEDIA_TYPE).Build(discoveryUri, method);
             return NewPlacesState(request, client.Handle(request), client, null);
         }
 
@@ -141,7 +141,7 @@ public FamilySearchPlaces NewPlacesState(Uri discoveryUri, IFilterableRestClient
         /// <returns>
         /// A <see cref="FamilySearchPlaces"/> instance containing the REST API response.
         /// </returns>
-        protected internal FamilySearchPlaces NewPlacesState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal FamilySearchPlaces NewPlacesState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new FamilySearchPlaces(request, response, client, accessToken, this);
         }
@@ -156,7 +156,7 @@ protected internal FamilySearchPlaces NewPlacesState(IRestRequest request, IRest
         /// <returns>
         /// A <see cref="CollectionState"/> instance containing the REST API response.
         /// </returns>
-        protected override CollectionState NewCollectionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected override CollectionState NewCollectionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new FamilySearchCollectionState(request, response, client, accessToken, this);
         }
@@ -171,9 +171,9 @@ protected override CollectionState NewCollectionState(IRestRequest request, IRes
         /// <returns>
         /// A <see cref="CollectionState"/> instance containing the REST API response.
         /// </returns>
-        internal virtual CollectionState NewCollectionStateInt(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        internal virtual CollectionState NewCollectionStateInt(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
-            return this.NewCollectionStateInt(request, response, client, accessToken);
+            return NewCollectionStateInt(request, response, client, accessToken);
         }
 
         /// <summary>
@@ -186,7 +186,7 @@ internal virtual CollectionState NewCollectionStateInt(IRestRequest request, IRe
         /// <returns>
         /// A <see cref="SourceDescriptionState"/> instance containing the REST API response.
         /// </returns>
-        protected override SourceDescriptionState NewSourceDescriptionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected override SourceDescriptionState NewSourceDescriptionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new FamilySearchSourceDescriptionState(request, response, client, accessToken, this);
         }
@@ -201,9 +201,9 @@ protected override SourceDescriptionState NewSourceDescriptionState(IRestRequest
         /// <returns>
         /// A <see cref="SourceDescriptionState"/> instance containing the REST API response.
         /// </returns>
-        internal virtual SourceDescriptionState NewSourceDescriptionStateInt(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        internal virtual SourceDescriptionState NewSourceDescriptionStateInt(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
-            return this.NewSourceDescriptionState(request, response, client, accessToken);
+            return NewSourceDescriptionState(request, response, client, accessToken);
         }
 
         /// <summary>
@@ -216,7 +216,7 @@ internal virtual SourceDescriptionState NewSourceDescriptionStateInt(IRestReques
         /// <returns>
         /// A <see cref="PersonState"/> instance containing the REST API response.
         /// </returns>
-        protected override PersonState NewPersonState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected override PersonState NewPersonState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return base.NewPersonState(request, response, client, accessToken);
         }
@@ -231,9 +231,9 @@ protected override PersonState NewPersonState(IRestRequest request, IRestRespons
         /// <returns>
         /// A <see cref="PersonState"/> instance containing the REST API response.
         /// </returns>
-        internal virtual PersonState NewPersonStateInt(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        internal virtual PersonState NewPersonStateInt(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
-            return this.NewPersonState(request, response, client, accessToken);
+            return NewPersonState(request, response, client, accessToken);
         }
 
         /// <summary>
@@ -246,7 +246,7 @@ internal virtual PersonState NewPersonStateInt(IRestRequest request, IRestRespon
         /// <returns>
         /// A <see cref="PersonNonMatchesState"/> instance containing the REST API response.
         /// </returns>
-        protected internal virtual PersonNonMatchesState NewPersonNonMatchesState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal virtual PersonNonMatchesState NewPersonNonMatchesState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new PersonNonMatchesState(request, response, client, accessToken, this);
         }
@@ -261,7 +261,7 @@ protected internal virtual PersonNonMatchesState NewPersonNonMatchesState(IRestR
         /// <returns>
         /// A <see cref="FamilySearchPlaceState"/> instance containing the REST API response.
         /// </returns>
-        protected internal FamilySearchPlaceState NewPlaceState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected internal FamilySearchPlaceState NewPlaceState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new FamilySearchPlaceState(request, response, client, accessToken, this);
         }
@@ -276,7 +276,7 @@ protected internal FamilySearchPlaceState NewPlaceState(IRestRequest request, IR
         /// <returns>
         /// A <see cref="PlaceDescriptionState"/> instance containing the REST API response.
         /// </returns>
-        protected override PlaceDescriptionState NewPlaceDescriptionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, String accessToken)
+        protected override PlaceDescriptionState NewPlaceDescriptionState(IRestRequest request, IRestResponse response, IFilterableRestClient client, string accessToken)
         {
             return new FamilySearchPlaceDescriptionState(request, response, client, accessToken, this);
         }
@@ -323,7 +323,7 @@ protected override IFilterableRestClient LoadDefaultClient(Uri uri)
         /// </remarks>
         internal virtual IFilterableRestClient LoadDefaultClientInt(Uri uri)
         {
-            return this.LoadDefaultClient(uri);
+            return LoadDefaultClient(uri);
         }
     }
 }
diff --git a/GEDCOM X File/GEDCOM X File.csproj b/GEDCOM X File/GEDCOM X File.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>