Skip to content

Commit c5e2ee3

Browse files
authored
fix: make initializeClient a pure function (#498)
* fix: make initializeClient a pure function * fix: make initializeClient a pure function
1 parent 70467ba commit c5e2ee3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/LambdaRuntimeApiClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public LambdaRuntimeApiClientImpl(String hostnameAndPort) {
3838
Objects.requireNonNull(hostnameAndPort, "hostnameAndPort cannot be null");
3939
this.baseUrl = "http://" + hostnameAndPort;
4040
this.invocationEndpoint = this.baseUrl + "/2018-06-01/runtime/invocation/";
41-
NativeClient.init();
41+
NativeClient.init(hostnameAndPort);
4242
}
4343

4444
@Override

aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* interactions with the Runtime API.
1515
*/
1616
class NativeClient {
17-
static void init() {
17+
static void init(String awsLambdaRuntimeApi) {
1818
JniHelper.load();
19-
initializeClient(USER_AGENT.getBytes());
19+
initializeClient(USER_AGENT.getBytes(), awsLambdaRuntimeApi.getBytes());
2020
}
2121

22-
static native void initializeClient(byte[] userAgent);
22+
static native void initializeClient(byte[] userAgent, byte[] awsLambdaRuntimeApi);
2323

2424
static native InvocationRequest next();
2525

aws-lambda-java-runtime-interface-client/src/main/jni/com_amazonaws_services_lambda_runtime_api_client_runtimeapi_NativeClient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ static std::string toNativeString(JNIEnv *env, jbyteArray jArray) {
6969
return nativeString;
7070
}
7171

72-
JNIEXPORT void JNICALL Java_com_amazonaws_services_lambda_runtime_api_client_runtimeapi_NativeClient_initializeClient(JNIEnv *env, jobject thisObject, jbyteArray userAgent) {
72+
JNIEXPORT void JNICALL Java_com_amazonaws_services_lambda_runtime_api_client_runtimeapi_NativeClient_initializeClient(JNIEnv *env, jobject thisObject, jbyteArray userAgent, jbyteArray awsLambdaRuntimeApi) {
7373
std::string user_agent = toNativeString(env, userAgent);
74-
std::string endpoint(getenv("AWS_LAMBDA_RUNTIME_API"));
74+
std::string endpoint = toNativeString(env, awsLambdaRuntimeApi);
7575
CLIENT = new aws::lambda_runtime::runtime(endpoint, user_agent);
7676
}
7777

aws-lambda-java-runtime-interface-client/src/main/jni/com_amazonaws_services_lambda_runtime_api_client_runtimeapi_NativeClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extern "C" {
1111
#endif
1212

1313
JNIEXPORT void JNICALL Java_com_amazonaws_services_lambda_runtime_api_client_runtimeapi_NativeClient_initializeClient
14-
(JNIEnv *, jobject, jbyteArray);
14+
(JNIEnv *, jobject, jbyteArray, jbyteArray);
1515

1616
JNIEXPORT jobject JNICALL Java_com_amazonaws_services_lambda_runtime_api_client_runtimeapi_NativeClient_next
1717
(JNIEnv *, jobject);

0 commit comments

Comments
 (0)