SONAR-3704 API : remove the component org.sonar.api.utils.ServerHttpClient

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchModule.java
index 45020ddf099a37f4f8b59174db1654636de0de1e..b598f81a9ad1ee1f26bfe019c1e5987911a6b038 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchModule.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchModule.java
@@ -24,28 +24,12 @@ import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.ResourceTypes;
-import org.sonar.api.utils.ServerHttpClient;
 import org.sonar.batch.DefaultFileLinesContextFactory;
 import org.sonar.batch.DefaultResourceCreationLock;
 import org.sonar.batch.ProjectConfigurator;
 import org.sonar.batch.ProjectTree;
-import org.sonar.batch.components.PastMeasuresLoader;
-import org.sonar.batch.components.PastSnapshotFinder;
-import org.sonar.batch.components.PastSnapshotFinderByDate;
-import org.sonar.batch.components.PastSnapshotFinderByDays;
-import org.sonar.batch.components.PastSnapshotFinderByPreviousAnalysis;
-import org.sonar.batch.components.PastSnapshotFinderByPreviousVersion;
-import org.sonar.batch.components.PastSnapshotFinderByVersion;
-import org.sonar.batch.index.DefaultIndex;
-import org.sonar.batch.index.DefaultPersistenceManager;
-import org.sonar.batch.index.DefaultResourcePersister;
-import org.sonar.batch.index.DependencyPersister;
-import org.sonar.batch.index.EventPersister;
-import org.sonar.batch.index.LinkPersister;
-import org.sonar.batch.index.MeasurePersister;
-import org.sonar.batch.index.MemoryOptimizer;
-import org.sonar.batch.index.ReadOnlyPersistenceManager;
-import org.sonar.batch.index.SourcePersister;
+import org.sonar.batch.components.*;
+import org.sonar.batch.index.*;
 import org.sonar.core.metric.CacheMetricFinder;
 import org.sonar.core.notification.DefaultNotificationManager;
 import org.sonar.core.rule.CacheRuleFinder;
@@ -86,7 +70,6 @@ public class BatchModule extends Module {
     }
 
     addCoreSingleton(Plugins.class);
