Remove hibernate-validator dependency (ReactiveX#660)

Author: dlsrb6342

resilience4j-framework-common/build.gradle

@@ -5,8 +5,6 @@ dependencies {
     compile project(':resilience4j-retry')
     compile project(':resilience4j-bulkhead')
 
-    compile libraries.validationApi
-    compile libraries.hibernate_validator
 }
 
 ext.moduleName='io.github.resilience4j.framework-common'

resilience4j-framework-common/src/main/java/io/github/resilience4j/common/bulkhead/configuration/BulkheadConfigurationProperties.java

@@ -15,40 +15,40 @@
  */
 package io.github.resilience4j.common.bulkhead.configuration;
 
+import io.github.resilience4j.bulkhead.BulkheadConfig;
 import io.github.resilience4j.common.utils.ConfigUtils;
 import io.github.resilience4j.core.ConfigurationNotFoundException;
 import io.github.resilience4j.core.StringUtils;
 import io.github.resilience4j.core.lang.Nullable;
-import org.hibernate.validator.constraints.time.DurationMin;
 
-import javax.validation.constraints.Min;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 public class BulkheadConfigurationProperties {
 
 	private Map<String, InstanceProperties> instances = new HashMap<>();
 	private Map<String, InstanceProperties> configs = new HashMap<>();
 
-	public io.github.resilience4j.bulkhead.BulkheadConfig createBulkheadConfig(InstanceProperties instanceProperties) {
+	public BulkheadConfig createBulkheadConfig(InstanceProperties instanceProperties) {
 		if (StringUtils.isNotEmpty(instanceProperties.getBaseConfig())) {
 			InstanceProperties baseProperties = configs.get(instanceProperties.getBaseConfig());
 			if (baseProperties == null) {
 				throw new ConfigurationNotFoundException(instanceProperties.getBaseConfig());
 			}
 			return buildConfigFromBaseConfig(baseProperties, instanceProperties);
 		}
-		return buildBulkheadConfig(io.github.resilience4j.bulkhead.BulkheadConfig.custom(), instanceProperties);
+		return buildBulkheadConfig(BulkheadConfig.custom(), instanceProperties);
 	}
 
-	private io.github.resilience4j.bulkhead.BulkheadConfig buildConfigFromBaseConfig(InstanceProperties baseProperties, InstanceProperties instanceProperties) {
+	private BulkheadConfig buildConfigFromBaseConfig(InstanceProperties baseProperties, InstanceProperties instanceProperties) {
 		ConfigUtils.mergePropertiesIfAny(baseProperties, instanceProperties);
-		io.github.resilience4j.bulkhead.BulkheadConfig baseConfig = buildBulkheadConfig(io.github.resilience4j.bulkhead.BulkheadConfig.custom(), baseProperties);
-		return buildBulkheadConfig(io.github.resilience4j.bulkhead.BulkheadConfig.from(baseConfig), instanceProperties);
+		BulkheadConfig baseConfig = buildBulkheadConfig(BulkheadConfig.custom(), baseProperties);
+		return buildBulkheadConfig(BulkheadConfig.from(baseConfig), instanceProperties);
 	}
 
-	private io.github.resilience4j.bulkhead.BulkheadConfig buildBulkheadConfig(io.github.resilience4j.bulkhead.BulkheadConfig.Builder builder, InstanceProperties instanceProperties) {
+	private BulkheadConfig buildBulkheadConfig(BulkheadConfig.Builder builder, InstanceProperties instanceProperties) {
 		if (instanceProperties.getMaxConcurrentCalls() != null) {
 			builder.maxConcurrentCalls(instanceProperties.getMaxConcurrentCalls());
 		}
@@ -84,23 +84,30 @@ public Map<String, InstanceProperties> getConfigs() {
 	 */
 	public static class InstanceProperties {
 
-		@Min(1)
 		private Integer maxConcurrentCalls;
-		@DurationMin(millis = 0)
-		private Duration maxWaitDuration;
-		@Nullable
-		private String baseConfig;
-		@Min(1)
-		@Nullable
-		private Integer eventConsumerBufferSize;
+        private Duration maxWaitDuration;
+        @Nullable
+        private String baseConfig;
+        @Nullable
+        private Integer eventConsumerBufferSize;
 
 		public InstanceProperties setMaxConcurrentCalls(Integer maxConcurrentCalls) {
+            Objects.requireNonNull(maxConcurrentCalls);
+            if (maxConcurrentCalls < 1) {
+                throw new IllegalArgumentException("maxConcurrentCalls must be greater than or equal to 1.");
+            }
+
 			this.maxConcurrentCalls = maxConcurrentCalls;
 			return this;
 		}
 
 		public InstanceProperties setMaxWaitDuration(Duration maxWaitDuration) {
-			this.maxWaitDuration = maxWaitDuration;
+            Objects.requireNonNull(maxWaitDuration);
+            if (maxWaitDuration.toMillis() < 0) {
+                throw new IllegalArgumentException("maxWaitDuration must be greater than or equal to 0.");
+            }
+
+            this.maxWaitDuration = maxWaitDuration;
 			return this;
 		}
 
@@ -110,7 +117,12 @@ public InstanceProperties setBaseConfig(String baseConfig) {
 		}
 
 		public InstanceProperties setEventConsumerBufferSize(Integer eventConsumerBufferSize) {
-			this.eventConsumerBufferSize = eventConsumerBufferSize;
+            Objects.requireNonNull(eventConsumerBufferSize);
+            if (eventConsumerBufferSize < 1) {
+                throw new IllegalArgumentException("eventConsumerBufferSize must be greater than or equal to 1.");
+            }
+
+            this.eventConsumerBufferSize = eventConsumerBufferSize;
 			return this;
 		}
 
@@ -122,10 +134,12 @@ public Duration getMaxWaitDuration() {
 			return maxWaitDuration;
 		}
 
+        @Nullable
 		public String getBaseConfig() {
 			return baseConfig;
 		}
 
+        @Nullable
 		public Integer getEventConsumerBufferSize() {
 			return eventConsumerBufferSize;
 		}

resilience4j-framework-common/src/main/java/io/github/resilience4j/common/bulkhead/configuration/ThreadPoolBulkheadConfigurationProperties.java

@@ -21,10 +21,10 @@
 import io.github.resilience4j.core.StringUtils;
 import io.github.resilience4j.core.lang.Nullable;
 
-import javax.validation.constraints.Min;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 public class ThreadPoolBulkheadConfigurationProperties {
 
@@ -102,7 +102,6 @@ public ThreadPoolBulkheadConfig buildThreadPoolBulkheadConfig(ThreadPoolBulkhead
 	 */
 	public static class InstanceProperties {
 
-		@Min(1)
 		@Nullable
 		private Integer eventConsumerBufferSize;
 
@@ -159,6 +158,11 @@ public Integer getEventConsumerBufferSize() {
 		}
 
 		public InstanceProperties setEventConsumerBufferSize(Integer eventConsumerBufferSize) {
+			Objects.requireNonNull(eventConsumerBufferSize);
+			if (eventConsumerBufferSize < 1) {
+				throw new IllegalArgumentException("eventConsumerBufferSize must be greater than or equal to 1.");
+			}
+
 			this.eventConsumerBufferSize = eventConsumerBufferSize;
 			return this;
 		}