Merge branch 'neil1hart-noguava'

fixes #1082 closes #2086
springfox · Jun 30, 2018 · 32cfb7d · 32cfb7d
2 parents 2a8d9e2 + eb1f74d
commit 32cfb7d
Show file tree

Hide file tree

Showing 404 changed files with 3,539 additions and 4,198 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -23,7 +23,6 @@ repositories {
 dependencies {
   compile gradleApi()
   compile localGroovy() //Gradle 2.3 -> Groovy 2.3.9
-  compile "com.google.guava:guava:20.0"
   testCompile 'org.spockframework:spock-core:1.1-groovy-2.4-rc-4@jar'
   testCompile 'junit:junit:4.12'
 }

diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/BuildInfo.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/BuildInfo.groovy
@@ -1,6 +1,5 @@
 package springfox.gradlebuild
 
-import com.google.common.base.MoreObjects
 import springfox.gradlebuild.version.ReleaseType
 import springfox.gradlebuild.version.SemanticVersion
 import springfox.gradlebuild.version.VersioningStrategy
@@ -66,13 +65,14 @@ class BuildInfo {
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("releaseVersion", currentVersion)
-        .add("buildVersion", buildVersion)
-        .add("nextVersion", nextVersion)
-        .add("releaseType", releaseType)
-        .add("releaseTag", releaseTag)
-        .add("dryRun", dryRun)
-        .toString();
+    return new StringBuffer(this.getClass().getSimpleName())
+        .append("{")
+        .append("releaseVersion=").append(currentVersion).append(", ")
+        .append("buildVersion=").append(buildVersion).append(", ")
+        .append("nextVersion=").append(nextVersion).append(", ")
+        .append("releaseType=").append(releaseType).append(", ")
+        .append("releaseTag=").append(releaseTag).append(", ")
+        .append("dryRun=").append(dryRun)
+        .append("}").toString();
   }
 }
diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/tasks/CheckRequiredSecretsTask.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/tasks/CheckRequiredSecretsTask.groovy
@@ -19,7 +19,6 @@
 
 package springfox.gradlebuild.tasks
 
