Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@

<groupId>io.revolver</groupId>
<artifactId>dropwizard-revolver</artifactId>
<version>2.0.1</version>
<version>2.0.3-SNAPSHOT</version>
<modules>
<module>revolver-model</module>
<module>resilience4j</module>
<module>sentinel</module>
<module>revolver-core</module>
<module>revolver-server</module>
<module>revolver-hystrix</module>
<module>revolver-vertx</module>
</modules>
<packaging>pom</packaging>

Expand Down
6 changes: 3 additions & 3 deletions resilience4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>dropwizard-revolver</artifactId>
<groupId>io.revolver</groupId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-model</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-core</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions revolver-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>dropwizard-revolver</artifactId>
<groupId>io.revolver</groupId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-model</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.appform.commonutils</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public ResponseType execute(RequestType request)
.getHandler(revolverExecutorType);

response = (ResponseType) revolverCommandHandler.executeSync(this, normalizedRequest);
log.info("RevolverResponse : {}", response);
if (log.isDebugEnabled()) {
log.debug("Command response: " + response);
}
Expand Down
6 changes: 3 additions & 3 deletions revolver-hystrix/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>dropwizard-revolver</artifactId>
<groupId>io.revolver</groupId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,12 +20,12 @@
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-model</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-core</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
14 changes: 13 additions & 1 deletion revolver-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,23 @@
<parent>
<artifactId>dropwizard-revolver</artifactId>
<groupId>io.revolver</groupId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>revolver-model</artifactId>

<properties>
<vertex.version>3.8.4</vertex.version>
</properties>

<dependencies>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
<version>${vertex.version}</version>
</dependency>
</dependencies>


</project>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.dropwizard.revolver.core.model.RevolverRequest;
import io.dropwizard.revolver.core.tracing.TraceInfo;
import io.dropwizard.revolver.http.config.RevolverHttpApiConfig;
import io.vertx.ext.web.RoutingContext;
import java.util.Map;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
Expand All @@ -42,6 +43,7 @@ public class RevolverHttpRequest extends RevolverRequest {
private String path;
private RevolverHttpApiConfig.RequestMethod method;
private byte[] body;
private RoutingContext routingContext;

public RevolverHttpRequest() {
this.headers = new MultivaluedHashMap<>();
Expand All @@ -55,7 +57,8 @@ public RevolverHttpRequest() {
public RevolverHttpRequest(String service, String api,
RevolverHttpApiConfig.RequestMethod method, TraceInfo traceInfo,
MultivaluedMap<String, String> headers, MultivaluedMap<String, String> queryParams,
Map<String, String> pathParams, String path, byte[] body, RevolverExecutorType revolverExecutorType) {
Map<String, String> pathParams, String path, byte[] body, RevolverExecutorType revolverExecutorType,
RoutingContext routingContext) {
super("http", service, api, traceInfo, revolverExecutorType);
this.headers = new MultivaluedHashMap<>();
this.queryParams = new MultivaluedHashMap<>();
Expand All @@ -66,5 +69,6 @@ public RevolverHttpRequest(String service, String api,
this.body = body;
this.path = path;
this.method = method;
this.routingContext = routingContext;
}
}
18 changes: 12 additions & 6 deletions revolver-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>dropwizard-revolver</artifactId>
<groupId>io.revolver</groupId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -16,29 +16,35 @@
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-model</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-core</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<!-- <dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-sentinel</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>-->
<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-resilience4j</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<!--<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-hystrix</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
</dependency>-->

<dependency>
<groupId>io.revolver</groupId>
<artifactId>revolver-vertx</artifactId>
<version>2.0.3-SNAPSHOT</version>
</dependency>

</dependencies>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,18 @@
import io.dropwizard.revolver.resource.RevolverRequestResource;
import io.dropwizard.revolver.splitting.PathExpressionSplitConfig;
import io.dropwizard.revolver.splitting.SplitConfig;
import io.dropwizard.revolver.vertx.RevolverVerticle;
import io.dropwizard.revolver.vertx.routes.RouterRegistry;
import io.dropwizard.riemann.RiemannBundle;
import io.dropwizard.riemann.RiemannConfig;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import io.vertx.circuitbreaker.CircuitBreaker;
import io.vertx.circuitbreaker.CircuitBreakerOptions;
import io.vertx.core.DeploymentOptions;
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.ext.web.Router;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
Expand All @@ -101,6 +109,21 @@ public abstract class RevolverBundle<T extends Configuration> implements Configu
public static final ObjectMapper MSG_PACK_OBJECT_MAPPER = new ObjectMapper(
new MessagePackFactory());
public static final Map<String, Boolean> apiStatus = new ConcurrentHashMap<>();
public static final Vertx vertx = Vertx.vertx(new VertxOptions());
public static final Router router = Router.router(vertx);

public static final CircuitBreaker cb = CircuitBreaker.create("my-circuit-breaker", vertx,
new CircuitBreakerOptions().setMaxFailures(2)
.setTimeout(20000)
.setFallbackOnFailure(false)
.setFailuresRollingWindow(30000)
.setResetTimeout(30000))
.openHandler(event -> {
System.out.println("Circuit opened");
})
.closeHandler(event -> {
System.out.println("Circuit closed");
});

public static RevolverServiceResolver serviceNameResolver = null;
public static ConcurrentHashMap<String, RevolverHttpApiConfig> apiConfig = new ConcurrentHashMap<>();
Expand Down Expand Up @@ -374,11 +397,27 @@ public void run(T configuration, Environment environment) {
InlineCallbackHandler callbackHandler = InlineCallbackHandler.builder()
.persistenceProvider(persistenceProvider).revolverConfig(revolverConfig).build();

initializeVertx(environment, persistenceProvider, callbackHandler, metrics);
registerResources(environment, metrics, persistenceProvider, callbackHandler);
registerMappers(environment);
registerFilters(environment);
}

private void initializeVertx(Environment environment, PersistenceProvider persistenceProvider,
InlineCallbackHandler callbackHandler, MetricRegistry metrics) {

RevolverRequestResource revolverRequestResource = new RevolverRequestResource(environment.getObjectMapper(),
environment.getObjectMapper(), persistenceProvider, callbackHandler, metrics, revolverConfig);
RouterRegistry.builder()
.router(router)
.revolverRequestResource(revolverRequestResource)
.build();

DeploymentOptions deploymentOptions = new DeploymentOptions();
deploymentOptions.setInstances(5);
vertx.deployVerticle(RevolverVerticle.class.getName(), deploymentOptions);
}

public abstract CuratorFramework getCurator();

public abstract RevolverConfig getRevolverConfig(T configuration);
Expand Down
Loading