Delete deprecated and unused Server#getDeployDir()

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 e84711cb940efd8c2053cf694a52eaf4eddf4701..708fbf1320c52181005af22b10b82756233c3bdb 100644 (file)
--- 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 e0c0a4b357a07093c905c595df19dc0413c7b0e9..39bfd8e0f712339a5af580c582daa154e58a1c27 100644 (file)
--- 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 60426340e0b6066623d17ec1449811f5a7556b7a..f72986aed8c19d75025b3d52969af4a116288c26 100644 (file)
--- 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;
@@ -107,12 +106,6 @@ class FakeServer extends Server {
     return null;
   }
 
-  @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 e44beba80d04c23ec70c4f18a9ffe434e152f6cd..2d3a086401e24db121f24e2b217451daddf2a287 100644 (file)
--- 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
@@ -191,11 +191,6 @@ public class StatusActionTest {
       throw new UnsupportedOperationException();
     }
 
-    @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 85237c7c3d6f0fea6494e592d60f5e596066d3ca..63afdc9ff45f847aeb2d262b648d53526d70a4fd 100644 (file)
--- 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 1d5a7fcb51a6a84807003ee2c349879089372042..adc382a81a66dc61415587fd3bb94e4212ff77df 100644 (file)
--- 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;
@@ -77,13 +76,6 @@ public abstract class Server {
   @Deprecated
   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

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 796c6b4ea52afaae39e0d0b87fb7f3e96e167b58..44b1f19f1223d0b74845bc49515e1b605430404b 100644 (file)
--- 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;
@@ -67,12 +66,6 @@ public class DefaultServer extends Server {
     return null;
   }
 
-  @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 886588d65975a979ea70104410dedff3b23b3b82..c5c71e711c9d5b5d0e9cc661b9804977082405bf 100644 (file)
--- 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();