From bf8912af990db5b706ca603f26aaf8dee7e1e63f Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Thu, 4 Jan 2024 11:00:46 -0800 Subject: [PATCH] To support VSOCK, stop limiting `port` to 16 bits. (#526) --- android/iotdevicesdk/build.gradle | 2 +- .../src/main/java/jobExecution/JobExecution.java | 2 +- .../MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java | 2 +- .../MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java | 2 +- .../src/main/java/MQTTSubscribe/MQTTSubscribe.java | 2 +- .../src/main/java/shadowUpdate/ShadowUpdate.java | 2 +- .../src/main/java/basicconnect/BasicConnect.java | 2 +- samples/BasicPubSub/src/main/java/pubsub/PubSub.java | 2 +- .../main/java/customkeyopsconnect/CustomKeyOpsConnect.java | 2 +- .../main/java/fleetprovisioning/FleetProvisioningSample.java | 2 +- .../java/fleetprovisioning/Mqtt5FleetProvisioningSample.java | 2 +- .../Greengrass/src/main/java/greengrass/BasicDiscovery.java | 2 +- .../main/java/javakeystoreconnect/JavaKeystoreConnect.java | 2 +- samples/Jobs/src/main/java/jobs/JobsSample.java | 2 +- .../src/main/java/pkcs11connect/Pkcs11Connect.java | 2 +- .../src/main/java/pkcs12connect/Pkcs12Connect.java | 2 +- samples/Shadow/src/main/java/shadow/ShadowSample.java | 2 +- .../src/main/java/websocketconnect/WebsocketConnect.java | 2 +- .../src/main/java/windowscertconnect/WindowsCertConnect.java | 2 +- .../X509CredentialsProviderConnect.java | 2 +- .../awssdk/eventstreamrpc/EventStreamRPCConnection.java | 2 +- .../eventstreamrpc/EventStreamRPCConnectionConfig.java | 5 +---- .../software/amazon/awssdk/eventstreamrpc/RpcServer.java | 2 +- sdk/pom.xml | 2 +- .../amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java | 2 +- .../MqttClientConnectionWrapperCreator.java | 2 +- update-crt.py | 2 +- 27 files changed, 27 insertions(+), 30 deletions(-) diff --git a/android/iotdevicesdk/build.gradle b/android/iotdevicesdk/build.gradle index 1271f126e..ca07ee2d6 100644 --- a/android/iotdevicesdk/build.gradle +++ b/android/iotdevicesdk/build.gradle @@ -92,7 +92,7 @@ repositories { } dependencies { - api 'software.amazon.awssdk.crt:aws-crt-android:0.29.3' + api 'software.amazon.awssdk.crt:aws-crt-android:0.29.5' implementation 'org.slf4j:slf4j-api:1.7.30' implementation 'com.google.code.gson:gson:2.9.0' implementation 'androidx.appcompat:appcompat:1.1.0' diff --git a/deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java b/deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java index 2e23703ab..165749644 100644 --- a/deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java +++ b/deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java @@ -39,7 +39,7 @@ public class JobExecution { static String clientId = "test-" + UUID.randomUUID().toString(); - static short port = 8883; + static int port = 8883; static MqttClientConnection connection; static IotJobsClient jobs; diff --git a/deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java b/deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java index bf24454a1..6b9eee2e7 100644 --- a/deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java +++ b/deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java @@ -49,7 +49,7 @@ public static void main(String[] args) { try(AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(DATestUtils.certificatePath, DATestUtils.keyPath)) { builder.withClientId(clientId) .withEndpoint(DATestUtils.endpoint) - .withPort((short)port) + .withPort(port) .withCleanSession(true) .withPingTimeoutMs(60000) .withProtocolOperationTimeoutMs(60000); diff --git a/deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java b/deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java index 948fdf8df..caf1f0642 100644 --- a/deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java +++ b/deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java @@ -52,7 +52,7 @@ public static void main(String[] args) { builder.withClientId(clientId) .withEndpoint(DATestUtils.endpoint) - .withPort((short)port) + .withPort(port) .withCleanSession(true) .withPingTimeoutMs(60000) .withProtocolOperationTimeoutMs(60000); diff --git a/deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java b/deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java index 484c207d0..869848e03 100644 --- a/deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java +++ b/deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java @@ -50,7 +50,7 @@ public static void main(String[] args) { builder.withClientId(clientId) .withEndpoint(DATestUtils.endpoint) - .withPort((short)port) + .withPort(port) .withCleanSession(true) .withPingTimeoutMs(60000) .withProtocolOperationTimeoutMs(60000); diff --git a/deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java b/deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java index 20131141c..832188d63 100644 --- a/deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java +++ b/deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java @@ -81,7 +81,7 @@ public static void main(String[] args) { try(AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(DATestUtils.certificatePath, DATestUtils.keyPath)) { builder.withClientId(clientId) .withEndpoint(DATestUtils.endpoint) - .withPort((short)port) + .withPort(port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); diff --git a/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java b/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java index fe5468466..d33adde21 100644 --- a/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java +++ b/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java @@ -75,7 +75,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) { diff --git a/samples/BasicPubSub/src/main/java/pubsub/PubSub.java b/samples/BasicPubSub/src/main/java/pubsub/PubSub.java index a3e2b64c5..6b4dbbe0f 100644 --- a/samples/BasicPubSub/src/main/java/pubsub/PubSub.java +++ b/samples/BasicPubSub/src/main/java/pubsub/PubSub.java @@ -79,7 +79,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) { diff --git a/samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java b/samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java index d7c6fe697..38b48640a 100644 --- a/samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java +++ b/samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java @@ -181,7 +181,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) { diff --git a/samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java b/samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java index 574245d62..52854bf2d 100644 --- a/samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java +++ b/samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java @@ -174,7 +174,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); connection = builder.build(); diff --git a/samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java b/samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java index cfed067cc..9ce3d4114 100644 --- a/samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java +++ b/samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java @@ -182,7 +182,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short) cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); connection = builder.build(); diff --git a/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java b/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java index 31a5d05b8..02626eda3 100644 --- a/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java +++ b/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java @@ -171,7 +171,7 @@ private static MqttClientConnection getClientFromDiscovery(final DiscoveryClient final AwsIotMqttConnectionBuilder connectionBuilder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(input_certPath, input_keyPath) .withClientId(input_thingName) - .withPort(port.shortValue()) + .withPort(port) .withEndpoint(dnsOrIp) .withConnectionEventCallbacks(new MqttClientConnectionEvents() { @Override diff --git a/samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java b/samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java index c8ad467d0..2880ad2b9 100644 --- a/samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java +++ b/samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java @@ -91,7 +91,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) { diff --git a/samples/Jobs/src/main/java/jobs/JobsSample.java b/samples/Jobs/src/main/java/jobs/JobsSample.java index 47eb689dd..00f1953e5 100644 --- a/samples/Jobs/src/main/java/jobs/JobsSample.java +++ b/samples/Jobs/src/main/java/jobs/JobsSample.java @@ -121,7 +121,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); MqttClientConnection connection = builder.build(); diff --git a/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java b/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java index b9cdff511..10dc357fa 100644 --- a/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java +++ b/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java @@ -96,7 +96,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short) cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); diff --git a/samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java b/samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java index 72237ef0a..5935e2251 100644 --- a/samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java +++ b/samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java @@ -74,7 +74,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); MqttClientConnection connection = builder.build(); diff --git a/samples/Shadow/src/main/java/shadow/ShadowSample.java b/samples/Shadow/src/main/java/shadow/ShadowSample.java index bd25ac100..a9a6457e6 100644 --- a/samples/Shadow/src/main/java/shadow/ShadowSample.java +++ b/samples/Shadow/src/main/java/shadow/ShadowSample.java @@ -220,7 +220,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); MqttClientConnection connection = builder.build(); diff --git a/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java b/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java index a2f94bdc6..923d3e2ea 100644 --- a/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java +++ b/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java @@ -74,7 +74,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) { diff --git a/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java b/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java index 96b77f63a..32224f04f 100644 --- a/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java +++ b/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java @@ -69,7 +69,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); MqttClientConnection connection = builder.build(); diff --git a/samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java b/samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java index 6654f7375..9b4141e52 100644 --- a/samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java +++ b/samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java @@ -78,7 +78,7 @@ public void onConnectionResumed(boolean sessionPresent) { builder.withConnectionEventCallbacks(callbacks) .withClientId(cmdData.input_clientId) .withEndpoint(cmdData.input_endpoint) - .withPort((short)cmdData.input_port) + .withPort(cmdData.input_port) .withCleanSession(true) .withProtocolOperationTimeoutMs(60000); HttpProxyOptions proxyOptions = null; diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java index a58b39942..b78d18260 100644 --- a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java +++ b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java @@ -89,7 +89,7 @@ public CompletableFuture connect(final LifecycleHandler lifecycleHandler) } final CompletableFuture initialConnectFuture = new CompletableFuture<>(); - ClientConnection.connect(config.getHost(), (short) config.getPort(), config.getSocketOptions(), + ClientConnection.connect(config.getHost(), config.getPort(), config.getSocketOptions(), config.getTlsContext(), config.getClientBootstrap(), new ClientConnectionHandler() { @Override protected void onConnectionSetup(final ClientConnection clientConnection, int errorCode) { diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java index 78ccf05ca..bbe3da86d 100644 --- a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java +++ b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java @@ -52,12 +52,9 @@ public EventStreamRPCConnectionConfig(ClientBootstrap clientBootstrap, EventLoop this.port = port; this.connectMessageAmender = connectMessageAmender; - //perform cast to throw exception here if port value is out of short value range - final short shortPort = (short)port; - //bit of C++ RAII here, validate what we can if (clientBootstrap == null || eventLoopGroup == null || socketOptions == null || - host == null || host.isEmpty() || port < 0) { + host == null || host.isEmpty()) { throw new IllegalArgumentException("EventStreamRPCConnectionConfig values are invalid!"); } } diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java index d803da792..9875197dc 100644 --- a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java +++ b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java @@ -66,7 +66,7 @@ public void runServer() { } serverBootstrap = new ServerBootstrap(eventLoopGroup); tlsContext = tlsContextOptions != null ? new ServerTlsContext(tlsContextOptions) : null; - listener = new ServerListener(hostname, (short) port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() { + listener = new ServerListener(hostname, port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() { @Override public ServerConnectionHandler onNewConnection(ServerConnection serverConnection, int errorCode) { try { diff --git a/sdk/pom.xml b/sdk/pom.xml index f1b0a984b..303f01a15 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -42,7 +42,7 @@ software.amazon.awssdk.crt aws-crt - 0.29.3 + 0.29.5 org.slf4j diff --git a/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java b/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java index cb8f6917a..bf7df24c2 100644 --- a/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java +++ b/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java @@ -272,7 +272,7 @@ public AwsIotMqttConnectionBuilder withEndpoint(String endpoint) { * MQTT, or 443 for websockets * @return {@link AwsIotMqttConnectionBuilder} */ - public AwsIotMqttConnectionBuilder withPort(short port) { + public AwsIotMqttConnectionBuilder withPort(int port) { this.config.setPort(port); return this; } diff --git a/servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java b/servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java index cd2c796fb..3dcbf6bf1 100644 --- a/servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java +++ b/servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java @@ -29,7 +29,7 @@ static MqttClientConnectionWrapper createMqtt3Connection( try (AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(cert, key)) { builder.withClientId(clientId) .withEndpoint(endpoint) - .withPort((short)port) + .withPort(port) .withCleanSession(true); return new Mqtt3ClientConnectionWrapper(builder); } catch (Exception ex) { diff --git a/update-crt.py b/update-crt.py index d0c13fdc8..367fb63d5 100755 --- a/update-crt.py +++ b/update-crt.py @@ -19,7 +19,7 @@ ## 5. `Python update-crt.py --check_consistency` ## Make sure crt and sdk version specified in the files are consistent. The script will not update any file with this option. -VERSION_PATTERN = '\d+\.\d+\.\d+' +VERSION_PATTERN = r'\d+\.\d+\.\d+' parser = argparse.ArgumentParser( description="Update files containing hard-coded aws-crt-java version numbers.")