@@ -43,15 +43,15 @@ public DesiredStateFile parseStateFile() {
43
43
DesiredStateFile .Builder builder = new DesiredStateFile .Builder ().mergeFrom (desiredStateFile );
44
44
SettingsFiles settingsFiles = desiredStateFile .getSettings ().get ().getFiles ().get ();
45
45
if (settingsFiles .getServices ().isPresent ()) {
46
- DesiredStateFile servicesFile = loadServiceFile (settingsFiles .getServices ().get ());
46
+ DesiredStateFile servicesFile = loadExternalFile (settingsFiles .getServices ().get (), "Services" );
47
47
builder .putAllServices (servicesFile .getServices ());
48
48
}
49
49
if (settingsFiles .getTopics ().isPresent ()) {
50
- DesiredStateFile topicsFile = loadTopicsFile (settingsFiles .getTopics ().get ());
50
+ DesiredStateFile topicsFile = loadExternalFile (settingsFiles .getTopics ().get (), "Topics" );
51
51
builder .putAllTopics (topicsFile .getTopics ());
52
52
}
53
53
if (settingsFiles .getUsers ().isPresent ()) {
54
- DesiredStateFile usersFile = loadUsersFile (settingsFiles .getUsers ().get ());
54
+ DesiredStateFile usersFile = loadExternalFile (settingsFiles .getUsers ().get (), "Users" );
55
55
builder .putAllUsers (usersFile .getUsers ());
56
56
}
57
57
return builder .build ();
@@ -88,28 +88,12 @@ public DesiredStateFile parseStateFile(File stateFile) {
88
88
}
89
89
}
90
90
91
- private DesiredStateFile loadServiceFile (String servicesFileName ) {
92
- File servicesFile = getAdditionalFile (servicesFileName );
93
- if (!servicesFile .exists ()) {
94
- throw new ValidationException (String .format ("Services file '%s' could not be found." , servicesFileName ));
91
+ private DesiredStateFile loadExternalFile (String fileName , String type ) {
92
+ File externalFile = getAdditionalFile (fileName );
93
+ if (!externalFile .exists ()) {
94
+ throw new ValidationException (String .format ("%s file '%s' could not be found." , type , fileName ));
95
95
}
96
- return parseStateFile (servicesFile );
97
- }
98
-
99
- private DesiredStateFile loadTopicsFile (String topicsFileName ) {
100
- File topicsFile = getAdditionalFile (topicsFileName );
101
- if (!topicsFile .exists ()) {
102
- throw new ValidationException (String .format ("Topics file '%s' could not be found." , topicsFileName ));
103
- }
104
- return parseStateFile (topicsFile );
105
- }
106
-
107
- private DesiredStateFile loadUsersFile (String usersFileName ) {
108
- File usersFile = getAdditionalFile (usersFileName );
109
- if (!usersFile .exists ()) {
110
- throw new ValidationException (String .format ("Users file '%s' could not be found." , usersFileName ));
111
- }
112
- return parseStateFile (usersFile );
96
+ return parseStateFile (externalFile );
113
97
}
114
98
115
99
private File getAdditionalFile (String fileName ) {
0 commit comments