Improved workspace folder structure.

Evenfall-Tech · Dec 14, 2022 · 588bebc · 588bebc
1 parent a40f42e
commit 588bebc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/src/GeoTools.GeoServer.Abstractions/GeoTools.GeoServer.Abstractions.csproj b/src/GeoTools.GeoServer.Abstractions/GeoTools.GeoServer.Abstractions.csproj
@@ -4,10 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Services\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Text.Json" Version="7.0.0" />
   </ItemGroup>

diff --git a/.../Models/Workspace/GetWorkspaceResponse.cs → .../Models/Workspace/GetWorkspaceResponse.cs b/.../Models/Workspace/GetWorkspaceResponse.cs → .../Models/Workspace/GetWorkspaceResponse.cs
@@ -2,7 +2,7 @@
 
 namespace GeoTools.GeoServer.Models
 {
-    public class GetWorkspaceResponse
+    internal class GetWorkspaceResponse
     {
         [JsonPropertyName("workspace")]
         public WorkspaceSummary Workspace { get; }

diff --git a/...ions/Models/Workspace/WorkspaceWrapper.cs → ...rver/Models/Workspace/WorkspaceWrapper.cs b/...ions/Models/Workspace/WorkspaceWrapper.cs → ...rver/Models/Workspace/WorkspaceWrapper.cs
@@ -5,7 +5,7 @@ namespace GeoTools.GeoServer.Models
     /// <summary>
     /// Wrapper object around Workspace, in order to conform to how XStream serializes to JSON in GeoServer.
     /// </summary>
-    public class WorkspaceWrapper
+    internal class WorkspaceWrapper
     {
         [JsonPropertyName("workspace")]
         public WorkspaceInfo Workspace { get; }

diff --git a/...ns/Models/Workspace/WorkspacesResponse.cs → ...er/Models/Workspace/WorkspacesResponse.cs b/...ns/Models/Workspace/WorkspacesResponse.cs → ...er/Models/Workspace/WorkspacesResponse.cs
@@ -2,7 +2,7 @@
 
 namespace GeoTools.GeoServer.Models
 {
-    public class WorkspacesResponse
+    internal class WorkspacesResponse
     {
         /// <summary>
         /// WorkspaceResponseWrapper.

diff --git a/src/GeoTools.GeoServer/Services/WorkspaceService.cs b/src/GeoTools.GeoServer/Services/WorkspaceService.cs
@@ -102,12 +102,12 @@ public async Task<GeoServerResponse<Uri>> CreateWorkspaceAsync(WorkspaceInfo wor
                 {
                     if (_options.IgnoreServerErrors)
                     {
-                        _logger.LogWarning(e, nameof(GetWorkspaceAsync));
+                        _logger.LogWarning(e, nameof(CreateWorkspaceAsync));
                         return new GeoServerResponse<Uri>(e.StatusCode, null);
                     }
                     else
                     {
-                        _logger.LogError(e, nameof(GetWorkspaceAsync));
+                        _logger.LogError(e, nameof(CreateWorkspaceAsync));
                         throw e.InnerException;
                     }
                 }
@@ -168,12 +168,12 @@ public async Task<GeoServerResponse<bool>> DeleteWorkspaceAsync(string name, boo
                 {
                     if (_options.IgnoreServerErrors)
                     {
-                        _logger.LogWarning(e, nameof(GetWorkspaceAsync));
+                        _logger.LogWarning(e, nameof(DeleteWorkspaceAsync));
                         return new GeoServerResponse<bool>(e.StatusCode, false);
                     }
                     else
                     {
-                        _logger.LogError(e, nameof(GetWorkspaceAsync));
+                        _logger.LogError(e, nameof(DeleteWorkspaceAsync));
                         throw e.InnerException;
                     }
                 }
@@ -274,12 +274,12 @@ public async Task<GeoServerResponse<IList<NamedLink>>> GetWorkspacesAsync(Cancel
                 {
                     if (_options.IgnoreServerErrors)
                     {
-                        _logger.LogWarning(e, nameof(GetWorkspaceAsync));
+                        _logger.LogWarning(e, nameof(GetWorkspacesAsync));
                         return new GeoServerResponse<IList<NamedLink>>(e.StatusCode, null);
                     }
                     else
                     {
-                        _logger.LogError(e, nameof(GetWorkspaceAsync));
+                        _logger.LogError(e, nameof(GetWorkspacesAsync));
                         throw e.InnerException;
                     }
                 }
@@ -338,12 +338,12 @@ public async Task<GeoServerResponse<bool>> UpdateWorkspaceAsync(string name, Wor
                 {
                     if (_options.IgnoreServerErrors)
                     {
-                        _logger.LogWarning(e, nameof(GetWorkspaceAsync));
+                        _logger.LogWarning(e, nameof(UpdateWorkspaceAsync));
                         return new GeoServerResponse<bool>(e.StatusCode, false);
                     }
                     else
                     {
-                        _logger.LogError(e, nameof(GetWorkspaceAsync));
+                        _logger.LogError(e, nameof(UpdateWorkspaceAsync));
                         throw e.InnerException;
                     }
                 }