Rewrite Java stream callbacks

Signed-off-by: Fredy Wijaya <[email protected]>

mobile/library/common/types/c_types.h

@@ -188,6 +188,7 @@ typedef struct {
  int64_t response_start_ms;
  // The time when the stream reached a final state: Error, Cancel, Success.
  int64_t stream_end_ms;
+ // TODO(fredyw): This should be a bool instead.
  // True if the upstream socket had been used previously.
  uint64_t socket_reused;
  // The number of bytes sent upstream.

mobile/library/java/io/envoyproxy/envoymobile/engine/BUILD

@@ -34,18 +34,15 @@ java_library(
  "EnvoyConfiguration.java",
  "EnvoyEngine.java",
  "EnvoyEngineImpl.java",
- "EnvoyFinalStreamIntelImpl.java",
  "EnvoyHTTPFilterCallbacksImpl.java",
  "EnvoyHTTPStream.java",
  "EnvoyNativeFilterConfig.java",
  "EnvoyNativeResourceRegistry.java",
  "EnvoyNativeResourceReleaser.java",
  "EnvoyNativeResourceWrapper.java",
- "EnvoyStreamIntelImpl.java",
  "HeaderMatchConfig.java",
  "JniBridgeUtility.java",
  "JniLibrary.java",
- "JvmCallbackContext.java",
  "JvmFilterContext.java",
  "JvmFilterFactoryContext.java",
  "JvmKeyValueStoreContext.java",

mobile/library/java/io/envoyproxy/envoymobile/engine/EnvoyHTTPStream.java

@@ -10,13 +10,13 @@ public class EnvoyHTTPStream {
  private final long engineHandle;
  private final long streamHandle;
  private final boolean explicitFlowControl;
- private final JvmCallbackContext callbacksContext;
+ private final EnvoyHTTPCallbacks callbacks;
 
  /**
  * Start the stream via the JNI library.
  */
  void start() {
- JniLibrary.startStream(engineHandle, streamHandle, callbacksContext, explicitFlowControl);
+ JniLibrary.startStream(engineHandle, streamHandle, callbacks, explicitFlowControl);
  }
 
  /**
@@ -31,7 +31,7 @@ public EnvoyHTTPStream(long engineHandle, long streamHandle, EnvoyHTTPCallbacks
  this.engineHandle = engineHandle;
  this.streamHandle = streamHandle;
  this.explicitFlowControl = explicitFlowControl;
- callbacksContext = new JvmCallbackContext(callbacks);
+ this.callbacks = callbacks;
  }
 
  /**

mobile/library/java/io/envoyproxy/envoymobile/engine/JniLibrary.java

@@ -1,6 +1,7 @@
 package io.envoyproxy.envoymobile.engine;
 
 import io.envoyproxy.envoymobile.engine.types.EnvoyEventTracker;
+import io.envoyproxy.envoymobile.engine.types.EnvoyHTTPCallbacks;
 import io.envoyproxy.envoymobile.engine.types.EnvoyLogger;
 import io.envoyproxy.envoymobile.engine.types.EnvoyOnEngineRunning;
 import java.nio.ByteBuffer;
@@ -58,16 +59,13 @@ private static class JavaLoader {
  * Open an underlying HTTP stream. Note: Streams must be started before other
  * other interaction can can occur.
  *
- * @param engine, handle to the stream's associated engine.
- * @param stream, handle to the stream to be started.
- * @param context, context that contains dispatch logic to fire callbacks
- * callbacks.
- * @param explicitFlowControl, whether explicit flow control should be enabled
- * for the stream.
- * @return envoy_stream, with a stream handle and a success status, or a failure
- * status.
+ * @param engine handle to the stream's associated engine.
+ * @param stream handle to the stream to be started.
+ * @param callbacks context that contains dispatch logic to fire callbacks.
+ * @param explicitFlowControl whether explicit flow control should be enabled for the stream.
+ * @return a stream handle and a success status, or a failure status.
  */
- protected static native int startStream(long engine, long stream, JvmCallbackContext context,
+ protected static native int startStream(long engine, long stream, EnvoyHTTPCallbacks callbacks,
  boolean explicitFlowControl);
 
  /**
@@ -263,7 +261,7 @@ public static native Object callCertificateVerificationFromNative(byte[][] certC
  * Mimic a call to AndroidNetworkLibrary#addTestRootCertificate from native code.
  * To be used for testing only.
  *
- * @param rootCert DER encoded bytes of the certificate.
+ * @param cert DER encoded bytes of the certificate.
  */
  public static native void callAddTestRootCertificateFromNative(byte[] cert);
 
@@ -274,7 +272,7 @@ public static native Object callCertificateVerificationFromNative(byte[][] certC
  */
  public static native void callClearTestRootCertificateFromNative();
 
- /*
+ /**
  * Given a filter name, create the proto config for adding the native filter
  *
  * @param filterName the name of the native filter