load tests (in progress)

kptfh · Mar 7, 2018 · 8d3d757 · 8d3d757
1 parent 4a4b5bb
commit 8d3d757
Show file tree

Hide file tree

Showing 16 changed files with 243 additions and 32 deletions.
diff --git a/feign-reactive-cloud/src/main/java/feign/CloudReactiveFeign.java b/feign-reactive-cloud/src/main/java/feign/CloudReactiveFeign.java
@@ -7,6 +7,7 @@
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import feign.reactive.ReactiveMethodHandlerFactory;
+import feign.reactive.HystrixMethodHandler;
 import feign.reactive.client.ReactiveClient;
 import feign.reactive.client.ReactiveClientFactory;
 import feign.reactive.client.RibbonReactiveClient;
@@ -18,7 +19,7 @@
 
 /**
  * Allows to specify ribbon {@link LoadBalancerCommand}
- * and HystrixObservableCommand.Setter.
+ * and HystrixObservableCommand.Setter with fallback factory.
  *
  * @author Sergii Karpenko
  */

diff --git a/...main/java/feign/HystrixMethodHandler.java → .../feign/reactive/HystrixMethodHandler.java b/...main/java/feign/HystrixMethodHandler.java → .../feign/reactive/HystrixMethodHandler.java
@@ -1,7 +1,9 @@
-package feign;
+package feign.reactive;
 
 import com.netflix.hystrix.HystrixObservableCommand;
-import feign.reactive.ReactiveMethodHandlerFactory;
+import feign.CloudReactiveFeign;
+import feign.MethodMetadata;
+import feign.Target;
 import org.reactivestreams.Publisher;
 import org.springframework.lang.Nullable;
 import reactor.core.publisher.Flux;
@@ -36,16 +38,17 @@ private HystrixMethodHandler(
             @Nullable
                     Function<Throwable, Object> fallbackFactory) {
         checkNotNull(target, "target must be not null");
-        ;
+
         checkNotNull(methodMetadata, "methodMetadata must be not null");
         method = Arrays.stream(target.type().getMethods())
                 .filter(method -> configKey(target.type(), method).equals(methodMetadata.configKey()))
                 .findFirst().orElseThrow(() -> new IllegalArgumentException());
+        method.setAccessible(true);
 
         returnPublisherType = ((ParameterizedType) methodMetadata.returnType()).getRawType();
         this.methodHandler = checkNotNull(methodHandler, "methodHandler must be not null");
         this.fallbackFactory = fallbackFactory;
-        checkNotNull(setterFactory, "hystrixObservableCommandSetter must be not null");
+        checkNotNull(setterFactory, "setterFactory must be not null");
         hystrixObservableCommandSetter = setterFactory.create(target, methodMetadata);
     }
 
