aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-ce/src
diff options
context:
space:
mode:
authorPierre Guillot <50145663+pierre-guillot-sonarsource@users.noreply.github.com>2022-06-07 09:48:04 +0200
committersonartech <sonartech@sonarsource.com>2022-06-07 20:03:10 +0000
commit4597d09ca1a81c86a56f416d2a9b4cb27e6ca4c2 (patch)
tree454cac73481faf13d3773caab4c5026fbb4541f4 /server/sonar-ce/src
parent624f20e1bbcda0bd58e544144b023ad345d582f6 (diff)
downloadsonarqube-4597d09ca1a81c86a56f416d2a9b4cb27e6ca4c2.tar.gz
sonarqube-4597d09ca1a81c86a56f416d2a9b4cb27e6ca4c2.zip
SONAR-16449 remove SonarCloud references in SonarQube codebase
Diffstat (limited to 'server/sonar-ce/src')
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/cleaning/NoopCeCleaningSchedulerImpl.java27
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java9
2 files changed, 1 insertions, 35 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/cleaning/NoopCeCleaningSchedulerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/cleaning/NoopCeCleaningSchedulerImpl.java
deleted file mode 100644
index fb8ca7b3cff..00000000000
--- a/server/sonar-ce/src/main/java/org/sonar/ce/cleaning/NoopCeCleaningSchedulerImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2022 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.ce.cleaning;
-
-public class NoopCeCleaningSchedulerImpl implements CeCleaningScheduler {
- @Override
- public void startScheduling() {
- // do nothing
- }
-}
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
index ff9eea4f9f0..fd41e64a6c4 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
@@ -47,7 +47,6 @@ import org.sonar.ce.CeTaskCommonsModule;
import org.sonar.ce.StandaloneCeDistributedInformation;
import org.sonar.ce.async.SynchronousAsyncExecution;
import org.sonar.ce.cleaning.CeCleaningModule;
-import org.sonar.ce.cleaning.NoopCeCleaningSchedulerImpl;
import org.sonar.ce.db.ReadOnlyPropertiesDao;
import org.sonar.ce.issue.index.NoAsyncIssueIndexing;
import org.sonar.ce.logging.CeProcessLogging;
@@ -157,7 +156,6 @@ import static org.sonar.core.extension.CoreExtensionsInstaller.noAdditionalSideF
import static org.sonar.core.extension.PlatformLevelPredicates.hasPlatformLevel;
import static org.sonar.core.extension.PlatformLevelPredicates.hasPlatformLevel4OrNone;
import static org.sonar.process.ProcessProperties.Property.CLUSTER_ENABLED;
-import static org.sonar.process.ProcessProperties.Property.SONARCLOUD_ENABLED;
public class ComputeEngineContainerImpl implements ComputeEngineContainer {
@@ -452,12 +450,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
);
- if (props.valueAsBoolean(SONARCLOUD_ENABLED.getKey())) {
- // no cleaning job on sonarcloud and no distributed information
- container.add(
- NoopCeCleaningSchedulerImpl.class,
- StandaloneCeDistributedInformation.class);
- } else if (props.valueAsBoolean(CLUSTER_ENABLED.getKey())) {
+ if (props.valueAsBoolean(CLUSTER_ENABLED.getKey())) {
container.add(
new CeCleaningModule(),