Merge pull request #8321 from mandy-chessell/oak2024

Additional search methods in Classification Manager OMAS
odpi · Aug 5, 2024 · da485e6 · da485e6
2 parents 7051c65 + d32a4fa
commit da485e6
Show file tree

Hide file tree

Showing 162 changed files with 10,319 additions and 2,577 deletions.
diff --git a/CocoComboGUIDMap.json b/CocoComboGUIDMap.json
diff --git a/CoreContentPackGUIDMap.json b/CoreContentPackGUIDMap.json
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/egeria-platform-report.md b/egeria-platform-report.md
diff --git a/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
@@ -268,7 +268,7 @@ public AssetGraphResponse getAssetGraph(String   serverName,
                         if (metadataElement != null)
                         {
                             relationships = metadataRelationshipHandler.getAllAttachmentLinks(userId,
-                                                                                              metadataElement.getGUID(),
+                                                                                              metadataElement.getElementHeader().getGUID(),
                                                                                               anchoredElementParameterName,
                                                                                               OpenMetadataType.OPEN_METADATA_ROOT.typeName,
                                                                                               false,
@@ -409,6 +409,11 @@ public AssetSearchMatchesListResponse findAssetsInDomain(String
                 displayNamePropertyCondition.setValue(displayNamePropertyValue);
                 propertyConditions.add(displayNamePropertyCondition);
 
+                displayNamePropertyCondition.setProperty(OpenMetadataProperty.RESOURCE_NAME.name);
+                displayNamePropertyCondition.setOperator(PropertyComparisonOperator.LIKE);
+                displayNamePropertyCondition.setValue(displayNamePropertyValue);
+                propertyConditions.add(displayNamePropertyCondition);
+
                 descPropertyCondition.setProperty(OpenMetadataProperty.DESCRIPTION.name);
                 descPropertyCondition.setOperator(PropertyComparisonOperator.LIKE);
                 descPropertyCondition.setValue(descPropertyValue);