Переглянути джерело

Use == instead of equals on enums

pull/20/head
Kristijan Mitrovic 4 роки тому
джерело
коміт
408a5a1b00
3 змінених файлів з 5 додано та 5 видалено
  1. +1
    -1
      bubble-server/src/main/java/bubble/resources/account/AuthResource.java
  2. +1
    -1
      bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
  3. +3
    -3
      bubble-server/src/main/java/bubble/server/listener/BubbleFirstTimeListener.java

+ 1
- 1
bubble-server/src/main/java/bubble/resources/account/AuthResource.java Переглянути файл

@@ -112,7 +112,7 @@ public class AuthResource {
@GET @Path(EP_READY)
public Response getNodeIsReady(@Context ContainerRequest ctx) {
try {
if (configuration.getThisNetwork().getState().equals(BubbleNetworkState.restoring)) return ok();
if (configuration.getThisNetwork().getState() == BubbleNetworkState.restoring) return ok();
if (deviceDAO.findByAccountAndUninitialized(accountDAO.getFirstAdmin().getUuid())
.stream()
.anyMatch(Device::configsOk)) {


+ 1
- 1
bubble-server/src/main/java/bubble/server/BubbleConfiguration.java Переглянути файл

@@ -306,7 +306,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
{TAG_LAUNCH_LOCK, isSageLauncher() || thisNetwork == null ? null : thisNetwork.launchLock()},
{TAG_RESTORE_MODE, thisNetwork == null
? false
: thisNetwork.getState().equals(BubbleNetworkState.restoring)
: thisNetwork.getState() == BubbleNetworkState.restoring
&& !restoreService.isRestoreStarted(thisNetwork.getUuid())},
{TAG_SSL_PORT, getDefaultSslPort()},
{TAG_SUPPORT, getSupport()},


+ 3
- 3
bubble-server/src/main/java/bubble/server/listener/BubbleFirstTimeListener.java Переглянути файл

@@ -114,9 +114,9 @@ public class BubbleFirstTimeListener extends RestServerLifecycleListenerBase<Bub

private void updateNetworkState(@NonNull final BubbleConfiguration config, @NonNull final BubbleNetwork network,
@NonNull final FirstTimeType firstTimeType) {
if (network.getState().equals(BubbleNetworkState.starting)) {
network.setState(firstTimeType.equals(FirstTimeType.restore) ? BubbleNetworkState.restoring
: BubbleNetworkState.running);
if (network.getState() == BubbleNetworkState.starting) {
network.setState(firstTimeType == FirstTimeType.restore ? BubbleNetworkState.restoring
: BubbleNetworkState.running);
config.getBean(BubbleNetworkDAO.class).update(network);
}
}


Завантаження…
Відмінити
Зберегти