eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-20 19:20:04 +00:00
Code Activity

Bug 4302: Simplified pipeline patching code

Browse Source
This commit is contained in:
Steffen Schaefer committed 2017-09-27 15:25:44 +02:00
1 parent d2ba0f9650
commit 514ad1fe32
1 file changed
+2 -8
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/settings/UserSettingsBuildingPipelineWithAdditionalSettingsLayers.java
+2 -8
View File
@@ -138,10 +138,7 @@ public class UserSettingsBuildingPipelineWithAdditionalSettingsLayers extends Us
@Override
public <CS extends Settings> StorableSettingsRepresentation getStorableRepresentationOfUserSettings(CS newSettings,
CS newInstance, Iterable<String> path) {
CS pipelinedSettings = SettingsUtil.copyDefaultsFromValues(newInstance, newInstance);
pipelinedSettings = SettingsUtil.copyDefaults(newSettings, newInstance); // overrides values which are set to
// default values
pipelinedSettings = applyPatchesForPipelineLevel(pipelinedSettings, PipelineLevel.SYSTEM_DEFAULTS, path,
CS pipelinedSettings = applyPatchesForPipelineLevel(newInstance, PipelineLevel.SYSTEM_DEFAULTS, path,
layersSettingsPatches);
pipelinedSettings = SettingsUtil.copyDefaultsFromValues(pipelinedSettings, pipelinedSettings);
@@ -175,10 +172,7 @@ public class UserSettingsBuildingPipelineWithAdditionalSettingsLayers extends Us
public <CS extends Settings> StorableSettingsRepresentation getStorableRepresentationOfDocumentSettings(
CS newSettings, CS newInstance,
StorableRepresentationOfDocumentAndUserSettings previousSettingsRepresentation, Iterable<String> path) {
CS pipelinedSettings = SettingsUtil.copyDefaultsFromValues(newInstance, newInstance);
pipelinedSettings = SettingsUtil.copyDefaults(newSettings, newInstance); // overrides values which are set to
// default values
pipelinedSettings = applyPatchesForPipelineLevel(pipelinedSettings, PipelineLevel.SYSTEM_DEFAULTS, path,
CS pipelinedSettings = applyPatchesForPipelineLevel(newInstance, PipelineLevel.SYSTEM_DEFAULTS, path,
layersSettingsPatches);
pipelinedSettings = SettingsUtil.copyDefaultsFromValues(pipelinedSettings, pipelinedSettings);