fix quality flaws

4 files changed, 73 insertions, 49 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
index 6f734e84c59..01ab0eedb08 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import javax.annotation.Nullable;
@@ -165,12 +166,12 @@ public final class PropertyDefinition {
       return Result.SUCCESS;
     }
 
-    EnumMap<PropertyType, Validation> validations = createValidations(options);
-    return validations.getOrDefault(type, aValue -> Result.SUCCESS).validate(value);
+    EnumMap<PropertyType, Function<String, Result>> validations = createValidations(options);
+    return validations.getOrDefault(type, aValue -> Result.SUCCESS).apply(value);
   }
 
-  private static EnumMap<PropertyType, Validation> createValidations(List<String> options) {
-    return new EnumMap<>(ImmutableMap.<PropertyType, Validation>builder()
+  private static EnumMap<PropertyType, Function<String, Result>> createValidations(List<String> options) {
+    return new EnumMap<>(ImmutableMap.<PropertyType, Function<String, Result>>builder()
       .put(BOOLEAN, validateBoolean())
       .put(INTEGER, validateInteger())
       .put(LONG, validateInteger())
@@ -181,7 +182,7 @@ public final class PropertyDefinition {
       .build());
   }
 
-  private static Validation validateBoolean() {
+  private static Function<String, Result> validateBoolean() {
     return value -> {
       if (!StringUtils.equalsIgnoreCase(value, "true") && !StringUtils.equalsIgnoreCase(value, "false")) {
         return Result.newError("notBoolean");
@@ -190,7 +191,7 @@ public final class PropertyDefinition {
     };
   }
 
-  private static Validation validateInteger() {
+  private static Function<String, Result> validateInteger() {
     return value -> {
       if (!NumberUtils.isDigits(value)) {
         return Result.newError("notInteger");
@@ -199,7 +200,7 @@ public final class PropertyDefinition {
     };
   }
 
-  private static Validation validateFloat() {
+  private static Function<String, Result> validateFloat() {
     return value -> {
       try {
         Double.parseDouble(value);
@@ -210,7 +211,7 @@ public final class PropertyDefinition {
     };
   }
 
-  private static Validation validateRegexp() {
+  private static Function<String, Result> validateRegexp() {
     return value -> {
       try {
         Pattern.compile(value);
@@ -575,9 +576,4 @@ public final class PropertyDefinition {
       }
     }
   }
-
-  @FunctionalInterface
-  private interface Validation {
-    Result validate(String value);
-  }
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java
index 2fdfbff01f2..30430453b4b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java
@@ -19,13 +19,11 @@
  */
 package org.sonar.api.measures;
 
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
@@ -40,7 +38,7 @@ import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 /**
  * Used to define a metric in a plugin. Should be used with {@link Metrics} extension point.
- * Should no more be used on scanner side. Use {@link org.sonar.api.batch.measure.Metric} instead. 
+ * Should no more be used on scanner side. Use {@link org.sonar.api.batch.measure.Metric} instead.
  */
 @ScannerSide
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
@@ -55,6 +53,7 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
 
   /**
    * The maximum supported value of scale for decimal metrics
+   *
    * @since 5.3
    */
   public static final int MAX_DECIMAL_SCALE = 5;
@@ -109,13 +108,9 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
   public enum Level {
     OK("Green"), WARN("Orange"), ERROR("Red");
 
-    private static final List<String> NAMES = Lists.transform(Arrays.asList(values()), new Function<Level, String>() {
-      @Nonnull
-      @Override
-      public String apply(@Nonnull Level level) {
-        return level.name();
-      }
-    });
+    private static final List<String> NAMES = Arrays.stream(values())
+      .map(Level::name)
+      .collect(Collectors.toList());
 
     private String colorName;
 
@@ -521,6 +516,7 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
 
   /**
    * Return the number scale if metric type is {@link ValueType#FLOAT}, else {@code null}
+   *
    * @since 5.3
    */
   @CheckForNull
@@ -631,12 +627,11 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
      * </ul>
      * Metric.DIRECTION_NONE is the default value.
      *
+     * @param d the direction
+     * @return the builder
      * @see Metric#DIRECTION_WORST
      * @see Metric#DIRECTION_BETTER
      * @see Metric#DIRECTION_NONE
-     *
-     * @param d the direction
-     * @return the builder
      */
     public Builder setDirection(Integer d) {
       this.direction = d;
@@ -680,7 +675,6 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
      *
      * @param f the formula
      * @return the builder
-     *
      * @deprecated since 5.2, it's no more possible to define a formula on a metric, please use {@link org.sonar.api.ce.measure.MeasureComputer} instead
      */
     @Deprecated
@@ -741,10 +735,9 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
     /**
      * Specifies whether this metric can be edited online in the "Manual measures" page. Default is false.
      *
-     * @since 2.10
-     *
      * @param b true if the metric can be edited online.
      * @return the builder
+     * @since 2.10
      */
     public Builder setUserManaged(boolean b) {
       this.userManaged = b;
@@ -756,10 +749,9 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
      * <br>
      * By default, historical data are kept.
      *
-     * @since 2.14
-     *
      * @param b true if measures from the past can be deleted automatically.
      * @return the builder
+     * @since 2.14
      */
     public Builder setDeleteHistoricalData(boolean b) {
       this.deleteHistoricalData = b;
@@ -769,6 +761,7 @@ public class Metric<G extends Serializable> implements Serializable, org.sonar.a
     /**
      * Scale to be used if the metric has decimal type ({@link ValueType#FLOAT} or {@link ValueType#PERCENT}).
      * Default is 1. It is not set (({@code null}) on non-decimal metrics.
+     *
      * @since 5.3
      */
     public Builder setDecimalScale(int scale) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java
index e1dd34718c5..0cd98837689 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/ZipUtils.java
@@ -54,11 +54,11 @@ public final class ZipUtils {
    * @return the target directory
    */
   public static File unzip(File zip, File toDir) throws IOException {
-    return unzip(zip, toDir, (Predicate<ZipEntry>)ze -> true);
+    return unzip(zip, toDir, (Predicate<ZipEntry>) ze -> true);
   }
 
   public static File unzip(InputStream zip, File toDir) throws IOException {
-    return unzip(zip, toDir, (Predicate<ZipEntry>)ze -> true);
+    return unzip(zip, toDir, (Predicate<ZipEntry>) ze -> true);
   }
 
   /**
@@ -71,8 +71,9 @@ public final class ZipUtils {
 
   /**
    * Unzip a file to a directory.
+   *
    * @param stream the zip input file
-   * @param toDir the target directory. It is created if needed.
+   * @param toDir  the target directory. It is created if needed.
    * @param filter filter zip entries so that only a subset of directories/files can be
    *               extracted to target directory.
    * @return the parameter {@code toDir}
@@ -88,14 +89,7 @@ public final class ZipUtils {
       ZipEntry entry;
       while ((entry = zipStream.getNextEntry()) != null) {
         if (filter.test(entry)) {
-          File to = new File(toDir, entry.getName());
-          if (entry.isDirectory()) {
-            throwExceptionIfDirectoryIsNotCreatable(to);
-          } else {
-            File parent = to.getParentFile();
-            throwExceptionIfDirectoryIsNotCreatable(parent);
-            copy(zipStream, to);
-          }
+          unzipEntry(entry, zipStream, toDir);
         }
       }
       return toDir;
@@ -105,6 +99,17 @@ public final class ZipUtils {
     }
   }
 
+  private static void unzipEntry(ZipEntry entry, ZipInputStream zipStream, File toDir) throws IOException {
+    File to = new File(toDir, entry.getName());
+    if (entry.isDirectory()) {
+      throwExceptionIfDirectoryIsNotCreatable(to);
+    } else {
+      File parent = to.getParentFile();
+      throwExceptionIfDirectoryIsNotCreatable(parent);
+      copy(zipStream, to);
+    }
+  }
+
   private static void throwExceptionIfDirectoryIsNotCreatable(File to) throws IOException {
     if (!to.exists() && !to.mkdirs()) {
       throw new IOException(ERROR_CREATING_DIRECTORY + to);
@@ -121,8 +126,9 @@ public final class ZipUtils {
 
   /**
    * Unzip a file to a directory.
-   * @param zip the zip file. It must exist.
-   * @param toDir the target directory. It is created if needed.
+   *
+   * @param zip    the zip file. It must exist.
+   * @param toDir  the target directory. It is created if needed.
    * @param filter filter zip entries so that only a subset of directories/files can be
    *               extracted to target directory.
    * @return the parameter {@code toDir}
@@ -233,8 +239,8 @@ public final class ZipUtils {
   }
 
   /**
-   * @deprecated replaced by {@link Predicate<ZipEntry>} in 6.2.
    * @see #unzip(File, File, Predicate)
+   * @deprecated replaced by {@link Predicate<ZipEntry>} in 6.2.
    */
   @Deprecated
   @FunctionalInterface
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/internal/SimpleGetRequestTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/internal/SimpleGetRequestTest.java
index 08f69177262..650b9ace11e 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/internal/SimpleGetRequestTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/internal/SimpleGetRequestTest.java
@@ -19,13 +19,14 @@
  */
 package org.sonar.api.server.ws.internal;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
 import java.io.InputStream;
 import org.junit.Test;
 import org.sonar.api.server.ws.Request;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.mockito.Mockito.mock;
+
 public class SimpleGetRequestTest {
 
   SimpleGetRequest underTest = new SimpleGetRequest();
@@ -59,4 +60,32 @@ public class SimpleGetRequestTest {
 
     assertThat(underTest.paramAsPart("unknown")).isNull();
   }
+
+  @Test
+  public void getMediaType() {
+    underTest.setMediaType("JSON");
+
+    assertThat(underTest.getMediaType()).isEqualTo("JSON");
+  }
+
+  @Test
+  public void multiParam_with_one_element() {
+    underTest.setParam("foo", "bar");
+
+    assertThat(underTest.multiParam("foo")).containsExactly("bar");
+  }
+
+  @Test
+  public void multiParam_without_any_element() {
+    assertThat(underTest.multiParam("42")).isEmpty();
+  }
+
+  @Test
+  public void getParams() {
+    underTest
+      .setParam("foo", "bar")
+      .setParam("fee", "beer");
+
+    assertThat(underTest.getParams()).containsOnly(entry("foo", "bar"), entry("fee", "beer"));
+  }
 }