Merge branch 'main' into 24-skern

kernelsam · kernelsam · commit 9cd8652b088b · 2025-04-28T12:16:20.000-07:00
diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs
@@ -246,35 +246,21 @@ SortedDictionary<string, SortedDictionary<string, string>> snippetsMap
             // check if we need to configure sources
             if (properties.ContainsKey(SourceKeyPrefix + 0))
             {
-                SzConfig config = env.GetConfig();
-                IntPtr handle = config.CreateConfig();
-                string? snippetConfig = null;
-                try
+                SzConfig config = configMgr.CreateConfig();
+                for (int index = 0;
+                    properties.ContainsKey(SourceKeyPrefix + index);
+                    index++)
                 {
-                    for (int index = 0;
-                        properties.ContainsKey(SourceKeyPrefix + index);
-                        index++)
-                    {
-                        string sourceKey = SourceKeyPrefix + index;
-                        string source = properties[sourceKey];
-                        source = source.Trim();
-                        Console.WriteLine("Adding data source: " + source);
-                        config.AddDataSource(handle, source);
-                    }
-                    snippetConfig = config.ExportConfig(handle);
-
-                }
-                finally
-                {
-                    config.CloseConfig(handle);
+                    string sourceKey = SourceKeyPrefix + index;
+                    string source = properties[sourceKey];
+                    source = source.Trim();
+                    Console.WriteLine("Adding data source: " + source);
+                    config.AddDataSource(source);
                 }
+                string snippetConfig = config.Export();
 
                 // register the config
-                long configID = configMgr.AddConfig(snippetConfig, snippet);
-
-                // set the default config to the snippet config
-                configMgr.SetDefaultConfigID(configID);
-
+                configMgr.SetDefaultConfig(snippetConfig);
             }
             else
             {
@@ -657,10 +643,7 @@ static string SetupTempRepository(InstallLocations senzingInstall)
     SzEnvironment env = SzCoreEnvironment.NewBuilder().Settings(settings).Build();
     try
     {
-        SzConfigManager configMgr = env.GetConfigManager();
-
-        long configID = configMgr.AddConfig(baseConfig, "Default Config");
-        configMgr.SetDefaultConfigID(configID);
+        env.GetConfigManager().SetDefaultConfig(baseConfig);
 
     }
     catch (Exception)
diff --git a/csharp/runner/SnippetRunner/SnippetRunner.csproj b/csharp/runner/SnippetRunner/SnippetRunner.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.1" />
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/snippets/configuration/AddDataSources/AddDataSources.csproj b/csharp/snippets/configuration/AddDataSources/AddDataSources.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/configuration/AddDataSources/Program.cs b/csharp/snippets/configuration/AddDataSources/Program.cs
@@ -28,8 +28,7 @@
 
 try
 {
-    // get the config and config manager from the environment
-    SzConfig config = env.GetConfig();
+    // get the config manager from the environment
     SzConfigManager configMgr = env.GetConfigManager();
 
     // setup a loop to handle race-condition conflicts on 
@@ -39,35 +38,25 @@
     {
         // get the current default config ID and associated config JSON
         long configID = configMgr.GetDefaultConfigID();
-        string configDefinition = configMgr.GetConfig(configID);
 
-        // prepare an in-memory config to be modified and get the handle
-        IntPtr configHandle = config.ImportConfig(configDefinition);
-        string? modifiedConfig = null;
-        try
-        {
-            // create an array of the data sources to add
-            string[] dataSources = { "CUSTOMERS", "EMPLOYEES", "WATCHLIST" };
-
-            // loop through the array and add each data source
-            foreach (string dataSource in dataSources)
-            {
-                config.AddDataSource(configHandle, dataSource);
-            }
-
-            // export the modified config to JSON text
-            modifiedConfig = config.ExportConfig(configHandle);
+        // get the SzConfig for the config ID
+        SzConfig config = configMgr.CreateConfig(configID);
+        
+        // create an array of the data sources to add
+        string[] dataSources = { "CUSTOMERS", "EMPLOYEES", "WATCHLIST" };
 
-        }
-        finally
+        // loop through the array and add each data source
+        foreach (string dataSource in dataSources)
         {
-            config.CloseConfig(configHandle);
+            config.AddDataSource(dataSource);
         }
 
-        // add the modified config to the repository with a comment
-        long newConfigID = configMgr.AddConfig(
-            modifiedConfig, "Added truth set data sources");
+        // prepare an in-memory config to be modified and get the handle
+        string modifiedConfig = config.Export();
 
+        // add the modified config to the repository with a comment
+        long newConfigID = configMgr.RegisterConfig(modifiedConfig);
+        
         try
         {
             // replace the default config
diff --git a/csharp/snippets/configuration/InitDefaultConfig/InitDefaultConfig.csproj b/csharp/snippets/configuration/InitDefaultConfig/InitDefaultConfig.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/configuration/InitDefaultConfig/Program.cs b/csharp/snippets/configuration/InitDefaultConfig/Program.cs
@@ -28,30 +28,16 @@
 
 try
 {
-    // get the config and config manager from the environment
-    SzConfig config = env.GetConfig();
+    // get the config and config from the environment
     SzConfigManager configMgr = env.GetConfigManager();
 
-    // prepare an in-memory config to be modified and get the handle
-    IntPtr configHandle = config.CreateConfig();
-    string? configDefinition = null;
-
-    try
-    {
-        configDefinition = config.ExportConfig(configHandle);
-
-    }
-    finally
-    {
-        config.CloseConfig(configHandle);
-    }
+    // prepare a config to be modified
+    SzConfig config             = configMgr.CreateConfig();
+    string   configDefinition   = config.Export();
 
     // add the modified config to the repository with a comment
-    long configID = configMgr.AddConfig(
-        configDefinition, "Initial configuration");
-
-    // replace the default config
-    configMgr.SetDefaultConfigID(configID);
+    configMgr.SetDefaultConfig(configDefinition);
+    
 }
 catch (SzException e)
 {
diff --git a/csharp/snippets/deleting/DeleteViaFutures/DeleteViaFutures.csproj b/csharp/snippets/deleting/DeleteViaFutures/DeleteViaFutures.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/deleting/DeleteViaLoop/DeleteViaLoop.csproj b/csharp/snippets/deleting/DeleteViaLoop/DeleteViaLoop.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/deleting/DeleteWithInfoViaFutures/DeleteWithInfoViaFutures.csproj b/csharp/snippets/deleting/DeleteWithInfoViaFutures/DeleteWithInfoViaFutures.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/information/CheckDatastorePerformance/CheckDatastorePerformance.csproj b/csharp/snippets/information/CheckDatastorePerformance/CheckDatastorePerformance.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/information/GetDatastoreInfo/GetDatastoreInfo.csproj b/csharp/snippets/information/GetDatastoreInfo/GetDatastoreInfo.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/information/GetLicense/GetLicense.csproj b/csharp/snippets/information/GetLicense/GetLicense.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/information/GetVersion/GetVersion.csproj b/csharp/snippets/information/GetVersion/GetVersion.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/initialization/EnginePriming/EnginePriming.csproj b/csharp/snippets/initialization/EnginePriming/EnginePriming.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/initialization/EnvironmentAndHubs/EnvironmentAndHubs.csproj b/csharp/snippets/initialization/EnvironmentAndHubs/EnvironmentAndHubs.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/initialization/EnvironmentAndHubs/Program.cs b/csharp/snippets/initialization/EnvironmentAndHubs/Program.cs
@@ -29,13 +29,11 @@
 try
 {
     SzProduct product = env.GetProduct();
-    SzConfig config = env.GetConfig();
     SzConfigManager configMgr = env.GetConfigManager();
     SzDiagnostic diagnostic = env.GetDiagnostic();
     SzEngine engine = env.GetEngine();
 
     Console.WriteLine(product);
-    Console.WriteLine(config);
     Console.WriteLine(configMgr);
     Console.WriteLine(diagnostic);
     Console.WriteLine(engine);
diff --git a/csharp/snippets/initialization/PurgeRepository/PurgeRepository.csproj b/csharp/snippets/initialization/PurgeRepository/PurgeRepository.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadRecords/LoadRecords.csproj b/csharp/snippets/loading/LoadRecords/LoadRecords.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadTruthSetWithInfoViaLoop/LoadTruthSetWithInfoViaLoop.csproj b/csharp/snippets/loading/LoadTruthSetWithInfoViaLoop/LoadTruthSetWithInfoViaLoop.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadViaFutures/LoadViaFutures.csproj b/csharp/snippets/loading/LoadViaFutures/LoadViaFutures.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadViaLoop/LoadViaLoop.csproj b/csharp/snippets/loading/LoadViaLoop/LoadViaLoop.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadViaQueue/LoadViaQueue.csproj b/csharp/snippets/loading/LoadViaQueue/LoadViaQueue.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadWithInfoViaFutures/LoadWithInfoViaFutures.csproj b/csharp/snippets/loading/LoadWithInfoViaFutures/LoadWithInfoViaFutures.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/loading/LoadWithStatsViaLoop/LoadWithStatsViaLoop.csproj b/csharp/snippets/loading/LoadWithStatsViaLoop/LoadWithStatsViaLoop.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/redo/LoadWithRedoViaLoop/LoadWithRedoViaLoop.csproj b/csharp/snippets/redo/LoadWithRedoViaLoop/LoadWithRedoViaLoop.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/redo/RedoContinuous/RedoContinuous.csproj b/csharp/snippets/redo/RedoContinuous/RedoContinuous.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/redo/RedoContinuousViaFutures/RedoContinuousViaFutures.csproj b/csharp/snippets/redo/RedoContinuousViaFutures/RedoContinuousViaFutures.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/redo/RedoWithInfoContinuous/RedoWithInfoContinuous.csproj b/csharp/snippets/redo/RedoWithInfoContinuous/RedoWithInfoContinuous.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/searching/SearchRecords/SearchRecords.csproj b/csharp/snippets/searching/SearchRecords/SearchRecords.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta.2.0" />
+    <PackageReference Include="Senzing.Sdk" Version="4.0.0-beta*" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/snippets/searching/SearchViaFutures/SearchViaFutures.csproj b/csharp/snippets/searching/SearchViaFutures/SearchViaFutures.csproj
diff --git a/csharp/snippets/stewardship/ForceResolve/ForceResolve.csproj b/csharp/snippets/stewardship/ForceResolve/ForceResolve.csproj
diff --git a/csharp/snippets/stewardship/ForceUnresolve/ForceUnresolve.csproj b/csharp/snippets/stewardship/ForceUnresolve/ForceUnresolve.csproj
diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java
diff --git a/java/snippets/configuration/AddDataSources.java b/java/snippets/configuration/AddDataSources.java
diff --git a/java/snippets/configuration/InitDefaultConfig.java b/java/snippets/configuration/InitDefaultConfig.java
diff --git a/java/snippets/initialization/EnvironmentAndHubs.java b/java/snippets/initialization/EnvironmentAndHubs.java
