fix(uat): use CURRENT for classpath component in second deployments (#…

…398)
aws-greengrass · Aug 25, 2023 · bd54a1b · bd54a1b
1 parent fb885d7
commit bd54a1b
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 62 deletions.
diff --git a/...ontrol/src/main/java/com/aws/greengrass/testing/mqtt/client/control/api/AgentControl.java b/...ontrol/src/main/java/com/aws/greengrass/testing/mqtt/client/control/api/AgentControl.java
@@ -93,7 +93,7 @@ ConnectionControl createMqttConnection(@NonNull MqttConnectRequest connectReques
      * Shutdown whole agent.
      *
      * @param reason shutdown reason
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     void shutdownAgent(String reason);
 
@@ -103,7 +103,7 @@ ConnectionControl createMqttConnection(@NonNull MqttConnectRequest connectReques
      *
      * @param discoveryRequest the request with clients name and credentials
      * @return the reply with connectivity information of IoT Core device broker
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     CoreDeviceDiscoveryReply discoveryCoreDevice(@NonNull CoreDeviceDiscoveryRequest discoveryRequest);
 }
diff --git a/...l/src/main/java/com/aws/greengrass/testing/mqtt/client/control/api/ConnectionControl.java b/...l/src/main/java/com/aws/greengrass/testing/mqtt/client/control/api/ConnectionControl.java
@@ -74,7 +74,7 @@ public interface ConnectionControl {
      * @param subscriptionId optional subscription id
      * @param subscriptions MQTT subscriptions
      * @return reply to subscribe
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     default MqttSubscribeReply subscribeMqtt(Integer subscriptionId, @NonNull Mqtt5Subscription... subscriptions) {
         final List<Mqtt5Properties> userProperties = null;
@@ -88,7 +88,7 @@ default MqttSubscribeReply subscribeMqtt(Integer subscriptionId, @NonNull Mqtt5S
      * @param userProperties optional MQTT v5.0 user properties
      * @param subscriptions MQTT subscriptions
      * @return reply to subscribe
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     MqttSubscribeReply subscribeMqtt(Integer subscriptionId, List<Mqtt5Properties> userProperties,
                                      @NonNull Mqtt5Subscription... subscriptions);
@@ -98,7 +98,7 @@ MqttSubscribeReply subscribeMqtt(Integer subscriptionId, List<Mqtt5Properties> u
      *
      * @param message message to publish
      * @return publish's response
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     MqttPublishReply publishMqtt(@NonNull Mqtt5Message message);
 
@@ -108,7 +108,7 @@ MqttSubscribeReply subscribeMqtt(Integer subscriptionId, List<Mqtt5Properties> u
      *
      * @param filters topic filters to unsubscribe
      * @return reply to unsubscribe
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     default MqttSubscribeReply unsubscribeMqtt(@NonNull String... filters) {
         final List<Mqtt5Properties> userProperties = null;
@@ -121,15 +121,15 @@ default MqttSubscribeReply unsubscribeMqtt(@NonNull String... filters) {
      * @param userProperties optional MQTT v5.0 user properties
      * @param filters topic filters to unsubscribe
      * @return reply to unsubscribe
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     MqttSubscribeReply unsubscribeMqtt(List<Mqtt5Properties> userProperties, @NonNull String... filters);
 
     /**
      * Close MQTT connection to the broker.
      *
      * @param reason reason code of disconnection as specified by MQTT v5.0 in DISCONNECT packet
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     default void closeMqttConnection(int reason) {
         closeMqttConnection(reason, null);
@@ -140,7 +140,7 @@ default void closeMqttConnection(int reason) {
      *
      * @param reason reason code of disconnection as specified by MQTT v5.0 in DISCONNECT packet
      * @param userProperties optional MQTT v5.0 user properties
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     void closeMqttConnection(int reason, List<Mqtt5Properties> userProperties);
 }
diff --git a/.../java/com/aws/greengrass/testing/mqtt/client/control/implementation/AgentControlImpl.java b/.../java/com/aws/greengrass/testing/mqtt/client/control/implementation/AgentControlImpl.java
@@ -225,7 +225,7 @@ boolean isOnThatAddress(@NonNull String address, int port) {
      *
      * @param subscribeRequest subscribe request
      * @return reply to subscribe
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     MqttSubscribeReply subscribeMqtt(@NonNull MqttSubscribeRequest subscribeRequest) {
         int connectionId = subscribeRequest.getConnectionId().getConnectionId();
@@ -238,7 +238,7 @@ MqttSubscribeReply subscribeMqtt(@NonNull MqttSubscribeRequest subscribeRequest)
      *
      * @param unsubscribeRequest unsubscribe request
      * @return reply to unsubscribe
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     MqttSubscribeReply unsubscribeMqtt(@NonNull MqttUnsubscribeRequest unsubscribeRequest) {
         int connectionId = unsubscribeRequest.getConnectionId().getConnectionId();
@@ -251,7 +251,7 @@ MqttSubscribeReply unsubscribeMqtt(@NonNull MqttUnsubscribeRequest unsubscribeRe
      *
      * @param publishRequest publish request
      * @return reply to publish
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     MqttPublishReply publishMqtt(@NonNull MqttPublishRequest publishRequest) {
         int connectionId = publishRequest.getConnectionId().getConnectionId();
@@ -264,7 +264,7 @@ MqttPublishReply publishMqtt(@NonNull MqttPublishRequest publishRequest) {
      * Close MQTT connection to the broker.
      *
      * @param closeRequest parameters of MQTT disconnect
-     * @throws StatusRuntimeException on errors
+     * @throws io.grpc.StatusRuntimeException on errors
      */
     void closeMqttConnection(@NonNull MqttCloseRequest closeRequest) {
         blockingStub.closeMqttConnection(closeRequest);

diff --git a/uat/testing-features/src/main/java/com/aws/greengrass/steps/MqttControlSteps.java b/uat/testing-features/src/main/java/com/aws/greengrass/steps/MqttControlSteps.java
@@ -304,6 +304,7 @@ public MqttControlSteps(
      * Convert boolean string to value.
      *
      * @param value the string value of boolean
+     * @return boolean object of value
      */
     @SuppressWarnings("PMD.UnnecessaryAnnotationValueElement")
     @ParameterType(value = "true|True|TRUE|false|False|FALSE")
@@ -315,6 +316,7 @@ public Boolean booleanValue(String value) {
      * Convert boolean or null string to nullable value.
      *
      * @param value the string value of boolean or null
+     * @return boolean object of value or null
      */
     @SuppressWarnings("PMD.UnnecessaryAnnotationValueElement")
     @ParameterType(value = "true|True|TRUE|false|False|FALSE|null|NULL")
@@ -1152,7 +1154,6 @@ private void receive(String message, String clientDeviceId, String topicString,
      * @param clientDeviceId the user defined client device id
      * @param value the duration of time to wait for message
      * @param unit the time unit to wait
-     * @throws TimeoutException when matched message was not received in specified duration of time
      * @throws RuntimeException on internal errors
      * @throws InterruptedException then thread has been interrupted
      */
@@ -1167,7 +1168,6 @@ public void checkIsNotDisconnect(String clientDeviceId, int value, String unit)
      * @param clientDeviceId the user defined client device id
      * @param value the duration of time to wait for message
      * @param unit the time unit to wait
-     * @throws TimeoutException when matched message was not received in specified duration of time
      * @throws RuntimeException on internal errors
      * @throws InterruptedException then thread has been interrupted
      */