diff options
8 files changed, 1 insertions, 43 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java index e84711cb940..708fbf1320c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java @@ -75,12 +75,7 @@ public class ServerImpl extends Server { public File getRootDir() { return fs.getHomeDir(); } - - @Override - public File getDeployDir() { - return fs.getDeployDir(); - } - + @Override public String getContextPath() { return urlSettings.getContextPath(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java index e0c0a4b357a..39bfd8e0f71 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java @@ -67,10 +67,7 @@ public class ServerImplTest { public void test_file_system_information() throws IOException { File home = temp.newFolder(); when(fs.getHomeDir()).thenReturn(home); - File deploy = temp.newFolder(); - when(fs.getDeployDir()).thenReturn(deploy); - assertThat(underTest.getDeployDir()).isEqualTo(deploy); assertThat(underTest.getRootDir()).isEqualTo(home); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java index 60426340e0b..f72986aed8c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ServerLifecycleNotifierTest.java @@ -21,7 +21,6 @@ package org.sonar.server.platform; import java.io.File; import java.util.Date; -import javax.annotation.CheckForNull; import org.junit.Before; import org.junit.Test; import org.sonar.api.platform.Server; @@ -108,12 +107,6 @@ class FakeServer extends Server { } @Override - @CheckForNull - public File getDeployDir() { - return null; - } - - @Override public String getContextPath() { return null; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java index e44beba80d0..2d3a086401e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java @@ -192,11 +192,6 @@ public class StatusActionTest { } @Override - public File getDeployDir() { - throw new UnsupportedOperationException(); - } - - @Override public String getContextPath() { throw new UnsupportedOperationException(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/telemetry/FakeServer.java b/server/sonar-server/src/test/java/org/sonar/server/telemetry/FakeServer.java index 85237c7c3d6..63afdc9ff45 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/telemetry/FakeServer.java +++ b/server/sonar-server/src/test/java/org/sonar/server/telemetry/FakeServer.java @@ -72,12 +72,6 @@ class FakeServer extends Server { return null; } - @CheckForNull - @Override - public File getDeployDir() { - return null; - } - @Override public String getContextPath() { return null; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java index 1d5a7fcb51a..adc382a81a6 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java @@ -21,7 +21,6 @@ package org.sonar.api.platform; import java.io.File; import java.util.Date; -import javax.annotation.CheckForNull; import org.sonar.api.batch.ScannerSide; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; @@ -78,13 +77,6 @@ public abstract class Server { public abstract File getRootDir(); /** - * @deprecated always {@code null} since version 6.0. No alternatives, as plugins do not have to touch this directory. - */ - @Deprecated - @CheckForNull - public abstract File getDeployDir(); - - /** * Context path of web server. Value is blank {@code ""} by default. When defined by * the property {@code sonar.web.context} of conf/sonar.properties, then value starts but does * not end with slash {@code '/'}, for instance {@code "/sonarqube"}. diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java index 796c6b4ea52..44b1f19f122 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/platform/DefaultServer.java @@ -21,7 +21,6 @@ package org.sonar.scanner.platform; import java.io.File; import java.util.Date; -import javax.annotation.CheckForNull; import org.apache.commons.lang.StringUtils; import org.sonar.api.CoreProperties; import org.sonar.api.SonarRuntime; @@ -68,12 +67,6 @@ public class DefaultServer extends Server { } @Override - @CheckForNull - public File getDeployDir() { - return null; - } - - @Override public String getContextPath() { return null; } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/platform/DefaultServerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/platform/DefaultServerTest.java index 886588d6597..c5c71e711c9 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/platform/DefaultServerTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/platform/DefaultServerTest.java @@ -51,7 +51,6 @@ public class DefaultServerTest { assertThat(metadata.getPermanentServerId()).isEqualTo("123"); assertThat(metadata.getRootDir()).isNull(); - assertThat(metadata.getDeployDir()).isNull(); assertThat(metadata.getContextPath()).isNull(); assertThat(metadata.isDev()).isFalse(); assertThat(metadata.isSecured()).isFalse(); |