Merge pull request #707 from zanata/remove-help-content-reference

Remove reference of helpContent
zanata · Mar 5, 2015 · ec98f24 · ec98f24
2 parents cadeb3d + d801ade
commit ec98f24
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java b/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
@@ -44,13 +44,19 @@
 @AllArgsConstructor
 public class HApplicationConfiguration extends ModelEntityBase {
 
+    /**
+     * obsolete data key. Help content was removed from UI but the content was
+     * left in the database for reference purposes.
+     */
+    @Deprecated
+    public static String KEY_HELP_CONTENT = "pages.help.content";
+
     public static String KEY_HOST = "host.url";
     public static String KEY_REGISTER = "register.url";
     public static String KEY_DOMAIN = "email.domain";
     public static String KEY_ADMIN_EMAIL = "email.admin.addr";
     public static String KEY_EMAIL_FROM_ADDRESS = "email.from.addr";
     public static String KEY_HOME_CONTENT = "pages.home.content";
-    public static String KEY_HELP_CONTENT = "pages.help.content";
     public static String KEY_LOG_DESTINATION_EMAIL = "log.destination.email";
     public static String KEY_EMAIL_LOG_EVENTS = "log.email.active";
     public static String KEY_EMAIL_LOG_LEVEL = "log.email.level";

diff --git a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
@@ -296,10 +296,6 @@ public String getHomeContent() {
         return databaseBackedConfig.getHomeContent();
     }
 
-    public String getHelpContent() {
-        return databaseBackedConfig.getHelpContent();
-    }
-
     public String getHelpUrl() {
         return databaseBackedConfig.getHelpUrl();
     }

diff --git a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
@@ -98,11 +98,6 @@ public class ServerConfigurationBean implements Serializable {
     private String homeContent = "";
     private PropertyWithKey<String> homeContentProperty = new PropertyWithKey<String>("homeContent", KEY_HOME_CONTENT);
 
-    @Getter
-    @Setter
-    private String helpContent = "";
-    private PropertyWithKey<String> helpContentProperty = new PropertyWithKey<String>("helpContent", KEY_HELP_CONTENT);
-
     @Getter
     @Setter
     private boolean enableLogEmail;
@@ -164,8 +159,7 @@ public class ServerConfigurationBean implements Serializable {
             new PropertyWithKey<String>("maxConcurrentRequestsPerApiKey", KEY_MAX_CONCURRENT_REQ_PER_API_KEY),
             new PropertyWithKey<String>("maxActiveRequestsPerApiKey", KEY_MAX_ACTIVE_REQ_PER_API_KEY),
             new PropertyWithKey<String>("maxFilesPerUpload", KEY_MAX_FILES_PER_UPLOAD),
-            homeContentProperty,
-            helpContentProperty
+            homeContentProperty
     );
 
     public String updateHomeContent() {

diff --git a/zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java b/zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
@@ -120,10 +120,6 @@ public String getEmailLogLevel() {
         return getConfigValue(HApplicationConfiguration.KEY_EMAIL_LOG_LEVEL);
     }
 
-    public String getHelpContent() {
-        return getConfigValue(HApplicationConfiguration.KEY_HELP_CONTENT);
-    }
-
     public String getHelpUrl() {
         return getConfigValue(HApplicationConfiguration.KEY_HELP_URL);
     }

diff --git a/zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java b/zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
@@ -69,11 +69,4 @@ public void getNonExistentValue() throws Exception {
         // This value is NOT provided in the DB Unit script above
         assertThat(databaseBackedConfig.getAdminEmailAddress(), nullValue());
     }
-
-    @Test
-    public void reset() {
-        String original = databaseBackedConfig.getHelpContent();
-        databaseBackedConfig.reset();
-        assertThat(databaseBackedConfig.getHelpContent(), equalTo(original));
-    }
 }