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

Commit

Permalink
rhbz988202 - turn method into static before move
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Mar 10, 2014
1 parent 7575823 commit 17b563b
Showing 1 changed file with 19 additions and 17 deletions.
36 changes: 19 additions & 17 deletions zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
View file
Expand Up @@ -23,7 +23,6 @@
import java.io.Serializable;

import javax.validation.constraints.Digits;
import javax.validation.constraints.Pattern;

import lombok.AccessLevel;
import lombok.Getter;
Expand Down Expand Up @@ -118,7 +117,7 @@ public String updateHomeContent() {
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_HOME_CONTENT);
persistApplicationConfig(HApplicationConfiguration.KEY_HOME_CONTENT,
var, homeContent);
var, homeContent, applicationConfigurationDAO);
applicationConfigurationDAO.flush();

FacesMessages.instance().add("Home content was successfully updated.");
Expand All @@ -130,7 +129,7 @@ public String updateHelpContent() {
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_HELP_CONTENT);
persistApplicationConfig(HApplicationConfiguration.KEY_HELP_CONTENT,
var, helpContent);
var, helpContent, applicationConfigurationDAO);
applicationConfigurationDAO.flush();

FacesMessages.instance().add(
Expand Down Expand Up @@ -219,32 +218,32 @@ public void update() {
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_REGISTER);
persistApplicationConfig(HApplicationConfiguration.KEY_REGISTER,
registerUrlValue, registerUrl);
registerUrlValue, registerUrl, applicationConfigurationDAO);

HApplicationConfiguration serverUrlValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_HOST);
persistApplicationConfig(HApplicationConfiguration.KEY_HOST,
serverUrlValue, serverUrl);
serverUrlValue, serverUrl, applicationConfigurationDAO);

HApplicationConfiguration emailDomainValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_DOMAIN);
persistApplicationConfig(HApplicationConfiguration.KEY_DOMAIN,
emailDomainValue, emailDomain);
emailDomainValue, emailDomain, applicationConfigurationDAO);

HApplicationConfiguration adminEmailValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_ADMIN_EMAIL);
persistApplicationConfig(HApplicationConfiguration.KEY_ADMIN_EMAIL,
adminEmailValue, adminEmail);
adminEmailValue, adminEmail, applicationConfigurationDAO);

HApplicationConfiguration fromEmailAddrValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_EMAIL_FROM_ADDRESS);
persistApplicationConfig(
HApplicationConfiguration.KEY_EMAIL_FROM_ADDRESS,
fromEmailAddrValue, fromEmailAddr);
fromEmailAddrValue, fromEmailAddr, applicationConfigurationDAO);

HApplicationConfiguration emailLogEventsValue =
applicationConfigurationDAO
Expand All @@ -264,46 +263,49 @@ public void update() {
.findByKey(HApplicationConfiguration.KEY_LOG_DESTINATION_EMAIL);
persistApplicationConfig(
HApplicationConfiguration.KEY_LOG_DESTINATION_EMAIL,
logDestEmailValue, logDestinationEmails);
logDestEmailValue, logDestinationEmails,
applicationConfigurationDAO);

HApplicationConfiguration logEmailLevelValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_EMAIL_LOG_LEVEL);
persistApplicationConfig(HApplicationConfiguration.KEY_EMAIL_LOG_LEVEL,
logEmailLevelValue, logEmailLevel);
logEmailLevelValue, logEmailLevel, applicationConfigurationDAO);

HApplicationConfiguration piwikUrlValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_PIWIK_URL);
persistApplicationConfig(HApplicationConfiguration.KEY_PIWIK_URL,
piwikUrlValue, piwikUrl);
piwikUrlValue, piwikUrl, applicationConfigurationDAO);

HApplicationConfiguration piwikIdSiteValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_PIWIK_IDSITE);
persistApplicationConfig(HApplicationConfiguration.KEY_PIWIK_IDSITE,
piwikIdSiteValue, piwikIdSite);
piwikIdSiteValue, piwikIdSite, applicationConfigurationDAO);

HApplicationConfiguration termsOfUseUrlValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_TERMS_CONDITIONS_URL);
.findByKey(
HApplicationConfiguration.KEY_TERMS_CONDITIONS_URL);
persistApplicationConfig(
HApplicationConfiguration.KEY_TERMS_CONDITIONS_URL,
termsOfUseUrlValue, termsOfUseUrl);
termsOfUseUrlValue, termsOfUseUrl, applicationConfigurationDAO);

HApplicationConfiguration rateLimitValue =
applicationConfigurationDAO
.findByKey(HApplicationConfiguration.KEY_RATE_LIMIT_PER_SECOND);
persistApplicationConfig(
HApplicationConfiguration.KEY_RATE_LIMIT_PER_SECOND,
rateLimitValue, rateLimitPerSecond);
rateLimitValue, rateLimitPerSecond, applicationConfigurationDAO);

applicationConfigurationDAO.flush();
FacesMessages.instance().add("Configuration was successfully updated.");
}

private void persistApplicationConfig(String key,
HApplicationConfiguration appConfig, String newValue) {
private static void persistApplicationConfig(String key,
HApplicationConfiguration appConfig, String newValue,
ApplicationConfigurationDAO applicationConfigurationDAO) {
if (appConfig != null) {
if (newValue == null || newValue.isEmpty()) {
applicationConfigurationDAO.makeTransient(appConfig);
Expand Down

0 comments on commit 17b563b

Please sign in to comment.