Merge pull request #15 from tranpl/master

refactor
tranpl · Aug 30, 2017 · 9250681 · 9250681
2 parents 88ca3dd + 5f4191c
commit 9250681
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/RedcapApi/Api/Redcap.cs b/RedcapApi/Api/Redcap.cs
@@ -910,7 +910,7 @@ public Task<string> GetRecordsAsync(RedcapFormat redcapFormat, ReturnFormat retu
         /// This method allows you to export the Arms for a project.
         /// NOTE: This only works for longitudinal projects. E.g. Arms are only available in longitudinal projects.
         /// </summary>
-        public async Task<string> ExportArms<T>(RedcapFormat redcapFormat, ReturnFormat returnFormat, List<T> arms = null)
+        public async Task<string> ExportArmsAsync<T>(RedcapFormat redcapFormat, ReturnFormat returnFormat, List<T> arms = null)
         {
             try
             {
@@ -951,7 +951,7 @@ public async Task<string> ExportArms<T>(RedcapFormat redcapFormat, ReturnFormat
         /// <param name="redcapFormat"></param>
         /// <param name="returnFormat"></param>
         /// <returns>Number of Arms imported</returns>
-        public async Task<string> ImportArms<T>(List<T> data, Override overRide, RedcapFormat redcapFormat, ReturnFormat returnFormat)
+        public async Task<string> ImportArmsAsync<T>(List<T> data, Override overRide, RedcapFormat redcapFormat, ReturnFormat returnFormat)
         {
             try
             {
@@ -990,7 +990,7 @@ public async Task<string> ImportArms<T>(List<T> data, Override overRide, RedcapF
         /// <param name="RedcapFormat"></param>
         /// <param name="returnFormat"></param>
         /// <returns></returns>
-        public async Task<string> DeleteArms<T>(T data)
+        public async Task<string> DeleteArmsAsync<T>(T data)
         {
             try
             {
@@ -1015,7 +1015,7 @@ public async Task<string> DeleteArms<T>(T data)
 
         }
 
-        public Task<string> DeleteArms<T>(List<T> data, Override overRide, RedcapFormat redcapFormat, ReturnFormat returnFormat)
+        public Task<string> DeleteArmsAsync<T>(List<T> data, Override overRide, RedcapFormat redcapFormat, ReturnFormat returnFormat)
         {
             throw new NotImplementedException();
         }

diff --git a/RedcapApi/Interfaces/IRedcap.cs b/RedcapApi/Interfaces/IRedcap.cs
@@ -30,7 +30,7 @@ public interface IRedcap
         /// <param name="returnFormat"></param>
         /// <param name="arms"></param>
         /// <returns>Arms for the project in the format specified</returns>
-        Task<string> ExportArms<T>(RedcapFormat redcapFormat, ReturnFormat returnFormat, List<T> arms);
+        Task<string> ExportArmsAsync<T>(RedcapFormat redcapFormat, ReturnFormat returnFormat, List<T> arms);
 
         /// <summary>
         /// This method allows you to import Arms into a project or to rename existing Arms in a project. 
@@ -47,7 +47,7 @@ public interface IRedcap
         /// <param name="redcapFormat"></param>
         /// <param name="returnFormat"></param>
         /// <returns>Number of Arms imported</returns>
-        Task<string> DeleteArms<T>(List<T> data, Override overRide, RedcapFormat redcapFormat, ReturnFormat returnFormat);
+        Task<string> DeleteArmsAsync<T>(List<T> data, Override overRide, RedcapFormat redcapFormat, ReturnFormat returnFormat);
         /// <summary>
         /// This method allows you to delete Arms from a project. Notice: Because of this method's destructive nature, it is only available for use for projects in Development status. Additionally, please be aware that deleting an arm also automatically deletes all events that belong to that arm, and will also automatically delete any records/data that have been collected under that arm (this is non-reversible data loss).
         /// NOTE: This only works for longitudinal projects. 
@@ -58,7 +58,7 @@ public interface IRedcap
         /// <param name="RedcapFormat"></param>
         /// <param name="returnFormat"></param>
         /// <returns></returns>
-        Task<string> DeleteArms<T>(T data);
+        Task<string> DeleteArmsAsync<T>(T data);
         Task<string> ExportEvents(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);
         Task<string> ImportEvents(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);
         Task<string> DeleteEvents(int[] arms, OverwriteBehavior overwriteBehavior, RedcapFormat RedcapFormat, ReturnFormat returnFormat);

diff --git a/RedcapApi/Redcap.csproj b/RedcapApi/Redcap.csproj
@@ -14,6 +14,7 @@
     <AssemblyVersion>0.2.4.0</AssemblyVersion>
     <PackageTags>redcap</PackageTags>
     <PackageReleaseNotes>initial alpha release</PackageReleaseNotes>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/RedcapApiDemo/Program.cs b/RedcapApiDemo/Program.cs
@@ -15,7 +15,7 @@ static void Main(string[] args)
             var redcap_api = new RedcapApi("3D57A7FA57C8A43F6C8803A84BB3957B", "http://localhost/redcap/api/");
 
             var armList = new List<int> {2 }.ToArray();
-            var result = redcap_api.DeleteArms(armList).Result;
+            var result = redcap_api.DeleteArmsAsync(armList).Result;
             var data = JsonConvert.DeserializeObject(result);
             Console.WriteLine(data);
             Console.ReadLine();