Fix issue where buffer sometimes throws size-related error.

apiman · Feb 4, 2017 · 56c206f · 56c206f
1 parent 3e9d6ab
commit 56c206f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/gateway/engine/beans/src/main/java/io/apiman/gateway/engine/beans/Contract.java b/gateway/engine/beans/src/main/java/io/apiman/gateway/engine/beans/Contract.java
@@ -122,7 +122,7 @@ public boolean matches(ApiRequest request) {
         String apiVersion = request.getApiVersion();
         return matches(apiOrgId, apiId, apiVersion);
     }
-    
+
     /**
      * Checks the API unique identifier against what this contract expects (org id, id, version).
      * Returns true if they match.
@@ -135,4 +135,12 @@ public boolean matches(String apiOrgId, String apiId, String apiVersion) {
         return this.apiOrgId.equals(apiOrgId) && this.apiId.equals(apiId) && this.apiVersion.equals(apiVersion);
     }
 
+    @Override
+    @SuppressWarnings("nls")
+    public String toString() {
+        final int maxLen = 10;
+        return "Contract [apiOrgId=" + apiOrgId + ", apiId=" + apiId + ", apiVersion=" + apiVersion + ", plan=" + plan + ", policies="
+                + (policies != null ? policies.subList(0, Math.min(policies.size(), maxLen)) : null) + "]";
+    }
+
 }
diff --git a/gateway/engine/beans/src/main/java/io/apiman/gateway/engine/beans/Policy.java b/gateway/engine/beans/src/main/java/io/apiman/gateway/engine/beans/Policy.java
@@ -19,13 +19,13 @@
 
 /**
  * Models a policy.
- * 
+ *
  * @author Marc Savy <msavy@redhat.com>
  */
 public class Policy implements Serializable {
 
     private static final long serialVersionUID = -5945877012261045491L;
-    
+
     private String policyJsonConfig; //config_info json str
     private String policyImpl; //Reference to policy (classname?) we're going to load?
 
@@ -99,4 +99,11 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
+
+    @Override
+    @SuppressWarnings("nls")
+    public String toString() {
+        return "Policy [policyJsonConfig=" + policyJsonConfig + ", policyImpl=" + policyImpl + "]";
+    }
+
 }
diff --git a/...ertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/URILoadingRegistry.java b/...ertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/URILoadingRegistry.java
@@ -190,7 +190,7 @@ private void checkQueue() {
         private void loadDataIntoRegistries() {
             URILoadingRegistry reg = null;
             while ((reg = awaiting.poll()) != null) {
-                log.debug("Loading data into registry: {0} ", reg);
+                log.debug("Loading data into registry {0}:", reg);
                 for (Api api : apis) {
                     reg.publishApiInternal(api, handleAnyFailure());
                     log.debug("Publishing: {0} ", api);

diff --git a/...ng/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/HttpResourceFetcher.java b/...ng/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/HttpResourceFetcher.java
@@ -40,7 +40,7 @@ public class HttpResourceFetcher implements ResourceFetcher {
     private URI uri;
     private boolean isHttps;
     private Vertx vertx;
-    private Buffer rawData;
+    private Buffer rawData = Buffer.buffer();
     private Handler<Throwable> exceptionHandler;
     private Map<String, String> config;
     private Authenticator authenticator;
@@ -72,11 +72,7 @@ public void fetch(Handler<Buffer> resultHandler) {
             .get(port, uri.getHost(), uri.getPath(), clientResponse -> {
                 if (clientResponse.statusCode() / 100 == 2) {
                     clientResponse.handler(data -> {
-                        if (rawData == null) {
-                            rawData = data;
-                        } else {
-                            rawData.appendBuffer(data);
-                        }
+                        rawData.appendBuffer(data);
                     })
                     .endHandler(end -> resultHandler.handle(rawData))
                     .exceptionHandler(exceptionHandler);

diff --git a/...polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/BasicAuth.java b/...polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/BasicAuth.java
@@ -18,6 +18,7 @@
 
 import io.apiman.common.util.Basic;
 import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.Future;
 import io.vertx.core.MultiMap;
 import io.vertx.core.Vertx;
 
@@ -40,6 +41,7 @@ public Authenticator validateConfig(Map<String, String> config) {
     @Override
     public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, AsyncResultHandler<Void> resultHandler) {
         headerMap.set("Authorization", Basic.encode(config.get("username"), config.get("password")));
+        resultHandler.handle(Future.succeededFuture());
         return this;
     }
 }