Merge pull request #9 from cisco-open/rest_payloadhandler_changes

Refactor transport classes

Author: preet-dev

src/main/java/io/opentelemetry/contrib/generator/telemetry/cli/CLIProcessor.java

@@ -20,9 +20,9 @@
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorInput;
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.TelemetryGenerator;
-import io.opentelemetry.contrib.generator.telemetry.transport.implementations.auth.BasicAuthHandler;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.BasicAuthHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.implementations.grpc.GRPCPayloadHandler;
-import io.opentelemetry.contrib.generator.telemetry.transport.implementations.http.RESTPayloadHandler;
+import io.opentelemetry.contrib.generator.telemetry.transport.implementations.rest.RESTPayloadHandler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import lombok.extern.slf4j.Slf4j;

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/auth/AuthHandler.java renamed to src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/auth/AuthHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.generator.telemetry.transport.implementations.auth;
+package io.opentelemetry.contrib.generator.telemetry.transport.auth;
 
 public interface AuthHandler {
 

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/auth/BasicAuthHandler.java renamed to src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/auth/BasicAuthHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.generator.telemetry.transport.implementations.auth;
+package io.opentelemetry.contrib.generator.telemetry.transport.auth;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/http/HTTPClient.java renamed to src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/HTTPClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.generator.telemetry.transport.implementations.http;
+package io.opentelemetry.contrib.generator.telemetry.transport.implementations;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/grpc/GRPCPayloadHandler.java

@@ -17,7 +17,7 @@
 package io.opentelemetry.contrib.generator.telemetry.transport.implementations.grpc;
 
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
-import io.opentelemetry.contrib.generator.telemetry.transport.implementations.auth.AuthHandler;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.AuthHandler;
 import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.*;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/http/RESTPayloadHandler.java renamed to src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/rest/RESTPayloadHandler.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.generator.telemetry.transport.implementations.http;
+package io.opentelemetry.contrib.generator.telemetry.transport.implementations.rest;
 
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
-import io.opentelemetry.contrib.generator.telemetry.transport.implementations.auth.AuthHandler;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.AuthHandler;
 import com.google.protobuf.GeneratedMessageV3;
+import io.opentelemetry.contrib.generator.telemetry.transport.implementations.HTTPClient;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import lombok.Getter;
@@ -31,7 +32,7 @@
 @Slf4j
 public class RESTPayloadHandler implements PayloadHandler {
 
-    private final String VANITY_URL;
+    private final String ENDPOINT_URL;
     private final AuthHandler authHandler;
     private final HTTPClient httpClient;
     @Getter
@@ -46,25 +47,25 @@ public class RESTPayloadHandler implements PayloadHandler {
     @Getter
     private boolean lastRequestSuccess;
 
-    public RESTPayloadHandler(String vanityURL, AuthHandler authHandler) {
-        this.VANITY_URL = vanityURL;
+    public RESTPayloadHandler(String endpointURL, AuthHandler authHandler) {
+        this.ENDPOINT_URL = endpointURL;
         httpClient = new HTTPClient();
         this.authHandler = authHandler;
     }
 
     @Override
     public boolean postPayload(GeneratedMessageV3 message) {
-        if (StringUtils.defaultString(VANITY_URL).isBlank() || authHandler == null) {
+        if (StringUtils.defaultString(ENDPOINT_URL).isBlank() || authHandler == null) {
             log.error("Missing URL or access token");
             return false;
         }
         String URL;
         if (message instanceof ExportMetricsServiceRequest) {
-            URL = VANITY_URL + metricsURL;
+            URL = ENDPOINT_URL + metricsURL;
         } else if (message instanceof ExportLogsServiceRequest) {
-            URL = VANITY_URL + logsURL;
+            URL = ENDPOINT_URL + logsURL;
         } else {
-            URL = VANITY_URL + tracesURL;
+            URL = ENDPOINT_URL + tracesURL;
         }
         httpClient.postBytes(URL, getHeadersPostData(), message.toByteArray());
         lastRequestSuccess = httpClient.isLastRequestSuccess();