chore!: package rename (#72)

jbutler · web-flow · commit 0e51e6ba567c · 2022-06-21T10:40:10.000-06:00
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/BridgeConfig.java b/src/main/java/com/aws/greengrass/mqtt/bridge/BridgeConfig.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import com.aws.greengrass.componentmanager.KernelConfigResolver;
 import com.aws.greengrass.config.Topics;
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/MQTTBridge.java b/src/main/java/com/aws/greengrass/mqtt/bridge/MQTTBridge.java
@@ -3,26 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import com.aws.greengrass.builtin.services.pubsub.PubSubIPCEventStreamAgent;
+import com.aws.greengrass.clientdevices.auth.ClientDevicesAuthService;
+import com.aws.greengrass.clientdevices.auth.exception.CertificateGenerationException;
 import com.aws.greengrass.componentmanager.KernelConfigResolver;
 import com.aws.greengrass.config.Node;
 import com.aws.greengrass.config.Topics;
 import com.aws.greengrass.config.WhatHappened;
 import com.aws.greengrass.dependency.ImplementsService;
 import com.aws.greengrass.dependency.State;
-import com.aws.greengrass.device.ClientDevicesAuthService;
-import com.aws.greengrass.device.exception.CertificateGenerationException;
 import com.aws.greengrass.lifecyclemanager.Kernel;
 import com.aws.greengrass.lifecyclemanager.PluginService;
 import com.aws.greengrass.lifecyclemanager.exceptions.ServiceLoadException;
-import com.aws.greengrass.mqttbridge.auth.MQTTClientKeyStore;
-import com.aws.greengrass.mqttbridge.clients.IoTCoreClient;
-import com.aws.greengrass.mqttbridge.clients.MQTTClient;
-import com.aws.greengrass.mqttbridge.clients.MQTTClientException;
-import com.aws.greengrass.mqttbridge.clients.PubSubClient;
-import com.aws.greengrass.mqttbridge.util.BatchedSubscriber;
+import com.aws.greengrass.mqtt.bridge.auth.MQTTClientKeyStore;
+import com.aws.greengrass.mqtt.bridge.clients.IoTCoreClient;
+import com.aws.greengrass.mqtt.bridge.clients.MQTTClient;
+import com.aws.greengrass.mqtt.bridge.clients.MQTTClientException;
+import com.aws.greengrass.mqtt.bridge.clients.PubSubClient;
+import com.aws.greengrass.mqtt.bridge.util.BatchedSubscriber;
 import com.aws.greengrass.mqttclient.MqttClient;
 import com.aws.greengrass.util.Coerce;
 import com.aws.greengrass.util.Utils;
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/Message.java b/src/main/java/com/aws/greengrass/mqtt/bridge/Message.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import lombok.Value;
 
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/MessageBridge.java b/src/main/java/com/aws/greengrass/mqtt/bridge/MessageBridge.java
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import com.aws.greengrass.logging.api.Logger;
 import com.aws.greengrass.logging.impl.LogManager;
-import com.aws.greengrass.mqttbridge.clients.MessageClient;
-import com.aws.greengrass.mqttbridge.clients.MessageClientException;
+import com.aws.greengrass.mqtt.bridge.clients.MessageClient;
+import com.aws.greengrass.mqtt.bridge.clients.MessageClientException;
 import com.aws.greengrass.util.Utils;
 import org.eclipse.paho.client.mqttv3.MqttTopic;
 
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/TopicMapping.java b/src/main/java/com/aws/greengrass/mqtt/bridge/TopicMapping.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/auth/CsrGeneratingException.java b/src/main/java/com/aws/greengrass/mqtt/bridge/auth/CsrGeneratingException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.auth;
+package com.aws.greengrass.mqtt.bridge.auth;
 
 /**
  * Exception thrown in CSR generation.
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/auth/MQTTClientKeyStore.java b/src/main/java/com/aws/greengrass/mqtt/bridge/auth/MQTTClientKeyStore.java
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.auth;
+package com.aws.greengrass.mqtt.bridge.auth;
 
-import com.aws.greengrass.device.ClientDevicesAuthServiceApi;
-import com.aws.greengrass.device.api.CertificateUpdateEvent;
-import com.aws.greengrass.device.api.GetCertificateRequest;
-import com.aws.greengrass.device.api.GetCertificateRequestOptions;
-import com.aws.greengrass.device.exception.CertificateGenerationException;
+import com.aws.greengrass.clientdevices.auth.api.CertificateUpdateEvent;
+import com.aws.greengrass.clientdevices.auth.api.ClientDevicesAuthServiceApi;
+import com.aws.greengrass.clientdevices.auth.api.GetCertificateRequest;
+import com.aws.greengrass.clientdevices.auth.api.GetCertificateRequestOptions;
+import com.aws.greengrass.clientdevices.auth.exception.CertificateGenerationException;
 import com.aws.greengrass.logging.api.Logger;
 import com.aws.greengrass.logging.impl.LogManager;
-import com.aws.greengrass.mqttbridge.MQTTBridge;
+import com.aws.greengrass.mqtt.bridge.MQTTBridge;
 import lombok.AccessLevel;
 import lombok.Getter;
 
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/clients/IoTCoreClient.java b/src/main/java/com/aws/greengrass/mqtt/bridge/clients/IoTCoreClient.java
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 import com.aws.greengrass.logging.api.Logger;
 import com.aws.greengrass.logging.impl.LogManager;
-import com.aws.greengrass.mqttbridge.Message;
+import com.aws.greengrass.mqtt.bridge.Message;
 import com.aws.greengrass.mqttclient.MqttClient;
 import com.aws.greengrass.mqttclient.PublishRequest;
 import com.aws.greengrass.mqttclient.SubscribeRequest;
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MQTTClient.java b/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MQTTClient.java
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 import com.aws.greengrass.logging.api.Logger;
 import com.aws.greengrass.logging.impl.LogManager;
-import com.aws.greengrass.mqttbridge.BridgeConfig;
-import com.aws.greengrass.mqttbridge.Message;
-import com.aws.greengrass.mqttbridge.auth.MQTTClientKeyStore;
+import com.aws.greengrass.mqtt.bridge.BridgeConfig;
+import com.aws.greengrass.mqtt.bridge.Message;
+import com.aws.greengrass.mqtt.bridge.auth.MQTTClientKeyStore;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MQTTClientException.java b/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MQTTClientException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 /**
  * Exception thrown by the MQTT Client.
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MessageClient.java b/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MessageClient.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
-import com.aws.greengrass.mqttbridge.Message;
+import com.aws.greengrass.mqtt.bridge.Message;
 
 import java.util.Set;
 import java.util.function.Consumer;
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MessageClientException.java b/src/main/java/com/aws/greengrass/mqtt/bridge/clients/MessageClientException.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 /**
  * Exception thrown by the Message Clients.
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/clients/PubSubClient.java b/src/main/java/com/aws/greengrass/mqtt/bridge/clients/PubSubClient.java
@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 import com.aws.greengrass.builtin.services.pubsub.PubSubIPCEventStreamAgent;
 import com.aws.greengrass.builtin.services.pubsub.PublishEvent;
 import com.aws.greengrass.logging.api.Logger;
 import com.aws.greengrass.logging.impl.LogManager;
-import com.aws.greengrass.mqttbridge.Message;
+import com.aws.greengrass.mqtt.bridge.MQTTBridge;
+import com.aws.greengrass.mqtt.bridge.Message;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NonNull;
@@ -19,8 +20,6 @@
 import java.util.function.Consumer;
 import javax.inject.Inject;
 
-import static com.aws.greengrass.mqttbridge.MQTTBridge.SERVICE_NAME;
-
 public class PubSubClient implements MessageClient {
     private static final Logger LOGGER = LogManager.getLogger(PubSubClient.class);
     public static final String TOPIC = "topic";
@@ -82,7 +81,7 @@ private void unsubscribeAll() {
     }
 
     private void unsubscribeFromPubSub(String topic) {
-        pubSubIPCAgent.unsubscribe(topic, pubSubCallback, SERVICE_NAME);
+        pubSubIPCAgent.unsubscribe(topic, pubSubCallback, MQTTBridge.SERVICE_NAME);
     }
 
     @Override
@@ -91,7 +90,7 @@ public void publish(Message message) {
     }
 
     private void publishToPubSub(String topic, byte[] payload) {
-        pubSubIPCAgent.publish(topic, payload, SERVICE_NAME);
+        pubSubIPCAgent.publish(topic, payload, MQTTBridge.SERVICE_NAME);
     }
 
     @Override
@@ -123,6 +122,6 @@ public synchronized void updateSubscriptions(Set<String> topics, @NonNull Consum
     }
 
     private void subscribeToPubSub(String topic) {
-        pubSubIPCAgent.subscribe(topic, pubSubCallback, SERVICE_NAME);
+        pubSubIPCAgent.subscribe(topic, pubSubCallback, MQTTBridge.SERVICE_NAME);
     }
 }
diff --git a/src/main/java/com/aws/greengrass/mqtt/bridge/util/BatchedSubscriber.java b/src/main/java/com/aws/greengrass/mqtt/bridge/util/BatchedSubscriber.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.util;
+package com.aws.greengrass.mqtt.bridge.util;
 
 import com.aws.greengrass.config.ChildChanged;
 import com.aws.greengrass.config.Node;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/BridgeConfigTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/BridgeConfigTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import com.aws.greengrass.componentmanager.KernelConfigResolver;
 import com.aws.greengrass.config.Topics;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/MQTTBridgeTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/MQTTBridgeTest.java
@@ -3,20 +3,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import com.aws.greengrass.builtin.services.pubsub.PubSubIPCEventStreamAgent;
-import com.aws.greengrass.certificatemanager.CertificateManager;
+import com.aws.greengrass.clientdevices.auth.CertificateManager;
 import com.aws.greengrass.componentmanager.KernelConfigResolver;
 import com.aws.greengrass.config.Topic;
 import com.aws.greengrass.config.Topics;
 import com.aws.greengrass.config.UpdateBehaviorTree;
 import com.aws.greengrass.dependency.State;
-import com.aws.greengrass.device.ClientDevicesAuthService;
+import com.aws.greengrass.clientdevices.auth.ClientDevicesAuthService;
 import com.aws.greengrass.lifecyclemanager.GlobalStateChangeListener;
 import com.aws.greengrass.lifecyclemanager.GreengrassService;
 import com.aws.greengrass.lifecyclemanager.Kernel;
-import com.aws.greengrass.mqttbridge.auth.MQTTClientKeyStore;
+import com.aws.greengrass.mqtt.bridge.auth.MQTTClientKeyStore;
 import com.aws.greengrass.mqttclient.MqttClient;
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 import com.aws.greengrass.testcommons.testutilities.GGServiceTestUtil;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/MessageBridgeTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/MessageBridgeTest.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
-import com.aws.greengrass.mqttbridge.clients.MessageClient;
-import com.aws.greengrass.mqttbridge.clients.MessageClientException;
+import com.aws.greengrass.mqtt.bridge.clients.MessageClient;
+import com.aws.greengrass.mqtt.bridge.clients.MessageClientException;
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 import com.aws.greengrass.util.Utils;
 import org.hamcrest.MatcherAssert;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/TopicMappingTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/TopicMappingTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge;
+package com.aws.greengrass.mqtt.bridge;
 
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 import com.aws.greengrass.util.Utils;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/auth/MQTTClientKeyStoreTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/auth/MQTTClientKeyStoreTest.java
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.auth;
+package com.aws.greengrass.mqtt.bridge.auth;
 
-import com.aws.greengrass.device.ClientDevicesAuthServiceApi;
-import com.aws.greengrass.device.api.CertificateUpdateEvent;
-import com.aws.greengrass.device.api.GetCertificateRequest;
+import com.aws.greengrass.clientdevices.auth.api.ClientDevicesAuthServiceApi;
+import com.aws.greengrass.clientdevices.auth.api.CertificateUpdateEvent;
+import com.aws.greengrass.clientdevices.auth.api.GetCertificateRequest;
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,8 +37,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static com.aws.greengrass.mqttbridge.auth.MQTTClientKeyStore.DEFAULT_KEYSTORE_PASSWORD;
-import static com.aws.greengrass.mqttbridge.auth.MQTTClientKeyStore.KEY_ALIAS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
@@ -97,12 +95,12 @@ void GIVEN_MQTTClientKeyStore_WHEN_initialized_THEN_keyAndCertGenerated() throws
         getCertificateRequest.getCertificateUpdateConsumer().accept(certificateUpdate);
         assertThat(keyStore.size(), is(1));
 
-        PrivateKey privateKey = (PrivateKey) keyStore.getKey(KEY_ALIAS, DEFAULT_KEYSTORE_PASSWORD);
+        PrivateKey privateKey = (PrivateKey) keyStore.getKey(MQTTClientKeyStore.KEY_ALIAS, MQTTClientKeyStore.DEFAULT_KEYSTORE_PASSWORD);
         assertThat(privateKey.getAlgorithm(), is("RSA"));
 
-        assertThat(keyStore.getCertificateChain(KEY_ALIAS).length, is(2));
-        verifyStoredCertificate((X509Certificate) keyStore.getCertificateChain(KEY_ALIAS)[0]);
-        verifyStoredCertificate((X509Certificate) keyStore.getCertificateChain(KEY_ALIAS)[1]);
+        assertThat(keyStore.getCertificateChain(MQTTClientKeyStore.KEY_ALIAS).length, is(2));
+        verifyStoredCertificate((X509Certificate) keyStore.getCertificateChain(MQTTClientKeyStore.KEY_ALIAS)[0]);
+        verifyStoredCertificate((X509Certificate) keyStore.getCertificateChain(MQTTClientKeyStore.KEY_ALIAS)[1]);
     }
 
     private void verifyStoredCertificate(X509Certificate cert) throws CertificateEncodingException, IOException {
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/clients/FakeMqttClient.java b/src/test/java/com/aws/greengrass/mqtt/bridge/clients/FakeMqttClient.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 import lombok.Getter;
 import org.eclipse.paho.client.mqttv3.IMqttClient;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/clients/FakeMqttClientTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/clients/FakeMqttClientTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 import org.eclipse.paho.client.mqttv3.MqttException;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/clients/IoTCoreClientTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/clients/IoTCoreClientTest.java
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
-import com.aws.greengrass.mqttbridge.Message;
+import com.aws.greengrass.mqtt.bridge.Message;
 import com.aws.greengrass.mqttclient.MqttClient;
 import com.aws.greengrass.mqttclient.PublishRequest;
 import com.aws.greengrass.mqttclient.SubscribeRequest;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/clients/MQTTClientTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/clients/MQTTClientTest.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.aws.greengrass.mqttbridge.clients;
+package com.aws.greengrass.mqtt.bridge.clients;
 
-import com.aws.greengrass.mqttbridge.Message;
-import com.aws.greengrass.mqttbridge.auth.MQTTClientKeyStore;
+import com.aws.greengrass.mqtt.bridge.auth.MQTTClientKeyStore;
+import com.aws.greengrass.mqtt.bridge.Message;
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/clients/PubSubClientTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/clients/PubSubClientTest.java
diff --git a/src/test/java/com/aws/greengrass/mqtt/bridge/util/BatchedSubscriberTest.java b/src/test/java/com/aws/greengrass/mqtt/bridge/util/BatchedSubscriberTest.java
diff --git a/src/test/resources/com/aws/greengrass/mqtt/bridge/config.yaml b/src/test/resources/com/aws/greengrass/mqtt/bridge/config.yaml
diff --git a/src/test/resources/com/aws/greengrass/mqtt/bridge/config_with_mapping.yaml b/src/test/resources/com/aws/greengrass/mqtt/bridge/config_with_mapping.yaml
