chore: change packages

littlehorse-enterprises · Jan 31, 2024 · 7079a70 · 7079a70
1 parent 617ba99
commit 7079a70
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 46 deletions.
diff --git a/.../io/littlehorse/canary/app/Bootstrap.java → ...java/io/littlehorse/canary/Bootstrap.java b/.../io/littlehorse/canary/app/Bootstrap.java → ...java/io/littlehorse/canary/Bootstrap.java
@@ -1,4 +1,4 @@
-package io.littlehorse.canary.app;
+package io.littlehorse.canary;
 
 import io.littlehorse.canary.config.CanaryConfig;
 

diff --git a/canary/src/main/java/io/littlehorse/canary/CanaryException.java b/canary/src/main/java/io/littlehorse/canary/CanaryException.java
@@ -0,0 +1,17 @@
+package io.littlehorse.canary;
+
+public class CanaryException extends RuntimeException {
+    public CanaryException() {}
+
+    public CanaryException(String message) {
+        super(message);
+    }
+
+    public CanaryException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public CanaryException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/canary/src/main/java/io/littlehorse/canary/Main.java b/canary/src/main/java/io/littlehorse/canary/Main.java
@@ -2,7 +2,6 @@
 
 import com.google.common.collect.Lists;
 import io.littlehorse.canary.aggregator.AggregatorBootstrap;
-import io.littlehorse.canary.app.Bootstrap;
 import io.littlehorse.canary.config.CanaryConfig;
 import io.littlehorse.canary.config.ConfigLoader;
 import io.littlehorse.canary.kafka.KafkaBootstrap;

diff --git a/canary/src/main/java/io/littlehorse/canary/aggregator/AggregatorBootstrap.java b/canary/src/main/java/io/littlehorse/canary/aggregator/AggregatorBootstrap.java
@@ -1,7 +1,7 @@
 package io.littlehorse.canary.aggregator;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import io.littlehorse.canary.app.Bootstrap;
+import io.littlehorse.canary.Bootstrap;
 import io.littlehorse.canary.config.CanaryConfig;
 import io.littlehorse.canary.proto.Metric;
 import io.littlehorse.canary.proto.StreamTopologyFailure;

diff --git a/canary/src/main/java/io/littlehorse/canary/app/InitializationException.java b/canary/src/main/java/io/littlehorse/canary/app/InitializationException.java
diff --git a/canary/src/main/java/io/littlehorse/canary/kafka/KafkaBootstrap.java b/canary/src/main/java/io/littlehorse/canary/kafka/KafkaBootstrap.java
@@ -1,7 +1,7 @@
 package io.littlehorse.canary.kafka;
 
-import io.littlehorse.canary.app.Bootstrap;
-import io.littlehorse.canary.app.InitializationException;
+import io.littlehorse.canary.Bootstrap;
+import io.littlehorse.canary.CanaryException;
 import io.littlehorse.canary.config.CanaryConfig;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,7 @@ public void initialize(CanaryConfig config) {
             if (e.getCause() instanceof TopicExistsException) {
                 log.warn(e.getMessage());
             } else {
-                throw new InitializationException(e);
+                throw new CanaryException(e);
             }
         }
         log.trace("Initialized");

diff --git a/canary/src/main/java/io/littlehorse/canary/kafka/MetricsEmitter.java b/canary/src/main/java/io/littlehorse/canary/kafka/MetricsEmitter.java
@@ -1,5 +1,6 @@
 package io.littlehorse.canary.kafka;
 
+import io.littlehorse.canary.CanaryException;
 import io.littlehorse.canary.config.CanaryConfig;
 import io.littlehorse.canary.proto.Metric;
 import java.io.Closeable;
@@ -40,7 +41,7 @@ public RecordMetadata emit(String key, Metric metric) {
         try {
             return future(key, metric).get();
         } catch (InterruptedException | ExecutionException e) {
-            throw new MetricsEmitterException(e);
+            throw new CanaryException(e);
         }
     }
 

diff --git a/canary/src/main/java/io/littlehorse/canary/kafka/MetricsEmitterException.java b/canary/src/main/java/io/littlehorse/canary/kafka/MetricsEmitterException.java
diff --git a/canary/src/main/java/io/littlehorse/canary/metronome/MetronomeBootstrap.java b/canary/src/main/java/io/littlehorse/canary/metronome/MetronomeBootstrap.java
@@ -1,6 +1,6 @@
 package io.littlehorse.canary.metronome;
 
-import io.littlehorse.canary.app.Bootstrap;
+import io.littlehorse.canary.Bootstrap;
 import io.littlehorse.canary.config.CanaryConfig;
 
 public class MetronomeBootstrap implements Bootstrap {

diff --git a/canary/src/main/java/io/littlehorse/canary/metronome/WorkerBootstrap.java b/canary/src/main/java/io/littlehorse/canary/metronome/WorkerBootstrap.java
@@ -1,7 +1,7 @@
 package io.littlehorse.canary.metronome;
 
-import io.littlehorse.canary.app.Bootstrap;
-import io.littlehorse.canary.app.InitializationException;
+import io.littlehorse.canary.Bootstrap;
+import io.littlehorse.canary.CanaryException;
 import io.littlehorse.canary.config.CanaryConfig;
 import io.littlehorse.canary.kafka.MetricsEmitter;
 import io.littlehorse.sdk.common.config.LHConfig;
@@ -25,7 +25,7 @@ private void initializeWorkflow(LHConfig lhConfig) {
         try {
             workflow.registerWfSpec(lhConfig.getBlockingStub());
         } catch (IOException e) {
-            throw new InitializationException(e);
+            throw new CanaryException(e);
         }
     }
 
@@ -36,7 +36,7 @@ private void initializeTaskWorker(LHConfig lhConfig, CanaryConfig config) {
             worker.registerTaskDef();
             worker.start();
         } catch (IOException e) {
-            throw new InitializationException(e);
+            throw new CanaryException(e);
         }
     }