opendev/gerrit
Code Issues Proposed changes

ConfigInfoImpl: Factor out initialization of MaxObjectSizeLimitInfo to a method

Browse Source 
Change-Id: I6803c76c23532671c8794267b69f1aaec206d696
This commit is contained in:
David Pursehouse
2018-08-03 16:26:24 +01:00
parent 7b0bb0f103
commit ad87670f59
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-server/src/main/java/com/google/gerrit/server/project/ConfigInfoImpl.java
View File

@@ -98,15 +98,7 @@ public class ConfigInfoImpl extends ConfigInfo {
this.requireSignedPush = requireSignedPush; this.requireSignedPush = requireSignedPush;
} }
MaxObjectSizeLimitInfo maxObjectSizeLimit = new MaxObjectSizeLimitInfo(); this.maxObjectSizeLimit = getMaxObjectSizeLimit(projectState, transferConfig, p);
maxObjectSizeLimit.value =
transferConfig.getEffectiveMaxObjectSizeLimit(projectState)
== transferConfig.getMaxObjectSizeLimit()
? transferConfig.getFormattedMaxObjectSizeLimit()
: p.getMaxObjectSizeLimit();
maxObjectSizeLimit.configuredValue = p.getMaxObjectSizeLimit();
maxObjectSizeLimit.inheritedValue = transferConfig.getFormattedMaxObjectSizeLimit();
this.maxObjectSizeLimit = maxObjectSizeLimit;
this.submitType = p.getSubmitType(); this.submitType = p.getSubmitType();
this.state = this.state =
@@ -130,6 +122,19 @@ public class ConfigInfoImpl extends ConfigInfo {
this.theme = projectState.getTheme(); this.theme = projectState.getTheme();
} }
private MaxObjectSizeLimitInfo getMaxObjectSizeLimit(
ProjectState projectState, TransferConfig transferConfig, Project p) {
MaxObjectSizeLimitInfo info = new MaxObjectSizeLimitInfo();
info.value =
transferConfig.getEffectiveMaxObjectSizeLimit(projectState)
== transferConfig.getMaxObjectSizeLimit()
? transferConfig.getFormattedMaxObjectSizeLimit()
: p.getMaxObjectSizeLimit();
info.configuredValue = p.getMaxObjectSizeLimit();
info.inheritedValue = transferConfig.getFormattedMaxObjectSizeLimit();
return info;
}
private Map<String, Map<String, ConfigParameterInfo>> getPluginConfig( private Map<String, Map<String, ConfigParameterInfo>> getPluginConfig(
ProjectState project, ProjectState project,
DynamicMap<ProjectConfigEntry> pluginConfigEntries, DynamicMap<ProjectConfigEntry> pluginConfigEntries,