From 1c98f8b61ee9b0f22b866d2198697c9c08c4d58d Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Thu, 6 Jun 2024 21:28:17 +0700 Subject: [PATCH] Refactor: Rename daonode to restapi --- .../bisq/{daonode => restapi}/RestApi.java | 2 +- .../{daonode => restapi}/RestApiMain.java | 20 +++++++++---------- .../dto/BondedReputationDto.java | 2 +- .../dto/BondedRoleVerificationDto.java | 2 +- .../dto/ProofOfBurnDto.java | 2 +- .../endpoints/AccountAgeApi.java | 8 ++++---- .../endpoints/BondedReputationApi.java | 8 ++++---- .../endpoints/BondedRoleVerificationApi.java | 8 ++++---- .../endpoints/ProofOfBurnApi.java | 8 ++++---- .../endpoints/SignedWitnessApi.java | 8 ++++---- .../error/CustomExceptionMapper.java | 2 +- .../error/ErrorMessage.java | 2 +- .../error/StatusException.java | 2 +- .../swagger/StaticFileHandler.java | 2 +- .../swagger/SwaggerResolution.java | 4 ++-- 15 files changed, 40 insertions(+), 40 deletions(-) rename restapi/src/main/java/bisq/{daonode => restapi}/RestApi.java (99%) rename restapi/src/main/java/bisq/{daonode => restapi}/RestApiMain.java (89%) rename restapi/src/main/java/bisq/{daonode => restapi}/dto/BondedReputationDto.java (98%) rename restapi/src/main/java/bisq/{daonode => restapi}/dto/BondedRoleVerificationDto.java (97%) rename restapi/src/main/java/bisq/{daonode => restapi}/dto/ProofOfBurnDto.java (98%) rename restapi/src/main/java/bisq/{daonode => restapi}/endpoints/AccountAgeApi.java (95%) rename restapi/src/main/java/bisq/{daonode => restapi}/endpoints/BondedReputationApi.java (96%) rename restapi/src/main/java/bisq/{daonode => restapi}/endpoints/BondedRoleVerificationApi.java (97%) rename restapi/src/main/java/bisq/{daonode => restapi}/endpoints/ProofOfBurnApi.java (96%) rename restapi/src/main/java/bisq/{daonode => restapi}/endpoints/SignedWitnessApi.java (95%) rename restapi/src/main/java/bisq/{daonode => restapi}/error/CustomExceptionMapper.java (97%) rename restapi/src/main/java/bisq/{daonode => restapi}/error/ErrorMessage.java (96%) rename restapi/src/main/java/bisq/{daonode => restapi}/error/StatusException.java (98%) rename restapi/src/main/java/bisq/{daonode => restapi}/swagger/StaticFileHandler.java (99%) rename restapi/src/main/java/bisq/{daonode => restapi}/swagger/SwaggerResolution.java (97%) diff --git a/restapi/src/main/java/bisq/daonode/RestApi.java b/restapi/src/main/java/bisq/restapi/RestApi.java similarity index 99% rename from restapi/src/main/java/bisq/daonode/RestApi.java rename to restapi/src/main/java/bisq/restapi/RestApi.java index 7a63dcfc87..06038ada4f 100644 --- a/restapi/src/main/java/bisq/daonode/RestApi.java +++ b/restapi/src/main/java/bisq/restapi/RestApi.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode; +package bisq.restapi; import bisq.core.account.witness.AccountAgeWitnessService; diff --git a/restapi/src/main/java/bisq/daonode/RestApiMain.java b/restapi/src/main/java/bisq/restapi/RestApiMain.java similarity index 89% rename from restapi/src/main/java/bisq/daonode/RestApiMain.java rename to restapi/src/main/java/bisq/restapi/RestApiMain.java index 89f16fbc9c..aa7cabd053 100644 --- a/restapi/src/main/java/bisq/daonode/RestApiMain.java +++ b/restapi/src/main/java/bisq/restapi/RestApiMain.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode; +package bisq.restapi; import bisq.common.config.Config; @@ -28,15 +28,15 @@ import lombok.extern.slf4j.Slf4j; -import bisq.daonode.endpoints.AccountAgeApi; -import bisq.daonode.endpoints.BondedReputationApi; -import bisq.daonode.endpoints.BondedRoleVerificationApi; -import bisq.daonode.endpoints.ProofOfBurnApi; -import bisq.daonode.endpoints.SignedWitnessApi; -import bisq.daonode.error.CustomExceptionMapper; -import bisq.daonode.error.StatusException; -import bisq.daonode.swagger.StaticFileHandler; -import bisq.daonode.swagger.SwaggerResolution; +import bisq.restapi.endpoints.AccountAgeApi; +import bisq.restapi.endpoints.BondedReputationApi; +import bisq.restapi.endpoints.BondedRoleVerificationApi; +import bisq.restapi.endpoints.ProofOfBurnApi; +import bisq.restapi.endpoints.SignedWitnessApi; +import bisq.restapi.error.CustomExceptionMapper; +import bisq.restapi.error.StatusException; +import bisq.restapi.swagger.StaticFileHandler; +import bisq.restapi.swagger.SwaggerResolution; import com.sun.net.httpserver.HttpServer; import org.glassfish.jersey.jdkhttp.JdkHttpServerFactory; import org.glassfish.jersey.server.ResourceConfig; diff --git a/restapi/src/main/java/bisq/daonode/dto/BondedReputationDto.java b/restapi/src/main/java/bisq/restapi/dto/BondedReputationDto.java similarity index 98% rename from restapi/src/main/java/bisq/daonode/dto/BondedReputationDto.java rename to restapi/src/main/java/bisq/restapi/dto/BondedReputationDto.java index e79883fb75..748eec80d5 100644 --- a/restapi/src/main/java/bisq/daonode/dto/BondedReputationDto.java +++ b/restapi/src/main/java/bisq/restapi/dto/BondedReputationDto.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.dto; +package bisq.restapi.dto; import lombok.Getter; import lombok.ToString; diff --git a/restapi/src/main/java/bisq/daonode/dto/BondedRoleVerificationDto.java b/restapi/src/main/java/bisq/restapi/dto/BondedRoleVerificationDto.java similarity index 97% rename from restapi/src/main/java/bisq/daonode/dto/BondedRoleVerificationDto.java rename to restapi/src/main/java/bisq/restapi/dto/BondedRoleVerificationDto.java index a537a91bea..6ab2b06a95 100644 --- a/restapi/src/main/java/bisq/daonode/dto/BondedRoleVerificationDto.java +++ b/restapi/src/main/java/bisq/restapi/dto/BondedRoleVerificationDto.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.dto; +package bisq.restapi.dto; import lombok.Getter; diff --git a/restapi/src/main/java/bisq/daonode/dto/ProofOfBurnDto.java b/restapi/src/main/java/bisq/restapi/dto/ProofOfBurnDto.java similarity index 98% rename from restapi/src/main/java/bisq/daonode/dto/ProofOfBurnDto.java rename to restapi/src/main/java/bisq/restapi/dto/ProofOfBurnDto.java index 64f45eabad..03d7018b9d 100644 --- a/restapi/src/main/java/bisq/daonode/dto/ProofOfBurnDto.java +++ b/restapi/src/main/java/bisq/restapi/dto/ProofOfBurnDto.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.dto; +package bisq.restapi.dto; import lombok.Getter; import lombok.ToString; diff --git a/restapi/src/main/java/bisq/daonode/endpoints/AccountAgeApi.java b/restapi/src/main/java/bisq/restapi/endpoints/AccountAgeApi.java similarity index 95% rename from restapi/src/main/java/bisq/daonode/endpoints/AccountAgeApi.java rename to restapi/src/main/java/bisq/restapi/endpoints/AccountAgeApi.java index 6871a58014..0aaed70d04 100644 --- a/restapi/src/main/java/bisq/daonode/endpoints/AccountAgeApi.java +++ b/restapi/src/main/java/bisq/restapi/endpoints/AccountAgeApi.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.endpoints; +package bisq.restapi.endpoints; import bisq.core.account.witness.AccountAgeWitness; import bisq.core.account.witness.AccountAgeWitnessService; @@ -28,9 +28,9 @@ import static com.google.common.base.Preconditions.checkNotNull; -import bisq.daonode.RestApi; -import bisq.daonode.RestApiMain; -import bisq.daonode.dto.ProofOfBurnDto; +import bisq.restapi.RestApi; +import bisq.restapi.RestApiMain; +import bisq.restapi.dto.ProofOfBurnDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/restapi/src/main/java/bisq/daonode/endpoints/BondedReputationApi.java b/restapi/src/main/java/bisq/restapi/endpoints/BondedReputationApi.java similarity index 96% rename from restapi/src/main/java/bisq/daonode/endpoints/BondedReputationApi.java rename to restapi/src/main/java/bisq/restapi/endpoints/BondedReputationApi.java index 178eb188ef..55957e7fa1 100644 --- a/restapi/src/main/java/bisq/daonode/endpoints/BondedReputationApi.java +++ b/restapi/src/main/java/bisq/restapi/endpoints/BondedReputationApi.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.endpoints; +package bisq.restapi.endpoints; import bisq.core.dao.governance.bond.reputation.BondedReputationRepository; import bisq.core.dao.state.DaoStateService; @@ -32,9 +32,9 @@ import lombok.extern.slf4j.Slf4j; -import bisq.daonode.RestApi; -import bisq.daonode.RestApiMain; -import bisq.daonode.dto.BondedReputationDto; +import bisq.restapi.RestApi; +import bisq.restapi.RestApiMain; +import bisq.restapi.dto.BondedReputationDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/restapi/src/main/java/bisq/daonode/endpoints/BondedRoleVerificationApi.java b/restapi/src/main/java/bisq/restapi/endpoints/BondedRoleVerificationApi.java similarity index 97% rename from restapi/src/main/java/bisq/daonode/endpoints/BondedRoleVerificationApi.java rename to restapi/src/main/java/bisq/restapi/endpoints/BondedRoleVerificationApi.java index 4fe3db0c33..5c6777e5d5 100644 --- a/restapi/src/main/java/bisq/daonode/endpoints/BondedRoleVerificationApi.java +++ b/restapi/src/main/java/bisq/restapi/endpoints/BondedRoleVerificationApi.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.endpoints; +package bisq.restapi.endpoints; import bisq.core.dao.SignVerifyService; import bisq.core.dao.governance.bond.BondState; @@ -31,9 +31,9 @@ import lombok.extern.slf4j.Slf4j; -import bisq.daonode.RestApi; -import bisq.daonode.RestApiMain; -import bisq.daonode.dto.BondedRoleVerificationDto; +import bisq.restapi.RestApi; +import bisq.restapi.RestApiMain; +import bisq.restapi.dto.BondedRoleVerificationDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/restapi/src/main/java/bisq/daonode/endpoints/ProofOfBurnApi.java b/restapi/src/main/java/bisq/restapi/endpoints/ProofOfBurnApi.java similarity index 96% rename from restapi/src/main/java/bisq/daonode/endpoints/ProofOfBurnApi.java rename to restapi/src/main/java/bisq/restapi/endpoints/ProofOfBurnApi.java index 98df0694cc..5bf57be789 100644 --- a/restapi/src/main/java/bisq/daonode/endpoints/ProofOfBurnApi.java +++ b/restapi/src/main/java/bisq/restapi/endpoints/ProofOfBurnApi.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.endpoints; +package bisq.restapi.endpoints; import bisq.core.dao.governance.proofofburn.ProofOfBurnService; import bisq.core.dao.state.DaoStateService; @@ -31,9 +31,9 @@ import static com.google.common.base.Preconditions.checkNotNull; -import bisq.daonode.RestApi; -import bisq.daonode.RestApiMain; -import bisq.daonode.dto.ProofOfBurnDto; +import bisq.restapi.RestApi; +import bisq.restapi.RestApiMain; +import bisq.restapi.dto.ProofOfBurnDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/restapi/src/main/java/bisq/daonode/endpoints/SignedWitnessApi.java b/restapi/src/main/java/bisq/restapi/endpoints/SignedWitnessApi.java similarity index 95% rename from restapi/src/main/java/bisq/daonode/endpoints/SignedWitnessApi.java rename to restapi/src/main/java/bisq/restapi/endpoints/SignedWitnessApi.java index 5b38f22d80..7c5f0bd56f 100644 --- a/restapi/src/main/java/bisq/daonode/endpoints/SignedWitnessApi.java +++ b/restapi/src/main/java/bisq/restapi/endpoints/SignedWitnessApi.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.endpoints; +package bisq.restapi.endpoints; import bisq.core.account.witness.AccountAgeWitnessService; @@ -27,9 +27,9 @@ import static com.google.common.base.Preconditions.checkNotNull; -import bisq.daonode.RestApi; -import bisq.daonode.RestApiMain; -import bisq.daonode.dto.ProofOfBurnDto; +import bisq.restapi.RestApi; +import bisq.restapi.RestApiMain; +import bisq.restapi.dto.ProofOfBurnDto; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/restapi/src/main/java/bisq/daonode/error/CustomExceptionMapper.java b/restapi/src/main/java/bisq/restapi/error/CustomExceptionMapper.java similarity index 97% rename from restapi/src/main/java/bisq/daonode/error/CustomExceptionMapper.java rename to restapi/src/main/java/bisq/restapi/error/CustomExceptionMapper.java index f2fdeaec90..1cbeecdd9d 100644 --- a/restapi/src/main/java/bisq/daonode/error/CustomExceptionMapper.java +++ b/restapi/src/main/java/bisq/restapi/error/CustomExceptionMapper.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.error; +package bisq.restapi.error; import lombok.extern.slf4j.Slf4j; diff --git a/restapi/src/main/java/bisq/daonode/error/ErrorMessage.java b/restapi/src/main/java/bisq/restapi/error/ErrorMessage.java similarity index 96% rename from restapi/src/main/java/bisq/daonode/error/ErrorMessage.java rename to restapi/src/main/java/bisq/restapi/error/ErrorMessage.java index 17454a8251..bcde609b76 100644 --- a/restapi/src/main/java/bisq/daonode/error/ErrorMessage.java +++ b/restapi/src/main/java/bisq/restapi/error/ErrorMessage.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.error; +package bisq.restapi.error; import lombok.Getter; diff --git a/restapi/src/main/java/bisq/daonode/error/StatusException.java b/restapi/src/main/java/bisq/restapi/error/StatusException.java similarity index 98% rename from restapi/src/main/java/bisq/daonode/error/StatusException.java rename to restapi/src/main/java/bisq/restapi/error/StatusException.java index 004262b946..05482a7bb1 100644 --- a/restapi/src/main/java/bisq/daonode/error/StatusException.java +++ b/restapi/src/main/java/bisq/restapi/error/StatusException.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.error; +package bisq.restapi.error; import lombok.Getter; import lombok.Setter; diff --git a/restapi/src/main/java/bisq/daonode/swagger/StaticFileHandler.java b/restapi/src/main/java/bisq/restapi/swagger/StaticFileHandler.java similarity index 99% rename from restapi/src/main/java/bisq/daonode/swagger/StaticFileHandler.java rename to restapi/src/main/java/bisq/restapi/swagger/StaticFileHandler.java index 9bad65bf4a..e7e8797bd6 100644 --- a/restapi/src/main/java/bisq/daonode/swagger/StaticFileHandler.java +++ b/restapi/src/main/java/bisq/restapi/swagger/StaticFileHandler.java @@ -15,7 +15,7 @@ * along with Bisq. If not, see . */ -package bisq.daonode.swagger; +package bisq.restapi.swagger; import java.net.URI; diff --git a/restapi/src/main/java/bisq/daonode/swagger/SwaggerResolution.java b/restapi/src/main/java/bisq/restapi/swagger/SwaggerResolution.java similarity index 97% rename from restapi/src/main/java/bisq/daonode/swagger/SwaggerResolution.java rename to restapi/src/main/java/bisq/restapi/swagger/SwaggerResolution.java index 4527cac22e..14c2c5037c 100644 --- a/restapi/src/main/java/bisq/daonode/swagger/SwaggerResolution.java +++ b/restapi/src/main/java/bisq/restapi/swagger/SwaggerResolution.java @@ -15,13 +15,13 @@ * along with Bisq. If not, see . */ -package bisq.daonode.swagger; +package bisq.restapi.swagger; import lombok.extern.slf4j.Slf4j; -import bisq.daonode.RestApiMain; +import bisq.restapi.RestApiMain; import io.swagger.v3.core.util.Json; import io.swagger.v3.jaxrs2.Reader; import io.swagger.v3.oas.annotations.Hidden;