@@ -64,10 +67,9 @@ protected Observable<Object> resumeWithFallback() {
                 if (fallbackFactory != null) {
                     Object fallback = fallbackFactory.apply(getExecutionException());
                     try {
-                        method.setAccessible(true);
-                        Object fallbackValue = method.invoke(fallback, argv);
+                        Object fallbackValue = getFallbackValue(fallback, method, argv);
                         return RxReactiveStreams.toObservable((Publisher<Object>) fallbackValue);
-                    } catch (Exception e) {
+                    } catch (Throwable e) {
                         return Observable.error(e);
                     }
 
@@ -82,12 +84,16 @@ protected Observable<Object> resumeWithFallback() {
         return returnPublisherType == Mono.class ? Mono.from(publisher) : Flux.from(publisher);
     }
 
-    static class Factory implements ReactiveMethodHandlerFactory {
+    protected Object getFallbackValue(Object target, Method method, Object[] argv) throws Throwable {
+        return method.invoke(target, argv);
+    }
+
+    public static class Factory implements ReactiveMethodHandlerFactory {
         private final ReactiveMethodHandlerFactory methodHandlerFactory;
         private final CloudReactiveFeign.SetterFactory commandSetterFactory;
         private final Function<Throwable, Object> fallbackFactory;
 
-        Factory(ReactiveMethodHandlerFactory methodHandlerFactory,
+        public Factory(ReactiveMethodHandlerFactory methodHandlerFactory,
                 CloudReactiveFeign.SetterFactory commandSetterFactory,
                 @Nullable
                         Function<Throwable, Object> fallbackFactory) {

diff --git a/feign-reactive-cloud/src/test/java/feign/reactive/HystrixReactiveHttpClientTest.java b/feign-reactive-cloud/src/test/java/feign/reactive/HystrixReactiveHttpClientTest.java
@@ -31,7 +31,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 
-
+/**
+ * @author Sergii Karpenko
+ */
 public class HystrixReactiveHttpClientTest {
 
     @ClassRule

diff --git a/feign-reactive-cloud/src/test/java/feign/reactive/LoadBalancingReactiveHttpClientTest.java b/feign-reactive-cloud/src/test/java/feign/reactive/LoadBalancingReactiveHttpClientTest.java
@@ -31,7 +31,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.isA;
 
-
+/**
+ * @author Sergii Karpenko
+ */
 public class LoadBalancingReactiveHttpClientTest {
 
     @ClassRule

diff --git a/feign-reactive-core/src/main/java/feign/ReactiveFeign.java b/feign-reactive-core/src/main/java/feign/ReactiveFeign.java
@@ -4,10 +4,7 @@
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
-import feign.reactive.ReactiveClientMethodHandler;
-import feign.reactive.ReactiveDelegatingContract;
-import feign.reactive.ReactiveMethodHandlerFactory;
-import feign.reactive.ReactiveOptions;
+import feign.reactive.*;
 import feign.reactive.client.ReactiveClientFactory;
 import feign.reactive.client.WebReactiveClient;
 import io.netty.channel.ChannelOption;

diff --git a/feign-reactive-core/src/main/java/feign/reactive/ReactiveDelegatingContract.java b/feign-reactive-core/src/main/java/feign/reactive/ReactiveDelegatingContract.java
@@ -5,6 +5,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -32,10 +33,7 @@ public List<MethodMetadata> parseAndValidatateMetadata(
 
         for (final MethodMetadata metadata : metadatas) {
             final Type type = metadata.returnType();
-
-            if (!(type instanceof ParameterizedType)
-                    || !((ParameterizedType) type).getRawType().equals(Mono.class)
-                    && !((ParameterizedType) type).getRawType().equals(Flux.class)) {
+            if (!isMonoOrFlux(type)) {
                 throw new IllegalArgumentException(String.format(
                         "Method %s of contract %s doesn't returns reactor.core.publisher.Mono or reactor.core.publisher.Flux",
                         metadata.configKey(), targetType.getSimpleName()));
@@ -44,4 +42,10 @@ public List<MethodMetadata> parseAndValidatateMetadata(
 
         return metadatas;
     }
+
+    private boolean isMonoOrFlux(final Type type) {
+        return (type instanceof ParameterizedType)
+                && (((ParameterizedType) type).getRawType().equals(Mono.class)
+                    || ((ParameterizedType) type).getRawType().equals(Flux.class));
+    }
 }
diff --git a/...java/feign/ReactiveInvocationHandler.java → ...n/reactive/ReactiveInvocationHandler.java b/...java/feign/ReactiveInvocationHandler.java → ...n/reactive/ReactiveInvocationHandler.java
@@ -1,6 +1,8 @@
-package feign;
+package feign.reactive;
 
+import feign.InvocationHandlerFactory;
 import feign.InvocationHandlerFactory.MethodHandler;
+import feign.Target;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -18,7 +20,7 @@
  *
  * @author Sergii Karpenko
  */
-final class ReactiveInvocationHandler implements InvocationHandler {
+public final class ReactiveInvocationHandler implements InvocationHandler {
     private final Target<?> target;
     private final Map<Method, MethodHandler> dispatch;
 
@@ -43,13 +45,7 @@ public Object invoke(final Object proxy,
             case "toString":
                 return toString();
             default:
-                if (isReturnsMonoOrFlux(method)) {
-                    return invokeRequestMethod(method, args);
-                } else {
-                    throw new FeignException(String.format(
-                            "Method %s of contract %s doesn't return reactor.core.publisher.Mono or reactor.core.publisher.Flux",
-                            method.getName(), method.getDeclaringClass().getSimpleName()));
-                }
+                return invokeRequestMethod(method, args);
         }
     }
 
@@ -103,7 +99,7 @@ public String toString() {
     /**
      * Factory for ReactiveInvocationHandler.
      */
-    static final class Factory implements InvocationHandlerFactory {
+    public static final class Factory implements InvocationHandlerFactory {
 
         @Override
         public InvocationHandler create(final Target target,

diff --git a/...ain/java/feign/ReactiveMethodHandler.java → ...feign/reactive/ReactiveMethodHandler.java b/...ain/java/feign/ReactiveMethodHandler.java → ...feign/reactive/ReactiveMethodHandler.java
@@ -1,5 +1,6 @@
-package feign;
+package feign.reactive;
 
+import feign.InvocationHandlerFactory;
 import org.reactivestreams.Publisher;
 
 /**

diff --git a/feign-reactive-core/src/main/java/feign/reactive/ReactiveMethodHandlerFactory.java b/feign-reactive-core/src/main/java/feign/reactive/ReactiveMethodHandlerFactory.java
@@ -2,7 +2,6 @@
 
 
 import feign.MethodMetadata;
-import feign.ReactiveMethodHandler;
 import feign.Target;
 
 public interface ReactiveMethodHandlerFactory {

diff --git a/feign-reactive-core/src/test/java/feign/reactive/ReactiveHttpClientTest.java b/feign-reactive-core/src/test/java/feign/reactive/ReactiveHttpClientTest.java
@@ -26,6 +26,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 
+/**
+ * @author Sergii Karpenko
+ */
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(
         classes = {IcecreamController.class},

diff --git a/feign-reactive-core/src/test/java/feign/reactive/ReactiveHttpOptionsTest.java b/feign-reactive-core/src/test/java/feign/reactive/ReactiveHttpOptionsTest.java
@@ -20,6 +20,8 @@
 /**
  * Test the new capability of Reactive Feign client to support both Feign
  * Request.Options (regression) and the new ReactiveOptions configuration.
+ *
+ * @author Sergii Karpenko
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(

diff --git a/feign-reactive-core/src/test/java/feign/reactive/RetryingTest.java b/feign-reactive-core/src/test/java/feign/reactive/RetryingTest.java
@@ -22,6 +22,9 @@
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 
+/**
+ * @author Sergii Karpenko
+ */
 public class RetryingTest {
 
     @ClassRule

diff --git a/feign-reactive-load-tests/pom.xml b/feign-reactive-load-tests/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.github.openfeign</groupId>
+        <artifactId>feign-reactive</artifactId>
+        <version>0.3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>feign-reactive-load-tests</artifactId>
+
+    <properties>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-reactive-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-reactive-cloud</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.netflix.hystrix</groupId>
+            <artifactId>hystrix-core</artifactId>
+            <version>${hystrix.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.netflix.archaius</groupId>
+            <artifactId>archaius-core</artifactId>
+            <version>${archaius.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.netflix.ribbon</groupId>
+            <artifactId>ribbon-core</artifactId>
+            <version>${ribbon-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.netflix.ribbon</groupId>
+            <artifactId>ribbon-loadbalancer</artifactId>
+            <version>${ribbon-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava-reactive-streams</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>