Rename module

gwenneg · Feb 2, 2024 · d073fa7 · d073fa7
1 parent 1d6be15
commit d073fa7
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 22 deletions.
diff --git a/connector-common-sources/pom.xml → connector-common-secrets/pom.xml b/connector-common-sources/pom.xml → connector-common-secrets/pom.xml
@@ -4,7 +4,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>notifications-connector-common-sources</artifactId>
+    <artifactId>notifications-connector-common-secrets</artifactId>
 
     <parent>
         <groupId>com.redhat.cloud.notifications</groupId>
@@ -16,6 +16,14 @@
 
         <!-- Scope: compile -->
 
+        <!-- notifications modules -->
+        <dependency>
+            <groupId>com.redhat.cloud.notifications</groupId>
+            <artifactId>notifications-connector-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Quarkus -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-validator</artifactId>

diff --git a/...tifications/connector/sources/Secret.java → ...tifications/connector/secrets/Secret.java b/...tifications/connector/sources/Secret.java → ...tifications/connector/secrets/Secret.java
@@ -1,4 +1,4 @@
-package com.redhat.cloud.notifications.connector.sources;
+package com.redhat.cloud.notifications.connector.secrets;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

diff --git a/...ctor/sources/SourcesExchangeProperty.java → ...ctor/secrets/SecretsExchangeProperty.java b/...ctor/sources/SourcesExchangeProperty.java → ...ctor/secrets/SecretsExchangeProperty.java
@@ -1,6 +1,6 @@
-package com.redhat.cloud.notifications.connector.sources;
+package com.redhat.cloud.notifications.connector.secrets;
 