-    addCoreSingleton(ServerHttpClient.class);
     addCoreSingleton(MeasuresDao.class);
     addCoreSingleton(CacheRuleFinder.class);
     addCoreSingleton(CacheMetricFinder.class);

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/ServerHttpClient.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/ServerHttpClient.java
deleted file mode 100644 (file)
index 1db7fd0..0000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/ServerHttpClient.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar 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.
- *
- * Sonar 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 Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.api.utils;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.sonar.api.BatchComponent;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * @since 1.10
- * @deprecated use org.sonar.api.plaform.Server instead
- */
-@Deprecated
-public class ServerHttpClient implements BatchComponent {
-
-  protected static final String SERVER_API_PATH = "/api/server";
-  private static final String KEY_PATH = SERVER_API_PATH + "/key";
-  private static final String VERSION_PATH = SERVER_API_PATH + "/version";
-  protected static final String MAVEN_PATH = "/deploy/maven";
-  private static final int CONNECT_TIMEOUT_MILLISECONDS = 30000;
-  private static final int READ_TIMEOUT_MILLISECONDS = 60000;
-
-  private String url;
-  private Integer connectTimeoutMiliseconds = CONNECT_TIMEOUT_MILLISECONDS;
-  private Integer readTimeoutMiliseconds = READ_TIMEOUT_MILLISECONDS;
-
-  public ServerHttpClient(String remoteServerUrl) {
-    this(remoteServerUrl, null, null);
-  }
-
-  public ServerHttpClient(String remoteServerUrl, Integer connectTimeoutMiliseconds, Integer readTimeoutMiliseconds) {
-    this.url = StringUtils.chomp(remoteServerUrl, "/");
-    if (connectTimeoutMiliseconds != null) {
-      this.connectTimeoutMiliseconds = connectTimeoutMiliseconds;
-    }
-    if (readTimeoutMiliseconds != null) {
-      this.readTimeoutMiliseconds = readTimeoutMiliseconds;
-    }
-
-  }
-
-  public ServerHttpClient(Configuration configuration) {
-    this(configuration.getString("sonar.host.url", "http://localhost:9000"),
-        configuration.getInteger("sonar.host.connectTimeoutMs", CONNECT_TIMEOUT_MILLISECONDS),
-        configuration.getInteger("sonar.host.readTimeoutMs", READ_TIMEOUT_MILLISECONDS));
-
-  }
-
-  /**
-   * Throws a runtime ServerConnectionException if it fails to connect Sonar server
-   */
-  public void checkUp() {
-    String exceptionLabel = "Sonar server at " + url +
-        " is unreacheable. Either start it or setup the sonar.host.url setting if the URL is incorrect";
-    if (getId() == null) {
-      throw new ServerConnectionException(exceptionLabel);
-    }
-  }
-
-  public String getId() {
-    return executeAction(KEY_PATH);
-  }
-
-  public String getVersion() {
-    return executeAction(VERSION_PATH);
-  }
-
-  public String getMavenRepositoryUrl() {
-    return this.url + MAVEN_PATH;
-  }
-
-  protected String executeAction(String action) {
-    String result = getRemoteContent(url + action);
-    if (StringUtils.isBlank(result)) {
-      throw new ServerApiEmptyContentException("Empty " + action + " returned from server");
-    }
-    return result;
-  }
-
-  protected String getRemoteContent(String url) {
-    HttpURLConnection conn = null;
-    Reader reader = null;
-    try {
-      conn = getConnection(url, "GET");
-      reader = new InputStreamReader((InputStream) conn.getContent());
-
-      int statusCode = conn.getResponseCode();
-      if (statusCode != HttpURLConnection.HTTP_OK) {
-        throw new ServerConnectionException("Status returned by url : '" + url + "' is invalid : " + statusCode);
-      }
-
-      return IOUtils.toString(reader);
-    } catch (IOException e) {
-      throw new ServerConnectionException("url=" + url, e);
-
-    } finally {
-      IOUtils.closeQuietly(reader);
-      if (conn != null) {
-        conn.disconnect();
-      }
-    }
-  }
-
-  public String getUrl() {
-    return url;
-  }
-
-  private HttpURLConnection getConnection(String url, String method) throws IOException {
-    URL page = new URL(url);
-    HttpURLConnection conn = (HttpURLConnection) page.openConnection();
-    conn.setConnectTimeout(connectTimeoutMiliseconds);
-    conn.setReadTimeout(readTimeoutMiliseconds);
-
-    conn.setRequestMethod(method);
-    conn.connect();
-    return conn;
-  }
-
-  public static class ServerApiEmptyContentException extends SonarException {
-
-    public ServerApiEmptyContentException(String s) {
-      super(s);
-    }
-  }
-
-  public static class ServerConnectionException extends SonarException {
-
-    public ServerConnectionException(String msg) {
-      super(msg);
-    }
-
-    public ServerConnectionException(String msg, Throwable throwable) {
-      super(msg, throwable);
-    }
-
-  }
-}

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/ServerHttpClientTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/ServerHttpClientTest.java
deleted file mode 100644 (file)
index 5519053..0000000
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/ServerHttpClientTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2012 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar 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.
- *
- * Sonar 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 Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.api.utils;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-public class ServerHttpClientTest {
-
-  private final String serverUrl = "http://test";
-
-  private ServerHttpClient serverHttpClient;
-
-  @Before
-  public void before() {
-    serverHttpClient = new ServerHttpClient(serverUrl);
-  }
-
-  @Test
-  public void shouldReturnAValidResult() {
-    final String validContent = "valid";
-    ServerHttpClient serverHttpClient = new ServerHttpClient(serverUrl) {
-      @Override
-      protected String getRemoteContent(String url) {
-        return (validContent);
-      }
-    };
-
-    assertThat(serverHttpClient.executeAction("an action"), is(validContent));
-  }
-
-  @Test
-  public void shouldRemoveLastUrlSlash() {
-    ServerHttpClient serverHttpClient = new ServerHttpClient(serverUrl + "/");
-    assertThat(serverHttpClient.getUrl(), is(serverUrl));
-  }
-
-  @Test(expected = ServerHttpClient.ServerApiEmptyContentException.class)
-  public void shouldThrowAnExceptionIfResultIsEmpty() {
-    final String invalidContent = " ";
-    ServerHttpClient serverHttpClient = new ServerHttpClient(serverUrl) {
-      @Override
-      protected String getRemoteContent(String url) {
-        return (invalidContent);
-      }
-    };
-    serverHttpClient.executeAction("an action");
-  }
-
-  @Test
-  public void shouldReturnMavenRepositoryUrl() {
-    String sonarRepo = serverHttpClient.getMavenRepositoryUrl();
-    assertThat(sonarRepo, is(serverUrl + ServerHttpClient.MAVEN_PATH));
-  }
-
-  @Test(expected = ServerHttpClient.ServerConnectionException.class)
-  public void shouldFailIfCanNotConnectToServer() {
-    ServerHttpClient serverHttpClient = new ServerHttpClient("fake") {
-      @Override
-      protected String getRemoteContent(String url) {
-        throw new ServerConnectionException("");
-      }
-    };
-    serverHttpClient.checkUp();
-  }
-
-}