Correct gradle build

Signed-off-by: Mandy Chessell <[email protected]>

asset-set-up/pom.xml

@@ -95,6 +95,10 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>platform-services-client</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -21,6 +21,7 @@
 import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
 import org.odpi.openmetadata.frameworks.connectors.properties.AssetUniverse;
 import org.odpi.openmetadata.http.HttpHelper;
+import org.odpi.openmetadata.platformservices.client.PlatformServicesClient;
 
 import java.util.HashMap;
 import java.util.List;
@@ -106,6 +107,38 @@ private AssetSetUp(String serverName,
     }
 
 
+    /**
+     * Retrieve the version of the platform.  This fails if the platform is not running or the endpoint is populated by a service that is not an
+     * OMAG Server Platform.
+     *
+     * @return platform version or null
+     */
+    private String getPlatformOrigin()
+    {
+        try
+        {
+            /*
+             * This client is from the platform services module and queries the runtime state of the platform and the servers that are running on it.
+             */
+            PlatformServicesClient platformServicesClient = new PlatformServicesClient("MyPlatform", platformURLRoot);
+
+            /*
+             * This is the first call to the platform and determines the version of the software.
+             * If the platform is not running, or the remote service is not an OMAG Server Platform,
+             * the utility fails at this point.
+             */
+            return platformServicesClient.getPlatformOrigin(clientUserId);
+        }
+        catch (Exception error)
+        {
+            System.out.println("\n\nThere was an " + error.getClass().getName() + " exception when calling the platform.  Error message is: " + error.getMessage());
+            System.out.println("Ensure the platform URl is correct and the platform is running");
+        }
+
+        return null;
+    }
+
+
     /**
      * Maintain a list of assets that this utility knows about.
      *
@@ -181,7 +214,7 @@ private void addCSVAsset(String fileName,
         {
             /*
              * This creates the asset for the file - and also assets for the directories above if they do not already exist.  The call to
-             * addAssetsToMaps saves all of the guids for later processing.
+             * addAssetsToMaps saves all the guids for later processing.
              */
             String assetGUID = this.addAssetsToMaps(csvOnboardingClient.addCSVFileToCatalog(clientUserId,
                                                                                             fileName,
@@ -386,6 +419,18 @@ public static void main(String[] args)
         {
             AssetSetUp assetSetUp = new AssetSetUp(serverName, platformURLRoot, clientUserId);
 
+            String platformOrigin = assetSetUp.getPlatformOrigin();
+
+            if (platformOrigin != null)
+            {
+                System.out.print(" - " + platformOrigin);
+            }
+            else
+            {
+                System.out.println();
+                System.exit(-1);
+            }
+
             assetSetUp.run();
         }
         catch (Exception  error)

component-id-report/build.gradle

@@ -14,12 +14,12 @@ dependencies {
     implementation "org.odpi.egeria:repository-services-apis"
     implementation "org.odpi.egeria:admin-services-api"
     implementation "org.odpi.egeria:integration-daemon-services-registration"
-    implementation "org.odpi.egeria:cohort-registry-file-store-connector"
-    implementation "org.odpi.egeria:open-metadata-archive-file-connector"
-    implementation "org.odpi.egeria:open-metadata-archive-directory-connector"
-    implementation "org.odpi.egeria:inmemory-repository-connector"
-    implementation "org.odpi.egeria:omrs-rest-repository-connector"
-    implementation "org.odpi.egeria:open-metadata-security-samples"
+    runtimeOnly "org.odpi.egeria:cohort-registry-file-store-connector"
+    runtimeOnly "org.odpi.egeria:open-metadata-archive-file-connector"
+    runtimeOnly "org.odpi.egeria:open-metadata-archive-directory-connector"
+    runtimeOnly "org.odpi.egeria:inmemory-repository-connector"
+    runtimeOnly "org.odpi.egeria:omrs-rest-repository-connector"
+    runtimeOnly "org.odpi.egeria:open-metadata-security-samples"
     runtimeOnly 'ch.qos.logback:logback-classic'
 }
 

database-report/build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 dependencies {
-    implementation "org.odpi.egeria:egeria-report-utilities"
+    implementation project(":egeria-report-utilities")
     implementation "org.odpi.egeria:open-connector-framework"
     implementation "org.odpi.egeria:data-manager-api"
     implementation "org.odpi.egeria:data-manager-client"

database-report/src/main/java/org/odpi/openmetadata/devprojects/reports/databasereport/DatabaseReport.java

@@ -133,7 +133,7 @@ private void locateDatabase()
 
         String command = null;
         int    pageSize = 10;
-        int    startFrom = 0 - pageSize;
+        int    startFrom = - pageSize;
 
         try
         {
@@ -226,7 +226,7 @@ private void displayDatabaseSummary(DatabaseElement databaseElement,
         {
             System.out.print("| " + databaseElement.getElementHeader().getGUID());
             System.out.print(" | " + databaseElement.getDatabaseProperties().getQualifiedName());
-            System.out.print(" | " + databaseElement.getDatabaseProperties().getDisplayName());
+            System.out.print(" | " + databaseElement.getDatabaseProperties().getName());
             System.out.print(" | " + databaseElement.getDatabaseProperties().getDescription());
             System.out.println(" |");
         }
@@ -244,16 +244,16 @@ private void displayDatabase(String databaseGUID)
         {
             DatabaseElement databaseElement = databaseManagerClient.getDatabaseByGUID(clientUserId, databaseGUID);
 
-            EgeriaReport report = new EgeriaReport("Database " + databaseElement.getDatabaseProperties().getDisplayName());
+            EgeriaReport report = new EgeriaReport("Database " + databaseElement.getDatabaseProperties().getName());
 
             final String reportTitle = "Database report for: ";
-            report.printReportTitle(0, reportTitle + databaseElement.getDatabaseProperties().getDisplayName() + " on server: " + serverName);
+            report.printReportTitle(0, reportTitle + databaseElement.getDatabaseProperties().getName() + " on server: " + serverName);
 
             report.printElementInTable(0,
                                        true,
                                        databaseElement.getElementHeader().getGUID(),
                                        databaseElement.getDatabaseProperties().getQualifiedName(),
-                                       databaseElement.getDatabaseProperties().getDisplayName(),
+                                       databaseElement.getDatabaseProperties().getName(),
                                        databaseElement.getDatabaseProperties().getDescription());
 
             /*
@@ -490,7 +490,7 @@ private void createSampleDatabase(String  databaseManagerGUID,
                     DatabaseSchemaProperties databaseSchemaProperties = new DatabaseSchemaProperties();
 
                     databaseSchemaProperties.setQualifiedName(databaseName + "." + schemaName);
-                    databaseSchemaProperties.setDisplayName(schemaName);
+                    databaseSchemaProperties.setName(schemaName);
                     databaseSchemaProperties.setDescription("Database schema definition called " + schemaName + " with " + numberOfTables + " tables.");
 
                     String databaseSchemaGUID = databaseManagerClient.createDatabaseSchema(clientUserId,

egeria-config-utility/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "org.odpi.egeria:admin-services-client"
     implementation "org.odpi.egeria:platform-services-client"
     implementation "org.odpi.egeria:http-helper"
+    implementation 'org.odpi.egeria:ffdc-services:3.15-SNAPSHOT'
     runtimeOnly 'ch.qos.logback:logback-classic'
 }
 

egeria-infrastructure-catalog-connector/build.gradle

@@ -3,10 +3,6 @@
  * Copyright Contributors to the ODPi Egeria project.
  */
 
-plugins {
-    id 'application'
-    id "com.github.johnrengelman.shadow"
-}
 
 dependencies {
     implementation "org.odpi.egeria:audit-log-framework"

egeria-platform-report/src/main/java/org/odpi/openmetadata/devprojects/reports/platform/EgeriaPlatformReport.java

@@ -27,6 +27,7 @@
 import org.odpi.openmetadata.http.HttpHelper;
 import org.odpi.openmetadata.platformservices.client.PlatformServicesClient;
 import org.odpi.openmetadata.platformservices.properties.OMAGServerInstanceHistory;
+import org.odpi.openmetadata.platformservices.properties.ServerStatus;
 import org.odpi.openmetadata.repositoryservices.clients.MetadataHighwayServicesClient;
 import org.odpi.openmetadata.repositoryservices.connectors.stores.cohortregistrystore.properties.MemberRegistration;
 import org.odpi.openmetadata.repositoryservices.properties.CohortConnectionStatus;
@@ -180,7 +181,7 @@ private void run()
                     {
                         if (serverName != null)
                         {
-                            org.odpi.openmetadata.platformservices.properties.ServerStatus platformServerStatus = platformServicesClient.getServerStatus(clientUserId, serverName);
+                            ServerStatus platformServerStatus = platformServicesClient.getServerStatus(clientUserId, serverName);
 
                             if (platformServerStatus != null)
                             {

egeria-report-utilities/build.gradle

@@ -3,11 +3,6 @@
  * Copyright Contributors to the ODPi Egeria project.
  */
 
-plugins {
-    id 'application'
-    id "com.github.johnrengelman.shadow"
-}
-
 dependencies {
     implementation "org.odpi.egeria:open-connector-framework"
     implementation "org.odpi.egeria:ffdc-services"

egeria-report-utilities/src/main/java/org/odpi/openmetadata/devprojects/reports/EgeriaReport.java

@@ -18,7 +18,7 @@
  */
 public class EgeriaReport
 {
-    private FileOutputStream fileOutStream;
+    private final FileOutputStream fileOutStream;
 
 
     /**
@@ -289,6 +289,8 @@ public EgeriaReport(String reportFileName) throws IOException
 
     /**
      * This adds the last line to the report.
+     *
+     * @throws IOException unable to write the report
      */
     public void closeReport() throws IOException
     {

event-display-audit-log-connector/build.gradle

@@ -3,10 +3,6 @@
  * Copyright Contributors to the ODPi Egeria project.
  */
 
-plugins {
-    id 'application'
-    id "com.github.johnrengelman.shadow"
-}
 
 dependencies {
     implementation "org.odpi.egeria:open-connector-framework"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists