Skip to content

Commit d240688

Browse files
committed
#128 | Refactored environment validation for Goonje to use dedicated method
- Extracted Goonje environment validation into isGoonjEnvironmentValid() method - Moved isRwbEnvironmentValid() method to bottom of class for consistency - Changed scheduleGoonje() to use isGoonjEnvironmentValid() instead of direct validateEnvironment() call
1 parent a5c0888 commit d240688

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

integrator/src/main/java/org/avni_integration_service/scheduler/IntegrationJobScheduler.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private boolean scheduleGoonj() {
122122
IntegrationSystemConfigCollection integrationSystemConfigs = integrationSystemConfigRepository.getInstanceConfiguration(goonjSystem);
123123
GoonjConfig goonjConfig = new GoonjConfig(integrationSystemConfigs, goonjSystem);
124124

125-
if (!validateEnvironment(goonjSystem.getName(), goonjConfig.getEnvironment())) {
125+
if (!isGoonjEnvironmentValid(goonjConfig)) {
126126
continue;
127127
}
128128

@@ -178,10 +178,6 @@ private boolean validateEnvironment(String systemName, String dbEnv) {
178178
return true;
179179
}
180180

181-
private boolean isRwbEnvironmentValid(RwbConfig rwbConfig) {
182-
return validateEnvironment(rwbConfig.getIntegrationSystem().getName(), rwbConfig.getEnvironment());
183-
}
184-
185181
private boolean scheduleAmrit() {
186182
logger.info("--- Amrit Module ---");
187183
boolean scheduled = false;
@@ -271,4 +267,13 @@ private boolean scheduleRwb() {
271267
}
272268
return anyScheduled;
273269
}
270+
271+
272+
private boolean isRwbEnvironmentValid(RwbConfig rwbConfig) {
273+
return validateEnvironment(rwbConfig.getIntegrationSystem().getName(), rwbConfig.getEnvironment());
274+
}
275+
276+
private boolean isGoonjEnvironmentValid(GoonjConfig goonjConfig) {
277+
return validateEnvironment(goonjConfig.getIntegrationSystem().getName(), goonjConfig.getEnvironment());
278+
}
274279
}

0 commit comments

Comments
 (0)