From ba3c13b388823a69e5821aa5d3006e3b1cc01923 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 17 Nov 2016 09:38:01 +0100 Subject: [PATCH] SONAR-8151 remove property category Organizations from UI for 6.2 --- .../ComputeEngineContainerImplTest.java | 2 +- .../core/config/CorePropertyDefinitions.java | 21 +++++++++++-------- .../config/CorePropertyDefinitionsTest.java | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index a31db40f3ee..35fbd48101b 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -108,7 +108,7 @@ public class ComputeEngineContainerImplTest { + 26 // level 1 + 47 // content of DaoModule + 2 // content of EsSearchModule - + 63 // content of CorePropertyDefinitions + + 62 // content of CorePropertyDefinitions + 1 // content of CePropertyDefinitions ); assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull(); diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index 32e595df780..03a10b6e8c8 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -292,15 +292,18 @@ public class CorePropertyDefinitions { .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_DUPLICATIONS_EXCLUSIONS) .multiValues(true) - .build(), - - // ORGANIZATIONS - PropertyDefinition.builder(ORGANIZATIONS_ANYONE_CAN_CREATE) - .name("Allow any authenticated user to create organizations") - .defaultValue(Boolean.toString(false)) - .category(CATEGORY_ORGANIZATIONS) - .type(PropertyType.BOOLEAN) - .build())); + .build() +// FIXME remove organization property category from UI for release 6.2 +// , +// +// // ORGANIZATIONS +// PropertyDefinition.builder(ORGANIZATIONS_ANYONE_CAN_CREATE) +// .name("Allow any authenticated user to create organizations") +// .defaultValue(Boolean.toString(false)) +// .category(CATEGORY_ORGANIZATIONS) +// .type(PropertyType.BOOLEAN) +// .build() + )); return defs; } } diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java index 470cc2f2ed8..bf9d2501497 100644 --- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java @@ -35,7 +35,7 @@ public class CorePropertyDefinitionsTest { @Test public void all() { List defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(65); + assertThat(defs).hasSize(64); } @Test -- 2.39.5