From 8290a1feaf4bec966be00919cbe5963d4b6e3867 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <k.reinhard@micromata.de>
Date: Mon, 14 Jan 2019 16:23:37 +0000
Subject: [PATCH] Merge pull request #18 from kreinhard/master
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java | 9 ---------
1 files changed, 0 insertions(+), 9 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 d3f0ad8..ce67240 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,12 +1,9 @@
package de.micromata.borgbutler.server;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import de.micromata.borgbutler.cache.ButlerCache;
import de.micromata.borgbutler.config.Configuration;
import de.micromata.borgbutler.config.ConfigurationHandler;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,16 +12,11 @@
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 = WEBSERVER_PORT_DEFAULT;
- @Getter
- @Setter
- @JsonIgnore
- private boolean showTestData = SHOW_TEST_DATA_PREF_DEFAULT;
private boolean webDevelopmentMode = WEB_DEVELOPMENT_MODE_PREF_DEFAULT;
@JsonProperty
public String getCacheDir() {
@@ -72,7 +64,6 @@
public void copyFrom(ServerConfiguration other) {
super.copyFrom(other);
this.port = other.port;
- this.showTestData = other.showTestData;
this.webDevelopmentMode = other.webDevelopmentMode;
}
}
--
Gitblit v1.10.0