From 4a8b750ff98ee1e777c8defc25fc95ec41c97a20 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Fri, 10 Jul 2020 10:06:13 +0200 Subject: [PATCH] Rename restoreInProgress --- .../java/bubble/server/BubbleConfiguration.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java index a029fc57..002f3f6b 100644 --- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java +++ b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java @@ -48,7 +48,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import javax.annotation.Nullable; import java.beans.Transient; import java.io.File; import java.util.*; @@ -92,7 +91,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration public static final String TAG_SUPPORT = "support"; public static final String TAG_SECURITY_LEVELS = "securityLevels"; public static final String TAG_RESTORE_MODE = "awaitingRestore"; - public static final String TAG_RESTORING_IN_PROGRESS = "restoringInProgress"; + public static final String TAG_RESTORING_IN_PROGRESS = "restoreInProgress"; public static final String TAG_JAR_VERSION = "jarVersion"; public static final String TAG_JAR_UPGRADE_AVAILABLE = "jarUpgradeAvailable"; @@ -353,17 +352,6 @@ public class BubbleConfiguration extends PgRestServerConfiguration } } - /** - * Return true if it is expected from the user to fillin data required for starting backup restoring process on - * this node of this network. - */ - private boolean isRestoringInProgress(@Nullable final BubbleNetwork thisNetwork) { - if (thisNetwork == null || thisNetwork.getState() != BubbleNetworkState.restoring) return false; - - // if restore process is already started, do not show the form to user again: - return !getBean(RestoreService.class).isSelfRestoreStarted(); - } - // called after activation, because now thisNetwork will be defined public void refreshPublicSystemConfigs () { synchronized (publicSystemConfigs) { publicSystemConfigs.set(null); }