fix: correctly log inside ObjectInstantiation

eclipse · Nov 6, 2024 · 695fc1c · 695fc1c
1 parent 4d1ab24
commit 695fc1c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...on/src/main/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassador.java b/...on/src/main/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassador.java
@@ -115,7 +115,7 @@ public ApplicationAmbassador(AmbassadorParameter ambassadorParameter) {
         try {
             SimulationKernel.SimulationKernel.setConfigurationPath(ambassadorParameter.configuration.getParentFile());
             // try to read the configuration from the configuration file
-            ambassadorConfig = new ObjectInstantiation<>(CApplicationAmbassador.class).readFile(ambassadorParameter.configuration);
+            ambassadorConfig = new ObjectInstantiation<>(CApplicationAmbassador.class, log).readFile(ambassadorParameter.configuration);
 
             Validate.isTrue(ambassadorConfig.eventSchedulerThreads > 0,
                     "Number of eventSchedulerThreads must be greater than zero."

diff --git a/fed/mosaic-sns/src/main/java/org/eclipse/mosaic/fed/sns/ambassador/SnsAmbassador.java b/fed/mosaic-sns/src/main/java/org/eclipse/mosaic/fed/sns/ambassador/SnsAmbassador.java
@@ -94,7 +94,7 @@ public void initialize(final long startTime, final long endTime) throws Internal
         }
 
         try {
-            CSns configuration = new ObjectInstantiation<>(CSns.class).readFile(ambassadorParameter.configuration);
+            CSns configuration = new ObjectInstantiation<>(CSns.class, log).readFile(ambassadorParameter.configuration);
             if (configuration.singlehopDelay instanceof GammaSpeedDelay) {
                 log.info("Detected GammaSpeedDelay for. The SNS is currently ignoring speed of entities in its evaluation of delay values");
             }

diff --git a/...saic-network/src/main/java/org/eclipse/mosaic/lib/coupling/AbstractNetworkAmbassador.java b/...saic-network/src/main/java/org/eclipse/mosaic/lib/coupling/AbstractNetworkAmbassador.java
@@ -166,7 +166,7 @@ protected AbstractNetworkAmbassador(AmbassadorParameter ambassadorParameter, Str
         this.removedNodes = new ArrayList<>();
 
         try {
-            config = new ObjectInstantiation<>(CAbstractNetworkAmbassador.class).readFile(ambassadorParameter.configuration);
+            config = new ObjectInstantiation<>(CAbstractNetworkAmbassador.class, log).readFile(ambassadorParameter.configuration);
         } catch (InstantiationException e) {
             log.warn("Problem when instantiating ambassador configuration from '{}'. Ignore file and try again with default config.", ambassadorParameter.configuration);
             config = new CAbstractNetworkAmbassador();

diff --git a/rti/mosaic-starter/src/main/java/org/eclipse/mosaic/starter/MosaicStarter.java b/rti/mosaic-starter/src/main/java/org/eclipse/mosaic/starter/MosaicStarter.java
@@ -213,7 +213,7 @@ protected CHosts loadHostsConfiguration(Path hostConfigurationFile) {
 
     private <T> T loadJsonConfiguration(Path configurationFile, Class<T> clazz) throws ExecutionException {
         try (InputStream inputStream = loadResource(configurationFile)) {
-            return new ObjectInstantiation<>(clazz).read(inputStream);
+            return new ObjectInstantiation<>(clazz, getLogger()).read(inputStream);
         } catch (IOException | InstantiationException e) {
             printAndLog("Could not load file due to invalid format.", e);
             throw new ExecutionException();
@@ -223,7 +223,7 @@ private <T> T loadJsonConfiguration(Path configurationFile, Class<T> clazz) thro
     @SuppressWarnings("unchecked")
     private <T> T loadJsonConfiguration(Path configurationFile, T defaultObject) {
         try (InputStream inputStream = loadResource(configurationFile)) {
-            return new ObjectInstantiation<>((Class<T>) defaultObject.getClass()).read(inputStream);
+            return new ObjectInstantiation<>((Class<T>) defaultObject.getClass(), getLogger()).read(inputStream);
         } catch (IOException | InstantiationException e) {
             getLogger().warn("Could not load file {}. Using default configuration.", configurationFile);
             return defaultObject;