diff --git a/mdm-plugin-datamodel/README.md b/mdm-plugin-datamodel/README.md index ca0462389f..9f177e15dc 100644 --- a/mdm-plugin-datamodel/README.md +++ b/mdm-plugin-datamodel/README.md @@ -41,8 +41,6 @@ Controller: dataModel | GET | /api/dataModels/types | Action: types | POST | /api/dataModels/import/${importerNamespace}/${importerName}/${importerVersion} | Action: importModels | POST | /api/dataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | Action: exportModels - | DELETE | /api/dataModels/${dataModelId}/dataClasses/clean | Action: deleteAllUnusedDataClasses - | DELETE | /api/dataModels/${dataModelId}/dataTypes/clean | Action: deleteAllUnusedDataTypes | GET | /api/folders/${folderId}/dataModels | Action: index | DELETE | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated | PUT | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated diff --git a/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/DataModelController.groovy b/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/DataModelController.groovy index 2fa7cb084c..ba18e8f9da 100644 --- a/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/DataModelController.groovy +++ b/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/DataModelController.groovy @@ -84,36 +84,6 @@ class DataModelController extends ModelController { dataModelService } - @Transactional - def deleteAllUnusedDataClasses() { - if (handleReadOnly()) { - return - } - - DataModel dataModel = queryForResource params.dataModelId - - if (!dataModel) return notFound(params.dataModelId) - - dataModelService.deleteAllUnusedDataClasses(dataModel) - - render status: NO_CONTENT // NO CONTENT STATUS CODE - } - - @Transactional - def deleteAllUnusedDataTypes() { - if (handleReadOnly()) { - return - } - - DataModel dataModel = queryForResource params.dataModelId - - if (!dataModel) return notFound(params.dataModelId) - - dataModelService.deleteAllUnusedDataTypes(dataModel) - - render status: NO_CONTENT // NO CONTENT STATUS CODE - } - def search(SearchParams searchParams) { if (searchParams.hasErrors()) { diff --git a/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/UrlMappings.groovy b/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/UrlMappings.groovy index f822551d1e..1fed2b1f5b 100644 --- a/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/UrlMappings.groovy +++ b/mdm-plugin-datamodel/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/datamodel/UrlMappings.groovy @@ -60,9 +60,6 @@ class UrlMappings { put "/subset/$otherDataModelId"(controller: 'dataModel', action: 'subset') get "/intersects/$otherDataModelId"(controller: 'dataModel', action: 'intersects') - delete '/dataTypes/clean'(controller: 'dataModel', action: 'deleteAllUnusedDataTypes') - delete '/dataClasses/clean'(controller: 'dataModel', action: 'deleteAllUnusedDataClasses') - get '/hierarchy'(controller: 'dataModel', action: 'hierarchy') post '/search'(controller: 'dataModel', action: 'search') diff --git a/mdm-plugin-datamodel/src/integration-test/resources/url-mappings/tracked_endpoints.txt b/mdm-plugin-datamodel/src/integration-test/resources/url-mappings/tracked_endpoints.txt index aedf2175d2..5505327345 100644 --- a/mdm-plugin-datamodel/src/integration-test/resources/url-mappings/tracked_endpoints.txt +++ b/mdm-plugin-datamodel/src/integration-test/resources/url-mappings/tracked_endpoints.txt @@ -36,8 +36,6 @@ | GET | /api/dataModels/types | types | | POST | /api/dataModels/import/${importerNamespace}/${importerName}/${importerVersion} | importModels | | POST | /api/dataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | exportModels | -| DELETE | /api/dataModels/${dataModelId}/dataClasses/clean | deleteAllUnusedDataClasses | -| DELETE | /api/dataModels/${dataModelId}/dataTypes/clean | deleteAllUnusedDataTypes | | GET | /api/folders/${folderId}/dataModels | index | | DELETE | /api/dataModels/${dataModelId}/readByAuthenticated | readByAuthenticated | | PUT | /api/dataModels/${dataModelId}/readByAuthenticated | readByAuthenticated | diff --git a/mdm-plugin-referencedata/README.md b/mdm-plugin-referencedata/README.md index 158cff0510..d66b0ad81e 100644 --- a/mdm-plugin-referencedata/README.md +++ b/mdm-plugin-referencedata/README.md @@ -41,8 +41,6 @@ Controller: dataModel | GET | /api/dataModels/types | Action: types | POST | /api/dataModels/import/${importerNamespace}/${importerName}/${importerVersion} | Action: importModels | POST | /api/dataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | Action: exportModels - | DELETE | /api/dataModels/${dataModelId}/dataClasses/clean | Action: deleteAllUnusedDataClasses - | DELETE | /api/dataModels/${dataModelId}/dataTypes/clean | Action: deleteAllUnusedDataTypes | GET | /api/folders/${folderId}/dataModels | Action: index | DELETE | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated | PUT | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated diff --git a/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/ReferenceDataModelController.groovy b/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/ReferenceDataModelController.groovy index 5f4c0aa4c2..6356252c9f 100644 --- a/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/ReferenceDataModelController.groovy +++ b/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/ReferenceDataModelController.groovy @@ -72,36 +72,6 @@ class ReferenceDataModelController extends ModelController { resource ? respond(resource, [model: [userSecurityPolicyManager: currentUserSecurityPolicyManager], view: 'hierarchy']) : notFound(params.id) } - @Transactional - def deleteAllUnusedDataClasses() { - if (handleReadOnly()) { - return - } - - ReferenceDataModel referenceDataModel = queryForResource params.referenceDataModelId - - if (!referenceDataModel) return notFound(params.referenceDataModelId) - - referenceDataModelService.deleteAllUnusedDataClasses(referenceDataModel) - - render status: NO_CONTENT // NO CONTENT STATUS CODE - } - - @Transactional - def deleteAllUnusedDataTypes() { - if (handleReadOnly()) { - return - } - - ReferenceDataModel referenceDataModel = queryForResource params.referenceDataModelId - - if (!referenceDataModel) return notFound(params.referenceDataModelId) - - referenceDataModelService.deleteAllUnusedDataTypes(referenceDataModel) - - render status: NO_CONTENT // NO CONTENT STATUS CODE - } - def search(SearchParams searchParams) { if (searchParams.hasErrors()) { diff --git a/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/UrlMappings.groovy b/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/UrlMappings.groovy index 46c073f956..9ad564b96d 100644 --- a/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/UrlMappings.groovy +++ b/mdm-plugin-referencedata/grails-app/controllers/uk/ac/ox/softeng/maurodatamapper/referencedata/UrlMappings.groovy @@ -57,8 +57,6 @@ class UrlMappings { put "/folder/$folderId"(controller: 'referenceDataModel', action: 'changeFolder') get "/export/$exporterNamespace/$exporterName/$exporterVersion"(controller: 'referenceDataModel', action: 'exportModel') - delete '/referenceDataTypes/clean'(controller: 'referenceDataModel', action: 'deleteAllUnusedReferenceDataTypes') - get '/hierarchy'(controller: 'referenceDataModel', action: 'hierarchy') post '/search'(controller: 'referenceDataModel', action: 'search') diff --git a/mdm-plugin-referencedata/src/integration-test/resources/url-mappings/tracked_endpoints.txt b/mdm-plugin-referencedata/src/integration-test/resources/url-mappings/tracked_endpoints.txt index 9ede4d9c5c..1798ee0fc9 100644 --- a/mdm-plugin-referencedata/src/integration-test/resources/url-mappings/tracked_endpoints.txt +++ b/mdm-plugin-referencedata/src/integration-test/resources/url-mappings/tracked_endpoints.txt @@ -14,7 +14,6 @@ | PUT | /api/admin/referenceDataModels/${id}/undoSoftDelete | undoSoftDelete | | POST | /api/referenceDataModels/import/${importerNamespace}/${importerName}/${importerVersion} | importModels | | POST | /api/referenceDataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | exportModels | -| DELETE | /api/referenceDataModels/${referenceDataModelId}/referenceDataTypes/clean | deleteAllUnusedReferenceDataTypes | | GET | /api/folders/${folderId}/referenceDataModels | index | | DELETE | /api/referenceDataModels/${referenceDataModelId}/readByAuthenticated | readByAuthenticated | | PUT | /api/referenceDataModels/${referenceDataModelId}/readByAuthenticated | readByAuthenticated | diff --git a/mdm-testing-functional/README.md b/mdm-testing-functional/README.md index deaccb40f5..d598c800dd 100644 --- a/mdm-testing-functional/README.md +++ b/mdm-testing-functional/README.md @@ -236,8 +236,6 @@ Controller: dataModel | GET | /api/dataModels/types | Action: types | POST | /api/dataModels/import/${importerNamespace}/${importerName}/${importerVersion} | Action: importModels | POST | /api/dataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | Action: exportModels -| DELETE | /api/dataModels/${dataModelId}/dataClasses/clean | Action: deleteAllUnusedDataClasses -| DELETE | /api/dataModels/${dataModelId}/dataTypes/clean | Action: deleteAllUnusedDataTypes | GET | /api/folders/${folderId}/dataModels | Action: index | DELETE | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated | PUT | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated @@ -418,7 +416,6 @@ Controller: referenceDataModel | PUT | /api/admin/referenceDataModels/${id}/undoSoftDelete | Action: undoSoftDelete | POST | /api/referenceDataModels/import/${importerNamespace}/${importerName}/${importerVersion} | Action: importModels | POST | /api/referenceDataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | Action: exportModels -| DELETE | /api/referenceDataModels/${referenceDataModelId}/referenceDataTypes/clean | Action: deleteAllUnusedReferenceDataTypes | GET | /api/folders/${folderId}/referenceDataModels | Action: index | DELETE | /api/referenceDataModels/${referenceDataModelId}/readByAuthenticated | Action: readByAuthenticated | PUT | /api/referenceDataModels/${referenceDataModelId}/readByAuthenticated | Action: readByAuthenticated diff --git a/mdm-testing-functional/untested_endpoints.md b/mdm-testing-functional/untested_endpoints.md index eb3a7d34d1..0fa73787ed 100644 --- a/mdm-testing-functional/untested_endpoints.md +++ b/mdm-testing-functional/untested_endpoints.md @@ -228,8 +228,6 @@ Controller: dataModel | GET | /api/dataModels/types | Action: types | POST | /api/dataModels/import/${importerNamespace}/${importerName}/${importerVersion} | Action: importModels | POST | /api/dataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | Action: exportModels -| DELETE | /api/dataModels/${dataModelId}/dataClasses/clean | Action: deleteAllUnusedDataClasses -| DELETE | /api/dataModels/${dataModelId}/dataTypes/clean | Action: deleteAllUnusedDataTypes | GET | /api/folders/${folderId}/dataModels | Action: index | DELETE | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated | PUT | /api/dataModels/${dataModelId}/readByAuthenticated | Action: readByAuthenticated @@ -410,7 +408,6 @@ Controller: referenceDataModel | PUT | /api/admin/referenceDataModels/${id}/undoSoftDelete | Action: undoSoftDelete | POST | /api/referenceDataModels/import/${importerNamespace}/${importerName}/${importerVersion} | Action: importModels | POST | /api/referenceDataModels/export/${exporterNamespace}/${exporterName}/${exporterVersion} | Action: exportModels -| DELETE | /api/referenceDataModels/${referenceDataModelId}/referenceDataTypes/clean | Action: deleteAllUnusedReferenceDataTypes | GET | /api/folders/${folderId}/referenceDataModels | Action: index | DELETE | /api/referenceDataModels/${referenceDataModelId}/readByAuthenticated | Action: readByAuthenticated | PUT | /api/referenceDataModels/${referenceDataModelId}/readByAuthenticated | Action: readByAuthenticated