From fdcfe8f81af4ae85dd7c8949713a2ce422a3d255 Mon Sep 17 00:00:00 2001 From: Alan Chiu Date: Wed, 11 Sep 2019 09:46:23 -0700 Subject: [PATCH 1/2] Rename Envoy to EnvoyClient Signed-off-by: Alan Chiu --- examples/java/hello_world/MainActivity.java | 4 +- examples/kotlin/hello_world/MainActivity.kt | 4 +- ...uilder.kt => AndroidEnvoyClientBuilder.kt} | 4 +- .../src/io/envoyproxy/envoymobile/BUILD | 8 +-- .../envoymobile/{Envoy.kt => EnvoyClient.kt} | 2 +- ...{EnvoyBuilder.kt => EnvoyClientBuilder.kt} | 14 +++--- .../envoymobile/{Client.kt => HTTPClient.kt} | 2 +- .../test/io/envoyproxy/envoymobile/BUILD | 4 +- ...ilderTest.kt => EnvoyClientBuilderTest.kt} | 50 +++++++++---------- .../{EnvoyTest.kt => EnvoyClientTest.kt} | 2 +- 10 files changed, 47 insertions(+), 47 deletions(-) rename library/kotlin/src/io/envoyproxy/envoymobile/{AndroidEnvoyBuilder.kt => AndroidEnvoyClientBuilder.kt} (77%) rename library/kotlin/src/io/envoyproxy/envoymobile/{Envoy.kt => EnvoyClient.kt} (99%) rename library/kotlin/src/io/envoyproxy/envoymobile/{EnvoyBuilder.kt => EnvoyClientBuilder.kt} (86%) rename library/kotlin/src/io/envoyproxy/envoymobile/{Client.kt => HTTPClient.kt} (98%) rename library/kotlin/test/io/envoyproxy/envoymobile/{EnvoyBuilderTest.kt => EnvoyClientBuilderTest.kt} (54%) rename library/kotlin/test/io/envoyproxy/envoymobile/{EnvoyTest.kt => EnvoyClientTest.kt} (99%) diff --git a/examples/java/hello_world/MainActivity.java b/examples/java/hello_world/MainActivity.java index e5374b731a..fdcace1d3a 100644 --- a/examples/java/hello_world/MainActivity.java +++ b/examples/java/hello_world/MainActivity.java @@ -7,7 +7,7 @@ import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import io.envoyproxy.envoymobile.AndroidEnvoyBuilder; +import io.envoyproxy.envoymobile.AndroidEnvoyClientBuilder; import io.envoyproxy.envoymobile.Envoy; import io.envoyproxy.envoymobile.Request; import io.envoyproxy.envoymobile.RequestBuilder; @@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - envoy = new AndroidEnvoyBuilder(getBaseContext()).build(); + envoy = new AndroidEnvoyClientBuilder(getBaseContext()).build(); recyclerView = findViewById(R.id.recycler_view); recyclerView.setLayoutManager(new LinearLayoutManager(this)); diff --git a/examples/kotlin/hello_world/MainActivity.kt b/examples/kotlin/hello_world/MainActivity.kt index 23970f5269..c634123c85 100644 --- a/examples/kotlin/hello_world/MainActivity.kt +++ b/examples/kotlin/hello_world/MainActivity.kt @@ -8,7 +8,7 @@ import android.support.v7.widget.DividerItemDecoration import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView import android.util.Log -import io.envoyproxy.envoymobile.AndroidEnvoyBuilder +import io.envoyproxy.envoymobile.AndroidEnvoyClientBuilder import io.envoyproxy.envoymobile.Envoy import io.envoyproxy.envoymobile.RequestBuilder import io.envoyproxy.envoymobile.RequestMethod @@ -37,7 +37,7 @@ class MainActivity : Activity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - envoy = AndroidEnvoyBuilder(baseContext).build() + envoy = AndroidEnvoyClientBuilder(baseContext).build() recyclerView = findViewById(R.id.recycler_view) as RecyclerView recyclerView.layoutManager = LinearLayoutManager(this) diff --git a/library/kotlin/src/io/envoyproxy/envoymobile/AndroidEnvoyBuilder.kt b/library/kotlin/src/io/envoyproxy/envoymobile/AndroidEnvoyClientBuilder.kt similarity index 77% rename from library/kotlin/src/io/envoyproxy/envoymobile/AndroidEnvoyBuilder.kt rename to library/kotlin/src/io/envoyproxy/envoymobile/AndroidEnvoyClientBuilder.kt index 2f11e6b8c9..31532e34a5 100644 --- a/library/kotlin/src/io/envoyproxy/envoymobile/AndroidEnvoyBuilder.kt +++ b/library/kotlin/src/io/envoyproxy/envoymobile/AndroidEnvoyClientBuilder.kt @@ -3,9 +3,9 @@ package io.envoyproxy.envoymobile import android.content.Context import io.envoyproxy.envoymobile.engine.AndroidEngineImpl -class AndroidEnvoyBuilder( +class AndroidEnvoyClientBuilder( context: Context -) : EnvoyBuilder() { +) : EnvoyClientBuilder() { init { addEngineType { AndroidEngineImpl(context) } diff --git a/library/kotlin/src/io/envoyproxy/envoymobile/BUILD b/library/kotlin/src/io/envoyproxy/envoymobile/BUILD index 6843749b5d..525ffcdd64 100644 --- a/library/kotlin/src/io/envoyproxy/envoymobile/BUILD +++ b/library/kotlin/src/io/envoyproxy/envoymobile/BUILD @@ -13,7 +13,7 @@ aar_with_jni( envoy_mobile_kt_aar_android_library( name = "envoy_lib", srcs = [ - "AndroidEnvoyBuilder.kt", + "AndroidEnvoyClientBuilder.kt", ], custom_package = "io.envoyproxy.envoymobile", manifest = "EnvoyManifest.xml", @@ -29,11 +29,11 @@ envoy_mobile_kt_aar_android_library( envoy_mobile_kt_library( name = "envoy_interfaces_lib", srcs = [ - "Client.kt", - "Envoy.kt", - "EnvoyBuilder.kt", + "EnvoyClient.kt", + "EnvoyClientBuilder.kt", "EnvoyException.kt", "EnvoyStreamEmitter.kt", + "HTTPClient.kt", "Request.kt", "RequestBuilder.kt", "RequestMapper.kt", diff --git a/library/kotlin/src/io/envoyproxy/envoymobile/Envoy.kt b/library/kotlin/src/io/envoyproxy/envoymobile/EnvoyClient.kt similarity index 99% rename from library/kotlin/src/io/envoyproxy/envoymobile/Envoy.kt rename to library/kotlin/src/io/envoyproxy/envoymobile/EnvoyClient.kt index b1a880db8e..88ea40d022 100644 --- a/library/kotlin/src/io/envoyproxy/envoymobile/Envoy.kt +++ b/library/kotlin/src/io/envoyproxy/envoymobile/EnvoyClient.kt @@ -25,7 +25,7 @@ class Envoy private constructor( internal val envoyConfiguration: EnvoyConfiguration?, internal val configurationYAML: String?, internal val logLevel: LogLevel -) : Client { +) : HTTPClient { constructor(engine: EnvoyEngine, envoyConfiguration: EnvoyConfiguration, logLevel: LogLevel = LogLevel.INFO) : this(engine, envoyConfiguration, null, logLevel) constructor(engine: EnvoyEngine, configurationYAML: String, logLevel: LogLevel = LogLevel.INFO) : this(engine, null, configurationYAML, logLevel) diff --git a/library/kotlin/src/io/envoyproxy/envoymobile/EnvoyBuilder.kt b/library/kotlin/src/io/envoyproxy/envoymobile/EnvoyClientBuilder.kt similarity index 86% rename from library/kotlin/src/io/envoyproxy/envoymobile/EnvoyBuilder.kt rename to library/kotlin/src/io/envoyproxy/envoymobile/EnvoyClientBuilder.kt index a21fb2fa86..ecf3732373 100644 --- a/library/kotlin/src/io/envoyproxy/envoymobile/EnvoyBuilder.kt +++ b/library/kotlin/src/io/envoyproxy/envoymobile/EnvoyClientBuilder.kt @@ -5,7 +5,7 @@ import io.envoyproxy.envoymobile.engine.EnvoyEngine import io.envoyproxy.envoymobile.engine.EnvoyEngineImpl -open class EnvoyBuilder internal constructor( +open class EnvoyClientBuilder internal constructor( ) { private var logLevel = LogLevel.INFO private var configYAML: String? = null @@ -19,7 +19,7 @@ open class EnvoyBuilder internal constructor( * Add a log level to use with Envoy. * @param logLevel the log level to use with Envoy. */ - fun addLogLevel(logLevel: LogLevel): EnvoyBuilder { + fun addLogLevel(logLevel: LogLevel): EnvoyClientBuilder { this.logLevel = logLevel return this } @@ -30,7 +30,7 @@ open class EnvoyBuilder internal constructor( * * @param configYAML the contents of a yaml file to use as a configuration. */ - fun addConfigYAML(configYAML: String?): EnvoyBuilder { + fun addConfigYAML(configYAML: String?): EnvoyClientBuilder { this.configYAML = configYAML return this } @@ -40,7 +40,7 @@ open class EnvoyBuilder internal constructor( * * @param connectTimeoutSeconds timeout for new network connections to hosts in the cluster. */ - fun addConnectTimeoutSeconds(connectTimeoutSeconds: Int): EnvoyBuilder { + fun addConnectTimeoutSeconds(connectTimeoutSeconds: Int): EnvoyClientBuilder { this.connectTimeoutSeconds = connectTimeoutSeconds return this } @@ -50,7 +50,7 @@ open class EnvoyBuilder internal constructor( * * @param dnsRefreshSeconds rate in seconds to refresh DNS. */ - fun addDNSRefreshSeconds(dnsRefreshSeconds: Int): EnvoyBuilder { + fun addDNSRefreshSeconds(dnsRefreshSeconds: Int): EnvoyClientBuilder { this.dnsRefreshSeconds = dnsRefreshSeconds return this } @@ -60,7 +60,7 @@ open class EnvoyBuilder internal constructor( * * @param statsFlushSeconds interval at which to flush Envoy stats. */ - fun addStatsFlushSeconds(statsFlushSeconds: Int): EnvoyBuilder { + fun addStatsFlushSeconds(statsFlushSeconds: Int): EnvoyClientBuilder { this.statsFlushSeconds = statsFlushSeconds return this } @@ -84,7 +84,7 @@ open class EnvoyBuilder internal constructor( * * A new instance of this engine will be created when `build()` is called. */ - internal fun addEngineType(engineType: () -> EnvoyEngine): EnvoyBuilder { + internal fun addEngineType(engineType: () -> EnvoyEngine): EnvoyClientBuilder { this.engineType = engineType return this } diff --git a/library/kotlin/src/io/envoyproxy/envoymobile/Client.kt b/library/kotlin/src/io/envoyproxy/envoymobile/HTTPClient.kt similarity index 98% rename from library/kotlin/src/io/envoyproxy/envoymobile/Client.kt rename to library/kotlin/src/io/envoyproxy/envoymobile/HTTPClient.kt index 3850459414..d53a073a20 100644 --- a/library/kotlin/src/io/envoyproxy/envoymobile/Client.kt +++ b/library/kotlin/src/io/envoyproxy/envoymobile/HTTPClient.kt @@ -2,7 +2,7 @@ package io.envoyproxy.envoymobile import java.nio.ByteBuffer -interface Client { +interface HTTPClient { /** * For starting a stream. * diff --git a/library/kotlin/test/io/envoyproxy/envoymobile/BUILD b/library/kotlin/test/io/envoyproxy/envoymobile/BUILD index d6df5ef21c..b066486e81 100644 --- a/library/kotlin/test/io/envoyproxy/envoymobile/BUILD +++ b/library/kotlin/test/io/envoyproxy/envoymobile/BUILD @@ -45,7 +45,7 @@ envoy_mobile_kt_test( envoy_mobile_kt_test( name = "envoy_builder_test", srcs = [ - "EnvoyBuilderTest.kt", + "EnvoyClientBuilderTest.kt", ], deps = [ "//library/kotlin/src/io/envoyproxy/envoymobile:envoy_interfaces_lib", @@ -65,7 +65,7 @@ envoy_mobile_kt_test( envoy_mobile_kt_test( name = "envoy_client_test", srcs = [ - "EnvoyTest.kt", + "EnvoyClientTest.kt", ], deps = [ "//library/kotlin/src/io/envoyproxy/envoymobile:envoy_interfaces_lib", diff --git a/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyBuilderTest.kt b/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyClientBuilderTest.kt similarity index 54% rename from library/kotlin/test/io/envoyproxy/envoymobile/EnvoyBuilderTest.kt rename to library/kotlin/test/io/envoyproxy/envoymobile/EnvoyClientBuilderTest.kt index eb18f3ef0e..ef3aa8296d 100644 --- a/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyBuilderTest.kt +++ b/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyClientBuilderTest.kt @@ -1,6 +1,6 @@ package io.envoyproxy.envoymobile.io.envoyproxy.envoymobile -import io.envoyproxy.envoymobile.EnvoyBuilder +import io.envoyproxy.envoymobile.EnvoyClientBuilder import io.envoyproxy.envoymobile.LogLevel import io.envoyproxy.envoymobile.engine.EnvoyEngine import org.assertj.core.api.Assertions.assertThat @@ -17,60 +17,60 @@ mock_template: class EnvoyBuilderTest { - private lateinit var builder: EnvoyBuilder + private lateinit var clientBuilder: EnvoyClientBuilder private var engine: EnvoyEngine = mock(EnvoyEngine::class.java) @Test fun `adding custom config builder uses custom config for running Envoy`() { - builder = EnvoyBuilder() - builder.addConfigYAML(TEST_CONFIG) - builder.addEngineType { engine } + clientBuilder = EnvoyClientBuilder() + clientBuilder.addConfigYAML(TEST_CONFIG) + clientBuilder.addEngineType { engine } - builder.addConfigYAML("mock_template:") - val envoy = builder.build() + clientBuilder.addConfigYAML("mock_template:") + val envoy = clientBuilder.build() assertThat(envoy.configurationYAML).isEqualTo("mock_template:") } @Test fun `adding log level builder uses log level for running Envoy`() { - builder = EnvoyBuilder() - builder.addConfigYAML(TEST_CONFIG) - builder.addEngineType { engine } + clientBuilder = EnvoyClientBuilder() + clientBuilder.addConfigYAML(TEST_CONFIG) + clientBuilder.addEngineType { engine } - builder.addLogLevel(LogLevel.DEBUG) - val envoy = builder.build() + clientBuilder.addLogLevel(LogLevel.DEBUG) + val envoy = clientBuilder.build() assertThat(envoy.logLevel).isEqualTo(LogLevel.DEBUG) } @Test fun `specifying connection timeout overrides default`() { - builder = EnvoyBuilder() - builder.addEngineType { engine } + clientBuilder = EnvoyClientBuilder() + clientBuilder.addEngineType { engine } - builder.addConnectTimeoutSeconds(1234) - val envoy = builder.build() + clientBuilder.addConnectTimeoutSeconds(1234) + val envoy = clientBuilder.build() assertThat(envoy.envoyConfiguration!!.connectTimeoutSeconds).isEqualTo(1234) } @Test fun `specifying DNS refresh overrides default`() { - builder = EnvoyBuilder() - builder.addEngineType { engine } + clientBuilder = EnvoyClientBuilder() + clientBuilder.addEngineType { engine } - builder.addDNSRefreshSeconds(1234) - val envoy = builder.build() + clientBuilder.addDNSRefreshSeconds(1234) + val envoy = clientBuilder.build() assertThat(envoy.envoyConfiguration!!.dnsRefreshSeconds).isEqualTo(1234) } @Test fun `specifying stats flush overrides default`() { - builder = EnvoyBuilder() - builder.addEngineType { engine } + clientBuilder = EnvoyClientBuilder() + clientBuilder.addEngineType { engine } - builder.addStatsFlushSeconds(1234) - builder.build() - val envoy = builder.build() + clientBuilder.addStatsFlushSeconds(1234) + clientBuilder.build() + val envoy = clientBuilder.build() assertThat(envoy.envoyConfiguration!!.statsFlushSeconds).isEqualTo(1234) } diff --git a/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyTest.kt b/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyClientTest.kt similarity index 99% rename from library/kotlin/test/io/envoyproxy/envoymobile/EnvoyTest.kt rename to library/kotlin/test/io/envoyproxy/envoymobile/EnvoyClientTest.kt index 8ef1a161f8..bded9e082d 100644 --- a/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyTest.kt +++ b/library/kotlin/test/io/envoyproxy/envoymobile/EnvoyClientTest.kt @@ -15,7 +15,7 @@ import org.mockito.Mockito.verify import java.nio.ByteBuffer import java.util.concurrent.Executor -class EnvoyTest { +class EnvoyClientTest { private val engine = mock(EnvoyEngine::class.java) private val stream = mock(EnvoyHTTPStream::class.java) From a4ce1b0382ec765729754d37ff9eebaf23aed4dc Mon Sep 17 00:00:00 2001 From: Alan Chiu Date: Wed, 11 Sep 2019 10:00:48 -0700 Subject: [PATCH 2/2] fix Signed-off-by: Alan Chiu --- library/kotlin/test/io/envoyproxy/envoymobile/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/kotlin/test/io/envoyproxy/envoymobile/BUILD b/library/kotlin/test/io/envoyproxy/envoymobile/BUILD index b066486e81..e168dbf0e8 100644 --- a/library/kotlin/test/io/envoyproxy/envoymobile/BUILD +++ b/library/kotlin/test/io/envoyproxy/envoymobile/BUILD @@ -43,7 +43,7 @@ envoy_mobile_kt_test( ) envoy_mobile_kt_test( - name = "envoy_builder_test", + name = "envoy_client_builder_test", srcs = [ "EnvoyClientBuilderTest.kt", ],