From 172a37ec8cb8238b75f7505dd22876226407ed62 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 14 Aug 2021 13:49:19 +0100 Subject: [PATCH] Renamed org.qortal.storage package to org.qortal.arbitrary --- .../java/org/qortal/api/resource/ArbitraryResource.java | 6 +++--- .../java/org/qortal/api/resource/WebsiteResource.java | 8 ++++---- .../{storage => arbitrary}/ArbitraryDataBuilder.java | 4 ++-- .../{storage => arbitrary}/ArbitraryDataCombiner.java | 2 +- .../{storage => arbitrary}/ArbitraryDataCreatePatch.java | 2 +- .../qortal/{storage => arbitrary}/ArbitraryDataDiff.java | 2 +- .../qortal/{storage => arbitrary}/ArbitraryDataFile.java | 2 +- .../{storage => arbitrary}/ArbitraryDataFileChunk.java | 2 +- .../qortal/{storage => arbitrary}/ArbitraryDataMerge.java | 2 +- .../{storage => arbitrary}/ArbitraryDataPatches.java | 2 +- .../{storage => arbitrary}/ArbitraryDataReader.java | 4 ++-- .../{storage => arbitrary}/ArbitraryDataWriter.java | 4 ++-- .../java/org/qortal/controller/ArbitraryDataManager.java | 4 ++-- ...DataFileMessage.java => ArbitraryDataFileMessage.java} | 2 +- .../repository/hsqldb/HSQLDBArbitraryRepository.java | 2 +- .../java/org/qortal/transaction/ArbitraryTransaction.java | 4 ++-- src/test/java/org/qortal/test/DataTests.java | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataBuilder.java (98%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataCombiner.java (98%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataCreatePatch.java (98%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataDiff.java (99%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataFile.java (99%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataFileChunk.java (98%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataMerge.java (99%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataPatches.java (98%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataReader.java (99%) rename src/main/java/org/qortal/{storage => arbitrary}/ArbitraryDataWriter.java (99%) rename src/main/java/org/qortal/network/message/{DataFileMessage.java => ArbitraryDataFileMessage.java} (97%) diff --git a/src/main/java/org/qortal/api/resource/ArbitraryResource.java b/src/main/java/org/qortal/api/resource/ArbitraryResource.java index 78cf9213..15c41a88 100644 --- a/src/main/java/org/qortal/api/resource/ArbitraryResource.java +++ b/src/main/java/org/qortal/api/resource/ArbitraryResource.java @@ -45,9 +45,9 @@ import org.qortal.repository.DataException; import org.qortal.repository.Repository; import org.qortal.repository.RepositoryManager; import org.qortal.settings.Settings; -import org.qortal.storage.ArbitraryDataFile; -import org.qortal.storage.ArbitraryDataFileChunk; -import org.qortal.storage.ArbitraryDataWriter; +import org.qortal.arbitrary.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFileChunk; +import org.qortal.arbitrary.ArbitraryDataWriter; import org.qortal.transaction.ArbitraryTransaction; import org.qortal.transaction.Transaction; import org.qortal.transaction.Transaction.TransactionType; diff --git a/src/main/java/org/qortal/api/resource/WebsiteResource.java b/src/main/java/org/qortal/api/resource/WebsiteResource.java index 933452a0..9bd1c142 100644 --- a/src/main/java/org/qortal/api/resource/WebsiteResource.java +++ b/src/main/java/org/qortal/api/resource/WebsiteResource.java @@ -38,10 +38,10 @@ import org.qortal.repository.DataException; import org.qortal.repository.Repository; import org.qortal.repository.RepositoryManager; import org.qortal.settings.Settings; -import org.qortal.storage.ArbitraryDataFile; -import org.qortal.storage.ArbitraryDataFile.*; -import org.qortal.storage.ArbitraryDataReader; -import org.qortal.storage.ArbitraryDataWriter; +import org.qortal.arbitrary.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFile.*; +import org.qortal.arbitrary.ArbitraryDataReader; +import org.qortal.arbitrary.ArbitraryDataWriter; import org.qortal.transaction.ArbitraryTransaction; import org.qortal.transaction.Transaction; import org.qortal.transform.TransformationException; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataBuilder.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java similarity index 98% rename from src/main/java/org/qortal/storage/ArbitraryDataBuilder.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java index 5da39e51..7d9984f1 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataBuilder.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,7 +8,7 @@ import org.qortal.data.transaction.ArbitraryTransactionData.Service; import org.qortal.repository.DataException; import org.qortal.repository.Repository; import org.qortal.repository.RepositoryManager; -import org.qortal.storage.ArbitraryDataFile.ResourceIdType; +import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType; import org.qortal.utils.Base58; import java.io.IOException; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataCombiner.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java similarity index 98% rename from src/main/java/org/qortal/storage/ArbitraryDataCombiner.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java index 11bf4675..0554cdb5 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataCombiner.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataCreatePatch.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataCreatePatch.java similarity index 98% rename from src/main/java/org/qortal/storage/ArbitraryDataCreatePatch.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataCreatePatch.java index ec12f070..ed4095a4 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataCreatePatch.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataCreatePatch.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataDiff.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java similarity index 99% rename from src/main/java/org/qortal/storage/ArbitraryDataDiff.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java index e9461338..defc4a4b 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataDiff.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataFile.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java similarity index 99% rename from src/main/java/org/qortal/storage/ArbitraryDataFile.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java index 008a44d3..9cce4879 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataFile.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataFileChunk.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java similarity index 98% rename from src/main/java/org/qortal/storage/ArbitraryDataFileChunk.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java index ce94bf41..ccd14eae 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataFileChunk.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataFileChunk.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataMerge.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java similarity index 99% rename from src/main/java/org/qortal/storage/ArbitraryDataMerge.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java index 85ad93e9..f1163da4 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataMerge.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataPatches.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java similarity index 98% rename from src/main/java/org/qortal/storage/ArbitraryDataPatches.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java index cfa11480..c12c6a53 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataPatches.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java similarity index 99% rename from src/main/java/org/qortal/storage/ArbitraryDataReader.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java index 8cd9f262..3fb2c44d 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataReader.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,7 +8,7 @@ import org.qortal.data.transaction.ArbitraryTransactionData.*; import org.qortal.repository.DataException; import org.qortal.repository.Repository; import org.qortal.repository.RepositoryManager; -import org.qortal.storage.ArbitraryDataFile.*; +import org.qortal.arbitrary.ArbitraryDataFile.*; import org.qortal.transform.Transformer; import org.qortal.utils.Base58; import org.qortal.utils.FilesystemUtils; diff --git a/src/main/java/org/qortal/storage/ArbitraryDataWriter.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java similarity index 99% rename from src/main/java/org/qortal/storage/ArbitraryDataWriter.java rename to src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java index 19a29b45..5d987b8d 100644 --- a/src/main/java/org/qortal/storage/ArbitraryDataWriter.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataWriter.java @@ -1,4 +1,4 @@ -package org.qortal.storage; +package org.qortal.arbitrary; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -6,7 +6,7 @@ import org.apache.logging.log4j.Logger; import org.qortal.data.transaction.ArbitraryTransactionData.*; import org.qortal.crypto.AES; import org.qortal.repository.DataException; -import org.qortal.storage.ArbitraryDataFile.*; +import org.qortal.arbitrary.ArbitraryDataFile.*; import org.qortal.utils.ZipUtils; import javax.crypto.BadPaddingException; diff --git a/src/main/java/org/qortal/controller/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/ArbitraryDataManager.java index 7028b550..8f7614e1 100644 --- a/src/main/java/org/qortal/controller/ArbitraryDataManager.java +++ b/src/main/java/org/qortal/controller/ArbitraryDataManager.java @@ -13,8 +13,8 @@ import org.qortal.network.message.*; import org.qortal.repository.DataException; import org.qortal.repository.Repository; import org.qortal.repository.RepositoryManager; -import org.qortal.storage.ArbitraryDataFile; -import org.qortal.storage.ArbitraryDataFileChunk; +import org.qortal.arbitrary.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFileChunk; import org.qortal.transaction.ArbitraryTransaction; import org.qortal.transaction.Transaction.TransactionType; import org.qortal.utils.Base58; diff --git a/src/main/java/org/qortal/network/message/DataFileMessage.java b/src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java similarity index 97% rename from src/main/java/org/qortal/network/message/DataFileMessage.java rename to src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java index a2a144dd..33911871 100644 --- a/src/main/java/org/qortal/network/message/DataFileMessage.java +++ b/src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java @@ -1,7 +1,7 @@ package org.qortal.network.message; import com.google.common.primitives.Ints; -import org.qortal.storage.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFile; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java index dc70496f..29c0326d 100644 --- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java @@ -10,7 +10,7 @@ import org.qortal.data.transaction.BaseTransactionData; import org.qortal.data.transaction.TransactionData; import org.qortal.repository.ArbitraryRepository; import org.qortal.repository.DataException; -import org.qortal.storage.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFile; import org.qortal.transaction.Transaction.ApprovalStatus; import java.sql.ResultSet; diff --git a/src/main/java/org/qortal/transaction/ArbitraryTransaction.java b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java index 890f8d32..0f5bea60 100644 --- a/src/main/java/org/qortal/transaction/ArbitraryTransaction.java +++ b/src/main/java/org/qortal/transaction/ArbitraryTransaction.java @@ -13,8 +13,8 @@ import org.qortal.data.transaction.TransactionData; import org.qortal.payment.Payment; import org.qortal.repository.DataException; import org.qortal.repository.Repository; -import org.qortal.storage.ArbitraryDataFile; -import org.qortal.storage.ArbitraryDataFileChunk; +import org.qortal.arbitrary.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFileChunk; import org.qortal.transform.TransformationException; import org.qortal.transform.transaction.ArbitraryTransactionTransformer; import org.qortal.transform.transaction.TransactionTransformer; diff --git a/src/test/java/org/qortal/test/DataTests.java b/src/test/java/org/qortal/test/DataTests.java index 6dd8d66c..1d515239 100644 --- a/src/test/java/org/qortal/test/DataTests.java +++ b/src/test/java/org/qortal/test/DataTests.java @@ -3,7 +3,7 @@ package org.qortal.test; import org.junit.Before; import org.junit.Test; import org.qortal.repository.DataException; -import org.qortal.storage.ArbitraryDataFile; +import org.qortal.arbitrary.ArbitraryDataFile; import org.qortal.test.common.Common; import java.util.Random;