From 97014e34e543add2dc8c5449902be61ae93a3bc7 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Fri, 1 Sep 2023 17:57:47 +0100 Subject: [PATCH 1/4] Add apache-atlas-rest-connector Signed-off-by: Mandy Chessell --- README.md | 21 ++ .../adapters/open-connectors/README.md | 2 + .../system-connectors/README.md | 16 + .../Apache Atlas API.postman_collection.json | 0 .../apache-atlas-rest-connector/README.md | 26 ++ .../apache-atlas-rest-connector/build.gradle | 34 ++ .../docs/atlas-types.drawio | 0 .../docs/get-glossaries-response.json | 0 .../get-glossary-sub-category-response.json | 0 .../docs/get-glossary-term-response.json | 0 .../get-glossary-top-category-response.json | 0 .../ApacheAtlasRESTConnector.java} | 314 ++++++++++++------ .../apacheatlas/ApacheAtlasRESTProvider.java | 93 ++++++ .../ffdc/ApacheAtlasAuditCode.java | 153 +++++++++ .../ffdc/ApacheAtlasErrorCode.java | 150 +++++++++ .../ffdc/NameConflictException.java | 2 +- .../apacheatlas/ffdc/package-info.java | 9 + .../resource/apacheatlas/package-info.java | 8 + .../properties/AtlasAttributeDef.java | 2 +- .../AtlasAttributeSearchResult.java | 2 +- .../properties/AtlasAuditEventV2.java | 2 +- .../properties/AtlasAuditOperation.java | 2 +- .../properties/AtlasBusinessMetadataDef.java | 2 +- .../properties/AtlasCardinality.java | 2 +- .../properties/AtlasClassification.java | 2 +- .../AtlasClassificationAssociateRequest.java | 2 +- .../properties/AtlasClassificationDef.java | 2 +- .../properties/AtlasCondition.java | 2 +- .../properties/AtlasConstraintDef.java | 2 +- .../properties/AtlasElementDef.java | 2 +- .../apacheatlas/properties/AtlasEntity.java | 2 +- .../properties/AtlasEntityDef.java | 2 +- .../properties/AtlasEntityExtInfo.java | 2 +- .../properties/AtlasEntityHeader.java | 2 +- .../properties/AtlasEntityHeaders.java | 2 +- .../AtlasEntityMutationResponse.java | 2 +- .../properties/AtlasEntityOperation.java | 2 +- .../properties/AtlasEntityWithExtInfo.java | 2 +- .../apacheatlas/properties/AtlasEnumDef.java | 2 +- .../properties/AtlasFilterCriteria.java | 2 +- .../properties/AtlasFullTextResult.java | 2 +- .../AtlasGlossaryAnchorElement.java | 2 +- .../AtlasGlossaryBaseProperties.java | 2 +- .../AtlasGlossaryCategoryElement.java | 2 +- .../properties/AtlasGlossaryElement.java | 2 +- .../AtlasGlossaryMemberBaseProperties.java | 2 +- .../properties/AtlasGlossaryProperties.java | 2 +- .../properties/AtlasGlossaryTermElement.java | 2 +- .../properties/AtlasIndexType.java | 2 +- .../properties/AtlasInstanceStatus.java | 2 +- .../properties/AtlasLineageDirection.java | 2 +- .../properties/AtlasLineageInfo.java | 2 +- .../properties/AtlasLineageInfoOnDemand.java | 2 +- .../AtlasLineageOnDemandConstraints.java | 2 +- .../properties/AtlasLineageRelationship.java | 2 +- .../apacheatlas/properties/AtlasObjectId.java | 2 +- .../apacheatlas/properties/AtlasOperator.java | 2 +- .../properties/AtlasPropagateTags.java | 2 +- .../properties/AtlasQueryType.java | 2 +- .../AtlasRelatedCategoryHeader.java | 2 +- .../properties/AtlasRelatedObjectId.java | 2 +- .../properties/AtlasRelatedTermHeader.java | 2 +- .../properties/AtlasRelationship.java | 2 +- .../AtlasRelationshipAttributeDef.java | 2 +- .../properties/AtlasRelationshipCategory.java | 2 +- .../properties/AtlasRelationshipDef.java | 2 +- .../properties/AtlasRelationshipEndDef.java | 2 +- .../properties/AtlasRelationshipHeader.java | 2 +- .../properties/AtlasSearchParameters.java | 2 +- .../properties/AtlasSearchResult.java | 2 +- .../properties/AtlasSortOrder.java | 2 +- .../apacheatlas/properties/AtlasStruct.java | 2 +- .../properties/AtlasStructDef.java | 2 +- .../properties/AtlasTermAssignmentHeader.java | 2 +- .../properties/AtlasTermAssignmentStatus.java | 2 +- .../AtlasTermRelationshipStatus.java | 2 +- .../properties/AtlasTimeBoundary.java | 2 +- .../properties/AtlasTypeCategory.java | 2 +- .../properties/AtlasTypeDefBase.java | 2 +- .../apacheatlas/properties/AtlasTypesDef.java | 2 +- .../apacheatlas/properties/package-info.java | 2 +- .../apacheatlas/ffdc/AuditCodeTest.java | 27 ++ .../apacheatlas/ffdc/ErrorCodeTest.java | 27 ++ .../CocoPharmaServerSecurityConnector.java | 18 +- settings.gradle | 1 + 85 files changed, 853 insertions(+), 174 deletions(-) create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/README.md rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector => system-connectors/apache-atlas-rest-connector}/Apache Atlas API.postman_collection.json (100%) create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/README.md create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/build.gradle rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector => system-connectors/apache-atlas-rest-connector}/docs/atlas-types.drawio (100%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector => system-connectors/apache-atlas-rest-connector}/docs/get-glossaries-response.json (100%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector => system-connectors/apache-atlas-rest-connector}/docs/get-glossary-sub-category-response.json (100%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector => system-connectors/apache-atlas-rest-connector}/docs/get-glossary-term-response.json (100%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector => system-connectors/apache-atlas-rest-connector}/docs/get-glossary-top-category-response.json (100%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasRESTClient.java => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java} (79%) create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasAuditCode.java create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasErrorCode.java rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/ffdc/NameConflictException.java (94%) create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/package-info.java create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/package-info.java rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasAttributeDef.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasAttributeSearchResult.java (94%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasAuditEventV2.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasAuditOperation.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasBusinessMetadataDef.java (92%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasCardinality.java (91%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasClassification.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasClassificationAssociateRequest.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasClassificationDef.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasCondition.java (89%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasConstraintDef.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasElementDef.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntity.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityDef.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityExtInfo.java (90%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityHeader.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityHeaders.java (93%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityMutationResponse.java (93%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityOperation.java (86%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEntityWithExtInfo.java (89%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasEnumDef.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasFilterCriteria.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasFullTextResult.java (94%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryAnchorElement.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryBaseProperties.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryCategoryElement.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryElement.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java (91%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryProperties.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasGlossaryTermElement.java (99%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasIndexType.java (89%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasInstanceStatus.java (92%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasLineageDirection.java (91%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasLineageInfo.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasLineageInfoOnDemand.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasLineageOnDemandConstraints.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasLineageRelationship.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasObjectId.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasOperator.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasPropagateTags.java (92%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasQueryType.java (90%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelatedCategoryHeader.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelatedObjectId.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelatedTermHeader.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelationship.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelationshipAttributeDef.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelationshipCategory.java (92%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelationshipDef.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelationshipEndDef.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasRelationshipHeader.java (96%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasSearchParameters.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasSearchResult.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasSortOrder.java (89%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasStruct.java (94%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasStructDef.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTermAssignmentHeader.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTermAssignmentStatus.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTermRelationshipStatus.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTimeBoundary.java (95%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTypeCategory.java (93%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTypeDefBase.java (98%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/AtlasTypesDef.java (97%) rename open-metadata-implementation/adapters/open-connectors/{integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration => system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource}/apacheatlas/properties/package-info.java (66%) create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/AuditCodeTest.java create mode 100644 open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ErrorCodeTest.java diff --git a/README.md b/README.md index cd3fa2b8570..4b104e346ab 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,27 @@ type system, frameworks, APIs, event payloads and interchange protocols to enabl engines and platforms to exchange metadata in order to get the best value from data, whilst ensuring it is properly governed. +This git repository contains the core Egeria code and resources. This includes the build for Egeria's runtimes. +The project is built using `gradle`. Clone or download the contents of this repository. +You will also need the [Java 17 SDK installed](https://adoptium.net/). +Then run the following gradle command from the top-level directory to build the code and run the tests. + +```bash +./gradlew clean build +``` + +Once you see the "Build Successful" message, go to the `open-metadata-distributions` directory. +There are three choices of assembly to use: + +* `open-metadata-assemblies` contains all of the Egeria runtimes. This is the assembly that is used in our standard [Docker containers](https://hub.docker.com/r/odpi/egeria). +* `omag-server-platform` contains just the [OMAG Server Platform](https://egeria-project.org/concepts/omag-server-platform/) runtime. +* `egeria-ui-application` contains the Egeria UI REST Services application. + +Change into the directory for the assembly you need and then look in `build/unpacked`. +There you will see the built and assembled libraries and associated content. + +Details on how to run Egeria can be found on [our website](https://egeria-project.org/education/tutorials/omag-server-tutorial/overview/). + ## Egeria governance This project aims to operate in a transparent, accessible way for the benefit of the Egeria community. diff --git a/open-metadata-implementation/adapters/open-connectors/README.md b/open-metadata-implementation/adapters/open-connectors/README.md index d24d7dfe03c..ecc895ead21 100644 --- a/open-metadata-implementation/adapters/open-connectors/README.md +++ b/open-metadata-implementation/adapters/open-connectors/README.md @@ -51,6 +51,8 @@ Java. * **[secrets-store-connectors](secrets-store-connectors)** provides connectors to access secrets (passwords, certificates etc) at runtime. +* **[system-connectors](system-connectors)** provides connectors to access data and function from different systems. + In addition, there is the **[connector-configuration-factory](connector-configuration-factory)** that creates **Connection** objects to configure these connectors. diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/README.md b/open-metadata-implementation/adapters/open-connectors/system-connectors/README.md new file mode 100644 index 00000000000..c8be4e1271c --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/README.md @@ -0,0 +1,16 @@ + + + +# System connectors + +The system connectors are resource connectors that act like clients to particular types of systems. +They are typically embedded in integration connectors and governance services. + +* [Apache Atlas REST Connector](apache-atlas-rest-connector) is able to issue calls to Apache Atlas on request. + + + + +---- +License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/), +Copyright Contributors to the Egeria project. \ No newline at end of file diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/Apache Atlas API.postman_collection.json b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/Apache Atlas API.postman_collection.json similarity index 100% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/Apache Atlas API.postman_collection.json rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/Apache Atlas API.postman_collection.json diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/README.md b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/README.md new file mode 100644 index 00000000000..dbc0f5b60d8 --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/README.md @@ -0,0 +1,26 @@ + + + +# Apache Atlas REST Connector + +Apache Atlas has a REST API that allows external callers to query and create both +types and instances. This connector provides a simple Java API to this REST API. +It is written without any dependencies on Apache Atlas (or its associated Hadoop components) +so it happily runs in the same version of Java as the rest of Egeria. + +This connector is used by other connectors from Egeria, and may also be used +by components from outside Egeria. + +The values from the connection used by this connector are: + +* Connection.getUserId() and Connection.getClearPassword() for logging in to Apache Atlas. +* Connection.getDisplayName() for the connector name in messages. +* Connection.getEndpoint().getAddress() for the URL root (typically host and port name) of the Apache Atlas server. +* Connection.getConfigurationProperties.get("atlasServerName") for the name of the Apache Atlas server to use in messages. + + + + +---- +License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/), +Copyright Contributors to the Egeria project. \ No newline at end of file diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/build.gradle b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/build.gradle new file mode 100644 index 00000000000..cc2cfe5ce7f --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/build.gradle @@ -0,0 +1,34 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Copyright Contributors to the ODPi Egeria project. + */ + + +dependencies { + compileOnly project(':open-metadata-implementation:frameworks:audit-log-framework') + compileOnly project(':open-metadata-implementation:frameworks:open-connector-framework') + compileOnly project(':open-metadata-implementation:repository-services:repository-services-apis') + compileOnly project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:rest-client-connectors-api') + compileOnly project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:rest-client-factory') + compileOnly project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector') + testImplementation project(':open-metadata-implementation:frameworks:audit-log-framework') + testImplementation project(':open-metadata-implementation:repository-services:repository-services-apis') + testImplementation project(':open-metadata-test:open-metadata-ut') + testImplementation 'org.testng:testng' + compileOnly 'org.springframework:spring-core' + compileOnly 'com.fasterxml.jackson.core:jackson-databind' + compileOnly 'com.fasterxml.jackson.core:jackson-annotations' + +} + +description = 'Apache Atlas REST Connector' + +java { + withJavadocJar() +} + +test { + useTestNG() + // This will default to standard search pattern - see https://docs.gradle.org/current/userguide/java_testing.html#sec:test_detection + scanForTestClasses = false +} diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/atlas-types.drawio b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/atlas-types.drawio similarity index 100% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/atlas-types.drawio rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/atlas-types.drawio diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossaries-response.json b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossaries-response.json similarity index 100% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossaries-response.json rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossaries-response.json diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossary-sub-category-response.json b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossary-sub-category-response.json similarity index 100% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossary-sub-category-response.json rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossary-sub-category-response.json diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossary-term-response.json b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossary-term-response.json similarity index 100% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossary-term-response.json rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossary-term-response.json diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossary-top-category-response.json b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossary-top-category-response.json similarity index 100% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/docs/get-glossary-top-category-response.json rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/docs/get-glossary-top-category-response.json diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasRESTClient.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java similarity index 79% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasRESTClient.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java index 8b0a61dff2b..615de32b08b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasRESTClient.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java @@ -1,33 +1,39 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas; - - -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.NameConflictException; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasBusinessMetadataDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasClassificationDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityHeader; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityMutationResponse; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityOperation; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityWithExtInfo; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasGlossaryCategoryElement; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasGlossaryElement; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasGlossaryTermElement; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasInstanceStatus; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationship; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationshipDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasSearchResult; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasTypesDef; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas; + + +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.ApacheAtlasAuditCode; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.ApacheAtlasErrorCode; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.NameConflictException; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasBusinessMetadataDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasClassificationDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityHeader; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityMutationResponse; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityOperation; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasGlossaryCategoryElement; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasGlossaryElement; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasGlossaryTermElement; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasInstanceStatus; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationship; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationshipDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasSearchResult; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasTypesDef; import org.odpi.openmetadata.adapters.connectors.restclients.RESTClientConnector; import org.odpi.openmetadata.adapters.connectors.restclients.factory.RESTClientFactory; import org.odpi.openmetadata.adapters.connectors.restclients.spring.SpringRESTClientConnector; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; -import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; +import org.odpi.openmetadata.frameworks.auditlog.AuditLoggingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDescription; +import org.odpi.openmetadata.frameworks.connectors.Connector; +import org.odpi.openmetadata.frameworks.connectors.ConnectorBase; +import org.odpi.openmetadata.frameworks.connectors.VirtualConnectorExtension; +import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; +import org.odpi.openmetadata.frameworks.connectors.properties.EndpointProperties; import org.springframework.core.ParameterizedTypeReference; import java.util.ArrayList; @@ -40,63 +46,161 @@ /** * RESTClient is responsible for issuing calls to the OMAS REST APIs. */ -public class ApacheAtlasRESTClient +public class ApacheAtlasRESTConnector extends ConnectorBase implements AuditLoggingComponent, + VirtualConnectorExtension { - protected String serverName; /* Initialized in constructor */ - protected String baseURL; /* Initialized in constructor */ - protected AuditLog auditLog; /* Initialized in constructor */ + private AuditLog auditLog = null; + private String atlasServerName = "Apache Atlas"; + private String targetRootURL = null; + private List embeddedConnectors = null; + private String connectorName = "Apache Atlas REST Connector"; + private RESTClientConnector clientConnector = null; - private final RESTClientConnector clientConnector; /* Initialized in constructor */ + /** + * Default Constructor used by the connector provider. + */ + public ApacheAtlasRESTConnector() + { + } + + /* ============================================================================== + * Standard methods that trigger activity. + */ /** - * Constructor for simple userId and password authentication with audit log. - * - * @param connectorName name of the connector - * @param serverName name of the server - * @param baseURL URL root of the server platform where the OMAG Server is running. - * @param userId user id for the HTTP request - * @param password password for the HTTP request - * @param auditLog destination for log messages. - * @throws InvalidParameterException there is a problem creating the client-side components to issue any - * REST API calls. + * Receive an audit log object that can be used to record audit log messages. The caller has initialized it + * with the correct component description and log destinations. + * + * @param auditLog audit log object */ - ApacheAtlasRESTClient(String connectorName, - String serverName, - String baseURL, - String userId, - String password, - AuditLog auditLog) throws InvalidParameterException + @Override + public void setAuditLog(AuditLog auditLog) { - final String methodName = "RESTClient(userId and password)"; - - this.serverName = serverName; - this.baseURL = baseURL; this.auditLog = auditLog; + } + + + /** + * Return the component description that is used by this connector in the audit log. + * + * @return id, name, description, wiki page URL. + */ + @Override + public ComponentDescription getConnectorComponentDescription() + { + if ((this.auditLog != null) && (this.auditLog.getReport() != null)) + { + return auditLog.getReport().getReportingComponent(); + } + + return null; + } + + + /** + * Set up the list of connectors that this virtual connector will use to support its interface. + * The connectors are initialized waiting to start. When start() is called on the + * virtual connector, it needs to pass start() to each of the embedded connectors. Similarly for + * disconnect(). + * + * @param embeddedConnectors list of connectors + */ + @Override + public void initializeEmbeddedConnectors(List embeddedConnectors) + { + this.embeddedConnectors = embeddedConnectors; + } + + + /** + * Indicates that the connector is completely configured and can begin processing. + * This call can be used to register with non-blocking services. + * + * @throws ConnectorCheckedException there is a problem within the connector. + */ + @Override + public void start() throws ConnectorCheckedException + { + super.start(); + + final String methodName = "start"; + + if ((connectionProperties.getUserId() == null) || (connectionProperties.getClearPassword() == null)) + { + throw new ConnectorCheckedException(ApacheAtlasErrorCode.NULL_USER.getMessageDefinition(connectorName), + this.getClass().getName(), + methodName); + } + + if (connectionProperties.getConnectionName() != null) + { + connectorName = connectionProperties.getConnectionName(); + } + + /* + * Retrieve the configuration + */ + EndpointProperties endpoint = connectionProperties.getEndpoint(); - RESTClientFactory factory = new RESTClientFactory(serverName, - baseURL, - userId, - password); + if (endpoint != null) + { + targetRootURL = endpoint.getAddress(); + } + + if (targetRootURL == null) + { + throw new ConnectorCheckedException(ApacheAtlasErrorCode.NULL_URL.getMessageDefinition(connectorName), + this.getClass().getName(), + methodName); + } + + Map configurationProperties = connectionProperties.getConfigurationProperties(); + + if (configurationProperties != null) + { + if (configurationProperties.get(ApacheAtlasRESTProvider.ATLAS_SERVER_NAME_CONFIGURATION_PROPERTY) != null) + { + atlasServerName = configurationProperties.get(ApacheAtlasRESTProvider.ATLAS_SERVER_NAME_CONFIGURATION_PROPERTY).toString(); + } + } try { + /* + * Create the client that calls Apache Atlas. + */ + RESTClientFactory factory = new RESTClientFactory(atlasServerName, + targetRootURL, + connectionProperties.getUserId(), + connectionProperties.getClearPassword()); + this.clientConnector = factory.getClientConnector(); } - catch (Exception error) + catch (Exception error) { - throw new InvalidParameterException(ApacheAtlasErrorCode.UNEXPECTED_EXCEPTION.getMessageDefinition(connectorName, + if (auditLog != null) + { + auditLog.logException(methodName, + ApacheAtlasAuditCode.BAD_CONFIGURATION.getMessageDefinition(connectorName, + error.getClass().getName(), + targetRootURL, + methodName, + error.getMessage()), + error); + } + + throw new ConnectorCheckedException(ApacheAtlasErrorCode.UNEXPECTED_EXCEPTION.getMessageDefinition(connectorName, error.getClass().getName(), methodName, error.getMessage()), this.getClass().getName(), methodName, - error, - "baseURL, serverName, userId or password"); + error); } } - + /** * Return the types registered to Apache Atlas. @@ -107,7 +211,7 @@ public class ApacheAtlasRESTClient public AtlasTypesDef getAllTypes() throws PropertyServerException { final String methodName = "getAllTypes()"; - final String url = baseURL + "/api/atlas/v2/types/typedefs"; + final String url = targetRootURL + "/api/atlas/v2/types/typedefs"; return this.callGetRESTCallNoParams(methodName, AtlasTypesDef.class, url); } @@ -123,7 +227,7 @@ public AtlasTypesDef getAllTypes() throws PropertyServerException public AtlasEntityDef getEntityType(String typeName) throws PropertyServerException { final String methodName = "getEntityTypes(" + typeName + "}"; - final String url = baseURL + "/api/atlas/v2/types/entitydef/name/" + typeName; + final String url = targetRootURL + "/api/atlas/v2/types/entitydef/name/" + typeName; return this.callNoLogGetRESTCallNoParams(methodName, AtlasEntityDef.class, url); } @@ -139,7 +243,7 @@ public AtlasEntityDef getEntityType(String typeName) throws PropertyServerExcept public AtlasRelationshipDef getRelationshipType(String typeName) throws PropertyServerException { final String methodName = "getRelationshipTypes(" + typeName + "}"; - final String url = baseURL + "/api/atlas/v2/types/relationshipdef/name/" + typeName; + final String url = targetRootURL + "/api/atlas/v2/types/relationshipdef/name/" + typeName; return this.callNoLogGetRESTCallNoParams(methodName, AtlasRelationshipDef.class, url); } @@ -155,7 +259,7 @@ public AtlasRelationshipDef getRelationshipType(String typeName) throws Property public AtlasClassificationDef getClassificationType(String typeName) throws PropertyServerException { final String methodName = "getClassificationType(" + typeName + "}"; - final String url = baseURL + "/api/atlas/v2/types/classificationdef/name/" + typeName; + final String url = targetRootURL + "/api/atlas/v2/types/classificationdef/name/" + typeName; return this.callGetRESTCallNoParams(methodName, AtlasClassificationDef.class, url); } @@ -171,7 +275,7 @@ public AtlasClassificationDef getClassificationType(String typeName) throws Prop public AtlasBusinessMetadataDef getBusinessMetadataType(String typeName) throws PropertyServerException { final String methodName = "getBusinessMetadataType(" + typeName + "}"; - final String url = baseURL + "/api/atlas/v2/types/businessmetadatadef/name/" + typeName; + final String url = targetRootURL + "/api/atlas/v2/types/businessmetadatadef/name/" + typeName; return this.callGetRESTCallNoParams(methodName, AtlasBusinessMetadataDef.class, url); } @@ -187,7 +291,7 @@ public AtlasBusinessMetadataDef getBusinessMetadataType(String typeName) throws public AtlasTypesDef addNewTypes(AtlasTypesDef newTypeDefinitions) throws PropertyServerException { final String methodName = "addNewTypes()"; - final String url = baseURL + "/api/atlas/v2/types/typedefs"; + final String url = targetRootURL + "/api/atlas/v2/types/typedefs"; return this.callPostRESTCallNoParams(methodName, AtlasTypesDef.class, url, newTypeDefinitions); } @@ -203,7 +307,7 @@ public AtlasTypesDef addNewTypes(AtlasTypesDef newTypeDefinitions) throws Proper public String addEntity(AtlasEntity entity) throws PropertyServerException { final String methodName = "addEntity()"; - final String url = baseURL + "/api/atlas/v2/entity"; + final String url = targetRootURL + "/api/atlas/v2/entity"; AtlasEntityWithExtInfo atlasEntityWithExtInfo = new AtlasEntityWithExtInfo(); @@ -235,7 +339,7 @@ public String addEntity(AtlasEntity entity) throws PropertyServerException public AtlasEntityWithExtInfo updateEntity(AtlasEntityWithExtInfo entityWithExtInfo) throws PropertyServerException { final String methodName = "updateEntity()"; - final String url = baseURL + "/api/atlas/v2/entity"; + final String url = targetRootURL + "/api/atlas/v2/entity"; this.callPostRESTCallNoParams(methodName, AtlasEntityMutationResponse.class, url, entityWithExtInfo); @@ -253,7 +357,7 @@ public AtlasEntityWithExtInfo updateEntity(AtlasEntityWithExtInfo entityWithExt public AtlasEntityMutationResponse deleteEntity(String entityGUID) throws PropertyServerException { final String methodName = "deleteEntity()"; - final String url = baseURL + "/api/atlas/v2/entity/guid/{0}"; + final String url = targetRootURL + "/api/atlas/v2/entity/guid/{0}"; return this.callDeleteRESTCall(methodName, AtlasEntityMutationResponse.class, url, entityGUID); } @@ -269,7 +373,7 @@ public AtlasEntityMutationResponse deleteEntity(String entityGUID) throws Proper public AtlasRelationship addRelationship(AtlasRelationship atlasRelationship) throws PropertyServerException { final String methodName = "addRelationship()"; - final String url = baseURL + "/api/atlas/v2/relationship"; + final String url = targetRootURL + "/api/atlas/v2/relationship"; return this.callPostRESTCallNoParams(methodName, AtlasRelationship.class, url, atlasRelationship); } @@ -284,7 +388,7 @@ public AtlasRelationship addRelationship(AtlasRelationship atlasRelationship) t public void clearRelationship(String atlasRelationshipGUID) throws PropertyServerException { final String methodName = "clearRelationship()"; - final String url = baseURL + "/api/atlas/v2/relationship/" + atlasRelationshipGUID; + final String url = targetRootURL + "/api/atlas/v2/relationship/" + atlasRelationshipGUID; this.callDeleteRESTCall(methodName, url); } @@ -319,7 +423,7 @@ private AtlasEntityWithExtInfo validateActiveEntity(AtlasEntityWithExtInfo retri public AtlasEntityWithExtInfo getEntityByGUID(String guid) throws PropertyServerException { final String methodName = "getEntity(" + guid + ")"; - final String url = baseURL + "/api/atlas/v2/entity/guid/" + guid; + final String url = targetRootURL + "/api/atlas/v2/entity/guid/" + guid; AtlasEntityWithExtInfo entity = this.callGetRESTCallNoParams(methodName, AtlasEntityWithExtInfo.class, url); @@ -514,7 +618,7 @@ public List getEntitiesForType(String typeName, int pageSize) throws PropertyServerException { final String methodName = "getEntity(" + typeName + ")"; - final String url = baseURL + "/api/atlas/v2/search/dsl?typeName=" + typeName + "&offset=" + startFrom + "&limit=" + pageSize; + final String url = targetRootURL + "/api/atlas/v2/search/dsl?typeName=" + typeName + "&offset=" + startFrom + "&limit=" + pageSize; AtlasSearchResult searchResult = this.callGetRESTCallNoParams(methodName, AtlasSearchResult.class, url); @@ -549,7 +653,7 @@ public List getEntitiesForType(String typeName, public AtlasGlossaryElement getAtlasGlossary(int glossaryCount) throws PropertyServerException { final String methodName = "getAtlasGlossary(glossaryCount)"; - final String url = baseURL + "/api/atlas/v2/glossary?limit=1&offset=" + glossaryCount + "&sort=ASC"; + final String url = targetRootURL + "/api/atlas/v2/glossary?limit=1&offset=" + glossaryCount + "&sort=ASC"; List> glossaryElements = (ArrayList>)this.callGetRESTCallNoParams(methodName, ArrayList.class, url); @@ -575,7 +679,7 @@ public AtlasGlossaryElement getAtlasGlossary(int glossaryCount) throws PropertyS public AtlasGlossaryElement getAtlasGlossary(String glossaryGUID) throws PropertyServerException { final String methodName = "getAtlasGlossary(glossaryGUID)"; - final String url = baseURL + "/api/atlas/v2/glossary/" + glossaryGUID; + final String url = targetRootURL + "/api/atlas/v2/glossary/" + glossaryGUID; return this.callGetRESTCallNoParams(methodName, AtlasGlossaryElement.class, url); } @@ -591,7 +695,7 @@ public AtlasGlossaryElement getAtlasGlossary(String glossaryGUID) throws Propert public String createAtlasGlossary(AtlasGlossaryElement glossary) throws PropertyServerException { final String methodName = "createAtlasGlossary(glossary)"; - final String url = baseURL + "/api/atlas/v2/glossary"; + final String url = targetRootURL + "/api/atlas/v2/glossary"; AtlasGlossaryElement newGlossary = this.callPostRESTCallNoParams(methodName, AtlasGlossaryElement.class, url, glossary); @@ -614,7 +718,7 @@ public String createAtlasGlossary(AtlasGlossaryElement glossary) throws Property public AtlasGlossaryElement saveAtlasGlossary(AtlasGlossaryElement glossary) throws PropertyServerException { final String methodName = "saveAtlasGlossary(glossary)"; - final String url = baseURL + "/api/atlas/v2/glossary/{0}"; + final String url = targetRootURL + "/api/atlas/v2/glossary/{0}"; return this.callPutRESTCall(methodName, AtlasGlossaryElement.class, url, glossary, glossary.getGuid()); } @@ -630,7 +734,7 @@ public AtlasGlossaryElement saveAtlasGlossary(AtlasGlossaryElement glossary) thr public void deleteAtlasGlossary(AtlasGlossaryElement glossary) throws PropertyServerException { final String methodName = "deleteAtlasGlossary()"; - final String url = baseURL + "/api/atlas/v2/glossary/" + glossary.getGuid(); + final String url = targetRootURL + "/api/atlas/v2/glossary/" + glossary.getGuid(); this.callDeleteRESTCall(methodName, url); } @@ -646,7 +750,7 @@ public void deleteAtlasGlossary(AtlasGlossaryElement glossary) throws PropertySe public AtlasGlossaryTermElement getAtlasGlossaryTerm(String glossaryTermGUID) throws PropertyServerException { final String methodName = "getAtlasGlossaryTerm(glossaryTermGUID)"; - final String url = baseURL + "/api/atlas/v2/glossary/term/" + glossaryTermGUID; + final String url = targetRootURL + "/api/atlas/v2/glossary/term/" + glossaryTermGUID; return this.callGetRESTCallNoParams(methodName, AtlasGlossaryTermElement.class, url); } @@ -664,7 +768,7 @@ public String createAtlasGlossaryTerm(AtlasGlossaryTermElement term) throws Prop NameConflictException { final String methodName = "createAtlasGlossaryTerm()"; - final String url = baseURL + "/api/atlas/v2/glossary/term"; + final String url = targetRootURL + "/api/atlas/v2/glossary/term"; AtlasGlossaryTermElement newTerm; @@ -706,7 +810,7 @@ public String createAtlasGlossaryTerm(AtlasGlossaryTermElement term) throws Prop public AtlasGlossaryTermElement saveAtlasGlossaryTerm(AtlasGlossaryTermElement term) throws PropertyServerException { final String methodName = "saveAtlasGlossaryTerm()"; - final String url = baseURL + "/api/atlas/v2/glossary/term/{0}"; + final String url = targetRootURL + "/api/atlas/v2/glossary/term/{0}"; return this.callPutRESTCall(methodName, AtlasGlossaryTermElement.class, url, term, term.getGuid()); } @@ -721,7 +825,7 @@ public AtlasGlossaryTermElement saveAtlasGlossaryTerm(AtlasGlossaryTermElement t public void deleteAtlasGlossaryTerm(AtlasGlossaryTermElement term) throws PropertyServerException { final String methodName = "deleteAtlasGlossaryTerm()"; - final String url = baseURL + "/api/atlas/v2/glossary/term/" + term.getGuid(); + final String url = targetRootURL + "/api/atlas/v2/glossary/term/" + term.getGuid(); this.callDeleteRESTCall(methodName, url); } @@ -737,7 +841,7 @@ public void deleteAtlasGlossaryTerm(AtlasGlossaryTermElement term) throws Proper public AtlasGlossaryCategoryElement getAtlasGlossaryCategory(String glossaryCategoryGUID) throws PropertyServerException { final String methodName = "getAtlasGlossaryCategory(glossaryCategoryGUID)"; - final String url = baseURL + "/api/atlas/v2/glossary/category/" + glossaryCategoryGUID; + final String url = targetRootURL + "/api/atlas/v2/glossary/category/" + glossaryCategoryGUID; return this.callGetRESTCallNoParams(methodName, AtlasGlossaryCategoryElement.class, url); } @@ -755,7 +859,7 @@ public String createAtlasGlossaryCategory(AtlasGlossaryCategoryElement category) NameConflictException { final String methodName = "createAtlasGlossaryCategory(category)"; - final String url = baseURL + "/api/atlas/v2/glossary/category"; + final String url = targetRootURL + "/api/atlas/v2/glossary/category"; AtlasGlossaryCategoryElement newGlossaryCategory; @@ -796,7 +900,7 @@ public String createAtlasGlossaryCategory(AtlasGlossaryCategoryElement category) public AtlasGlossaryCategoryElement saveAtlasGlossaryCategory(AtlasGlossaryCategoryElement category) throws PropertyServerException { final String methodName = "saveAtlasGlossaryCategory(glossaryGUID)"; - final String url = baseURL + "/api/atlas/v2/glossary/category/{0}"; + final String url = targetRootURL + "/api/atlas/v2/glossary/category/{0}"; return this.callPutRESTCall(methodName, AtlasGlossaryCategoryElement.class, url, category, category.getGuid()); } @@ -811,7 +915,7 @@ public AtlasGlossaryCategoryElement saveAtlasGlossaryCategory(AtlasGlossaryCateg public void deleteAtlasGlossaryCategory(AtlasGlossaryCategoryElement category) throws PropertyServerException { final String methodName = "deleteAtlasGlossaryCategory(glossaryGUID)"; - final String url = baseURL + "/api/atlas/v2/glossary/category/" + category.getGuid(); + final String url = targetRootURL + "/api/atlas/v2/glossary/category/" + category.getGuid(); this.callDeleteRESTCall(methodName, url); } @@ -828,7 +932,7 @@ public void deleteAtlasGlossaryCategory(AtlasGlossaryCategoryElement category) t * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callGetRESTCallNoParams(String methodName, + private T callGetRESTCallNoParams(String methodName, Class returnClass, String urlTemplate) throws PropertyServerException { @@ -856,7 +960,7 @@ protected T callGetRESTCallNoParams(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callNoLogGetRESTCallNoParams(String methodName, + private T callNoLogGetRESTCallNoParams(String methodName, Class returnClass, String urlTemplate) throws PropertyServerException { @@ -866,7 +970,7 @@ protected T callNoLogGetRESTCallNoParams(String methodName, } catch (Exception error) { - logRESTCallException(methodName, true, error); + logRESTCallException(methodName, false, error); } return null; @@ -885,7 +989,7 @@ protected T callNoLogGetRESTCallNoParams(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callGetRESTCall(String methodName, + private T callGetRESTCall(String methodName, Class returnClass, String urlTemplate, Object... params) throws PropertyServerException @@ -914,7 +1018,7 @@ protected T callGetRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callGetRESTCall(String methodName, + private T callGetRESTCall(String methodName, ParameterizedTypeReference responseType, String urlTemplate, Object... params) throws PropertyServerException @@ -945,7 +1049,7 @@ protected T callGetRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callNoLogGetRESTCall(String methodName, + private T callNoLogGetRESTCall(String methodName, ParameterizedTypeReference responseType, String urlTemplate, Object... params) throws PropertyServerException @@ -977,7 +1081,7 @@ protected T callNoLogGetRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callPostRESTCallNoParams(String methodName, + private T callPostRESTCallNoParams(String methodName, Class returnClass, String urlTemplate, Object requestBody) throws PropertyServerException @@ -1008,7 +1112,7 @@ protected T callPostRESTCallNoParams(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callNoLogPostRESTCallNoParams(String methodName, + private T callNoLogPostRESTCallNoParams(String methodName, Class returnClass, String urlTemplate, Object requestBody) throws PropertyServerException @@ -1039,7 +1143,7 @@ protected T callNoLogPostRESTCallNoParams(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callPostRESTCallNameConflict(String methodName, + private T callPostRESTCallNameConflict(String methodName, Class returnClass, String urlTemplate, Object requestBody) throws PropertyServerException @@ -1059,8 +1163,8 @@ protected T callPostRESTCallNameConflict(String methodName, } throw new PropertyServerException(ApacheAtlasErrorCode.CLIENT_SIDE_REST_API_ERROR.getMessageDefinition(methodName, - serverName, - baseURL, + atlasServerName, + targetRootURL, error.getMessage()), this.getClass().getName(), methodName, @@ -1083,7 +1187,7 @@ protected T callPostRESTCallNameConflict(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callPostRESTCall(String methodName, + private T callPostRESTCall(String methodName, Class returnClass, String urlTemplate, Object requestBody, @@ -1115,7 +1219,7 @@ protected T callPostRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callPostRESTCall(String methodName, + private T callPostRESTCall(String methodName, ParameterizedTypeReference responseType, String urlTemplate, Object requestBody, @@ -1147,7 +1251,7 @@ protected T callPostRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callPutRESTCall(String methodName, + private T callPutRESTCall(String methodName, Class returnClass, String urlTemplate, Object requestBody, @@ -1179,7 +1283,7 @@ protected T callPutRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callPutRESTCall(String methodName, + private T callPutRESTCall(String methodName, ParameterizedTypeReference responseType, String urlTemplate, Object requestBody, @@ -1211,7 +1315,7 @@ protected T callPutRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callDeleteRESTCall(String methodName, + private T callDeleteRESTCall(String methodName, Class returnClass, String urlTemplate, Object... params) throws PropertyServerException @@ -1237,7 +1341,7 @@ protected T callDeleteRESTCall(String methodName, * * @throws PropertyServerException something went wrong with the REST call stack. */ - protected void callDeleteRESTCall(String methodName, + private void callDeleteRESTCall(String methodName, String urlTemplate) throws PropertyServerException { try @@ -1263,7 +1367,7 @@ protected void callDeleteRESTCall(String methodName, * @return response object * @throws PropertyServerException something went wrong with the REST call stack. */ - protected T callDeleteRESTCall(String methodName, + private T callDeleteRESTCall(String methodName, ParameterizedTypeReference responseType, String urlTemplate, Object... params) throws PropertyServerException { @@ -1297,15 +1401,15 @@ private void logRESTCallException(String methodName, { auditLog.logException(methodName, ApacheAtlasAuditCode.CLIENT_SIDE_REST_API_ERROR.getMessageDefinition(methodName, - serverName, - baseURL, + atlasServerName, + targetRootURL, error.getMessage()), error); } throw new PropertyServerException(ApacheAtlasErrorCode.CLIENT_SIDE_REST_API_ERROR.getMessageDefinition(methodName, - serverName, - baseURL, + atlasServerName, + targetRootURL, error.getMessage()), this.getClass().getName(), methodName, diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java new file mode 100644 index 00000000000..2f06bf2a622 --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java @@ -0,0 +1,93 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ + +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas; + +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; +import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase; +import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; + +import java.util.ArrayList; +import java.util.List; + + +/** + * ApacheAtlasRESTProvider is the connector provider for the Apache Atlas REST connector that provides a Java API to the Apache Atlas REST API. + */ +public class ApacheAtlasRESTProvider extends ConnectorProviderBase +{ + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 667; + + /* + * Unique identifier for the connector type. + */ + private static final String connectorTypeGUID = "aea66ea9-5763-4f93-ba89-244b60ae0da7"; + + /* + * Descriptive information about the connector for the connector type and audit log. + */ + private static final String connectorQualifiedName = "Egeria:ResourceConnector:ApacheAtlas"; + private static final String connectorDisplayName = "Apache Atlas REST Connector"; + private static final String connectorDescription = "Connector that provides a Java API to Apache Atlas."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/apache-atlas-rest-connector/"; + + /** + * The configuration property name used to supply the name of the Apache Atlas server. This name is used in messages + * and its default value is "Apache Atlas". + */ + public static final String ATLAS_SERVER_NAME_CONFIGURATION_PROPERTY = "atlasServerName"; + + /* + * Class of the connector. + */ + private static final Class connectorClass = ApacheAtlasRESTConnector.class; + + + /** + * Constructor used to initialize the ConnectorProvider with the Java class name of the specific + * store implementation. + */ + public ApacheAtlasRESTProvider() + { + super(); + + /* + * Set up the class name of the connector that this provider creates. + */ + super.setConnectorClassName(connectorClass.getName()); + + /* + * Set up the connector type that should be included in a connection used to configure this connector. + */ + ConnectorType connectorType = new ConnectorType(); + connectorType.setType(ConnectorType.getConnectorTypeType()); + connectorType.setGUID(connectorTypeGUID); + connectorType.setQualifiedName(connectorQualifiedName); + connectorType.setDisplayName(connectorDisplayName); + connectorType.setDescription(connectorDescription); + connectorType.setConnectorProviderClassName(this.getClass().getName()); + connectorType.setSupportedAssetTypeName("SoftwareServer"); + List recognizedConfigurationProperties = new ArrayList<>(); + recognizedConfigurationProperties.add(ATLAS_SERVER_NAME_CONFIGURATION_PROPERTY); + connectorType.setRecognizedConfigurationProperties(recognizedConfigurationProperties); + + super.connectorTypeBean = connectorType; + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); + componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentDescription(connectorDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); + } +} diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasAuditCode.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasAuditCode.java new file mode 100644 index 00000000000..078bd75991f --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasAuditCode.java @@ -0,0 +1,153 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc; + +import org.odpi.openmetadata.frameworks.auditlog.messagesets.AuditLogMessageDefinition; +import org.odpi.openmetadata.frameworks.auditlog.messagesets.AuditLogMessageSet; +import org.odpi.openmetadata.repositoryservices.auditlog.OMRSAuditLogRecordSeverity; + + +/** + * The ApacheAtlasAuditCode is used to define the message content for the OMRS Audit Log. + * The 5 fields in the enum are: + *
    + *
  • Log Message Identifier - to uniquely identify the message
    • + *
  • Severity - is this an event, decision, action, error or exception
    • + *
  • Log Message Text - includes placeholder to allow additional values to be captured
    • + *
  • Additional Information - further parameters and data relating to the audit message (optional)
    • + *
  • SystemAction - describes the result of the situation
    • + *
  • UserAction - describes how a user should correct the situation
    • + *
+ */ +public enum ApacheAtlasAuditCode implements AuditLogMessageSet +{ + /** + * APACHE-ATLAS-REST-CONNECTOR-0005 - The {0} Apache Atlas REST Connector encountered an {1} exception when connecting to {2} during the {3} method. The exception message included was {4} + */ + BAD_CONFIGURATION("APACHE-ATLAS-REST-CONNECTOR-0005", + OMRSAuditLogRecordSeverity.EXCEPTION, + "The {0} Apache Atlas REST Connector encountered an {1} exception when connecting to {2} during the {3} method. The exception message included was {4}", + "The exception is passed back to the Catalog Integrator OMIS in the integration daemon that is hosting " + + "this connector to enable it to perform error handling. More messages are likely to follow describing the " + + "error handling that was performed. These can help to determine how to recover from this error", + "This message contains the exception that was the original cause of the problem. Use the information from the " + + "exception stack trace to determine why the connector is not able to access the event broker and resolve that issue. " + + "Use the messages that where subsequently logged during the error handling to discover how to restart the " + + "connector in the integration daemon once the original cause of the error has been corrected."), + + /** + * APACHE-ATLAS-REST-CONNECTOR-0008 - The {0} Apache Atlas REST Connector received an unexpected exception {1} during method {2}; the error message was: {3} + */ + UNEXPECTED_EXCEPTION("APACHE-ATLAS-REST-CONNECTOR-0008", + OMRSAuditLogRecordSeverity.EXCEPTION, + "The {0} Apache Atlas REST Connector received an unexpected exception {1} during method {2}; the error message was: {3}", + "The connector is unable to catalog one or more metadata elements.", + "Use the details from the error message to determine the cause of the error and retry the request once it is resolved."), + + /** + * APACHE-ATLAS-REST-CONNECTOR-0009 - The {0} Apache Atlas REST Connector has stopped its monitoring of Apache Atlas at {1} and is shutting down + */ + CONNECTOR_STOPPING("APACHE-ATLAS-REST-CONNECTOR-0009", + OMRSAuditLogRecordSeverity.INFO, + "The {0} Apache Atlas REST Connector has stopped its monitoring of Apache Atlas at {1} and is shutting down", + "The connector is disconnecting.", + "No action is required unless there are errors that follow indicating that there were problems shutting down."), + + + /** + * APACHE-ATLAS-REST-CONNECTOR-0031 - A client-side exception was received from API call {0} to server {1} at {2}. The error message was {3} + */ + CLIENT_SIDE_REST_API_ERROR( "APACHE-ATLAS-REST-CONNECTOR-0031", + OMRSAuditLogRecordSeverity.EXCEPTION, + "A client-side exception was received from API call {0} to server {1} at {2}. The error message was {3}", + "The server has issued a call to the open metadata access service REST API in a remote server and has received an exception from the local client libraries.", + "Look for errors in the local server's console to understand and correct the source of the error."), + ; + + private final String logMessageId; + private final OMRSAuditLogRecordSeverity severity; + private final String logMessage; + private final String systemAction; + private final String userAction; + + + /** + * The constructor for ApacheAtlasAuditCode expects to be passed one of the enumeration rows defined in + * ApacheAtlasAuditCode above. For example: + *
+ * ApacheAtlasAuditCode auditCode = ApacheAtlasAuditCode.SERVER_NOT_AVAILABLE; + *
+ * This will expand out to the 4 parameters shown below. + * + * @param messageId - unique id for the message + * @param severity - severity of the message + * @param message - text for the message + * @param systemAction - description of the action taken by the system when the condition happened + * @param userAction - instructions for resolving the situation, if any + */ + ApacheAtlasAuditCode(String messageId, + OMRSAuditLogRecordSeverity severity, + String message, + String systemAction, + String userAction) + { + this.logMessageId = messageId; + this.severity = severity; + this.logMessage = message; + this.systemAction = systemAction; + this.userAction = userAction; + } + + + /** + * Retrieve a message definition object for logging. This method is used when there are no message inserts. + * + * @return message definition object. + */ + @Override + public AuditLogMessageDefinition getMessageDefinition() + { + return new AuditLogMessageDefinition(logMessageId, + severity, + logMessage, + systemAction, + userAction); + } + + + /** + * Retrieve a message definition object for logging. This method is used when there are values to be inserted into the message. + * + * @param params array of parameters (all strings). They are inserted into the message according to the numbering in the message text. + * @return message definition object. + */ + @Override + public AuditLogMessageDefinition getMessageDefinition(String ...params) + { + AuditLogMessageDefinition messageDefinition = new AuditLogMessageDefinition(logMessageId, + severity, + logMessage, + systemAction, + userAction); + messageDefinition.setMessageParameters(params); + return messageDefinition; + } + + + /** + * JSON-style toString + * + * @return string of property names and values for this enum + */ + @Override + public String toString() + { + return "ApacheAtlasAuditCode{" + + "logMessageId='" + logMessageId + '\'' + + ", severity=" + severity + + ", logMessage='" + logMessage + '\'' + + ", systemAction='" + systemAction + '\'' + + ", userAction='" + userAction + '\'' + + '}'; + } +} diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasErrorCode.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasErrorCode.java new file mode 100644 index 00000000000..cf1445cf91c --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/ApacheAtlasErrorCode.java @@ -0,0 +1,150 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc; + +import org.odpi.openmetadata.frameworks.auditlog.messagesets.ExceptionMessageDefinition; +import org.odpi.openmetadata.frameworks.auditlog.messagesets.ExceptionMessageSet; + +/** + * The ApacheAtlasErrorCode is used to define first failure data capture (FFDC) for errors that occur when working with + * the Kafka monitor Apache Atlas REST connector. It is used in conjunction with both Checked and Runtime (unchecked) exceptions. + * The 5 fields in the enum are: + *
    + *
  • HTTP Error Code - for translating between REST and JAVA - Typically the numbers used are:
    • + *
    • + *
    • 500 - internal error
      • + *
    • 400 - invalid parameters
      • + *
    • 404 - not found
      • + *
    • 409 - data conflict errors - eg item already defined
      • + *
    • + *
  • Error Message Identifier - to uniquely identify the message
    • + *
  • Error Message Text - includes placeholder to allow additional values to be captured
    • + *
  • SystemAction - describes the result of the error
    • + *
  • UserAction - describes how a consumer should correct the error
    • + *
+ */ +public enum ApacheAtlasErrorCode implements ExceptionMessageSet +{ + /** + * APACHE-ATLAS-REST-CONNECTOR-400-001 - Apache Atlas REST connector {0} has been configured without the URL to Apache Atlas + */ + NULL_URL(400, "APACHE-ATLAS-REST-CONNECTOR-400-001", + "Apache Atlas REST connector {0} has been configured without the URL to Apache Atlas", + "The connector is move to FAILED status and will not be called by the integration daemon until the configuration error has been corrected.", + "The Apache Atlas URL is configured in the Apache Atlas REST connector's connection endpoint in the address property. Typically it is the host name and port where Apache Atlas is listening. The connection is either found in the Integration Daemon's configuration, or, if the Integration Daemon is configured with integration groups, in the open metadata definition of the appropriate integration group."), + + /** + * APACHE-ATLAS-REST-CONNECTOR-400-002 - Apache Atlas REST connector {0} has been configured with either a null userId or password for connecting to Apache Atlas + */ + NULL_USER(400, "APACHE-ATLAS-REST-CONNECTOR-400-002", + "Apache Atlas REST connector {0} has been configured with either a null userId or password for connecting to Apache Atlas", + "The connector is not able to call Apache Atlas without error.", + "Update the connection information for the connector. " + + "This may have been supplied through the Integration Daemon's configuration, " + + "or if the Integration Daemon is using integration groups, " + + "the connection information is stored in the open metadata ecosystem. " + + "It is possible to supply the userId and password directly in the connection object or via an embedded SecretsConnector."), + + + /** + * APACHE-ATLAS-REST-CONNECTOR-400-004 - Glossary category {0} already exists in Apache Atlas + */ + CATEGORY_ALREADY_EXISTS(400, "APACHE-ATLAS-REST-CONNECTOR-400-004", + "Glossary category {0} already exists in Apache Atlas", + "The connector attempts to add a numerical post-fix to the category name to ensure it has a unique name.", + "No action is required. The connector will validate whether it has already created the category on another thread, or it will try the request with a new name."), + + /** + * APACHE-ATLAS-REST-CONNECTOR-400-005 - Glossary term {0} already exists in Apache Atlas + */ + TERM_ALREADY_EXISTS(400, "APACHE-ATLAS-REST-CONNECTOR-400-005", + "Glossary term {0} already exists in Apache Atlas", + "The connector attempts to add a numerical post-fix to the term name to ensure it has a unique name.", + "No action is required. The connector will validate whether it has already created the term on another thread, or it will try the request with a new name."), + + + /** + * APACHE-ATLAS-REST-CONNECTOR-500-001 - The {0} Apache Atlas REST connector received an unexpected exception {1} during method {2}; the error message was: {3} + */ + UNEXPECTED_EXCEPTION(500, "APACHE-ATLAS-REST-CONNECTOR-500-001", + "The {0} Apache Atlas REST connector received an unexpected exception {1} during method {2}; the error message was: {3}", + "The connector is unable to catalog one or more metadata elements.", + "Use the details from the error message to determine the cause of the error and retry the request once it is resolved."), + + /** + * APACHE-ATLAS-REST-CONNECTOR-503-001 - A client-side exception {0} was received from API call {1} to URL {2}. The error message was {3} + */ + CLIENT_SIDE_REST_API_ERROR(503, "APACHE-ATLAS-REST-CONNECTOR-503-001", + "A client-side exception of {0} was received from API call {1} to URL {2}. The error message was {3}", + "The connector has issued a call to the open metadata access service REST API in a remote server and has received an exception from the local client libraries.", + "Look for errors in the local server's console to understand and correct the source of the error."), + + ; + + private final ExceptionMessageDefinition messageDefinition; + + + /** + * The constructor for ApacheAtlasErrorCode expects to be passed one of the enumeration rows defined in + * ApacheAtlasErrorCode above. For example: + *

+ * ApacheAtlasErrorCode errorCode = ApacheAtlasErrorCode.ERROR_SENDING_EVENT; + *

+ * This will expand out to the 5 parameters shown below. + * + * @param httpErrorCode error code to use over REST calls + * @param errorMessageId unique identifier for the message + * @param errorMessage text for the message + * @param systemAction description of the action taken by the system when the error condition happened + * @param userAction instructions for resolving the error + */ + ApacheAtlasErrorCode(int httpErrorCode, String errorMessageId, String errorMessage, String systemAction, String userAction) + { + this.messageDefinition = new ExceptionMessageDefinition(httpErrorCode, + errorMessageId, + errorMessage, + systemAction, + userAction); + } + + + /** + * Retrieve a message definition object for an exception. This method is used when there are no message inserts. + * + * @return message definition object. + */ + @Override + public ExceptionMessageDefinition getMessageDefinition() + { + return messageDefinition; + } + + + /** + * Retrieve a message definition object for an exception. This method is used when there are values to be inserted into the message. + * + * @param params array of parameters (all strings). They are inserted into the message according to the numbering in the message text. + * @return message definition object. + */ + @Override + public ExceptionMessageDefinition getMessageDefinition(String... params) + { + messageDefinition.setMessageParameters(params); + + return messageDefinition; + } + + + /** + * JSON-style toString + * + * @return string of property names and values for this enum + */ + @Override + public String toString() + { + return "ApacheAtlasErrorCode{" + + "messageDefinition=" + messageDefinition + + '}'; + } +} diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/NameConflictException.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/NameConflictException.java similarity index 94% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/NameConflictException.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/NameConflictException.java index 685acee6adc..e8a152917d0 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/NameConflictException.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/NameConflictException.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc; import org.odpi.openmetadata.frameworks.auditlog.messagesets.ExceptionMessageDefinition; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/package-info.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/package-info.java new file mode 100644 index 00000000000..73b06940b8b --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ffdc/package-info.java @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +/** + * FFDC stands for First Failure Data Capture. The classes in this package provide the message definitions and + * descriptions used by the Apache Atlas REST connector. ApacheAtlasAuditCode contains the + * messages for the audit log and the ApacheAtlasErrorCode contains the messages for any exceptions + * that are thrown by the connectors. + */ +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc; diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/package-info.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/package-info.java new file mode 100644 index 00000000000..32df09cd73e --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/package-info.java @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ + +/** + * The Apache Atlas REST connector provides a java interface to the Apache Atlas server. + * It is a resource connector. + */ +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAttributeDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAttributeDef.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAttributeDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAttributeDef.java index 3daf4ad4521..709143acd22 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAttributeDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAttributeDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAttributeSearchResult.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAttributeSearchResult.java similarity index 94% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAttributeSearchResult.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAttributeSearchResult.java index 222c2b6c16c..c4951fdb3ee 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAttributeSearchResult.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAttributeSearchResult.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAuditEventV2.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAuditEventV2.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAuditEventV2.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAuditEventV2.java index ad5192cff3c..70dafdd63a7 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAuditEventV2.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAuditEventV2.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAuditOperation.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAuditOperation.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAuditOperation.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAuditOperation.java index 793fc26c337..56ca08f06de 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasAuditOperation.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasAuditOperation.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasBusinessMetadataDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasBusinessMetadataDef.java similarity index 92% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasBusinessMetadataDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasBusinessMetadataDef.java index 69c70a0f03e..c9bf51bb724 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasBusinessMetadataDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasBusinessMetadataDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasCardinality.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasCardinality.java similarity index 91% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasCardinality.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasCardinality.java index 5a74c2072e8..1c057fe9505 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasCardinality.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasCardinality.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassification.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassification.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassification.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassification.java index 1d6edc4b58f..6d78d543f00 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassification.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassification.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassificationAssociateRequest.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassificationAssociateRequest.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassificationAssociateRequest.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassificationAssociateRequest.java index 3590a0eef40..9e36e18d63a 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassificationAssociateRequest.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassificationAssociateRequest.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassificationDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassificationDef.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassificationDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassificationDef.java index 13fb475d3f7..948d5986d49 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasClassificationDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasClassificationDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasCondition.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasCondition.java similarity index 89% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasCondition.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasCondition.java index 06503c33fcd..771bea78506 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasCondition.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasCondition.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasConstraintDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasConstraintDef.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasConstraintDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasConstraintDef.java index 1cc261409a1..29f11772f98 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasConstraintDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasConstraintDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasElementDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasElementDef.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasElementDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasElementDef.java index 37ef6549df0..68fa615f983 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasElementDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasElementDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntity.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntity.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntity.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntity.java index ad6826da41b..a5318c1bc3e 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntity.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntity.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityDef.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityDef.java index f35b85078ce..bc49c321c8b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityExtInfo.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityExtInfo.java similarity index 90% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityExtInfo.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityExtInfo.java index eb56ba55670..658d163e811 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityExtInfo.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityExtInfo.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import java.util.Map; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityHeader.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityHeader.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityHeader.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityHeader.java index 9129f3f2f4a..f3b7d07e33e 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityHeader.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityHeader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityHeaders.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityHeaders.java similarity index 93% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityHeaders.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityHeaders.java index 3243ce554bf..bb00c4f5e91 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityHeaders.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityHeaders.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityMutationResponse.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityMutationResponse.java similarity index 93% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityMutationResponse.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityMutationResponse.java index f20deb27325..20d62a0a400 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityMutationResponse.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityMutationResponse.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import java.util.List; import java.util.Map; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityOperation.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityOperation.java similarity index 86% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityOperation.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityOperation.java index ce2e9d1c5b5..6a117ebf36f 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityOperation.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityOperation.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; /** * AtlasEntityOperation describes the change to a collection of entities. diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityWithExtInfo.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityWithExtInfo.java similarity index 89% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityWithExtInfo.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityWithExtInfo.java index 4c0ea39a196..48b54a6d0c1 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEntityWithExtInfo.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEntityWithExtInfo.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; /** * AtlasEntityWithExtInfo describes an entity with additional entity elements. diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEnumDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEnumDef.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEnumDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEnumDef.java index ecd2056e60c..c6b75e4e97d 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasEnumDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasEnumDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasFilterCriteria.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasFilterCriteria.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasFilterCriteria.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasFilterCriteria.java index 7284c99306e..c7043659c31 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasFilterCriteria.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasFilterCriteria.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasFullTextResult.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasFullTextResult.java similarity index 94% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasFullTextResult.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasFullTextResult.java index e42cb9a1793..bbf348a507a 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasFullTextResult.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasFullTextResult.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryAnchorElement.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryAnchorElement.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryAnchorElement.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryAnchorElement.java index e9be1bad4e6..6a830791d3b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryAnchorElement.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryAnchorElement.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryBaseProperties.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryBaseProperties.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryBaseProperties.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryBaseProperties.java index 6c58b9ca904..8a2dabc633c 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryBaseProperties.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryBaseProperties.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryCategoryElement.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryCategoryElement.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryCategoryElement.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryCategoryElement.java index e9b70198198..e84000265ab 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryCategoryElement.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryCategoryElement.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryElement.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryElement.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryElement.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryElement.java index 73c43ff9de8..cbc34fda015 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryElement.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryElement.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java similarity index 91% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java index 87768de4483..87afdb70ba6 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryMemberBaseProperties.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; /** * AtlasGlossaryMemberBaseProperties is the base class for terms and categories. diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryProperties.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryProperties.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryProperties.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryProperties.java index 19203a285b6..0815981c634 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryProperties.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryProperties.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryTermElement.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryTermElement.java similarity index 99% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryTermElement.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryTermElement.java index 5885a106430..008a6be41d4 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasGlossaryTermElement.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasGlossaryTermElement.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasIndexType.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasIndexType.java similarity index 89% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasIndexType.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasIndexType.java index 95aef2f7802..4be99d3d32a 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasIndexType.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasIndexType.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasInstanceStatus.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasInstanceStatus.java similarity index 92% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasInstanceStatus.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasInstanceStatus.java index 633862392fe..38f6abede6b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasInstanceStatus.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasInstanceStatus.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageDirection.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageDirection.java similarity index 91% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageDirection.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageDirection.java index 6a98c169921..efed4961fff 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageDirection.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageDirection.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageInfo.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageInfo.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageInfo.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageInfo.java index 4d5641fda81..4f3bb1e3dce 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageInfo.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageInfo.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageInfoOnDemand.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageInfoOnDemand.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageInfoOnDemand.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageInfoOnDemand.java index c3659127589..5e19e9d5111 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageInfoOnDemand.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageInfoOnDemand.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageOnDemandConstraints.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageOnDemandConstraints.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageOnDemandConstraints.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageOnDemandConstraints.java index 7c1b6528280..78de4c58535 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageOnDemandConstraints.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageOnDemandConstraints.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageRelationship.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageRelationship.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageRelationship.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageRelationship.java index 24bbe96a269..f0aa86fa81a 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasLineageRelationship.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasLineageRelationship.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasObjectId.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasObjectId.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasObjectId.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasObjectId.java index 57840bfddde..b4a2860fb2d 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasObjectId.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasObjectId.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasOperator.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasOperator.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasOperator.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasOperator.java index 2b1de56f8a9..798847e501e 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasOperator.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasOperator.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasPropagateTags.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasPropagateTags.java similarity index 92% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasPropagateTags.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasPropagateTags.java index 93749e16ea6..9fb885640a7 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasPropagateTags.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasPropagateTags.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasQueryType.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasQueryType.java similarity index 90% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasQueryType.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasQueryType.java index e1174dcf8fc..784c3f5c4b1 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasQueryType.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasQueryType.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedCategoryHeader.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedCategoryHeader.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedCategoryHeader.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedCategoryHeader.java index 65b2c174c8a..f1723ca46c8 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedCategoryHeader.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedCategoryHeader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedObjectId.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedObjectId.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedObjectId.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedObjectId.java index 60e2471272c..ae3263f8863 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedObjectId.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedObjectId.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedTermHeader.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedTermHeader.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedTermHeader.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedTermHeader.java index f4d3111d0b3..4aa4fb400f4 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelatedTermHeader.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelatedTermHeader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationship.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationship.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationship.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationship.java index 9889daca920..9615f286529 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationship.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationship.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipAttributeDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipAttributeDef.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipAttributeDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipAttributeDef.java index f0d0b8dbfd6..4b7dd0a3f3f 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipAttributeDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipAttributeDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipCategory.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipCategory.java similarity index 92% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipCategory.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipCategory.java index 06f58a46973..177530f3d4a 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipCategory.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipCategory.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipDef.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipDef.java index 8be66b2e6f1..dda9636303b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipEndDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipEndDef.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipEndDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipEndDef.java index 43173e05d01..926072cc23a 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipEndDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipEndDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipHeader.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipHeader.java similarity index 96% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipHeader.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipHeader.java index d25da2d7eb3..9dfe6cf6b6c 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasRelationshipHeader.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasRelationshipHeader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSearchParameters.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSearchParameters.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSearchParameters.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSearchParameters.java index 5c88a17479e..35376ff37f3 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSearchParameters.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSearchParameters.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSearchResult.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSearchResult.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSearchResult.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSearchResult.java index 23dd9e085a6..385b4bbeb6b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSearchResult.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSearchResult.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSortOrder.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSortOrder.java similarity index 89% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSortOrder.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSortOrder.java index f40864c8ba5..567ce7c4177 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasSortOrder.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasSortOrder.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasStruct.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasStruct.java similarity index 94% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasStruct.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasStruct.java index d70816b909b..cf1c03cc95c 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasStruct.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasStruct.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasStructDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasStructDef.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasStructDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasStructDef.java index 53e6a8b03fc..7a3868475df 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasStructDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasStructDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermAssignmentHeader.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermAssignmentHeader.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermAssignmentHeader.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermAssignmentHeader.java index 54020e98031..6f348cbc3d0 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermAssignmentHeader.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermAssignmentHeader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermAssignmentStatus.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermAssignmentStatus.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermAssignmentStatus.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermAssignmentStatus.java index 2c6048b1083..8bcc74e2206 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermAssignmentStatus.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermAssignmentStatus.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermRelationshipStatus.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermRelationshipStatus.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermRelationshipStatus.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermRelationshipStatus.java index 05f50513242..c9c77f6bf1d 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTermRelationshipStatus.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTermRelationshipStatus.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTimeBoundary.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTimeBoundary.java similarity index 95% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTimeBoundary.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTimeBoundary.java index 8a0e7f475eb..ae7390d9eec 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTimeBoundary.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTimeBoundary.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypeCategory.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypeCategory.java similarity index 93% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypeCategory.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypeCategory.java index 749f21a260f..f3c28b32282 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypeCategory.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypeCategory.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypeDefBase.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypeDefBase.java similarity index 98% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypeDefBase.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypeDefBase.java index b9824c8c437..ca2c77c5eec 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypeDefBase.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypeDefBase.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypesDef.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypesDef.java similarity index 97% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypesDef.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypesDef.java index 9a6b12b711a..7c306cf913f 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/AtlasTypesDef.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/AtlasTypesDef.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/package-info.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/package-info.java similarity index 66% rename from open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/package-info.java rename to open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/package-info.java index 40f64cc6cf7..77a8213ae15 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/properties/package-info.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/properties/package-info.java @@ -4,4 +4,4 @@ /** * These are the beans used on the Apache Atlas REST API calls. */ -package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties; \ No newline at end of file +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties; \ No newline at end of file diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/AuditCodeTest.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/AuditCodeTest.java new file mode 100644 index 00000000000..0a0b39da38a --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/AuditCodeTest.java @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc; + +import org.odpi.openmetadata.test.unittest.utilities.AuditLogMessageSetTest; +import org.testng.annotations.Test; + + +/** + * Verify the ApacheAtlasAuditCode enum contains unique message ids, non-null names and descriptions and can be + * serialized to JSON and back again. + */ +public class AuditCodeTest extends AuditLogMessageSetTest +{ + final static String messageIdPrefix = "APACHE-ATLAS-REST-CONNECTOR"; + + /** + * Validated the values of the enum. + */ + @Test public void testAllAuditCodeValues() + { + for (ApacheAtlasAuditCode errorCode : ApacheAtlasAuditCode.values()) + { + super.testSingleAuditCodeValue(errorCode, messageIdPrefix); + } + } +} diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ErrorCodeTest.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ErrorCodeTest.java new file mode 100644 index 00000000000..3e55f9c1af2 --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/test/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ErrorCodeTest.java @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc; + +import org.odpi.openmetadata.test.unittest.utilities.ExceptionMessageSetTest; +import org.testng.annotations.Test; + + +/** + * Verify the ApacheAtlasErrorCode enum contains unique message ids, non-null names and descriptions and can be + * serialized to JSON and back again. + */ +public class ErrorCodeTest extends ExceptionMessageSetTest +{ + final static String messageIdPrefix = "APACHE-ATLAS-REST-CONNECTOR"; + + /** + * Validated the values of the enum. + */ + @Test public void testAllErrorCodeValues() + { + for (ApacheAtlasErrorCode errorCode : ApacheAtlasErrorCode.values()) + { + super.testSingleErrorCodeValue(errorCode, messageIdPrefix); + } + } +} diff --git a/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityConnector.java b/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityConnector.java index 9f3d77ac008..b89e6f87d18 100644 --- a/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityConnector.java +++ b/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityConnector.java @@ -362,6 +362,10 @@ public void validateUserForServer(String userId) throws UserNotAuthorizedExce { return; } + else if (userId.endsWith("npa")) + { + return; + } super.validateUserForServer(userId); } @@ -440,6 +444,10 @@ public void validateUserForService(String userId, { return; } + else if (userId.endsWith("npa")) + { + return; + } super.validateUserForService(userId, serviceName); } @@ -672,11 +680,7 @@ private boolean userHasAccessToAssetZones(String userId, */ if ((zoneName.equals(dataLakeZoneName)) && (updateRequested)) { - if (npaAccounts.contains(userId)) - { - return true; - } - else if (userId.endsWith("npa")) + if ((npaAccounts.contains(userId)) || (userId.endsWith("npa"))) { return true; } @@ -705,6 +709,10 @@ else if (zoneName.equals(personalFilesZoneName)) { return true; } + else if ((zoneAccounts != null) && (userId.endsWith("npa")) && (zoneAccounts.contains("generalnpa"))) + { + return true; + } } } } diff --git a/settings.gradle b/settings.gradle index 13a3aca7efd..8658b1a2831 100644 --- a/settings.gradle +++ b/settings.gradle @@ -73,6 +73,7 @@ include(':open-metadata-implementation:adapters:open-connectors:rest-client-conn include(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:rest-client-factory') include(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector') include(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector') +include(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector') include(':open-metadata-implementation:adapters:open-connectors:connector-configuration-factory') include(':open-metadata-implementation:adapters:authentication-plugins:http-helper') include(':open-metadata-implementation:common-services:ffdc-services') From f3aae4daf1c79dcc7614e063d6c6ce84227fb66b Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Fri, 1 Sep 2023 18:02:28 +0100 Subject: [PATCH 2/4] Update apache atlas integration connector to use new resource connector Signed-off-by: Mandy Chessell --- .../atlas-integration-connector/README.md | 2 +- .../atlas-integration-connector/build.gradle | 1 + .../ApacheAtlasIntegrationConnector.java | 52 ++++++++---- .../ffdc/ApacheAtlasAuditCode.java | 79 ------------------- .../ffdc/ApacheAtlasErrorCode.java | 34 ++------ .../modules/ApacheHiveIntegrationModule.java | 8 +- .../modules/ApacheKafkaIntegrationModule.java | 4 +- .../AtlasGlossaryIntegrationModule.java | 35 ++++++-- .../modules/AtlasIntegrationModuleBase.java | 20 ++--- .../AtlasLineageIntegrationModule.java | 10 +-- .../AtlasRegisteredIntegrationModuleBase.java | 4 +- .../DatabaseIntegrationModuleBase.java | 10 +-- .../modules/RDBMSIntegrationModule.java | 6 +- 13 files changed, 103 insertions(+), 162 deletions(-) diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/README.md b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/README.md index 9122bcd4df9..95725d9612d 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/README.md +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/README.md @@ -3,7 +3,7 @@ # The Apache Atlas Integration Connector -The Apache Atlas integration connector publishes glossary terms to Apache Atlas. +The Apache Atlas integration connector publishes glossary terms, assets and lineage to Apache Atlas. ## Deployment and configuration diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/build.gradle b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/build.gradle index bbbd813c4f9..fb9cadefd04 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/build.gradle +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/build.gradle @@ -15,6 +15,7 @@ dependencies { compileOnly project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:rest-client-connectors-api') compileOnly project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:rest-client-factory') compileOnly project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector') + compileOnly project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector') testImplementation project(':open-metadata-implementation:frameworks:audit-log-framework') testImplementation project(':open-metadata-implementation:repository-services:repository-services-apis') testImplementation project(':open-metadata-test:open-metadata-ut') diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationConnector.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationConnector.java index 78d987fe18a..89ec385b94c 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationConnector.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationConnector.java @@ -7,23 +7,28 @@ import org.odpi.openmetadata.accessservices.assetmanager.events.AssetManagerOutTopicEvent; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; +import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.ApacheHiveIntegrationModule; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.ApacheKafkaIntegrationModule; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.AtlasGlossaryIntegrationModule; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.ApacheHiveIntegrationModule; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.AtlasLineageIntegrationModule; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.RDBMSIntegrationModule; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules.RegisteredIntegrationModule; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasAttributeDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasCardinality; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasPropagateTags; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationshipCategory; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationshipDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationshipEndDef; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasTypesDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTProvider; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasAttributeDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasCardinality; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasPropagateTags; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationshipCategory; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationshipDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationshipEndDef; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasTypesDef; +import org.odpi.openmetadata.frameworks.connectors.Connector; +import org.odpi.openmetadata.frameworks.connectors.ConnectorBroker; import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.frameworks.connectors.properties.EndpointProperties; +import org.odpi.openmetadata.frameworks.connectors.properties.beans.Connection; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ElementHeader; import org.odpi.openmetadata.frameworks.integration.contextmanager.PermittedSynchronization; import org.odpi.openmetadata.integrationservices.catalog.connector.CatalogIntegratorConnector; @@ -42,7 +47,7 @@ public class ApacheAtlasIntegrationConnector extends CatalogIntegratorConnector { private String targetRootURL = null; private CatalogIntegratorContext myContext = null; - private ApacheAtlasRESTClient atlasClient = null; + private ApacheAtlasRESTConnector atlasClient = null; private AtlasLineageIntegrationModule lineageIntegrationModule = null; private final Map> moduleMap = new HashMap<>(); @@ -122,12 +127,24 @@ public void start() throws ConnectorCheckedException /* * Create the client that calls Apache Atlas. */ - atlasClient = new ApacheAtlasRESTClient(connectorName, - "Apache Atlas", - targetRootURL, - connectionProperties.getUserId(), - connectionProperties.getClearPassword(), - auditLog); + Connection atlasConnection = new Connection(connectionBean); + + atlasConnection.setConnectorType(new ApacheAtlasRESTProvider().getConnectorType()); + ConnectorBroker connectorBroker = new ConnectorBroker(auditLog); + + Connector newConnector = connectorBroker.getConnector(atlasConnection); + + if (newConnector instanceof ApacheAtlasRESTConnector apacheAtlasRESTConnector) + { + this.atlasClient = apacheAtlasRESTConnector; + this.atlasClient.start(); + } + else + { + throw new ConnectorCheckedException(ApacheAtlasErrorCode.NULL_ATLAS_CLIENT.getMessageDefinition(connectorName), + this.getClass().getName(), + methodName); + } /* * Ensure the correlation types are properly defined in Apache Atlas. @@ -358,7 +375,7 @@ public void processEvent(AssetManagerOutTopicEvent event) * @param atlasClient client for Apache Atlas * @throws PropertyServerException unable to connect to Apache Atlas */ - private void setupCorrelationTypes(ApacheAtlasRESTClient atlasClient) throws PropertyServerException + private void setupCorrelationTypes(ApacheAtlasRESTConnector atlasClient) throws PropertyServerException { final String serviceType = "open_metadata_ecosystem"; final String entityDescription = "Information used in synchronizing Apache Atlas metadata with external catalogs via the Open Metadata Ecosystem supported by Egeria."; @@ -574,6 +591,7 @@ public void disconnect() throws ConnectorCheckedException auditLog.logMessage(methodName, ApacheAtlasAuditCode.CONNECTOR_STOPPING.getMessageDefinition(connectorName, targetRootURL)); } + atlasClient.disconnect(); super.disconnect(); } } diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasAuditCode.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasAuditCode.java index 8d7da3671dd..1a1d967b4d0 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasAuditCode.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasAuditCode.java @@ -181,66 +181,6 @@ public enum ApacheAtlasAuditCode implements AuditLogMessageSet "No action is required. This message is to record that the connector is preforming a sweep of the Atlas glossary" + " to ensure it is correctly represented in the open metadata ecosystem."), - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0021 - The {0} integration connector is copying the Apache Atlas glossary term called {1} into the {2} ({3}) open metadata glossary term - */ - SYNC_ATLAS_GLOSSARY_TERM("APACHE-ATLAS-INTEGRATION-CONNECTOR-0021", - OMRSAuditLogRecordSeverity.INFO, - "The {0} integration connector is copying the Apache Atlas glossary term called {1} into the {2} ({3}) open metadata glossary term", - "The connector will ensure that the content of the glossary term in the open metadata ecosystem is the same as the glossary term stored in Apache Atlas.", - "No action is required. This message is to record that the connector is preforming a sweep of the Atlas glossary" + - " to ensure its terms are correctly represented in the open metadata ecosystem."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0022 - The {0} integration connector is copying the Apache Atlas glossary category called {1} into the {2} ({3}) open metadata glossary category - */ - SYNC_ATLAS_GLOSSARY_CATEGORY("APACHE-ATLAS-INTEGRATION-CONNECTOR-0022", - OMRSAuditLogRecordSeverity.INFO, - "The {0} integration connector is copying the Apache Atlas glossary category called {1} into the {2} ({3}) open metadata glossary category", - "The connector will ensure that the content of the glossary category in the open metadata ecosystem is the same as the glossary category stored in Apache Atlas.", - "No action is required. This message is to record that the connector is preforming a sweep of the Atlas glossary" + - " to ensure its categories are correctly represented in the open metadata ecosystem."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0025 - The {0} integration connector is copying the open metadata glossary {1} ({2}) into the Apache Atlas glossary called {3} - */ - SYNC_EGERIA_GLOSSARY("APACHE-ATLAS-INTEGRATION-CONNECTOR-0025", - OMRSAuditLogRecordSeverity.INFO, - "The {0} integration connector is copying the open metadata glossary {1} ({2}) into the Apache Atlas glossary called {3}", - "The connector will ensure that the content of the glossary in Apache Atlas is the same as the glossary stored in the open metadata ecosystem.", - "No action is required. This message is to record that the connector is preforming a sweep of the open metadata glossary" + - " to ensure it is correctly represented in Apache Atlas."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0026 - The {0} integration connector is copying the open metadata glossary term {1} ({2}) into the Apache Atlas glossary term called {3} - */ - SYNC_EGERIA_GLOSSARY_TERM("APACHE-ATLAS-INTEGRATION-CONNECTOR-0026", - OMRSAuditLogRecordSeverity.INFO, - "The {0} integration connector is copying the open metadata glossary term {1} ({2}) into the Apache Atlas glossary term called {3}", - "The connector will ensure that the content of the glossary term in Apache Atlas is the same as the glossary term stored in the open metadata ecosystem.", - "No action is required. This message is to record that the connector is preforming a sweep of the open metadata glossary" + - " to ensure its terms correctly represented in Apache Atlas."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0027 - The {0} integration connector is copying the open metadata glossary category {1} ({2}) into the Apache Atlas glossary category called {3} - */ - SYNC_EGERIA_GLOSSARY_CATEGORY("APACHE-ATLAS-INTEGRATION-CONNECTOR-0027", - OMRSAuditLogRecordSeverity.INFO, - "The {0} integration connector is copying the open metadata glossary category {1} ({2}) into the Apache Atlas glossary category called {3}", - "The connector will ensure that the content of the glossary category in Apache Atlas is the same as the glossary category stored in the open metadata ecosystem.", - "No action is required. This message is to record that the connector is preforming a sweep of the open metadata glossary" + - " to ensure its categories correctly represented in Apache Atlas."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0031 - A client-side exception was received from API call {0} to server {1} at {2}. The error message was {3} - */ - CLIENT_SIDE_REST_API_ERROR( "APACHE-ATLAS-INTEGRATION-CONNECTOR-0031", - OMRSAuditLogRecordSeverity.EXCEPTION, - "A client-side exception was received from API call {0} to server {1} at {2}. The error message was {3}", - "The server has issued a call to the open metadata access service REST API in a remote server and has received an exception from the local client libraries.", - "Look for errors in the local server's console to understand and correct the source of the error."), - - /** * APACHE-ATLAS-INTEGRATION-CONNECTOR-0032 - The {0} integration connector encountered an {1} exception when registering a listener to the open metadata ecosystem. The exception message included was {2} */ @@ -250,25 +190,6 @@ public enum ApacheAtlasAuditCode implements AuditLogMessageSet "The connector continues to scan and synchronize metadata as configured. Without the listener, updates to open metadata elements with only be synchronized to Apache Atlas during a refresh scan.", "The likely cause of this error is that the Asset Manager OMAS in the metadata access server used by the integration daemon is not configured to support topics. This can be changed by reconfiguring the metadata access server to support topics. A less likely cause is that the metadata access server has stopped running"), - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0033 - Glossary category {0} already exists in Apache Atlas; trying a different name - */ - CATEGORY_ALREADY_EXISTS("APACHE-ATLAS-INTEGRATION-CONNECTOR-0033", - OMRSAuditLogRecordSeverity.INFO, - "Glossary category {0} already exists in Apache Atlas; trying a different name", - "The connector attempts to add a numerical post-fix to the category name to ensure it has a unique name.", - "No action is required. The connector will validate whether it has already created the category on another thread, or it will try the request with a new name."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0034 - Glossary term {0} already exists in Apache Atlas; trying a different name - */ - TERM_ALREADY_EXISTS("APACHE-ATLAS-INTEGRATION-CONNECTOR-0034", - OMRSAuditLogRecordSeverity.INFO, - "Glossary term {0} already exists in Apache Atlas; trying a different name", - "The connector attempts to add a numerical post-fix to the term name to ensure it has a unique name.", - "No action is required. The connector will validate whether it has already created the term on another thread, or it will try the request with a new name."), - - /** * APACHE-ATLAS-INTEGRATION-CONNECTOR-0035 - The {0} integration connector is calling the {1} integration module */ diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasErrorCode.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasErrorCode.java index 3db6a96265b..1347f65f72d 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasErrorCode.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ffdc/ApacheAtlasErrorCode.java @@ -57,27 +57,18 @@ public enum ApacheAtlasErrorCode implements ExceptionMessageSet "the connection information is stored in the connector's RegisteredIntegrationConnector relationship in the open metadata ecosystem."), /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-400-004 - Glossary category {0} already exists in Apache Atlas + * APACHE-ATLAS-INTEGRATION-CONNECTOR-400-004 - Integration connector {0} is unable to create an Apache Atlas REST Connector */ - CATEGORY_ALREADY_EXISTS(400, "APACHE-ATLAS-INTEGRATION-CONNECTOR-400-004", - "Glossary category {0} already exists in Apache Atlas", - "The connector attempts to add a numerical post-fix to the category name to ensure it has a unique name.", - "No action is required. The connector will validate whether it has already created the category on another thread, or it will try the request with a new name."), + NULL_ATLAS_CLIENT(400, "APACHE-ATLAS-INTEGRATION-CONNECTOR-400-004", + "Integration connector {0} is unable to create an Apache Atlas REST Connector", + "The connector uses the Apache Atlas REST Connector to make REST calls to Apache Atlas. The connector is moved to FAILED status and will no longer be called to synchronize metadata until the problem creating the Apache Atlas REST Connector is resolved.", + "Ensure that the jar file for the Apache Atlas REST Connector is in the class path of the platform."), /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-400-005 - Glossary term {0} already exists in Apache Atlas - */ - TERM_ALREADY_EXISTS(400, "APACHE-ATLAS-INTEGRATION-CONNECTOR-400-005", - "Glossary term {0} already exists in Apache Atlas", - "The connector attempts to add a numerical post-fix to the term name to ensure it has a unique name.", - "No action is required. The connector will validate whether it has already created the term on another thread, or it will try the request with a new name."), - - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-0036 - The {0} integration connector can not retrieve the correlation information for (1} open metadata entity {2} linked in Apache Atlas {3} to {4} entity {5} + * APACHE-ATLAS-INTEGRATION-CONNECTOR-404-001 - The {0} integration connector can not retrieve the correlation information for {1} open metadata entity {2} linked in Apache Atlas {3} to {4} entity {5} */ MISSING_CORRELATION(404, "APACHE-ATLAS-INTEGRATION-CONNECTOR-404-001", - "The {0} integration connector can not retrieve the correlation information for (1} open metadata entity {2} linked in Apache Atlas {3} to {4} entity {5}", + "The {0} integration connector can not retrieve the correlation information for {1} open metadata entity {2} linked in Apache Atlas {3} to {4} entity {5}", "The correlation information that should be associated with the open metadata entity is missing and the integration connector is not able to confidently synchronize it with the Apache Atlas entity.", "Review the audit log to determine if there were errors detected when the open metadata entity was created. The simplest resolution is to delete the open metadata entity. However, if this entity has been enhanced with many attachments and classifications then it is also possible to add the correlation information to the open metadata entity to allow the synchronization to continue."), @@ -88,16 +79,7 @@ public enum ApacheAtlasErrorCode implements ExceptionMessageSet "The {0} integration connector received an unexpected exception {1} during method {2}; the error message was: {3}", "The connector is unable to catalog one or more metadata elements.", "Use the details from the error message to determine the cause of the error and retry the request once it is resolved."), - - /** - * APACHE-ATLAS-INTEGRATION-CONNECTOR-503-001 - A client-side exception {0} was received from API call {1} to URL {2}. The error message was {3} - */ - CLIENT_SIDE_REST_API_ERROR(503, "APACHE-ATLAS-INTEGRATION-CONNECTOR-503-001", - "A client-side exception of {0} was received from API call {1} to URL {2}. The error message was {3}", - "The integration has issued a call to the open metadata access service REST API in a remote server and has received an exception from the local client libraries.", - "Look for errors in the local server's console to understand and correct the source of the error."), - - ; + ; private final ExceptionMessageDefinition messageDefinition; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheHiveIntegrationModule.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheHiveIntegrationModule.java index f0a84e09728..21ffc7c9b28 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheHiveIntegrationModule.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheHiveIntegrationModule.java @@ -7,9 +7,9 @@ import org.odpi.openmetadata.accessservices.assetmanager.properties.ExternalIdentifierProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SchemaAttributeProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SynchronizationDirection; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; @@ -58,7 +58,7 @@ public ApacheHiveIntegrationModule(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { super(connectorName, diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheKafkaIntegrationModule.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheKafkaIntegrationModule.java index 4577623db71..3ac5018b889 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheKafkaIntegrationModule.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/ApacheKafkaIntegrationModule.java @@ -4,9 +4,9 @@ import org.odpi.openmetadata.accessservices.assetmanager.events.AssetManagerOutTopicEvent; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; @@ -46,7 +46,7 @@ public ApacheKafkaIntegrationModule(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { super(connectorName, diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasGlossaryIntegrationModule.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasGlossaryIntegrationModule.java index d17d2e183d4..1b6bf8b7cba 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasGlossaryIntegrationModule.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasGlossaryIntegrationModule.java @@ -14,14 +14,14 @@ import org.odpi.openmetadata.accessservices.assetmanager.properties.GlossaryTermProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SynchronizationDirection; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasIntegrationProvider; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityHeader; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityWithExtInfo; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasObjectId; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationship; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityHeader; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasObjectId; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationship; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; @@ -93,7 +93,7 @@ public AtlasGlossaryIntegrationModule(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { super(connectorName, @@ -1730,6 +1730,8 @@ private void syncEgeriaGlossaryCategoryHierarchyInAtlas(GlossaryCategoryElement InvalidParameterException, UserNotAuthorizedException { + final String methodName = "syncEgeriaGlossaryCategoryHierarchyInAtlas"; + if (egeriaGlossaryCategory != null) { String egeriaGlossaryCategoryGUID = egeriaGlossaryCategory.getElementHeader().getGUID(); @@ -1750,7 +1752,24 @@ private void syncEgeriaGlossaryCategoryHierarchyInAtlas(GlossaryCategoryElement String currentAtlasParentRelationshipGUID = atlasClient.getRelationshipGUID(atlasGlossaryCategory, atlasParentCategoryPropertyName); - atlasClient.clearRelationship(currentAtlasParentRelationshipGUID); + try + { + atlasClient.clearRelationship(currentAtlasParentRelationshipGUID); + } + catch (Exception error) + { + if (auditLog != null) + { + auditLog.logException(methodName, + ApacheAtlasAuditCode.UNEXPECTED_EXCEPTION.getMessageDefinition(connectorName, + error.getClass().getName(), + methodName, + error.getMessage()), + error); + + + } + } atlasParentCategory = null; } diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasIntegrationModuleBase.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasIntegrationModuleBase.java index 02612a4d3b5..a7b0b91d77b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasIntegrationModuleBase.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasIntegrationModuleBase.java @@ -14,16 +14,16 @@ import org.odpi.openmetadata.accessservices.assetmanager.properties.SchemaAttributeProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SchemaTypeProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SynchronizationDirection; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityHeader; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityWithExtInfo; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasGlossaryBaseProperties; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasInstanceStatus; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasObjectId; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasRelationship; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityHeader; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasGlossaryBaseProperties; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasInstanceStatus; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasObjectId; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasRelationship; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; @@ -90,7 +90,7 @@ public abstract class AtlasIntegrationModuleBase protected final ConnectionProperties connectionProperties; protected final CatalogIntegratorContext myContext; protected final List embeddedConnectors; - protected final ApacheAtlasRESTClient atlasClient; + protected final ApacheAtlasRESTConnector atlasClient; protected final String targetRootURL; protected final DataAssetExchangeService dataAssetExchangeService; @@ -117,7 +117,7 @@ public AtlasIntegrationModuleBase(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { this.auditLog = auditLog; diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasLineageIntegrationModule.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasLineageIntegrationModule.java index eb1cf7ee65c..110851f612f 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasLineageIntegrationModule.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasLineageIntegrationModule.java @@ -8,12 +8,12 @@ import org.odpi.openmetadata.accessservices.assetmanager.properties.ProcessProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.ProcessStatus; import org.odpi.openmetadata.accessservices.assetmanager.properties.SynchronizationDirection; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityHeader; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityHeader; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; @@ -64,7 +64,7 @@ public AtlasLineageIntegrationModule(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { super(connectorName, diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasRegisteredIntegrationModuleBase.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasRegisteredIntegrationModuleBase.java index ec719f776d5..7840010ba90 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasRegisteredIntegrationModuleBase.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/AtlasRegisteredIntegrationModuleBase.java @@ -2,7 +2,7 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.modules; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException; @@ -43,7 +43,7 @@ public AtlasRegisteredIntegrationModuleBase(String connectorNa AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors, String[] supportedEntityTypes, String[] listenForTypes) throws UserNotAuthorizedException diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/DatabaseIntegrationModuleBase.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/DatabaseIntegrationModuleBase.java index 29cdc4a8c97..1d72b3e6e50 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/DatabaseIntegrationModuleBase.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/DatabaseIntegrationModuleBase.java @@ -12,12 +12,12 @@ import org.odpi.openmetadata.accessservices.assetmanager.properties.SchemaAttributeProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SchemaTypeProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SynchronizationDirection; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ffdc.ApacheAtlasErrorCode; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityHeader; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntityWithExtInfo; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityHeader; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntityWithExtInfo; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; @@ -80,7 +80,7 @@ public DatabaseIntegrationModuleBase(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { super(connectorName, diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/RDBMSIntegrationModule.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/RDBMSIntegrationModule.java index b2b54f3ad29..3624c0d8d20 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/RDBMSIntegrationModule.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/modules/RDBMSIntegrationModule.java @@ -5,8 +5,8 @@ import org.odpi.openmetadata.accessservices.assetmanager.properties.DataAssetProperties; import org.odpi.openmetadata.accessservices.assetmanager.properties.SchemaAttributeProperties; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasRESTClient; -import org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasEntity; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException; @@ -53,7 +53,7 @@ public RDBMSIntegrationModule(String connectorName, AuditLog auditLog, CatalogIntegratorContext myContext, String targetRootURL, - ApacheAtlasRESTClient atlasClient, + ApacheAtlasRESTConnector atlasClient, List embeddedConnectors) throws UserNotAuthorizedException { super(connectorName, From a397b2be8d63f225e6dfec380972b0679fdcfd98 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Fri, 1 Sep 2023 18:03:52 +0100 Subject: [PATCH 3/4] Add new connector to assemblies Signed-off-by: Mandy Chessell --- open-metadata-distribution/omag-server-platform/build.gradle | 4 ++++ .../open-metadata-assemblies/build.gradle | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/open-metadata-distribution/omag-server-platform/build.gradle b/open-metadata-distribution/omag-server-platform/build.gradle index 0d970457794..7289dd8dab4 100644 --- a/open-metadata-distribution/omag-server-platform/build.gradle +++ b/open-metadata-distribution/omag-server-platform/build.gradle @@ -50,6 +50,8 @@ dependencies { implementation project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-archive-connectors:open-metadata-archive-file-connector') implementation project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-archive-connectors:open-metadata-archive-directory-connector') implementation project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector') + implementation project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector') + implementation project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector') implementation project(':open-metadata-implementation:access-services:asset-catalog:asset-catalog-client') implementation project(':open-metadata-implementation:access-services:asset-consumer:asset-consumer-client') implementation project(':open-metadata-implementation:access-services:asset-lineage:asset-lineage-client') @@ -209,6 +211,8 @@ distributions { from { project(':open-metadata-implementation:adapters:open-connectors:governance-daemon-connectors:open-lineage-connectors:open-lineage-janus-connector').jar } from { project(':open-metadata-resources:open-metadata-samples:open-metadata-security-samples').jar } from { project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector').jar } + from { project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector').jar } + from { project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector').jar } from { project(':open-metadata-resources:open-metadata-samples:governance-services-sample').jar } fileMode = 0755 } diff --git a/open-metadata-distribution/open-metadata-assemblies/build.gradle b/open-metadata-distribution/open-metadata-assemblies/build.gradle index 2fe072fbfc6..bcd652c2182 100644 --- a/open-metadata-distribution/open-metadata-assemblies/build.gradle +++ b/open-metadata-distribution/open-metadata-assemblies/build.gradle @@ -51,6 +51,8 @@ dependencies { implementation project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-archive-connectors:open-metadata-archive-directory-connector') implementation project(':open-metadata-resources:open-metadata-samples:open-metadata-security-samples') implementation project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector') + implementation project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector') + implementation project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector') implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:asset-management-samples:asset-create-avro-sample') implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:asset-management-samples:asset-create-csv-sample') implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:asset-management-samples:asset-reader-avro-sample') @@ -154,6 +156,8 @@ distributions { from { project(':open-metadata-implementation:adapters:open-connectors:governance-daemon-connectors:open-lineage-connectors:open-lineage-janus-connector').jar } from { project(':open-metadata-resources:open-metadata-samples:open-metadata-security-samples').jar } from { project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector').jar } + from { project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector').jar } + from { project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector').jar } from { project(':open-metadata-resources:open-metadata-samples:governance-services-sample').jar } fileMode = 0755 } From 1536c4f1adb3a95741c7623379832007ddee6901 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Fri, 1 Sep 2023 18:05:04 +0100 Subject: [PATCH 4/4] Remove use of deprecated methods Signed-off-by: Mandy Chessell --- .../connectors/resource/jdbc/JDBCResourceConnectorProvider.java | 2 +- .../integration/jdbc/transfer/CreateConnectionStructure.java | 2 +- .../connectors/integration/jdbc/transfer/DatabaseTransfer.java | 2 +- .../connectors/integration/jdbc/transfer/SchemaTransfer.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java index f385a20bb96..d031fe57706 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java @@ -20,7 +20,7 @@ public class JDBCResourceConnectorProvider extends ConnectorProviderBase /* * Unique identifier of the connector for the audit log. */ - private static final int connectorComponentId = 660; + private static final int connectorComponentId = 662; /* * Unique identifier for the connector type. diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/CreateConnectionStructure.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/CreateConnectionStructure.java index e3182340d36..48d7dcf1240 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/CreateConnectionStructure.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/CreateConnectionStructure.java @@ -94,7 +94,7 @@ public void accept(DatabaseElement databaseElement) { */ private ConnectionProperties createConnectionProperties(DatabaseElement databaseElement){ ConnectionProperties connectionProperties = new ConnectionProperties(); - connectionProperties.setDisplayName(databaseElement.getDatabaseProperties().getDisplayName() + " Connection"); + connectionProperties.setDisplayName(databaseElement.getDatabaseProperties().getName() + " Connection"); connectionProperties.setQualifiedName(databaseElement.getDatabaseProperties().getQualifiedName() + "::connection"); connectionProperties.setConfigurationProperties(databaseElement.getDatabaseProperties().getExtendedProperties()); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/DatabaseTransfer.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/DatabaseTransfer.java index 7ececddb3c6..b067156d65c 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/DatabaseTransfer.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/DatabaseTransfer.java @@ -79,7 +79,7 @@ private DatabaseProperties buildDatabaseProperties() { DatabaseProperties databaseProperties = new DatabaseProperties(); databaseProperties.setQualifiedName(databaseManagerName + "::" + address); - databaseProperties.setDisplayName(StringUtils.isBlank(catalog) ? address : catalog); + databaseProperties.setName(StringUtils.isBlank(catalog) ? address : catalog); databaseProperties.setDatabaseInstance(driverName); databaseProperties.setDatabaseVersion(databaseProductVersion); databaseProperties.setDatabaseType(databaseProductName); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/SchemaTransfer.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/SchemaTransfer.java index a637cf1a24c..5b295dc39eb 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/SchemaTransfer.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/transfer/SchemaTransfer.java @@ -78,7 +78,7 @@ private DatabaseSchemaProperties buildSchemaProperties(JdbcSchema jdbcSchema) { additionalProperties.put(Jdbc.JDBC_SCHEMA_KEY, jdbcSchema.getTableSchem()); DatabaseSchemaProperties jdbcSchemaProperties = new DatabaseSchemaProperties(); - jdbcSchemaProperties.setDisplayName(jdbcSchema.getTableSchem()); + jdbcSchemaProperties.setName(jdbcSchema.getTableSchem()); jdbcSchemaProperties.setQualifiedName(databaseQualifiedName + "::" + jdbcSchema.getTableSchem()); jdbcSchemaProperties.setAdditionalProperties(additionalProperties); return jdbcSchemaProperties;