Move to Egeria 4.1

asset-deploy/build.gradle

@@ -10,6 +10,7 @@ plugins {
 
 dependencies {
     implementation "org.odpi.egeria:open-connector-framework"
+    implementation "org.odpi.egeria:ocf-metadata-client"
     implementation "org.odpi.egeria:it-infrastructure-api"
     implementation "org.odpi.egeria:it-infrastructure-client"
     implementation "org.odpi.egeria:admin-services-api"

asset-look-up/build.gradle

@@ -10,6 +10,8 @@ plugins {
 
 dependencies {
     implementation "org.odpi.egeria:open-connector-framework"
+    implementation "org.odpi.egeria:ocf-metadata-api"
+    implementation "org.odpi.egeria:ocf-metadata-client"
     implementation "org.odpi.egeria:asset-consumer-api"
     implementation "org.odpi.egeria:asset-consumer-client"
     implementation "org.odpi.egeria:platform-services-client"

asset-look-up/src/main/java/org/odpi/openmetadata/devprojects/reports/assetlookup/AssetLookUp.java

@@ -336,7 +336,7 @@ private void displayAssetSummary(String  assetGUID,
                 System.out.print("| " + assetUniverse.getGUID());
                 System.out.print(" | " + assetUniverse.getQualifiedName());
                 System.out.print(" | " + assetUniverse.getDisplayName());
-                System.out.print(" | " + assetUniverse.getDescription());
+                System.out.print(" | " + assetUniverse.getResourceDescription());
                 System.out.println(" |");
             }
         }
@@ -368,7 +368,8 @@ private void displayAsset(String assetGUID)
                 System.out.println("   " + assetUniverse.getType().getTypeName() + " inherits from " + assetUniverse.getType().getSuperTypeNames());
                 System.out.println("   qualifiedName: " + assetUniverse.getQualifiedName());
                 System.out.println("   displayName: " + assetUniverse.getDisplayName());
-                System.out.println("   description: " + assetUniverse.getDescription());
+                System.out.println("   resourceName: " + assetUniverse.getResourceName());
+                System.out.println("   description: " + assetUniverse.getResourceDescription());
 
                 /*
                  * The ownership determines who is responsible for the digital resource and its metadata.
@@ -385,7 +386,7 @@ private void displayAsset(String assetGUID)
                 List<String>       zoneMembership = assetUniverse.getZoneMembership();
                 if (zoneMembership == null)
                 {
-                    System.out.println("   zone membership: all zones" + assetUniverse.getDescription());
+                    System.out.println("   zone membership: all zones" + assetUniverse.getResourceName());
                 }
                 else
                 {
@@ -684,11 +685,11 @@ private void displayAsset(String assetGUID)
 
 
     /**
-     * Main program that controls the operation of the platform report.  The parameters are passed space separated.
+     * Main program that controls lookup of the asset.  The parameters are passed space separated.
      * The  parameters are used to override the report's default values. If mode is set to "interactive"
      * the caller is prompted for a command.  Otherwise, it is assumed to be a guid
      *
-     * @param args 1. service platform URL root, 2. client userId, 3. mode/guid
+     * @param args 0. server name, 1. service platform URL root, 2. client userId, 3. mode/guid
      */
     public static void main(String[] args)
     {

asset-set-up/build.gradle

@@ -10,17 +10,27 @@ plugins {
 
 dependencies {
     implementation "org.odpi.egeria:open-connector-framework"
+    implementation "org.odpi.egeria:open-integration-framework"
     implementation "org.odpi.egeria:asset-consumer-client"
+    implementation "org.odpi.egeria:asset-consumer-api"
     implementation "org.odpi.egeria:asset-manager-client"
+    implementation "org.odpi.egeria:asset-manager-api"
     implementation "org.odpi.egeria:asset-owner-client"
+    implementation "org.odpi.egeria:asset-owner-api"
     implementation "org.odpi.egeria:community-profile-api"
     implementation "org.odpi.egeria:community-profile-client"
+    implementation "org.odpi.egeria:data-manager-api"
     implementation "org.odpi.egeria:data-manager-client"
+    implementation "org.odpi.egeria:digital-architecture-api"
     implementation "org.odpi.egeria:digital-architecture-client"
     implementation "org.odpi.egeria:governance-program-api"
     implementation "org.odpi.egeria:governance-program-client"
+    implementation "org.odpi.egeria:it-infrastructure-api"
     implementation "org.odpi.egeria:it-infrastructure-client"
+    implementation "org.odpi.egeria:platform-services-api"
     implementation "org.odpi.egeria:platform-services-client"
+    implementation "org.odpi.egeria:ocf-metadata-api"
+    implementation "org.odpi.egeria:ocf-metadata-client"
     implementation "org.odpi.egeria:http-helper"
     runtimeOnly 'ch.qos.logback:logback-classic'
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'

asset-set-up/src/main/java/org/odpi/openmetadata/devprojects/utilities/assetsetup/AssetSetUp.java

@@ -3,14 +3,14 @@
 package org.odpi.openmetadata.devprojects.utilities.assetsetup;
 
 import org.odpi.openmetadata.accessservices.assetconsumer.client.AssetConsumer;
+import org.odpi.openmetadata.accessservices.assetmanager.client.exchange.ExternalAssetManagerClient;
 import org.odpi.openmetadata.accessservices.assetowner.client.CSVFileAssetOwner;
 import org.odpi.openmetadata.accessservices.communityprofile.client.OrganizationManagement;
 import org.odpi.openmetadata.accessservices.datamanager.client.DatabaseManagerClient;
 import org.odpi.openmetadata.accessservices.datamanager.client.ExternalReferenceManagerClient;
 import org.odpi.openmetadata.accessservices.digitalarchitecture.client.ConnectionManager;
 import org.odpi.openmetadata.accessservices.digitalarchitecture.client.LocationManager;
 import org.odpi.openmetadata.accessservices.communityprofile.properties.ActorProfileProperties;
-import org.odpi.openmetadata.accessservices.assetmanager.client.ExternalAssetManagerClient;
 import org.odpi.openmetadata.accessservices.digitalarchitecture.client.ReferenceDataManager;
 import org.odpi.openmetadata.accessservices.governanceprogram.client.GovernanceZoneManager;
 import org.odpi.openmetadata.accessservices.governanceprogram.properties.GovernanceZoneProperties;
@@ -54,9 +54,9 @@ public class AssetSetUp
 
     private AssetConsumer                  assetConsumerClient            = null;
     private CSVFileAssetOwner              csvOnboardingClient            = null;
-    private OrganizationManagement         organizationManagement         = null;
-    private ExternalAssetManagerClient     externalAssetManagerClient     = null;
-    private DatabaseManagerClient          databaseManagerClient          = null;
+    private OrganizationManagement         organizationManagement     = null;
+    private ExternalAssetManagerClient     externalAssetManagerClient = null;
+    private DatabaseManagerClient          databaseManagerClient      = null;
     private ExternalReferenceManagerClient externalReferenceManagerClient = null;
     private ConnectionManager              connectionManager              = null;
     private LocationManager                locationManager                = null;