From 0bdefbf053beb80736eff0a13fe8b90618c8d6dc Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 21 Dec 2018 22:56:09 +0000
Subject: [PATCH] ServerConfiguration is also stored in json.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java
index 516db28..d6b7074 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java
@@ -1,5 +1,9 @@
package de.micromata.borgbutler.server;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import de.micromata.borgbutler.config.Configuration;
+import de.micromata.borgbutler.config.ConfigurationHandler;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
@@ -8,20 +12,24 @@
import java.beans.Transient;
-public class ServerConfiguration {
+public class ServerConfiguration extends Configuration {
private static Logger log = LoggerFactory.getLogger(ServerConfiguration.class);
private final static String[] SUPPORTED_LANGUAGES = {"en", "de"};
+ public static final int WEBSERVER_PORT_DEFAULT = 9042;
+ private static final boolean SHOW_TEST_DATA_PREF_DEFAULT = false;
+ private static final boolean WEB_DEVELOPMENT_MODE_PREF_DEFAULT = false;
+
private static String applicationHome;
- private int port;
+ private int port = WEBSERVER_PORT_DEFAULT;
@Getter
@Setter
- private boolean showTestData = true;
- private boolean webDevelopmentMode = false;
- private boolean templatesDirModified = false;
+ @JsonIgnore
+ private boolean showTestData = SHOW_TEST_DATA_PREF_DEFAULT;
+ private boolean webDevelopmentMode = WEB_DEVELOPMENT_MODE_PREF_DEFAULT;
- public static ServerConfiguration getDefault() {
- return ServerConfigurationHandler.getDefaultConfiguration();
+ public static ServerConfiguration get() {
+ return (ServerConfiguration)ConfigurationHandler.getConfiguration();
}
public static String[] getSupportedLanguages() {
@@ -39,15 +47,6 @@
return applicationHome;
}
- public void resetModifiedFlag() {
- templatesDirModified = false;
- }
-
- @Transient
- public boolean isTemplatesDirModified() {
- return templatesDirModified;
- }
-
public int getPort() {
return port;
}
@@ -68,6 +67,7 @@
}
public void copyFrom(ServerConfiguration other) {
+ super.copyFrom(other);
this.port = other.port;
this.showTestData = other.showTestData;
this.webDevelopmentMode = other.webDevelopmentMode;
--
Gitblit v1.10.0