From c8b9191e461a5ad31860e961ee49f2f2098927e9 Mon Sep 17 00:00:00 2001 From: Guillaume Jambet Date: Thu, 2 Nov 2017 15:31:34 +0100 Subject: [PATCH] SONAR-10040 move projectbranch ws to package branch --- .../ws/BranchWsAction.java | 2 +- .../ws/BranchWsModule.java | 2 +- .../ws/BranchesWs.java | 2 +- .../ws/DeleteAction.java | 6 ++--- .../ws/ListAction.java | 4 ++-- .../ws/RenameAction.java | 4 ++-- .../ws}/package-info.java | 2 +- .../platformlevel/PlatformLevel4.java | 2 +- .../server/projectbranch/ws/package-info.java | 23 ------------------- .../ws/list-example.json | 0 .../ws/BranchWsModuleTest.java | 2 +- .../ws/BranchesWsTest.java | 2 +- .../ws/DeleteActionTest.java | 2 +- .../ws/ListActionTest.java | 2 +- .../ws/RenameActionTest.java | 2 +- 15 files changed, 17 insertions(+), 40 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch}/ws/BranchWsAction.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch}/ws/BranchWsModule.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch}/ws/BranchesWs.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch}/ws/DeleteAction.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch}/ws/ListAction.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch}/ws/RenameAction.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{projectbranch => branch/ws}/package-info.java (95%) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/package-info.java rename server/sonar-server/src/main/resources/org/sonar/server/{projectbranch => branch}/ws/list-example.json (100%) rename server/sonar-server/src/test/java/org/sonar/server/{projectbranch => branch}/ws/BranchWsModuleTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/{projectbranch => branch}/ws/BranchesWsTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/{projectbranch => branch}/ws/DeleteActionTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{projectbranch => branch}/ws/ListActionTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{projectbranch => branch}/ws/RenameActionTest.java (99%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java index 7a2c3f983b0..8f19fc4ac0d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsAction.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import org.sonar.server.ws.WsAction; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchWsModule.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java index da41f7aec81..73d421d28c6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchWsModule.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import org.sonar.core.platform.Module; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchesWs.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchesWs.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchesWs.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchesWs.java index 64657b98a15..7275130e1f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/BranchesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/BranchesWs.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import java.util.Arrays; import org.sonar.api.server.ws.WebService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/DeleteAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/DeleteAction.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/DeleteAction.java index 50c41916245..a04f6deed31 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/DeleteAction.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import com.google.common.io.Resources; import org.sonar.api.server.ws.Request; @@ -33,8 +33,8 @@ import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentFinder; import org.sonar.server.user.UserSession; -import static org.sonar.server.projectbranch.ws.BranchesWs.addBranchParam; -import static org.sonar.server.projectbranch.ws.BranchesWs.addProjectParam; +import static org.sonar.server.branch.ws.BranchesWs.addBranchParam; +import static org.sonar.server.branch.ws.BranchesWs.addProjectParam; import static org.sonar.server.ws.WsUtils.checkFoundWithOptional; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.ACTION_DELETE; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_BRANCH; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/ListAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/ListAction.java index cc575a3868a..078fb44ce6e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/ListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/ListAction.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import com.google.common.io.Resources; import java.util.Collection; @@ -57,7 +57,7 @@ import static org.sonar.core.util.stream.MoreCollectors.toList; import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex; import static org.sonar.db.component.BranchType.LONG; import static org.sonar.db.component.BranchType.SHORT; -import static org.sonar.server.projectbranch.ws.BranchesWs.addProjectParam; +import static org.sonar.server.branch.ws.BranchesWs.addProjectParam; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.ACTION_LIST; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_PROJECT; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/RenameAction.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/RenameAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/RenameAction.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/RenameAction.java index 3928c0aae00..9e4c6fb6561 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/RenameAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/RenameAction.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import java.util.Optional; import org.sonar.api.server.ws.Request; @@ -33,7 +33,7 @@ import org.sonar.server.component.ComponentFinder; import org.sonar.server.user.UserSession; import static com.google.common.base.Preconditions.checkArgument; -import static org.sonar.server.projectbranch.ws.BranchesWs.addProjectParam; +import static org.sonar.server.branch.ws.BranchesWs.addProjectParam; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.ACTION_RENAME; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_NAME; import static org.sonarqube.ws.client.projectbranches.ProjectBranchesParameters.PARAM_PROJECT; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/projectbranch/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/branch/ws/package-info.java index 6aa3bb36dc4..6e4b5e85b31 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/branch/ws/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.projectbranch; +package org.sonar.server.branch.ws; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index ccb703b4414..5df9ecf476c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -38,6 +38,7 @@ import org.sonar.server.authentication.AuthenticationModule; import org.sonar.server.authentication.LogOAuthWarning; import org.sonar.server.batch.BatchWsModule; import org.sonar.server.branch.BranchFeatureProxyImpl; +import org.sonar.server.branch.ws.BranchWsModule; import org.sonar.server.ce.ws.CeWsModule; import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentFinder; @@ -149,7 +150,6 @@ import org.sonar.server.plugins.ws.UninstallAction; import org.sonar.server.plugins.ws.UpdatesAction; import org.sonar.server.project.ws.ProjectsWsModule; import org.sonar.server.projectanalysis.ProjectAnalysisModule; -import org.sonar.server.projectbranch.ws.BranchWsModule; import org.sonar.server.projectlink.ws.ProjectLinksModule; import org.sonar.server.projecttag.ws.ProjectTagsWsModule; import org.sonar.server.property.InternalPropertiesImpl; diff --git a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/package-info.java deleted file mode 100644 index 86bd1e8363d..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/projectbranch/ws/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2017 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. - */ -@ParametersAreNonnullByDefault -package org.sonar.server.projectbranch.ws; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/resources/org/sonar/server/projectbranch/ws/list-example.json b/server/sonar-server/src/main/resources/org/sonar/server/branch/ws/list-example.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/projectbranch/ws/list-example.json rename to server/sonar-server/src/main/resources/org/sonar/server/branch/ws/list-example.json diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/BranchWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/BranchWsModuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java index 2ecb8a885a2..4b6c7d93e09 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/BranchWsModuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchWsModuleTest.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import org.junit.Test; import org.sonar.core.platform.ComponentContainer; diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/BranchesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/BranchesWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java index 9938bd991c0..4866279afa0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/BranchesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import org.junit.Test; import org.sonar.api.server.ws.Request; diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/DeleteActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java index 9112fe35ffa..5f40c2f106d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/DeleteActionTest.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import org.junit.Rule; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java index 81174c3c290..e008e9fe9b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import org.junit.Before; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/RenameActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/RenameActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java index e1dca4371db..85b6fc6b202 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectbranch/ws/RenameActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/RenameActionTest.java @@ -17,7 +17,7 @@ * 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.server.projectbranch.ws; +package org.sonar.server.branch.ws; import java.util.Optional; import org.junit.Rule; -- 2.39.5