diff --git a/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java b/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java index 10510b8..f16436b 100644 --- a/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java +++ b/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java @@ -29,9 +29,6 @@ public class Product extends TraceableEntity { @Column(name = "PRODUCT_NAME") private String productName; - @Column(name = "DISPLAY_NAME") - private String displayName; - @Column(name = "BASE_URL", unique = true) private String baseUrl; diff --git a/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java index 78ef3d2..39cd359 100644 --- a/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java +++ b/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java @@ -44,7 +44,6 @@ default Product create(CreateProductRequestDTO dto, Workspace workspace) { @Mapping(target = "workspace", ignore = true) @Mapping(target = "productName", ignore = true) - @Mapping(target = "displayName", ignore = true) @Mapping(target = "persisted", ignore = true) @Mapping(target = "modificationUser", ignore = true) @Mapping(target = "modificationDate", ignore = true) diff --git a/src/main/openapi/di-workspace-v1.yaml b/src/main/openapi/di-workspace-v1.yaml index 1edcb56..547cf78 100644 --- a/src/main/openapi/di-workspace-v1.yaml +++ b/src/main/openapi/di-workspace-v1.yaml @@ -161,8 +161,6 @@ components: properties: productName: type: string - displayName: - type: string baseUrl: type: string microfrontends: diff --git a/src/main/openapi/onecx-workspace-internal-openapi.yaml b/src/main/openapi/onecx-workspace-internal-openapi.yaml index 84250a1..5c32fc1 100644 --- a/src/main/openapi/onecx-workspace-internal-openapi.yaml +++ b/src/main/openapi/onecx-workspace-internal-openapi.yaml @@ -746,8 +746,6 @@ components: type: string productName: type: string - displayName: - type: string baseUrl: type: string RoleSearchCriteria: @@ -1385,8 +1383,6 @@ components: type: string productName: type: string - displayName: - type: string baseUrl: type: string microfrontends: @@ -1446,8 +1442,6 @@ components: type: string productName: type: string - displayName: - type: string baseUrl: type: string microfrontends: diff --git a/src/main/openapi/onecx-workspace-v1-openapi.yaml b/src/main/openapi/onecx-workspace-v1-openapi.yaml index 5f1d667..6656e70 100644 --- a/src/main/openapi/onecx-workspace-v1-openapi.yaml +++ b/src/main/openapi/onecx-workspace-v1-openapi.yaml @@ -181,8 +181,6 @@ components: properties: productName: type: string - displayName: - type: string baseUrl: type: string microfrontends: diff --git a/src/main/resources/db/changeLog.xml b/src/main/resources/db/changeLog.xml index c830630..53b5b80 100644 --- a/src/main/resources/db/changeLog.xml +++ b/src/main/resources/db/changeLog.xml @@ -6,7 +6,5 @@ - - \ No newline at end of file diff --git a/src/main/resources/db/v1/2024-03-05-add-product-display-name.xml b/src/main/resources/db/v1/2024-03-05-add-product-display-name.xml deleted file mode 100644 index 239da87..0000000 --- a/src/main/resources/db/v1/2024-03-05-add-product-display-name.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/data/testdata-external.xml b/src/test/resources/data/testdata-external.xml index f727a03..a287363 100644 --- a/src/test/resources/data/testdata-external.xml +++ b/src/test/resources/data/testdata-external.xml @@ -15,8 +15,8 @@ - - - + + + diff --git a/src/test/resources/data/testdata-internal.xml b/src/test/resources/data/testdata-internal.xml index f5baa1c..f9c27de 100644 --- a/src/test/resources/data/testdata-internal.xml +++ b/src/test/resources/data/testdata-internal.xml @@ -49,8 +49,8 @@ - - + + diff --git a/src/test/resources/import/workspace-import.json b/src/test/resources/import/workspace-import.json index 05ed441..8664b92 100644 --- a/src/test/resources/import/workspace-import.json +++ b/src/test/resources/import/workspace-import.json @@ -375,7 +375,6 @@ { "baseUrl" : "/core", "productName": "onecx-core", - "displayName": "onecx-core", "microfrontends": [ { "mfeId": "menu", @@ -443,7 +442,6 @@ { "baseUrl" : "/core", "productName": "onecx-core", - "displayName": "onecx-core", "microfrontends": [ { "mfeId": "menu",