-public class SourcesExchangeProperty {
+public class SecretsExchangeProperty {
 
     public static final String SECRET_ID = "secretId";
     public static final String SECRET_PASSWORD = "secretPassword";

diff --git a/...s/connector/sources/SourcesProcessor.java → ...s/connector/secrets/SecretsProcessor.java b/...s/connector/sources/SourcesProcessor.java → ...s/connector/secrets/SecretsProcessor.java
@@ -1,6 +1,5 @@
-package com.redhat.cloud.notifications.connector.sources;
+package com.redhat.cloud.notifications.connector.secrets;
 
-import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.camel.Exchange;
@@ -9,14 +8,14 @@
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 import static com.redhat.cloud.notifications.connector.ExchangeProperty.ORG_ID;
-import static com.redhat.cloud.notifications.connector.sources.SourcesExchangeProperty.SECRET_ID;
-import static com.redhat.cloud.notifications.connector.sources.SourcesExchangeProperty.SECRET_PASSWORD;
-import static com.redhat.cloud.notifications.connector.sources.SourcesExchangeProperty.SECRET_USERNAME;
+import static com.redhat.cloud.notifications.connector.secrets.SecretsExchangeProperty.SECRET_ID;
+import static com.redhat.cloud.notifications.connector.secrets.SecretsExchangeProperty.SECRET_PASSWORD;
+import static com.redhat.cloud.notifications.connector.secrets.SecretsExchangeProperty.SECRET_USERNAME;
 
 @ApplicationScoped
-public class SourcesProcessor implements Processor {
+public class SecretsProcessor implements Processor {
 
-    private static final String SOURCES_ENABLED = "notifications.connector.sources.enabled";
+    private static final String SOURCES_ENABLED = "notifications.connector.secrets.enabled";
     private static final String SOURCES_PSK = "notifications.connector.sources.psk";
 
     @ConfigProperty(name = SOURCES_ENABLED, defaultValue = "false")

diff --git a/...ions/connector/sources/SourcesClient.java → ...ions/connector/secrets/SourcesClient.java b/...ions/connector/sources/SourcesClient.java → ...ions/connector/secrets/SourcesClient.java
@@ -1,4 +1,4 @@
-package com.redhat.cloud.notifications.connector.sources;
+package com.redhat.cloud.notifications.connector.secrets;
 
 import io.quarkus.rest.client.reactive.ClientExceptionMapper;
 import jakarta.validation.constraints.NotBlank;

diff --git a/connector-servicenow/pom.xml b/connector-servicenow/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>com.redhat.cloud.notifications</groupId>
-            <artifactId>notifications-connector-common-sources</artifactId>
+            <artifactId>notifications-connector-common-secrets</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/connector-splunk/pom.xml b/connector-splunk/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>com.redhat.cloud.notifications</groupId>
-            <artifactId>notifications-connector-common-sources</artifactId>
+            <artifactId>notifications-connector-common-secrets</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/...n/java/com/redhat/cloud/notifications/connector/splunk/SplunkCloudEventDataExtractor.java b/...n/java/com/redhat/cloud/notifications/connector/splunk/SplunkCloudEventDataExtractor.java
@@ -8,8 +8,8 @@
 import org.apache.http.ProtocolException;
 
 import static com.redhat.cloud.notifications.connector.ExchangeProperty.TARGET_URL;
-import static com.redhat.cloud.notifications.connector.sources.SourcesExchangeProperty.SECRET_ID;
-import static com.redhat.cloud.notifications.connector.sources.SourcesExchangeProperty.SECRET_PASSWORD;
+import static com.redhat.cloud.notifications.connector.secrets.SecretsExchangeProperty.SECRET_ID;
+import static com.redhat.cloud.notifications.connector.secrets.SecretsExchangeProperty.SECRET_PASSWORD;
 import static com.redhat.cloud.notifications.connector.splunk.ExchangeProperty.ACCOUNT_ID;
 import static com.redhat.cloud.notifications.connector.splunk.ExchangeProperty.TARGET_URL_NO_SCHEME;
 import static com.redhat.cloud.notifications.connector.splunk.ExchangeProperty.TRUST_ALL;

diff --git a/...unk/src/main/java/com/redhat/cloud/notifications/connector/splunk/SplunkRouteBuilder.java b/...unk/src/main/java/com/redhat/cloud/notifications/connector/splunk/SplunkRouteBuilder.java
@@ -2,7 +2,7 @@
 
 import com.redhat.cloud.notifications.connector.EngineToConnectorRouteBuilder;
 import com.redhat.cloud.notifications.connector.http.HttpConnectorConfig;
-import com.redhat.cloud.notifications.connector.sources.SourcesProcessor;
+import com.redhat.cloud.notifications.connector.secrets.SecretsProcessor;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
@@ -12,7 +12,7 @@
 import static com.redhat.cloud.notifications.connector.ExchangeProperty.ORG_ID;
 import static com.redhat.cloud.notifications.connector.ExchangeProperty.TARGET_URL;
 import static com.redhat.cloud.notifications.connector.http.SslTrustAllManager.getSslContextParameters;
-import static com.redhat.cloud.notifications.connector.sources.SourcesExchangeProperty.SECRET_PASSWORD;
+import static com.redhat.cloud.notifications.connector.secrets.SecretsExchangeProperty.SECRET_PASSWORD;
 import static com.redhat.cloud.notifications.connector.splunk.ExchangeProperty.ACCOUNT_ID;
 import static com.redhat.cloud.notifications.connector.splunk.ExchangeProperty.TARGET_URL_NO_SCHEME;
 import static com.redhat.cloud.notifications.connector.splunk.ExchangeProperty.TRUST_ALL;
@@ -33,14 +33,14 @@ public class SplunkRouteBuilder extends EngineToConnectorRouteBuilder {
     EventsSplitter eventsSplitter;
 
     @Inject
-    SourcesProcessor sourcesProcessor;
+    SecretsProcessor secretsProcessor;
 
     @Override
     public void configureRoutes() {
 
         from(seda(ENGINE_TO_CONNECTOR))
                 .routeId(connectorConfig.getConnectorName())
-                .process(sourcesProcessor)
+                .process(secretsProcessor)
                 // Events are split to be sent in batch to Splunk HEC.
                 .process(eventsSplitter)
                 .setHeader("Authorization", simple("Splunk ${exchangeProperty." + SECRET_PASSWORD + "}"))

diff --git a/connector-webhook/pom.xml b/connector-webhook/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>com.redhat.cloud.notifications</groupId>
-            <artifactId>notifications-connector-common-sources</artifactId>
+            <artifactId>notifications-connector-common-secrets</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
         <module>common-aggregator</module>
         <module>connector-common</module>
         <module>connector-common-http</module>
-        <module>connector-common-sources</module>
+        <module>connector-common-secrets</module>
         <module>connector-drawer</module>
         <module>connector-email</module>
         <module>connector-google-chat</module>