refactor: split api management models into domain & dto

Author: nryanov

modules/api/api-management/build.gradle.kts

@@ -41,8 +41,9 @@ openApiGenerate {
 
     additionalProperties.put("apiNamePrefix", "ManagementRest")
     additionalProperties.put("apiNameSuffix", "")
+    additionalProperties.put("modelNameSuffix", "Dto")
     additionalProperties.put("apiPackage", "kasanari.catalog.management.api")
-    additionalProperties.put("modelPackage", "kasanari.catalog.management.model")
+    additionalProperties.put("modelPackage", "kasanari.catalog.management.dto")
     additionalProperties.put("dateLibrary", "java8")
 }
 

modules/api/api-management/src/main/java/kasanari/catalog/management/dto/CatalogModeDto.java

@@ -0,0 +1,26 @@
+package kasanari.catalog.management.dto;
+
+public enum CatalogModeDto {
+    INTERNAL("INTERNAL"),
+    PROXY("PROXY");
+
+    private final String value;
+
+    CatalogModeDto(String value) {
+        this.value = value;
+    }
+
+    public static CatalogModeDto fromValue(String value) {
+        for (var item : values()) {
+            if (item.value.equals(value)) {
+                return item;
+            }
+        }
+        throw new IllegalArgumentException("Unknown catalog mode: " + value);
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}

…/management/model/CatalogPublicInfo.java …management/dto/CatalogPublicInfoDto.javamodules/api/api-management/src/main/java/kasanari/catalog/management/model/CatalogPublicInfo.java renamed to modules/api/api-management/src/main/java/kasanari/catalog/management/dto/CatalogPublicInfoDto.java modules/api/api-management/src/main/java/kasanari/catalog/management/model/CatalogPublicInfo.java renamed to modules/api/api-management/src/main/java/kasanari/catalog/management/dto/CatalogPublicInfoDto.java

@@ -1,10 +1,10 @@
-package kasanari.catalog.management.model;
+package kasanari.catalog.management.dto;
 
-public class CatalogPublicInfo {
+public class CatalogPublicInfoDto {
     private String catalogId;
-    private CatalogType catalogType;
-    private CatalogMode mode;
-    private CatalogSpec spec;
+    private CatalogTypeDto catalogType;
+    private CatalogModeDto mode;
+    private CatalogSpecDto spec;
     private Long version;
 
     public String getCatalogId() {
@@ -15,27 +15,27 @@ public void setCatalogId(String catalogId) {
         this.catalogId = catalogId;
     }
 
-    public CatalogType getCatalogType() {
+    public CatalogTypeDto getCatalogType() {
         return catalogType;
     }
 
-    public void setCatalogType(CatalogType catalogType) {
+    public void setCatalogType(CatalogTypeDto catalogType) {
         this.catalogType = catalogType;
     }
 
-    public CatalogMode getMode() {
+    public CatalogModeDto getMode() {
         return mode;
     }
 
-    public void setMode(CatalogMode mode) {
+    public void setMode(CatalogModeDto mode) {
         this.mode = mode;
     }
 
-    public CatalogSpec getSpec() {
+    public CatalogSpecDto getSpec() {
         return spec;
     }
 
-    public void setSpec(CatalogSpec spec) {
+    public void setSpec(CatalogSpecDto spec) {
         this.spec = spec;
     }
 

modules/api/api-management/src/main/java/kasanari/catalog/management/dto/CatalogSpecDto.java

@@ -0,0 +1,23 @@
+package kasanari.catalog.management.dto;
+
+
+public class CatalogSpecDto {
+    private CatalogTypeDto type;
+    private IcebergCatalogSpecModeConfigDto modeConfig;
+
+    public CatalogTypeDto getType() {
+        return type;
+    }
+
+    public void setType(CatalogTypeDto type) {
+        this.type = type;
+    }
+
+    public IcebergCatalogSpecModeConfigDto getModeConfig() {
+        return modeConfig;
+    }
+
+    public void setModeConfig(IcebergCatalogSpecModeConfigDto modeConfig) {
+        this.modeConfig = modeConfig;
+    }
+}

modules/api/api-management/src/main/java/kasanari/catalog/management/dto/CatalogTypeDto.java

@@ -0,0 +1,27 @@
+package kasanari.catalog.management.dto;
+
+public enum CatalogTypeDto {
+    ICEBERG("ICEBERG"),
+    PAIMON("PAIMON"),
+    LANCE("LANCE");
+
+    private final String value;
+
+    CatalogTypeDto(String value) {
+        this.value = value;
+    }
+
+    public static CatalogTypeDto fromValue(String value) {
+        for (var item : values()) {
+            if (item.value.equals(value)) {
+                return item;
+            }
+        }
+        throw new IllegalArgumentException("Unknown catalog type: " + value);
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}

modules/api/api-management/src/main/java/kasanari/catalog/management/dto/CreateCatalogRequestDto.java

@@ -0,0 +1,40 @@
+package kasanari.catalog.management.dto;
+
+public class CreateCatalogRequestDto {
+    private String catalogId;
+    private CatalogTypeDto catalogType;
+    private CatalogModeDto mode;
+    private CatalogSpecDto spec;
+
+    public String getCatalogId() {
+        return catalogId;
+    }
+
+    public void setCatalogId(String catalogId) {
+        this.catalogId = catalogId;
+    }
+
+    public CatalogTypeDto getCatalogType() {
+        return catalogType;
+    }
+
+    public void setCatalogType(CatalogTypeDto catalogType) {
+        this.catalogType = catalogType;
+    }
+
+    public CatalogModeDto getMode() {
+        return mode;
+    }
+
+    public void setMode(CatalogModeDto mode) {
+        this.mode = mode;
+    }
+
+    public CatalogSpecDto getSpec() {
+        return spec;
+    }
+
+    public void setSpec(CatalogSpecDto spec) {
+        this.spec = spec;
+    }
+}

modules/api/api-management/src/main/java/kasanari/catalog/management/dto/DeleteRolesRequestDto.java

@@ -0,0 +1,16 @@
+package kasanari.catalog.management.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DeleteRolesRequestDto {
+    private List<RoleBindingDto> bindings = new ArrayList<>();
+
+    public List<RoleBindingDto> getBindings() {
+        return bindings;
+    }
+
+    public void setBindings(List<RoleBindingDto> bindings) {
+        this.bindings = bindings;
+    }
+}

…alog/management/model/ErrorResponse.java …log/management/dto/ErrorResponseDto.javamodules/api/api-management/src/main/java/kasanari/catalog/management/model/ErrorResponse.java renamed to modules/api/api-management/src/main/java/kasanari/catalog/management/dto/ErrorResponseDto.java modules/api/api-management/src/main/java/kasanari/catalog/management/model/ErrorResponse.java renamed to modules/api/api-management/src/main/java/kasanari/catalog/management/dto/ErrorResponseDto.java

@@ -1,6 +1,6 @@
-package kasanari.catalog.management.model;
+package kasanari.catalog.management.dto;
 
-public class ErrorResponse {
+public class ErrorResponseDto {
     private String message;
 
     public String getMessage() {

modules/api/api-management/src/main/java/kasanari/catalog/management/dto/GetRolesResponseDto.java

@@ -0,0 +1,16 @@
+package kasanari.catalog.management.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GetRolesResponseDto {
+    private List<RoleBindingDto> bindings = new ArrayList<>();
+
+    public List<RoleBindingDto> getBindings() {
+        return bindings;
+    }
+
+    public void setBindings(List<RoleBindingDto> bindings) {
+        this.bindings = bindings;
+    }
+}

…/model/IcebergCatalogSpecModeConfig.java …dto/IcebergCatalogSpecModeConfigDto.javamodules/api/api-management/src/main/java/kasanari/catalog/management/model/IcebergCatalogSpecModeConfig.java renamed to modules/api/api-management/src/main/java/kasanari/catalog/management/dto/IcebergCatalogSpecModeConfigDto.java modules/api/api-management/src/main/java/kasanari/catalog/management/model/IcebergCatalogSpecModeConfig.java renamed to modules/api/api-management/src/main/java/kasanari/catalog/management/dto/IcebergCatalogSpecModeConfigDto.java

@@ -1,9 +1,9 @@
-package kasanari.catalog.management.model;
+package kasanari.catalog.management.dto;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class IcebergCatalogSpecModeConfig {
+public class IcebergCatalogSpecModeConfigDto {
     private Map<String, String> properties = new HashMap<>();
     private String endpoint;