SONAR-24091 Fix quality gate on master

8 files changed, 2 insertions, 36 deletions

diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/AppInstallationTokenGenerator.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/AppInstallationTokenGenerator.java
index 005bab043ce..0e4308856e6 100644
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/AppInstallationTokenGenerator.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/AppInstallationTokenGenerator.java
@@ -20,7 +20,6 @@
 package org.sonar.auth.github;
 
 import org.sonar.api.ce.ComputeEngineSide;
-import org.sonar.auth.github.client.GithubApplicationClient;
 
 import static java.lang.Long.parseLong;
 import static java.lang.String.format;
diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubIdentityProvider.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubIdentityProvider.java
index 5d8fbca23e6..ae7d67e40ae 100644
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubIdentityProvider.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubIdentityProvider.java
@@ -31,7 +31,6 @@ import org.sonar.api.server.authentication.OAuth2IdentityProvider;
 import org.sonar.api.server.authentication.UnauthorizedException;
 import org.sonar.api.server.authentication.UserIdentity;
 import org.sonar.api.server.http.HttpRequest;
-import org.sonar.auth.github.client.GithubApplicationClient;
 import org.sonar.auth.github.scribe.ScribeServiceBuilder;
 
 import static com.google.common.base.Preconditions.checkState;
diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/client/GithubApplicationClient.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GithubApplicationClient.java
index a2b41e081a3..78d26725201 100644
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/client/GithubApplicationClient.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GithubApplicationClient.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.auth.github.client;
+package org.sonar.auth.github;
 
 import com.google.gson.annotations.SerializedName;
 import java.util.List;
@@ -27,12 +27,6 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.server.ServerSide;
-import org.sonar.auth.github.ExpiringAppInstallationToken;
-import org.sonar.auth.github.GithubAppConfiguration;
-import org.sonar.auth.github.GithubAppInstallation;
-import org.sonar.auth.github.GithubBinding;
-import org.sonar.auth.github.GsonRepositoryCollaborator;
-import org.sonar.auth.github.GsonRepositoryTeam;
 import org.sonar.auth.github.security.AccessToken;
 import org.sonar.auth.github.security.UserAccessToken;
 
diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GithubBinding.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GithubBinding.java
index 70faf9c5562..42110ced47f 100644
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GithubBinding.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GithubBinding.java
@@ -24,7 +24,7 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
-import static org.sonar.auth.github.client.GithubApplicationClient.Repository;
+import static org.sonar.auth.github.GithubApplicationClient.Repository;
 
 public class GithubBinding {
 
diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/client/package-info.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/client/package-info.java
deleted file mode 100644
index 6b632a6238d..00000000000
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/client/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2024 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.auth.github.client;
-
-import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/AppInstallationTokenGeneratorTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/AppInstallationTokenGeneratorTest.java
index 5e508f0c029..38857b5ba74 100644
--- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/AppInstallationTokenGeneratorTest.java
+++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/AppInstallationTokenGeneratorTest.java
@@ -26,7 +26,6 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.sonar.auth.github.client.GithubApplicationClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubIdentityProviderTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubIdentityProviderTest.java
index 774daaca488..f6755abcea8 100644
--- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubIdentityProviderTest.java
+++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/GitHubIdentityProviderTest.java
@@ -30,7 +30,6 @@ import org.sonar.api.server.authentication.UnauthorizedException;
 import org.sonar.api.server.authentication.UserIdentity;
 import org.sonar.api.server.http.HttpRequest;
 import org.sonar.auth.github.GithubBinding.Permissions;
-import org.sonar.auth.github.client.GithubApplicationClient;
 import org.sonar.auth.github.scribe.ScribeServiceBuilder;
 import org.sonar.db.DbClient;
 import org.sonar.server.property.InternalProperties;
diff --git a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java
index 8662be1ce76..5762c2d2112 100644
--- a/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java
+++ b/server/sonar-auth-github/src/test/java/org/sonar/auth/github/IntegrationTest.java
@@ -40,7 +40,6 @@ import org.sonar.api.server.authentication.UserIdentity;
 import org.sonar.api.server.http.HttpRequest;
 import org.sonar.api.server.http.HttpResponse;
 import org.sonar.api.utils.System2;
-import org.sonar.auth.github.client.GithubApplicationClient;
 import org.sonar.auth.github.scribe.ScribeServiceBuilder;
 import org.sonar.db.DbTester;
 import org.sonar.server.http.JakartaHttpRequest;