Skip to content
This repository has been archived by the owner on Nov 11, 2024. It is now read-only.

Commit

Permalink
Minor refactor to reduce duplicate prefix concatenation
Browse files Browse the repository at this point in the history 
Signed-off-by: Eamonn Mansour <[email protected]>
  • Loading branch information
@eamansour
eamansour committed Oct 7, 2024
1 parent d6cd592 commit 005d973
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions galasa-parent/dev.galasa.framework/src/main/java/dev/galasa/framework/FrameworkRuns.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,39 +207,41 @@ private boolean storeRun(String runName, SubmitRunRequest runRequest) throws Dyn
boolean local = runRequest.isLocalRun();
boolean trace = runRequest.isTraceEnabled();

String runPropertyPrefix = RUN_PREFIX + runName;

// *** Set up the otherRunProperties that will go with the Run number
HashMap<String, String> otherRunProperties = new HashMap<>();
otherRunProperties.put(RUN_PREFIX + runName + ".status", "queued");
otherRunProperties.put(RUN_PREFIX + runName + ".queued", Instant.now().toString());
otherRunProperties.put(RUN_PREFIX + runName + ".testbundle", bundleName);
otherRunProperties.put(RUN_PREFIX + runName + ".testclass", testName);
otherRunProperties.put(RUN_PREFIX + runName + ".request.type", runType);
otherRunProperties.put(RUN_PREFIX + runName + ".local", Boolean.toString(local));
otherRunProperties.put(runPropertyPrefix + ".status", "queued");
otherRunProperties.put(runPropertyPrefix + ".queued", Instant.now().toString());
otherRunProperties.put(runPropertyPrefix + ".testbundle", bundleName);
otherRunProperties.put(runPropertyPrefix + ".testclass", testName);
otherRunProperties.put(runPropertyPrefix + ".request.type", runType);
otherRunProperties.put(runPropertyPrefix + ".local", Boolean.toString(local));
if (trace) {
otherRunProperties.put(RUN_PREFIX + runName + ".trace", "true");
otherRunProperties.put(runPropertyPrefix + ".trace", "true");
}
if (mavenRepository != null) {
otherRunProperties.put(RUN_PREFIX + runName + ".repository", mavenRepository);
otherRunProperties.put(runPropertyPrefix + ".repository", mavenRepository);
}
if (obr != null) {
otherRunProperties.put(RUN_PREFIX + runName + ".obr", obr);
otherRunProperties.put(runPropertyPrefix + ".obr", obr);
}
if (stream != null) {
otherRunProperties.put(RUN_PREFIX + runName + ".stream", stream);
otherRunProperties.put(runPropertyPrefix + ".stream", stream);
}
if (groupName != null) {
otherRunProperties.put(RUN_PREFIX + runName + ".group", groupName);
otherRunProperties.put(runPropertyPrefix + ".group", groupName);
} else {
otherRunProperties.put(RUN_PREFIX + runName + ".group", UUID.randomUUID().toString());
otherRunProperties.put(runPropertyPrefix + ".group", UUID.randomUUID().toString());
}
otherRunProperties.put(RUN_PREFIX + runName + ".requestor", requestor.toLowerCase());
otherRunProperties.put(runPropertyPrefix + ".requestor", requestor.toLowerCase());

if (sharedEnvironmentPhase != null) {
otherRunProperties.put(RUN_PREFIX + runName + ".shared.environment", "true");
otherRunProperties.put(runPropertyPrefix + ".shared.environment", "true");
overrides.put("framework.run.shared.environment.phase", sharedEnvironmentPhase.toString());
}
if(gherkinTest != null) {
otherRunProperties.put(RUN_PREFIX + runName + ".gherkin", gherkinTest);
if (gherkinTest != null) {
otherRunProperties.put(runPropertyPrefix + ".gherkin", gherkinTest);
}

// *** Add in the overrides as a single property
Expand All @@ -249,12 +251,12 @@ private boolean storeRun(String runName, SubmitRunRequest runRequest) throws Dyn
.map((entry) -> entry.getKey() + "=" + entry.getValue())
.collect(Collectors.joining("\n"));

otherRunProperties.put(RUN_PREFIX + runName + ".overrides", overridesStr);
otherRunProperties.put(runPropertyPrefix + ".overrides", overridesStr);
}

// *** See if we can setup the runnumber properties (clashes possible if low max
// number or sharing prefix
return this.dss.putSwap(RUN_PREFIX + runName + ".test", null, bundleTest, otherRunProperties);
return this.dss.putSwap(runPropertyPrefix + ".test", null, bundleTest, otherRunProperties);
}

@Override
Expand Down Expand Up @@ -340,11 +342,12 @@ private void setDiscardSharedEnvironmentPhaseProperties(IRun run, String sharedE
}

HashMap<String, String> otherProperties = new HashMap<>();
otherProperties.put(RUN_PREFIX + sharedEnvironmentRunName + ".overrides", "framework.run.shared.environment.phase=" + SharedEnvironmentPhase.DISCARD.toString());
String runPropertyPrefix = RUN_PREFIX + sharedEnvironmentRunName;
otherProperties.put(runPropertyPrefix + ".overrides", "framework.run.shared.environment.phase=" + SharedEnvironmentPhase.DISCARD.toString());
if (groupName != null) {
otherProperties.put(RUN_PREFIX + sharedEnvironmentRunName + ".group", groupName);
otherProperties.put(runPropertyPrefix + ".group", groupName);
}
if (!this.dss.putSwap(RUN_PREFIX + sharedEnvironmentRunName + ".status", "up", "queued", otherProperties)) {
if (!this.dss.putSwap(runPropertyPrefix + ".status", "up", "queued", otherProperties)) {
throw new FrameworkException("Failed to switch Shared Environment " + sharedEnvironmentRunName + " to discard");
}
}
Expand Down

0 comments on commit 005d973

Please sign in to comment.