Skip to content

Commit 39aa279

Browse files
applied rest of refactoring
1 parent 540abee commit 39aa279

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public ConfigurationHolder(URI configurationLocation) {
5555

5656
this.configurationLocation = configurationLocation;
5757
this.configurationPath = FileSystemUtil.createFileSystemDependentPath(configurationLocation);
58-
this.configurationProperties = ConfigurationFinder.loadTemplateSetConfigurations(
58+
this.configurationProperties = ConfigurationFinder.retrieveCobiGenProperties(
5959
CobiGenPaths.getCobiGenHomePath().resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE));
6060

6161
// updates the root template path and informs all of its observers

cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/ConfigurationFinderTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void emptyConfigurationTest() throws IOException {
4444

4545
Path emptyConfiguration = Paths
4646
.get("src/test/resources/testdata/unittest/config/properties/emptyConfigProperties/config.properties");
47-
ConfigurationProperties conf = ConfigurationFinder.loadTemplateSetConfigurations(emptyConfiguration);
47+
ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(emptyConfiguration);
4848

4949
assertThat(conf.getGroupIds()).contains(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID);
5050
assertThat(conf.getHideTemplates()).isEmpty();
@@ -62,7 +62,7 @@ public void validConfigurationTest() throws IOException {
6262

6363
Path validConfiguration = Paths
6464
.get("src/test/resources/testdata/unittest/config/properties/validConfigProperties/config.properties");
65-
ConfigurationProperties conf = ConfigurationFinder.loadTemplateSetConfigurations(validConfiguration);
65+
ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(validConfiguration);
6666

6767
assertThat(conf.getGroupIds()).containsSequence("devonfw-cobigen-bla", "abcd", "blablob",
6868
ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID);
@@ -83,7 +83,7 @@ public void invalidInputConfigurationTest() throws IOException {
8383

8484
Path validConfiguration = Paths
8585
.get("src/test/resources/testdata/unittest/config/properties/invalidConfigProperties/config.properties");
86-
ConfigurationProperties conf = ConfigurationFinder.loadTemplateSetConfigurations(validConfiguration);
86+
ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(validConfiguration);
8787

8888
assertTrue(conf.getHideTemplates().isEmpty());
8989
assertTrue(conf.getMavenCoordinates().isEmpty());
@@ -100,7 +100,7 @@ public void invalidInputConfigurationTest() throws IOException {
100100
public void invalidPathTest() throws IOException {
101101

102102
Path invalidPath = Paths.get("path/which/does/not/exist");
103-
ConfigurationProperties conf = ConfigurationFinder.loadTemplateSetConfigurations(invalidPath);
103+
ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(invalidPath);
104104

105105
assertThat(conf.getGroupIds()).contains(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID);
106106
assertThat(conf.getHideTemplates()).isEmpty();

0 commit comments

Comments
 (0)