From f7a93bb2552ee6750112fdfd03353c36c04f0dac Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Wed, 23 Apr 2025 16:56:13 -0700 Subject: [PATCH] Updated C# and Java snippets for new SzConfig and SzConfigManager --- csharp/runner/SnippetRunner/Program.cs | 41 +++++------------ .../runner/SnippetRunner/SnippetRunner.csproj | 2 +- .../AddDataSources/AddDataSources.csproj | 4 +- .../configuration/AddDataSources/Program.cs | 39 ++++++---------- .../InitDefaultConfig.csproj | 4 +- .../InitDefaultConfig/Program.cs | 26 +++-------- .../DeleteViaFutures/DeleteViaFutures.csproj | 4 +- .../DeleteViaLoop/DeleteViaLoop.csproj | 4 +- .../DeleteWithInfoViaFutures.csproj | 4 +- .../CheckDatastorePerformance.csproj | 4 +- .../GetDatastoreInfo/GetDatastoreInfo.csproj | 4 +- .../information/GetLicense/GetLicense.csproj | 4 +- .../information/GetVersion/GetVersion.csproj | 4 +- .../EnginePriming/EnginePriming.csproj | 4 +- .../EnvironmentAndHubs.csproj | 4 +- .../EnvironmentAndHubs/Program.cs | 2 - .../PurgeRepository/PurgeRepository.csproj | 4 +- .../loading/LoadRecords/LoadRecords.csproj | 4 +- .../LoadTruthSetWithInfoViaLoop.csproj | 4 +- .../LoadViaFutures/LoadViaFutures.csproj | 4 +- .../loading/LoadViaLoop/LoadViaLoop.csproj | 4 +- .../loading/LoadViaQueue/LoadViaQueue.csproj | 4 +- .../LoadWithInfoViaFutures.csproj | 4 +- .../LoadWithStatsViaLoop.csproj | 4 +- .../LoadWithRedoViaLoop.csproj | 4 +- .../redo/RedoContinuous/RedoContinuous.csproj | 4 +- .../RedoContinuousViaFutures.csproj | 4 +- .../RedoWithInfoContinuous.csproj | 4 +- .../SearchRecords/SearchRecords.csproj | 4 +- .../SearchViaFutures/SearchViaFutures.csproj | 4 +- .../ForceResolve/ForceResolve.csproj | 4 +- .../ForceUnresolve/ForceUnresolve.csproj | 4 +- .../com/senzing/runner/SnippetRunner.java | 41 ++++++----------- .../configuration/AddDataSources.java | 46 ++++++++----------- .../configuration/InitDefaultConfig.java | 23 +++------- .../initialization/EnvironmentAndHubs.java | 2 - 36 files changed, 126 insertions(+), 204 deletions(-) diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs index 6193f9b..980b6d6 100644 --- a/csharp/runner/SnippetRunner/Program.cs +++ b/csharp/runner/SnippetRunner/Program.cs @@ -246,35 +246,21 @@ SortedDictionary> 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 index cd67f0e..576fb6b 100644 --- a/csharp/runner/SnippetRunner/SnippetRunner.csproj +++ b/csharp/runner/SnippetRunner/SnippetRunner.csproj @@ -9,7 +9,7 @@ - + diff --git a/csharp/snippets/configuration/AddDataSources/AddDataSources.csproj b/csharp/snippets/configuration/AddDataSources/AddDataSources.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/configuration/AddDataSources/AddDataSources.csproj +++ b/csharp/snippets/configuration/AddDataSources/AddDataSources.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/configuration/AddDataSources/Program.cs b/csharp/snippets/configuration/AddDataSources/Program.cs index e94eec3..01bc4f7 100644 --- 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 index 68fb551..25104ae 100644 --- a/csharp/snippets/configuration/InitDefaultConfig/InitDefaultConfig.csproj +++ b/csharp/snippets/configuration/InitDefaultConfig/InitDefaultConfig.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/configuration/InitDefaultConfig/Program.cs b/csharp/snippets/configuration/InitDefaultConfig/Program.cs index 67e8ed5..200c1e4 100644 --- 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 index 68fb551..25104ae 100644 --- a/csharp/snippets/deleting/DeleteViaFutures/DeleteViaFutures.csproj +++ b/csharp/snippets/deleting/DeleteViaFutures/DeleteViaFutures.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/deleting/DeleteViaLoop/DeleteViaLoop.csproj b/csharp/snippets/deleting/DeleteViaLoop/DeleteViaLoop.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/deleting/DeleteViaLoop/DeleteViaLoop.csproj +++ b/csharp/snippets/deleting/DeleteViaLoop/DeleteViaLoop.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/deleting/DeleteWithInfoViaFutures/DeleteWithInfoViaFutures.csproj b/csharp/snippets/deleting/DeleteWithInfoViaFutures/DeleteWithInfoViaFutures.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/deleting/DeleteWithInfoViaFutures/DeleteWithInfoViaFutures.csproj +++ b/csharp/snippets/deleting/DeleteWithInfoViaFutures/DeleteWithInfoViaFutures.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/information/CheckDatastorePerformance/CheckDatastorePerformance.csproj b/csharp/snippets/information/CheckDatastorePerformance/CheckDatastorePerformance.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/information/CheckDatastorePerformance/CheckDatastorePerformance.csproj +++ b/csharp/snippets/information/CheckDatastorePerformance/CheckDatastorePerformance.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/information/GetDatastoreInfo/GetDatastoreInfo.csproj b/csharp/snippets/information/GetDatastoreInfo/GetDatastoreInfo.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/information/GetDatastoreInfo/GetDatastoreInfo.csproj +++ b/csharp/snippets/information/GetDatastoreInfo/GetDatastoreInfo.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/information/GetLicense/GetLicense.csproj b/csharp/snippets/information/GetLicense/GetLicense.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/information/GetLicense/GetLicense.csproj +++ b/csharp/snippets/information/GetLicense/GetLicense.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/information/GetVersion/GetVersion.csproj b/csharp/snippets/information/GetVersion/GetVersion.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/information/GetVersion/GetVersion.csproj +++ b/csharp/snippets/information/GetVersion/GetVersion.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/initialization/EnginePriming/EnginePriming.csproj b/csharp/snippets/initialization/EnginePriming/EnginePriming.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/initialization/EnginePriming/EnginePriming.csproj +++ b/csharp/snippets/initialization/EnginePriming/EnginePriming.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/initialization/EnvironmentAndHubs/EnvironmentAndHubs.csproj b/csharp/snippets/initialization/EnvironmentAndHubs/EnvironmentAndHubs.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/initialization/EnvironmentAndHubs/EnvironmentAndHubs.csproj +++ b/csharp/snippets/initialization/EnvironmentAndHubs/EnvironmentAndHubs.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/initialization/EnvironmentAndHubs/Program.cs b/csharp/snippets/initialization/EnvironmentAndHubs/Program.cs index 5ed3414..7902a20 100644 --- 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 index 68fb551..25104ae 100644 --- a/csharp/snippets/initialization/PurgeRepository/PurgeRepository.csproj +++ b/csharp/snippets/initialization/PurgeRepository/PurgeRepository.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadRecords/LoadRecords.csproj b/csharp/snippets/loading/LoadRecords/LoadRecords.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadRecords/LoadRecords.csproj +++ b/csharp/snippets/loading/LoadRecords/LoadRecords.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadTruthSetWithInfoViaLoop/LoadTruthSetWithInfoViaLoop.csproj b/csharp/snippets/loading/LoadTruthSetWithInfoViaLoop/LoadTruthSetWithInfoViaLoop.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadTruthSetWithInfoViaLoop/LoadTruthSetWithInfoViaLoop.csproj +++ b/csharp/snippets/loading/LoadTruthSetWithInfoViaLoop/LoadTruthSetWithInfoViaLoop.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadViaFutures/LoadViaFutures.csproj b/csharp/snippets/loading/LoadViaFutures/LoadViaFutures.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadViaFutures/LoadViaFutures.csproj +++ b/csharp/snippets/loading/LoadViaFutures/LoadViaFutures.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadViaLoop/LoadViaLoop.csproj b/csharp/snippets/loading/LoadViaLoop/LoadViaLoop.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadViaLoop/LoadViaLoop.csproj +++ b/csharp/snippets/loading/LoadViaLoop/LoadViaLoop.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadViaQueue/LoadViaQueue.csproj b/csharp/snippets/loading/LoadViaQueue/LoadViaQueue.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadViaQueue/LoadViaQueue.csproj +++ b/csharp/snippets/loading/LoadViaQueue/LoadViaQueue.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadWithInfoViaFutures/LoadWithInfoViaFutures.csproj b/csharp/snippets/loading/LoadWithInfoViaFutures/LoadWithInfoViaFutures.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadWithInfoViaFutures/LoadWithInfoViaFutures.csproj +++ b/csharp/snippets/loading/LoadWithInfoViaFutures/LoadWithInfoViaFutures.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/loading/LoadWithStatsViaLoop/LoadWithStatsViaLoop.csproj b/csharp/snippets/loading/LoadWithStatsViaLoop/LoadWithStatsViaLoop.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/loading/LoadWithStatsViaLoop/LoadWithStatsViaLoop.csproj +++ b/csharp/snippets/loading/LoadWithStatsViaLoop/LoadWithStatsViaLoop.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/redo/LoadWithRedoViaLoop/LoadWithRedoViaLoop.csproj b/csharp/snippets/redo/LoadWithRedoViaLoop/LoadWithRedoViaLoop.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/redo/LoadWithRedoViaLoop/LoadWithRedoViaLoop.csproj +++ b/csharp/snippets/redo/LoadWithRedoViaLoop/LoadWithRedoViaLoop.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/redo/RedoContinuous/RedoContinuous.csproj b/csharp/snippets/redo/RedoContinuous/RedoContinuous.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/redo/RedoContinuous/RedoContinuous.csproj +++ b/csharp/snippets/redo/RedoContinuous/RedoContinuous.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/redo/RedoContinuousViaFutures/RedoContinuousViaFutures.csproj b/csharp/snippets/redo/RedoContinuousViaFutures/RedoContinuousViaFutures.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/redo/RedoContinuousViaFutures/RedoContinuousViaFutures.csproj +++ b/csharp/snippets/redo/RedoContinuousViaFutures/RedoContinuousViaFutures.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/redo/RedoWithInfoContinuous/RedoWithInfoContinuous.csproj b/csharp/snippets/redo/RedoWithInfoContinuous/RedoWithInfoContinuous.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/redo/RedoWithInfoContinuous/RedoWithInfoContinuous.csproj +++ b/csharp/snippets/redo/RedoWithInfoContinuous/RedoWithInfoContinuous.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/searching/SearchRecords/SearchRecords.csproj b/csharp/snippets/searching/SearchRecords/SearchRecords.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/searching/SearchRecords/SearchRecords.csproj +++ b/csharp/snippets/searching/SearchRecords/SearchRecords.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/searching/SearchViaFutures/SearchViaFutures.csproj b/csharp/snippets/searching/SearchViaFutures/SearchViaFutures.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/searching/SearchViaFutures/SearchViaFutures.csproj +++ b/csharp/snippets/searching/SearchViaFutures/SearchViaFutures.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/stewardship/ForceResolve/ForceResolve.csproj b/csharp/snippets/stewardship/ForceResolve/ForceResolve.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/stewardship/ForceResolve/ForceResolve.csproj +++ b/csharp/snippets/stewardship/ForceResolve/ForceResolve.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/csharp/snippets/stewardship/ForceUnresolve/ForceUnresolve.csproj b/csharp/snippets/stewardship/ForceUnresolve/ForceUnresolve.csproj index 68fb551..25104ae 100644 --- a/csharp/snippets/stewardship/ForceUnresolve/ForceUnresolve.csproj +++ b/csharp/snippets/stewardship/ForceUnresolve/ForceUnresolve.csproj @@ -7,8 +7,8 @@ enable - - + + diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index d0689ae..7b00011 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -181,31 +181,21 @@ public static void main(String[] args) { SzConfigManager configMgr = env.getConfigManager(); // check if we need to configure sources if (properties.containsKey(SOURCE_KEY_PREFIX + 0)) { - SzConfig config = env.getConfig(); - long handle = config.createConfig(); - String snippetConfig = null; - try { - for (int index = 0; - properties.containsKey(SOURCE_KEY_PREFIX + index); - index++) - { - String sourceKey = SOURCE_KEY_PREFIX + index; - String source = properties.getProperty(sourceKey); - source = source.trim(); - System.out.println("Adding data source: " + source); - config.addDataSource(handle, source); - } - snippetConfig = config.exportConfig(handle); - - } finally { - config.closeConfig(handle); + SzConfig config = configMgr.createConfig(); + for (int index = 0; + properties.containsKey(SOURCE_KEY_PREFIX + index); + index++) + { + String sourceKey = SOURCE_KEY_PREFIX + index; + String source = properties.getProperty(sourceKey); + source = source.trim(); + System.out.println("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, snippet); } else { // set the default config to the initial default @@ -501,11 +491,8 @@ private static String setupTempRepository(InstallLocations senzingInstall) throw 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 (SzException e) { System.err.println(settings); throw e; diff --git a/java/snippets/configuration/AddDataSources.java b/java/snippets/configuration/AddDataSources.java index ca29e52..442fc13 100644 --- a/java/snippets/configuration/AddDataSources.java +++ b/java/snippets/configuration/AddDataSources.java @@ -26,40 +26,32 @@ public static void main(String[] args) { .build(); try { - // get the config and config manager from the environment - SzConfig config = env.getConfig(); - SzConfigManager configMgr = env.getConfigManager(); + // get the config manager from the environment + SzConfigManager configMgr = env.getConfigManager(); // setup a loop to handle race-condition conflicts on // replacing the default config ID boolean replacedConfig = false; while (!replacedConfig) { - // 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 - long 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 - for (String dataSource : dataSources) { - config.addDataSource(configHandle, dataSource); - } - - // export the modified config to JSON text - modifiedConfig = config.exportConfig(configHandle); - - } finally { - config.closeConfig(configHandle); + // get the current default config ID + long configId = configMgr.getDefaultConfigId(); + + // 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" }; + + // loop through the array and add each data source + for (String dataSource : dataSources) { + config.addDataSource(dataSource); } - // add the modified config to the repository with a comment - long newConfigId = configMgr.addConfig( - modifiedConfig, "Added truth set data sources"); + // export the modified config to JSON text + String modifiedConfig = config.export(); + + // register the modified config in the repository + long newConfigId = configMgr.registerConfig(modifiedConfig); try { // replace the default config diff --git a/java/snippets/configuration/InitDefaultConfig.java b/java/snippets/configuration/InitDefaultConfig.java index b28fd2a..8774bfa 100644 --- a/java/snippets/configuration/InitDefaultConfig.java +++ b/java/snippets/configuration/InitDefaultConfig.java @@ -27,25 +27,14 @@ public static void main(String[] args) { try { // get the config and config manager from the environment - SzConfig config = env.getConfig(); - SzConfigManager configMgr = env.getConfigManager(); + SzConfigManager configMgr = env.getConfigManager(); - // prepare an in-memory config to be modified and get the handle - long configHandle = config.createConfig(); - String configDefinition = null; - try { - configDefinition = config.exportConfig(configHandle); + // prepare a config to be modified + SzConfig config = configMgr.createConfig(); + String configDefinition = config.export(); - } finally { - config.closeConfig(configHandle); - } - - // add the modified config to the repository with a comment - long configId = configMgr.addConfig( - configDefinition, "Initial configuration"); - - // replace the default config - configMgr.setDefaultConfigId(configId); + // register the modified config in the repository as the default + configMgr.setDefaultConfig(configDefinition); } catch (SzException e) { // handle any exception that may have occurred diff --git a/java/snippets/initialization/EnvironmentAndHubs.java b/java/snippets/initialization/EnvironmentAndHubs.java index ce5df07..4d79552 100644 --- a/java/snippets/initialization/EnvironmentAndHubs.java +++ b/java/snippets/initialization/EnvironmentAndHubs.java @@ -28,13 +28,11 @@ public static void main(String[] args) { try { SzProduct product = env.getProduct(); - SzConfig config = env.getConfig(); SzConfigManager configMgr = env.getConfigManager(); SzDiagnostic diagnostic = env.getDiagnostic(); SzEngine engine = env.getEngine(); System.out.println(product); - System.out.println(config); System.out.println(configMgr); System.out.println(diagnostic); System.out.println(engine);