-import com.google.common.base.Strings
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.tasks.TaskAction
@@ -42,7 +41,7 @@ class CheckRequiredSecretsTask extends DefaultTask {
     def value = project.hasProperty(propName) ?
         project.property(propName) :
         System.getenv(environmentVariable)
-    if (!Strings.isNullOrEmpty(value)) {
+    if (!(value == null ? true : value.isEmpty())) {
       return value
     }
     throw new GradleException("Either gradle property: $propName or environment variable: $environmentVariable" +

diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/version/GitVersionParser.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/version/GitVersionParser.groovy
@@ -1,10 +1,10 @@
 package springfox.gradlebuild.version
 
-import com.google.common.base.Optional
-import com.google.common.base.Splitter
-import com.google.common.collect.Iterables
+import java.util.stream.Stream
+import java.util.stream.StreamSupport
 
-import static com.google.common.base.Strings.nullToEmpty
+import static java.util.Optional.*
+import static java.util.stream.Collectors.*
 
 // Lifted from plugin 'com.cinnober.gradle:semver-git:2.2.0'
 // https://github.com/cinnober/semver-git
@@ -23,15 +23,15 @@ trait GitVersionParser {
           "e.g. 1.0.0-SNAPSHOT, 1.0.0-1-g10a2eg: $versionPart")
     }
     Integer patch = patchComponents[1].toInteger()
-    Integer count = Optional.fromNullable(patchComponents[3]).or("0").toInteger()
+    Integer count = ofNullable(patchComponents[3]).orElse("0").toInteger()
     String sha = patchComponents[4]
     String build = patchComponents[2]?.substring(1)
     [patch, build, count, sha]
   }
 
   SemanticVersion parseTransform(String version, String buildSuffix) {
-    def components = Splitter.on('.').split(version)
-    if (Iterables.size(components) < 3) {
+    def components = Stream.of(version.split("\\.")).collect(toList())
+    if (StreamSupport.stream(components.spliterator(), false).count() < 3) {
       throw new IllegalArgumentException("Not a valid version. Expecting a version of form <MAJOR.MINOR.PATCH> where " +
           "e.g. 1.0.0-SNAPSHOT, 1.0.0-1-g10a2eg: ${version}")
     }
@@ -45,7 +45,7 @@ trait GitVersionParser {
       suffix = ""
     } else {
       suffix = suffix.replaceAll("<count>", "$count")
-      suffix = suffix.replaceAll("<sha>", nullToEmpty(sha))
+      suffix = suffix.replaceAll("<sha>", ofNullable(sha).orElse(""))
     }
     return new SemanticVersion(parsedVersion.major, parsedVersion.minor, patch, suffix)
   }

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -5,7 +5,6 @@ ext {
   classmate = "1.4.0"
   equalsverifierVersion = '2.4.7'
   groovy = "2.5.0"
-  guava = "20.0"
   jacocoVersion = '0.8.1'
   jackson = '2.9.6'
   joda = "2.10"
@@ -69,7 +68,6 @@ ext {
                   "joda-time:joda-time:$joda"
           ],
           core          : [
-                  "com.google.guava:guava:${guava}",
                   "com.fasterxml:classmate:${classmate}",
                   "org.slf4j:slf4j-api:${slf4j}",
           ]

diff --git a/...fox-bean-validators/src/main/java/springfox/bean/validators/plugins/RangeAnnotations.java b/...fox-bean-validators/src/main/java/springfox/bean/validators/plugins/RangeAnnotations.java
@@ -19,14 +19,14 @@
 
 package springfox.bean.validators.plugins;
 
-import com.google.common.base.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import springfox.documentation.service.AllowableRangeValues;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
+import java.util.Optional;
 
 public class RangeAnnotations {
   private static final Logger LOG = LoggerFactory.getLogger(RangeAnnotations.class);

diff --git a/springfox-bean-validators/src/main/java/springfox/bean/validators/plugins/Validators.java b/springfox-bean-validators/src/main/java/springfox/bean/validators/plugins/Validators.java
@@ -19,7 +19,6 @@
 package springfox.bean.validators.plugins;
 
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.google.common.base.Optional;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationUtils;
 import springfox.documentation.service.ResolvedMethodParameter;
@@ -30,6 +29,9 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.Optional;
+
+import static java.util.Optional.*;
 
 /**
  * Utility methods for Validators
@@ -45,19 +47,19 @@ public static <T extends Annotation> Optional<T> extractAnnotation(
       ModelPropertyContext context,
       Class<T> annotationType) {
     return annotationFromBean(context, annotationType)
-        .or(annotationFromField(context, annotationType));
+       .map(Optional::of).orElse(annotationFromField(context, annotationType));
   }
 
   public static <T extends Annotation> Optional<T> annotationFromBean(
       ModelPropertyContext context,
       Class<T> annotationType) {
 
     Optional<BeanPropertyDefinition> propertyDefinition = context.getBeanPropertyDefinition();
-    Optional<T> notNull = Optional.absent();
+    Optional<T> notNull = empty();
     if (propertyDefinition.isPresent()) {
       Optional<Method> getter = extractGetterFromPropertyDefinition(propertyDefinition.get());
       Optional<Field> field = extractFieldFromPropertyDefinition(propertyDefinition.get());
-      notNull = findAnnotation(getter, annotationType).or(findAnnotation(field, annotationType));
+      notNull = findAnnotation(getter, annotationType).map(Optional::of).orElse(findAnnotation(field, annotationType));
     }
 
     return notNull;
@@ -79,25 +81,22 @@ public static <T extends Annotation> Optional<T> annotationFromParameter(
 
   private static Optional<Field> extractFieldFromPropertyDefinition(BeanPropertyDefinition propertyDefinition) {
     if (propertyDefinition.getField() != null) {
-      return Optional.fromNullable(propertyDefinition.getField().getAnnotated());
+      return ofNullable(propertyDefinition.getField().getAnnotated());
     }
-    return Optional.absent();
+    return empty();
   }
 
   private static Optional<Method> extractGetterFromPropertyDefinition(BeanPropertyDefinition propertyDefinition) {
     if (propertyDefinition.getGetter() != null) {
-      return Optional.fromNullable(propertyDefinition.getGetter().getMember());
+      return ofNullable(propertyDefinition.getGetter().getMember());
     }
-    return Optional.absent();
+    return empty();
   }
 
   private static <T extends Annotation> Optional<T> findAnnotation(
       Optional<? extends AnnotatedElement> annotatedElement,
       Class<T> annotationType) {
-    if (annotatedElement.isPresent()) {
-      return Optional.fromNullable(AnnotationUtils.findAnnotation(annotatedElement.get(), annotationType));
-    } else {
-      return Optional.absent();
-    }
+    return annotatedElement
+        .map(annotated -> AnnotationUtils.findAnnotation(annotated, annotationType));
   }
 }
diff --git a/.../springfox/bean/validators/plugins/parameter/ExpandedParameterMinMaxAnnotationPlugin.java b/.../springfox/bean/validators/plugins/parameter/ExpandedParameterMinMaxAnnotationPlugin.java
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright 2015-2017 the original author or authors.
+ *  Copyright 2015-2019 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -31,6 +30,7 @@
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.RangeAnnotations.*;
 

diff --git a/...springfox/bean/validators/plugins/parameter/ExpandedParameterNotNullAnnotationPlugin.java b/...springfox/bean/validators/plugins/parameter/ExpandedParameterNotNullAnnotationPlugin.java
@@ -18,7 +18,6 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -29,6 +28,7 @@
 import springfox.documentation.spi.service.contexts.ParameterExpansionContext;
 
 import javax.validation.constraints.NotNull;
+import java.util.Optional;
 
 @Component
 @Order(Validators.BEAN_VALIDATOR_PLUGIN_ORDER)

diff --git a/...springfox/bean/validators/plugins/parameter/ExpandedParameterPatternAnnotationPlugin.java b/...springfox/bean/validators/plugins/parameter/ExpandedParameterPatternAnnotationPlugin.java
@@ -18,7 +18,7 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -29,6 +29,7 @@
 import springfox.documentation.spi.service.contexts.ParameterExpansionContext;
 
 import javax.validation.constraints.Pattern;
+import java.util.Optional;
 
 @Component
 @Order(Validators.BEAN_VALIDATOR_PLUGIN_ORDER)

diff --git a/...va/springfox/bean/validators/plugins/parameter/ExpandedParameterSizeAnnotationPlugin.java b/...va/springfox/bean/validators/plugins/parameter/ExpandedParameterSizeAnnotationPlugin.java
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright 2015-2017 the original author or authors.
+ *  Copyright 2015-2019 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -30,6 +29,7 @@
 import springfox.documentation.spi.service.contexts.ParameterExpansionContext;
 
 import javax.validation.constraints.Size;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.RangeAnnotations.*;
 

diff --git a/...ors/src/main/java/springfox/bean/validators/plugins/parameter/MinMaxAnnotationPlugin.java b/...ors/src/main/java/springfox/bean/validators/plugins/parameter/MinMaxAnnotationPlugin.java
@@ -18,7 +18,7 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -31,6 +31,7 @@
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.RangeAnnotations.*;
 import static springfox.bean.validators.plugins.Validators.*;

diff --git a/...rs/src/main/java/springfox/bean/validators/plugins/parameter/NotNullAnnotationPlugin.java b/...rs/src/main/java/springfox/bean/validators/plugins/parameter/NotNullAnnotationPlugin.java
@@ -18,7 +18,7 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -29,6 +29,7 @@
 import springfox.documentation.spi.service.contexts.ParameterContext;
 
 import javax.validation.constraints.NotNull;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.Validators.*;
 

diff --git a/...rs/src/main/java/springfox/bean/validators/plugins/parameter/PatternAnnotationPlugin.java b/...rs/src/main/java/springfox/bean/validators/plugins/parameter/PatternAnnotationPlugin.java
@@ -18,7 +18,7 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -29,6 +29,7 @@
 import springfox.documentation.spi.service.contexts.ParameterContext;
 
 import javax.validation.constraints.Pattern;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.Validators.*;
 

diff --git a/...ators/src/main/java/springfox/bean/validators/plugins/parameter/SizeAnnotationPlugin.java b/...ators/src/main/java/springfox/bean/validators/plugins/parameter/SizeAnnotationPlugin.java
@@ -18,7 +18,6 @@
  */
 package springfox.bean.validators.plugins.parameter;
 
-import com.google.common.base.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -30,6 +29,7 @@
 import springfox.documentation.spi.service.contexts.ParameterContext;
 
 import javax.validation.constraints.Size;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.RangeAnnotations.*;
 import static springfox.bean.validators.plugins.Validators.*;

diff --git a/...src/main/java/springfox/bean/validators/plugins/schema/DecimalMinMaxAnnotationPlugin.java b/...src/main/java/springfox/bean/validators/plugins/schema/DecimalMinMaxAnnotationPlugin.java
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright 2015-2017 the original author or authors.
+ *  Copyright 2015-2019 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
  */
 package springfox.bean.validators.plugins.schema;
 
-import com.google.common.base.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -32,6 +32,7 @@
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
+import java.util.Optional;
 
 import static springfox.bean.validators.plugins.Validators.*;