SONAR-7685 Remove commons-io dependency from sonar-ws

diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index c5b918763795225f838ef402536ff8c0998595c9..5b99a172636c2fa3915da16a1bc2788e562fb796 100644 (file)
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -14,7 +14,6 @@ dependencies {
 
   compile 'com.google.protobuf:protobuf-java'
   compile 'com.squareup.okhttp3:okhttp'
-  compile 'commons-io:commons-io'
 
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/FilenameUtils.java b/sonar-ws/src/main/java/org/sonarqube/ws/FilenameUtils.java
new file mode 100644 (file)
index 0000000..eff84f1
--- /dev/null
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/FilenameUtils.java
@@ -0,0 +1,67 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 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.
+ */
+package org.sonarqube.ws;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Extracted from org.apache.commons.io.FilenameUtils
+ */
+public class FilenameUtils {
+
+  private static final int NOT_FOUND = -1;
+
+  private static final char EXTENSION_SEPARATOR = '.';
+  /**
+   * The Unix separator character.
+   */
+  private static final char UNIX_SEPARATOR = '/';
+
+  /**
+   * The Windows separator character.
+   */
+  private static final char WINDOWS_SEPARATOR = '\\';
+
+  private FilenameUtils() {
+    // Only static methods here
+  }
+
+  public static String getExtension(String filename) {
+    requireNonNull(filename);
+    final int index = indexOfExtension(filename);
+    if (index == NOT_FOUND) {
+      return "";
+    } else {
+      return filename.substring(index + 1);
+    }
+  }
+
+  private static int indexOfExtension(String filename) {
+    final int extensionPos = filename.lastIndexOf(EXTENSION_SEPARATOR);
+    final int lastSeparator = indexOfLastSeparator(filename);
+    return lastSeparator > extensionPos ? NOT_FOUND : extensionPos;
+  }
+
+  private static int indexOfLastSeparator(String filename) {
+    final int lastUnixPos = filename.lastIndexOf(UNIX_SEPARATOR);
+    final int lastWindowsPos = filename.lastIndexOf(WINDOWS_SEPARATOR);
+    return Math.max(lastUnixPos, lastWindowsPos);
+  }
+}

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java
index 6ac901845a15f2f6b742c720cbb82525bcf16cc6..7765a5cf6425dafe7da895b76d9f28068c4cf684 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java
@@ -22,7 +22,6 @@ package org.sonarqube.ws;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import org.apache.commons.io.FilenameUtils;
 
 import static org.sonarqube.ws.WsUtils.isNullOrEmpty;
 

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/WsUtils.java b/sonar-ws/src/main/java/org/sonarqube/ws/WsUtils.java
index 5a332795baea344b2b9fed6003217a7653597dc6..87c3b19b5794a0ad8951f2e7a24ce10681eff580 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/WsUtils.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/WsUtils.java
@@ -49,4 +49,5 @@ public class WsUtils {
   public static String nullToEmpty(@Nullable String string) {
     return string == null ? "" : string;
   }
+
 }

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseService.java
index b3abea01c2ca3d0fc69133a2baf306a58354d416..14e586aca6e27fdc486b14e76de606ccba23425f 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseService.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
 import java.util.Collection;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-import org.apache.commons.io.IOUtils;
 import org.sonarqube.ws.MediaTypes;
 
 import static org.sonarqube.ws.WsUtils.checkArgument;
@@ -54,9 +53,8 @@ public abstract class BaseService {
 
   public static <T extends Message> T convert(WsResponse response, Parser<T> parser) {
     try (InputStream byteStream = response.contentStream()) {
-      byte[] bytes = IOUtils.toByteArray(byteStream);
       // HTTP header "Content-Type" is not verified. It may be different than protobuf.
-      return parser.parseFrom(bytes);
+      return parser.parseFrom(byteStream);
     } catch (Exception e) {
       throw new IllegalStateException("Fail to parse protobuf response of " + response.requestUrl(), e);
     }

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java
index 9cb8785417a928bfd5acea08adaf9b7c4bde42d0..4230b849c67aaa172af1ea331229f02e4db5ad00 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/MockWsResponse.java
@@ -20,7 +20,6 @@
 package org.sonarqube.ws.client;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
@@ -29,7 +28,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import org.apache.commons.io.IOUtils;
 import org.sonarqube.ws.MediaTypes;
 
 import static java.util.Objects.requireNonNull;
@@ -41,7 +39,7 @@ public class MockWsResponse extends BaseResponse {
   private int code = HttpURLConnection.HTTP_OK;
   private String requestUrl;
   private byte[] content;
-  private final Map<String,String> headers = new HashMap<>();
+  private final Map<String, String> headers = new HashMap<>();
 
   @Override
   public int code() {
@@ -73,14 +71,6 @@ public class MockWsResponse extends BaseResponse {
     return this;
   }
 
-  public MockWsResponse setContent(InputStream is) {
-    try {
-      return setContent(IOUtils.toByteArray(is));
-    } catch (IOException e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
-
   public MockWsResponse setContent(byte[] b) {
     this.content = b;
     return this;