refactor loading yaml files to new version 2.0 (no more need for glob…

…al tags in yaml files).

src/main/java/group/msg/jpowermonitor/config/DefaultConfigProvider.java

@@ -105,7 +105,7 @@ private JPowerMonitorConfig tryReadingFromFileSystem(String source) {
 
     private JPowerMonitorConfig readConfigFromPath(Path path) {
         try (Reader reader = Files.newBufferedReader(path, yamlFileEncoding)) {
-            return new Yaml().load(reader);
+            return new Yaml().loadAs(reader, JPowerMonitorConfig.class);
         } catch (Exception e) {
             System.err.println("Cannot read '" + path + "' from filesystem: " + e.getMessage());
         }
@@ -123,7 +123,7 @@ private JPowerMonitorConfig tryReadingFromResources(String source) {
 
     private JPowerMonitorConfig readConfigFromResource(String source) {
         try (InputStream input = DefaultConfigProvider.class.getClassLoader().getResourceAsStream(source)) {
-            return new Yaml().load(input);
+            return new Yaml().loadAs(input, JPowerMonitorConfig.class);
         } catch (Exception exc) {
             System.out.println("Cannot read '" + source + "' from resources:" + exc.getMessage());
         }

src/main/resources/jpowermonitor-template.yaml

@@ -1,4 +1,3 @@
-!!group.msg.jpowermonitor.config.JPowerMonitorConfig
 # Number of initial calls to open hardware monitor for measuring the power consumption in idle mode (without running any tests)
 initCycles: 10
 # Sampling interval in milliseconds for the initialization period. This is the interval the data source for the sensor values is questioned for new values while measuring idle energy.

src/test/java/group/msg/jpowermonitor/ConfigProviderForTests.java

@@ -21,7 +21,7 @@ public JPowerMonitorConfig getCachedConfig() throws JPowerMonitorException {
     public JPowerMonitorConfig readConfig(String source) throws JPowerMonitorException {
         ClassLoader cl = ConfigProviderForTests.class.getClassLoader();
         try (InputStream input = cl.getResourceAsStream(source)) {
-            return new Yaml().load(input);
+            return new Yaml().loadAs(input, JPowerMonitorConfig.class);
         } catch (Exception exc) {
             throw new JPowerMonitorException(String.format("Cannot load config for tests from '%s'", source), exc);
         }

src/test/resources/CommaSeparatedValuesReaderTest.yaml

@@ -1,4 +1,3 @@
-!!group.msg.jpowermonitor.config.JPowerMonitorConfig
 initCycles: 1
 samplingIntervalForInitInMs: 1
 calmDownIntervalInMs: 1

src/test/resources/DefaultConfigProviderTest.yaml

@@ -1,4 +1,3 @@
-!!group.msg.jpowermonitor.config.JPowerMonitorConfig
 initCycles: 7
 samplingIntervalForInitInMs: 8
 calmDownIntervalInMs: 9

src/test/resources/EndlessLoopTest.yaml

@@ -1,4 +1,3 @@
-!!group.msg.jpowermonitor.config.JPowerMonitorConfig
 initCycles: 0
 samplingIntervalForInitInMs: 1
 calmDownIntervalInMs: 1

src/test/resources/JPowerMonitorConfigTest.yaml

@@ -1,4 +1,3 @@
-!!group.msg.jpowermonitor.config.JPowerMonitorConfig
 # Number of initial calls to open hardware monitor for measuring the power consumption in idle mode (without running any tests)
 initCycles: 10
 # Sampling interval in milliseconds for the initialization period. This is the interval the data source for the sensor values is questioned for new values while measuring idle energy.

src/test/resources/MyTest.yaml

@@ -1,4 +1,3 @@
-!!group.msg.jpowermonitor.config.JPowerMonitorConfig
 initCycles: 0
 samplingIntervalForInitInMs: 1
 calmDownIntervalInMs: 1