fix

Signed-off-by: Alan Chiu <[email protected]>
envoyproxy · May 4, 2021 · e24eb69 · e24eb69
1 parent fff728f
commit e24eb69
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/library/java/io/envoyproxy/envoymobile/engine/AndroidEngineImpl.java b/library/java/io/envoyproxy/envoymobile/engine/AndroidEngineImpl.java
@@ -27,12 +27,12 @@ public EnvoyHTTPStream startStream(EnvoyHTTPCallbacks callbacks) {
     return envoyEngine.startStream(callbacks);
   }
 
-  public int runWithConfig(EnvoyConfiguration envoyConfiguration, String configurationYAML,
-                           String logLevel) {
+  public int runWithTemplate(String configurationYAML, EnvoyConfiguration envoyConfiguration,
+                             String logLevel) {
     // re-enable lifecycle-based stat flushing when https://github.com/lyft/envoy-mobile/issues/748
     // gets fixed. AndroidAppLifecycleMonitor monitor = new AndroidAppLifecycleMonitor();
     // application.registerActivityLifecycleCallbacks(monitor);
-    return envoyEngine.runWithConfig(envoyConfiguration, configurationYAML, logLevel);
+    return envoyEngine.runWithTemplate(configurationYAML, envoyConfiguration, logLevel);
   }
 
   @Override

diff --git a/library/java/io/envoyproxy/envoymobile/engine/EnvoyEngine.java b/library/java/io/envoyproxy/envoymobile/engine/EnvoyEngine.java
@@ -1,8 +1,6 @@
 package io.envoyproxy.envoymobile.engine;
 
 import io.envoyproxy.envoymobile.engine.types.EnvoyHTTPCallbacks;
-import io.envoyproxy.envoymobile.engine.types.EnvoyLogger;
-import io.envoyproxy.envoymobile.engine.types.EnvoyOnEngineRunning;
 import io.envoyproxy.envoymobile.engine.types.EnvoyStringAccessor;
 
 import java.util.Map;
@@ -27,13 +25,13 @@ public interface EnvoyEngine {
    *
    * The envoyConfiguration is used to resolve the configurationYAML.
    *
-   * @param envoyConfiguration The EnvoyConfiguration used to start Envoy.
    * @param configurationYAML The configuration yaml with which to start Envoy.
+   * @param envoyConfiguration The EnvoyConfiguration used to start Envoy.
    * @param logLevel          The log level to use when starting Envoy.
    * @return A status indicating if the action was successful.
    */
-  int runWithConfig(EnvoyConfiguration envoyConfiguration, String configurationYAML,
-                    String logLevel);
+  int runWithTemplate(String configurationYAML, EnvoyConfiguration envoyConfiguration,
+                      String logLevel);
 
   /**
    * Run the Envoy engine with the provided EnvoyConfiguration and log level.

diff --git a/library/java/io/envoyproxy/envoymobile/engine/EnvoyEngineImpl.java b/library/java/io/envoyproxy/envoymobile/engine/EnvoyEngineImpl.java
@@ -52,14 +52,14 @@ public void terminate() {
    *
    * The envoyConfiguration is used to resolve the configurationYAML.
    *
-   * @param envoyConfiguration The EnvoyConfiguration used to start Envoy.
    * @param configurationYAML The configuration yaml with which to start Envoy.
+   * @param envoyConfiguration The EnvoyConfiguration used to start Envoy.
    * @param logLevel          The log level to use when starting Envoy.
    * @return A status indicating if the action was successful.
    */
   @Override
-  public int runWithConfig(EnvoyConfiguration envoyConfiguration, String configurationYAML,
-                           String logLevel) {
+  public int runWithTemplate(String configurationYAML, EnvoyConfiguration envoyConfiguration,
+                             String logLevel) {
     for (EnvoyHTTPFilterFactory filterFactory : envoyConfiguration.httpPlatformFilterFactories) {
       JniLibrary.registerFilterFactory(filterFactory.getFilterName(),
                                        new JvmFilterFactoryContext(filterFactory));

diff --git a/library/kotlin/io/envoyproxy/envoymobile/EngineImpl.kt b/library/kotlin/io/envoyproxy/envoymobile/EngineImpl.kt
@@ -26,7 +26,7 @@ class EngineImpl constructor(
     streamClient = StreamClientImpl(envoyEngine)
     pulseClient = PulseClientImpl(envoyEngine)
     if (configurationYAML != null) {
-      envoyEngine.runWithConfig(envoyConfiguration, configurationYAML, logLevel.level)
+      envoyEngine.runWithTemplate(configurationYAML, envoyConfiguration, logLevel.level)
     } else {
       envoyEngine.runWithConfig(envoyConfiguration, logLevel.level)
     }

diff --git a/library/kotlin/io/envoyproxy/envoymobile/mocks/MockEnvoyEngine.kt b/library/kotlin/io/envoyproxy/envoymobile/mocks/MockEnvoyEngine.kt
@@ -12,7 +12,11 @@ import io.envoyproxy.envoymobile.engine.types.EnvoyStringAccessor
 internal class MockEnvoyEngine : EnvoyEngine {
   override fun runWithConfig(envoyConfiguration: EnvoyConfiguration?, logLevel: String?): Int = 0
 
-  override fun runWithConfig(envoyConfiguration: EnvoyConfiguration, configurationYAML: String?, logLevel: String?): Int = 0
+  override fun runWithTemplate(
+    configurationYAML: String,
+    envoyConfiguration: EnvoyConfiguration,
+    logLevel: String
+  ): Int = 0
 
   override fun startStream(callbacks: EnvoyHTTPCallbacks?): EnvoyHTTPStream = MockEnvoyHTTPStream(callbacks!!)