From 4a07739148b209f6a16131b8473f77f83f4053dd Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 1 Jun 2018 10:29:29 +0200 Subject: [PATCH] SONAR-10818 rename edition "data_center" to "datacenter" Match the key of license generator --- .../java/org/sonar/core/platform/EditionProvider.java | 2 +- .../sonar/core/platform/PlatformEditionProviderTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sonar-core/src/main/java/org/sonar/core/platform/EditionProvider.java b/sonar-core/src/main/java/org/sonar/core/platform/EditionProvider.java index fa0dd84ea1f..75dd00acf85 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/EditionProvider.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/EditionProvider.java @@ -30,7 +30,7 @@ public interface EditionProvider { COMMUNITY("Community"), DEVELOPER("Developer"), ENTERPRISE("Enterprise"), - DATA_CENTER("Data Center"); + DATACENTER("Data Center"); private final String label; diff --git a/sonar-core/src/test/java/org/sonar/core/platform/PlatformEditionProviderTest.java b/sonar-core/src/test/java/org/sonar/core/platform/PlatformEditionProviderTest.java index 032d9fbcd19..95bc1905f30 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/PlatformEditionProviderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/PlatformEditionProviderTest.java @@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException; import static java.util.Optional.of; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.core.platform.EditionProvider.Edition.COMMUNITY; -import static org.sonar.core.platform.EditionProvider.Edition.DATA_CENTER; +import static org.sonar.core.platform.EditionProvider.Edition.DATACENTER; import static org.sonar.core.platform.EditionProvider.Edition.DEVELOPER; public class PlatformEditionProviderTest { @@ -47,19 +47,19 @@ public class PlatformEditionProviderTest { @Test public void returns_edition_from_other_EditionProvider_in_any_container() { ComponentContainer container = new ComponentContainer(); - container.add((EditionProvider) () -> of(DATA_CENTER)); + container.add((EditionProvider) () -> of(DATACENTER)); ComponentContainer child = new ComponentContainer(container); child.add(PlatformEditionProvider.class); assertThat(container.getComponentByType(PlatformEditionProvider.class)).isNull(); PlatformEditionProvider platformEditionProvider = child.getComponentByType(PlatformEditionProvider.class); - assertThat(platformEditionProvider.get()).contains(DATA_CENTER); + assertThat(platformEditionProvider.get()).contains(DATACENTER); } @Test public void get_fails_with_ISE_if_there_is_more_than_one_other_EditionProvider_in_any_container() { ComponentContainer container = new ComponentContainer(); - container.add((EditionProvider) () -> of(DATA_CENTER)); + container.add((EditionProvider) () -> of(DATACENTER)); ComponentContainer child = new ComponentContainer(container); child.add((EditionProvider) () -> of(DEVELOPER)); child.add(PlatformEditionProvider.class); -- 2.39.5