From 578f62ca8629592fc3a2d654ec619de3ad268653 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 22 Jun 2018 17:27:53 +0200 Subject: [PATCH] move ServerLogging to server-common --- .../org/sonar/ce/container/ComputeEngineContainerImpl.java | 2 +- .../java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java | 2 +- .../org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java | 2 +- .../src/main/java/org/sonar/server/log}/ServerLogging.java | 3 +-- .../src/test/java/org/sonar/server/log}/ServerLoggingTest.java | 3 +-- .../server/platform/monitoring/StandaloneSystemSection.java | 2 +- .../server/platform/monitoring/cluster/LoggingSection.java | 2 +- .../sonar/server/platform/platformlevel/PlatformLevel4.java | 2 +- .../sonar/server/platform/ws/ChangeLogLevelClusterService.java | 2 +- .../server/platform/ws/ChangeLogLevelStandaloneService.java | 2 +- .../src/main/java/org/sonar/server/platform/ws/LogsAction.java | 2 +- .../platform/monitoring/StandaloneSystemSectionTest.java | 2 +- .../server/platform/monitoring/cluster/LoggingSectionTest.java | 2 +- .../org/sonar/server/platform/ws/ChangeLogLevelActionTest.java | 2 +- .../test/java/org/sonar/server/platform/ws/LogsActionTest.java | 2 +- 15 files changed, 15 insertions(+), 17 deletions(-) rename server/{sonar-server/src/main/java/org/sonar/server/platform => sonar-server-common/src/main/java/org/sonar/server/log}/ServerLogging.java (97%) rename server/{sonar-server/src/test/java/org/sonar/server/platform => sonar-server-common/src/test/java/org/sonar/server/log}/ServerLoggingTest.java (98%) 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 275d844fd68..b84b88fd678 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 @@ -135,7 +135,7 @@ import org.sonar.server.platform.ServerFileSystemImpl; import org.sonar.server.platform.ServerIdManager; import org.sonar.server.platform.ServerImpl; import org.sonar.server.platform.ServerLifecycleNotifier; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.platform.StartupMetadataProvider; import org.sonar.server.platform.TempFolderProvider; import org.sonar.server.platform.UrlSettings; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java b/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java index 4f1c119dac0..6e4f00f38f0 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/logging/ChangeLogLevelHttpAction.java @@ -23,7 +23,7 @@ import fi.iki.elonen.NanoHTTPD; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.api.utils.log.Loggers; import org.sonar.ce.httpd.HttpAction; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import static fi.iki.elonen.NanoHTTPD.MIME_PLAINTEXT; import static fi.iki.elonen.NanoHTTPD.Response.Status.BAD_REQUEST; diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java index 0ea88d70fdd..414faaa60e3 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/logging/ChangeLogLevelHttpActionTest.java @@ -26,7 +26,7 @@ import org.apache.commons.io.IOUtils; import org.junit.Test; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.ce.httpd.HttpAction; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import static fi.iki.elonen.NanoHTTPD.Method.GET; import static fi.iki.elonen.NanoHTTPD.Method.POST; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java b/server/sonar-server-common/src/main/java/org/sonar/server/log/ServerLogging.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java rename to server/sonar-server-common/src/main/java/org/sonar/server/log/ServerLogging.java index c1e4b87780d..61ceeafa742 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerLogging.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/log/ServerLogging.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.platform; +package org.sonar.server.log; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -32,7 +32,6 @@ import org.sonar.api.utils.log.LoggerLevel; import org.sonar.api.utils.log.Loggers; import org.sonar.db.Database; import org.sonar.process.logging.LogbackHelper; -import org.sonar.server.log.ServerProcessLogging; import static org.sonar.api.utils.log.LoggerLevel.TRACE; import static org.sonar.process.ProcessProperties.Property.PATH_LOGS; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/log/ServerLoggingTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/log/ServerLoggingTest.java index c69492a19ee..3188896039c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLoggingTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/log/ServerLoggingTest.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.platform; +package org.sonar.server.log; import ch.qos.logback.classic.Level; import com.tngtech.java.junit.dataprovider.DataProvider; @@ -37,7 +37,6 @@ import org.sonar.api.utils.log.LoggerLevel; import org.sonar.db.Database; import org.sonar.process.logging.LogLevelConfig; import org.sonar.process.logging.LogbackHelper; -import org.sonar.server.log.ServerProcessLogging; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java index a632032addb..d720aae974e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java @@ -31,7 +31,7 @@ import org.sonar.api.server.authentication.IdentityProvider; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo; import org.sonar.server.authentication.IdentityProviderRepository; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.user.SecurityRealmFactory; import static org.sonar.process.ProcessProperties.Property.PATH_DATA; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/LoggingSection.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/LoggingSection.java index be1637dba3b..ffe6824e019 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/LoggingSection.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/LoggingSection.java @@ -26,7 +26,7 @@ import org.sonar.api.server.ServerSide; import org.sonar.process.systeminfo.SystemInfoSection; import org.sonar.process.systeminfo.SystemInfoUtils; import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; @ComputeEngineSide @ServerSide 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 cf5e8b244cc..beac5301928 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 @@ -115,7 +115,7 @@ import org.sonar.server.permission.ws.template.DefaultTemplatesResolverImpl; import org.sonar.server.platform.BackendCleanup; import org.sonar.server.platform.ClusterVerification; import org.sonar.server.platform.PersistentSettings; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.platform.SettingsChangeNotifier; import org.sonar.server.platform.WebCoreExtensionsInstaller; import org.sonar.server.platform.monitoring.WebSystemInfoModule; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java index dc808173905..11c870bf1b5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelClusterService.java @@ -26,7 +26,7 @@ import org.sonar.process.ProcessId; import org.sonar.process.cluster.hz.DistributedCall; import org.sonar.process.cluster.hz.HazelcastMember; import org.sonar.process.cluster.hz.HazelcastMemberSelectors; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; public class ChangeLogLevelClusterService implements ChangeLogLevelService { diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java index ec064c924b0..9048e973d43 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ChangeLogLevelStandaloneService.java @@ -21,7 +21,7 @@ package org.sonar.server.platform.ws; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.ce.http.CeHttpClient; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; public class ChangeLogLevelStandaloneService implements ChangeLogLevelService { diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java index 6131e743719..ae720be556d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/LogsAction.java @@ -27,7 +27,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.process.ProcessId; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.user.UserSession; import org.sonarqube.ws.MediaTypes; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java index 2573836712f..3d92b97a393 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java @@ -29,7 +29,7 @@ import org.sonar.api.utils.log.LoggerLevel; import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo; import org.sonar.server.authentication.IdentityProviderRepositoryRule; import org.sonar.server.authentication.TestIdentityProvider; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.user.SecurityRealmFactory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/LoggingSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/LoggingSectionTest.java index 0dd79746679..6feadd9b1c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/LoggingSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/LoggingSectionTest.java @@ -28,7 +28,7 @@ import org.sonar.api.SonarQubeSide; import org.sonar.api.SonarRuntime; import org.sonar.api.utils.log.LoggerLevel; import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java index dc10ee2e2c5..1741dfeb2c1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java @@ -26,7 +26,7 @@ import org.sonar.api.utils.log.LoggerLevel; import org.sonar.ce.http.CeHttpClient; import org.sonar.ce.http.CeHttpClientImpl; import org.sonar.server.exceptions.ForbiddenException; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsActionTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java index 4e1795c5326..aa57cad09bd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/LogsActionTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.server.exceptions.ForbiddenException; -import org.sonar.server.platform.ServerLogging; +import org.sonar.server.log.ServerLogging; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.TestResponse; import org.sonar.server.ws.WsActionTester; -- 2.39.5