Standardize Java packages (#378)

* Standardize Java packages Signed-off-by: Steven Sheehy <[email protected]> * Delete unused EventStreamAnalytics Signed-off-by: Steven Sheehy <[email protected]> * Organize imports Signed-off-by: Steven Sheehy <[email protected]> * Organize imports Signed-off-by: Steven Sheehy <[email protected]>
hiero-ledger · Nov 15, 2019 · 18303a0 · 18303a0
1 parent 8a96c01
commit 18303a0
Show file tree

Hide file tree

Showing 53 changed files with 75 additions and 433 deletions.
diff --git a/NodeCollector/NodeCollector.sh b/NodeCollector/NodeCollector.sh
diff --git a/events_0.0.3/2019-07-25T19_57_21.217420Z.evts b/events_0.0.3/2019-07-25T19_57_21.217420Z.evts
diff --git a/events_0.0.3/2019-07-25T19_57_21.217420Z.evts_sig b/events_0.0.3/2019-07-25T19_57_21.217420Z.evts_sig
diff --git a/events_0.0.3/2019-07-25T19_58_21.826156Z.evts b/events_0.0.3/2019-07-25T19_58_21.826156Z.evts
diff --git a/events_0.0.3/2019-07-25T19_58_21.826156Z.evts_sig b/events_0.0.3/2019-07-25T19_58_21.826156Z.evts_sig
diff --git a/events_0.0.3/2019-07-25T19_59_00.009464Z.evts b/events_0.0.3/2019-07-25T19_59_00.009464Z.evts
diff --git a/events_0.0.3/2019-07-25T19_59_00.009464Z.evts_sig b/events_0.0.3/2019-07-25T19_59_00.009464Z.evts_sig
diff --git a/events_0.0.3/2019-07-25T20_00_00.005517Z.evts b/events_0.0.3/2019-07-25T20_00_00.005517Z.evts
diff --git a/events_0.0.3/2019-07-25T20_00_00.005517Z.evts_sig b/events_0.0.3/2019-07-25T20_00_00.005517Z.evts_sig
diff --git a/hedera-mirror-node.code-workspace b/hedera-mirror-node.code-workspace
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,6 @@
         <java.version>11</java.version>
         <jib.version>1.5.1</jib.version>
         <junit-jupiter.version>5.5.2</junit-jupiter.version>
-        <start-class>com.hedera.MirrorNodeApplication</start-class>
         <testcontainers.version>1.12.1</testcontainers.version>
     </properties>
     <dependencies>

diff --git a/...ava/com/hedera/MirrorNodeApplication.java → .../hedera/mirror/MirrorNodeApplication.java b/...ava/com/hedera/MirrorNodeApplication.java → .../hedera/mirror/MirrorNodeApplication.java
@@ -1,4 +1,4 @@
-package com.hedera;
+package com.hedera.mirror;
 
 /*-
  * ‌

diff --git a/src/main/java/com/hedera/mirror/MirrorProperties.java b/src/main/java/com/hedera/mirror/MirrorProperties.java
@@ -31,7 +31,7 @@
 import org.springframework.validation.annotation.Validated;
 
 import com.hedera.mirror.domain.HederaNetwork;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 @Data
 @Named

diff --git a/src/main/java/com/hedera/mirror/addressbook/NetworkAddressBook.java b/src/main/java/com/hedera/mirror/addressbook/NetworkAddressBook.java
@@ -39,7 +39,7 @@
 import com.hedera.mirror.MirrorProperties;
 import com.hedera.mirror.domain.HederaNetwork;
 import com.hedera.mirror.domain.NodeAddress;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 @Log4j2
 @Named

diff --git a/src/main/java/com/hedera/mirror/domain/Entities.java b/src/main/java/com/hedera/mirror/domain/Entities.java
@@ -32,7 +32,7 @@
 
 import lombok.Data;
 
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 @Data
 @Entity

diff --git a/src/main/java/com/hedera/mirror/downloader/Downloader.java b/src/main/java/com/hedera/mirror/downloader/Downloader.java
@@ -56,8 +56,8 @@
 import com.hedera.mirror.domain.ApplicationStatusCode;
 import com.hedera.mirror.domain.NodeAddress;
 import com.hedera.mirror.repository.ApplicationStatusRepository;
-import com.hedera.utilities.ShutdownHelper;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.ShutdownHelper;
+import com.hedera.mirror.util.Utility;
 
 public abstract class Downloader {
     protected final Logger log = LogManager.getLogger(getClass());

diff --git a/src/main/java/com/hedera/mirror/downloader/DownloaderProperties.java b/src/main/java/com/hedera/mirror/downloader/DownloaderProperties.java
@@ -24,7 +24,7 @@
 import javax.annotation.PostConstruct;
 
 import com.hedera.mirror.domain.StreamType;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 public interface DownloaderProperties {
 

diff --git a/src/main/java/com/hedera/mirror/downloader/NodeSignatureVerifier.java b/src/main/java/com/hedera/mirror/downloader/NodeSignatureVerifier.java
@@ -38,7 +38,7 @@
 
 import com.hedera.mirror.addressbook.NetworkAddressBook;
 import com.hedera.mirror.domain.NodeAddress;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 @Log4j2
 public class NodeSignatureVerifier {

diff --git a/src/main/java/com/hedera/mirror/migration/V1_11_6__Missing_Entities.java b/src/main/java/com/hedera/mirror/migration/V1_11_6__Missing_Entities.java
@@ -44,7 +44,7 @@
 import com.hedera.mirror.repository.EntityRepository;
 import com.hedera.mirror.repository.EntityTypeRepository;
 import com.hedera.mirror.repository.TransactionRepository;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 @Log4j2
 @Named

diff --git a/src/main/java/com/hedera/mirror/parser/FileWatcher.java b/src/main/java/com/hedera/mirror/parser/FileWatcher.java
@@ -35,7 +35,7 @@
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 
-import com.hedera.utilities.ShutdownHelper;
+import com.hedera.mirror.util.ShutdownHelper;
 
 @RequiredArgsConstructor
 public abstract class FileWatcher {

diff --git a/src/main/java/com/hedera/mirror/parser/ParserProperties.java b/src/main/java/com/hedera/mirror/parser/ParserProperties.java
@@ -24,7 +24,7 @@
 import javax.annotation.PostConstruct;
 
 import com.hedera.mirror.domain.StreamType;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.Utility;
 
 public interface ParserProperties {
 

diff --git a/src/main/java/com/hedera/mirror/parser/balance/AccountBalancesFileLoader.java b/src/main/java/com/hedera/mirror/parser/balance/AccountBalancesFileLoader.java
@@ -36,8 +36,8 @@
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 
-import com.hedera.databaseUtilities.DatabaseUtilities;
 import com.hedera.mirror.exception.InvalidDatasetException;
+import com.hedera.mirror.util.DatabaseUtilities;
 import com.hedera.mirror.util.TimestampConverter;
 
 /**

diff --git a/src/main/java/com/hedera/mirror/parser/balance/BalanceFileParser.java b/src/main/java/com/hedera/mirror/parser/balance/BalanceFileParser.java
@@ -30,8 +30,8 @@
 import javax.inject.Named;
 
 import com.hedera.mirror.parser.FileWatcher;
-import com.hedera.utilities.ShutdownHelper;
-import com.hedera.utilities.Utility;
+import com.hedera.mirror.util.ShutdownHelper;
+import com.hedera.mirror.util.Utility;
 
 @Named
 public class BalanceFileParser extends FileWatcher {
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ @@
     import lombok.Data;
-    import com.hedera.utilities.Utility;
+    import com.hedera.mirror.util.Utility;
     @Data
     @Entity
@@ Expand Down @@