From 7fa3f42505164895a6c54460dd740bfca00e5a0e Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Thu, 31 Oct 2024 23:40:12 +0100
Subject: [PATCH] webapi: reorganizes src tree by endpoints (soda, mcutout,
merge)
---
data-access/servlet/mvn-build.sh | 2 +-
data-access/servlet/mvn-clean.sh | 2 +-
data-access/servlet/src/main/java/{ops => }/Vlkb.java | 0
.../servlet/src/main/java/{ => authz}/webapi/AuthZFilter.java | 0
.../servlet/src/main/java/{ => authz}/webapi/AuthZSettings.java | 0
.../servlet/src/main/java/{ops => common}/cli/ExecCmd.java | 0
.../servlet/src/main/java/{webapi => common}/output/Inputs.java | 0
.../src/main/java/{webapi => common}/output/XmlSerializer.java | 0
.../servlet/src/main/java/{ => common}/resolver/Resolver.java | 0
.../src/main/java/{ => common}/resolver/ResolverByObsCore.java | 0
.../main/java/{ => common}/resolver/ResolverByObsCoreDb.java | 0
.../src/main/java/{ => common}/resolver/ResolverFromId.java | 0
data-access/servlet/src/main/java/{ops => mcutout}/CutArgs.java | 0
.../servlet/src/main/java/{ops => mcutout}/JdlMCutout.java | 0
.../main/java/{common/output => mcutout}/NullValueCount.java | 0
data-access/servlet/src/main/java/{ops => mcutout}/VlkbCli.java | 0
.../servlet/src/main/java/{ => mcutout}/webapi/UWSMCutout.java | 0
.../src/main/java/{ => mcutout}/webapi/UWSMCutoutJobOwner.java | 0
.../java/{ => mcutout}/webapi/UWSMCutoutUserIdentifier.java | 0
.../src/main/java/{ => mcutout}/webapi/UWSMCutoutWork.java | 0
data-access/servlet/src/main/java/{ops => merge}/Regrid.java | 0
data-access/servlet/src/main/java/{ops => merge}/Reproject.java | 0
data-access/servlet/src/main/java/{ops => merge}/VlkbAmqp.java | 0
.../servlet/src/main/java/{ops => merge}/amqp/JsonDecoder.java | 0
.../servlet/src/main/java/{ops => merge}/amqp/JsonEncoder.java | 0
.../src/main/java/{ops => merge}/amqp/JsonEncoderMerge.java | 0
.../servlet/src/main/java/{ops => merge}/amqp/RpcOverAmqp.java | 0
.../servlet/src/main/java/{ => merge}/webapi/UWSMerge.java | 0
.../servlet/src/main/java/{ => merge}/webapi/UWSMergeWork.java | 0
data-access/servlet/src/main/java/{ops => soda}/Soda.java | 0
data-access/servlet/src/main/java/{ops => soda}/SodaImpl.java | 0
.../servlet/src/main/java/{ => soda}/webapi/ServletCutout.java | 0
.../servlet/src/main/java/{ => soda}/webapi/Settings.java | 0
33 files changed, 2 insertions(+), 2 deletions(-)
rename data-access/servlet/src/main/java/{ops => }/Vlkb.java (100%)
rename data-access/servlet/src/main/java/{ => authz}/webapi/AuthZFilter.java (100%)
rename data-access/servlet/src/main/java/{ => authz}/webapi/AuthZSettings.java (100%)
rename data-access/servlet/src/main/java/{ops => common}/cli/ExecCmd.java (100%)
rename data-access/servlet/src/main/java/{webapi => common}/output/Inputs.java (100%)
rename data-access/servlet/src/main/java/{webapi => common}/output/XmlSerializer.java (100%)
rename data-access/servlet/src/main/java/{ => common}/resolver/Resolver.java (100%)
rename data-access/servlet/src/main/java/{ => common}/resolver/ResolverByObsCore.java (100%)
rename data-access/servlet/src/main/java/{ => common}/resolver/ResolverByObsCoreDb.java (100%)
rename data-access/servlet/src/main/java/{ => common}/resolver/ResolverFromId.java (100%)
rename data-access/servlet/src/main/java/{ops => mcutout}/CutArgs.java (100%)
rename data-access/servlet/src/main/java/{ops => mcutout}/JdlMCutout.java (100%)
rename data-access/servlet/src/main/java/{common/output => mcutout}/NullValueCount.java (100%)
rename data-access/servlet/src/main/java/{ops => mcutout}/VlkbCli.java (100%)
rename data-access/servlet/src/main/java/{ => mcutout}/webapi/UWSMCutout.java (100%)
rename data-access/servlet/src/main/java/{ => mcutout}/webapi/UWSMCutoutJobOwner.java (100%)
rename data-access/servlet/src/main/java/{ => mcutout}/webapi/UWSMCutoutUserIdentifier.java (100%)
rename data-access/servlet/src/main/java/{ => mcutout}/webapi/UWSMCutoutWork.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/Regrid.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/Reproject.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/VlkbAmqp.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/amqp/JsonDecoder.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/amqp/JsonEncoder.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/amqp/JsonEncoderMerge.java (100%)
rename data-access/servlet/src/main/java/{ops => merge}/amqp/RpcOverAmqp.java (100%)
rename data-access/servlet/src/main/java/{ => merge}/webapi/UWSMerge.java (100%)
rename data-access/servlet/src/main/java/{ => merge}/webapi/UWSMergeWork.java (100%)
rename data-access/servlet/src/main/java/{ops => soda}/Soda.java (100%)
rename data-access/servlet/src/main/java/{ops => soda}/SodaImpl.java (100%)
rename data-access/servlet/src/main/java/{ => soda}/webapi/ServletCutout.java (100%)
rename data-access/servlet/src/main/java/{ => soda}/webapi/Settings.java (100%)
diff --git a/data-access/servlet/mvn-build.sh b/data-access/servlet/mvn-build.sh
index 66c5f7c..8216ee0 100755
--- a/data-access/servlet/mvn-build.sh
+++ b/data-access/servlet/mvn-build.sh
@@ -2,7 +2,7 @@
VERSION=$(git describe)
-echo "class Version { static String asString = \"${VERSION}\";}" > src/main/java/webapi/Version.java
+echo "class Version { static String asString = \"${VERSION}\";}" > src/main/java/Version.java
mvn package
#JAVA_HOME=/usr/lib/jvm/java-17-openjdk-17.0.9.0.9-3.fc38.x86_64 mvn package
diff --git a/data-access/servlet/mvn-clean.sh b/data-access/servlet/mvn-clean.sh
index 5a7d8e0..22567f2 100755
--- a/data-access/servlet/mvn-clean.sh
+++ b/data-access/servlet/mvn-clean.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-rm -f src/main/java/webapi/Version.java
+rm -f src/main/java/Version.java
mvn clean
diff --git a/data-access/servlet/src/main/java/ops/Vlkb.java b/data-access/servlet/src/main/java/Vlkb.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/Vlkb.java
rename to data-access/servlet/src/main/java/Vlkb.java
diff --git a/data-access/servlet/src/main/java/webapi/AuthZFilter.java b/data-access/servlet/src/main/java/authz/webapi/AuthZFilter.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/AuthZFilter.java
rename to data-access/servlet/src/main/java/authz/webapi/AuthZFilter.java
diff --git a/data-access/servlet/src/main/java/webapi/AuthZSettings.java b/data-access/servlet/src/main/java/authz/webapi/AuthZSettings.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/AuthZSettings.java
rename to data-access/servlet/src/main/java/authz/webapi/AuthZSettings.java
diff --git a/data-access/servlet/src/main/java/ops/cli/ExecCmd.java b/data-access/servlet/src/main/java/common/cli/ExecCmd.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/cli/ExecCmd.java
rename to data-access/servlet/src/main/java/common/cli/ExecCmd.java
diff --git a/data-access/servlet/src/main/java/webapi/output/Inputs.java b/data-access/servlet/src/main/java/common/output/Inputs.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/output/Inputs.java
rename to data-access/servlet/src/main/java/common/output/Inputs.java
diff --git a/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java b/data-access/servlet/src/main/java/common/output/XmlSerializer.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/output/XmlSerializer.java
rename to data-access/servlet/src/main/java/common/output/XmlSerializer.java
diff --git a/data-access/servlet/src/main/java/resolver/Resolver.java b/data-access/servlet/src/main/java/common/resolver/Resolver.java
similarity index 100%
rename from data-access/servlet/src/main/java/resolver/Resolver.java
rename to data-access/servlet/src/main/java/common/resolver/Resolver.java
diff --git a/data-access/servlet/src/main/java/resolver/ResolverByObsCore.java b/data-access/servlet/src/main/java/common/resolver/ResolverByObsCore.java
similarity index 100%
rename from data-access/servlet/src/main/java/resolver/ResolverByObsCore.java
rename to data-access/servlet/src/main/java/common/resolver/ResolverByObsCore.java
diff --git a/data-access/servlet/src/main/java/resolver/ResolverByObsCoreDb.java b/data-access/servlet/src/main/java/common/resolver/ResolverByObsCoreDb.java
similarity index 100%
rename from data-access/servlet/src/main/java/resolver/ResolverByObsCoreDb.java
rename to data-access/servlet/src/main/java/common/resolver/ResolverByObsCoreDb.java
diff --git a/data-access/servlet/src/main/java/resolver/ResolverFromId.java b/data-access/servlet/src/main/java/common/resolver/ResolverFromId.java
similarity index 100%
rename from data-access/servlet/src/main/java/resolver/ResolverFromId.java
rename to data-access/servlet/src/main/java/common/resolver/ResolverFromId.java
diff --git a/data-access/servlet/src/main/java/ops/CutArgs.java b/data-access/servlet/src/main/java/mcutout/CutArgs.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/CutArgs.java
rename to data-access/servlet/src/main/java/mcutout/CutArgs.java
diff --git a/data-access/servlet/src/main/java/ops/JdlMCutout.java b/data-access/servlet/src/main/java/mcutout/JdlMCutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/JdlMCutout.java
rename to data-access/servlet/src/main/java/mcutout/JdlMCutout.java
diff --git a/data-access/servlet/src/main/java/common/output/NullValueCount.java b/data-access/servlet/src/main/java/mcutout/NullValueCount.java
similarity index 100%
rename from data-access/servlet/src/main/java/common/output/NullValueCount.java
rename to data-access/servlet/src/main/java/mcutout/NullValueCount.java
diff --git a/data-access/servlet/src/main/java/ops/VlkbCli.java b/data-access/servlet/src/main/java/mcutout/VlkbCli.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/VlkbCli.java
rename to data-access/servlet/src/main/java/mcutout/VlkbCli.java
diff --git a/data-access/servlet/src/main/java/webapi/UWSMCutout.java b/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/UWSMCutout.java
rename to data-access/servlet/src/main/java/mcutout/webapi/UWSMCutout.java
diff --git a/data-access/servlet/src/main/java/webapi/UWSMCutoutJobOwner.java b/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutJobOwner.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/UWSMCutoutJobOwner.java
rename to data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutJobOwner.java
diff --git a/data-access/servlet/src/main/java/webapi/UWSMCutoutUserIdentifier.java b/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutUserIdentifier.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/UWSMCutoutUserIdentifier.java
rename to data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutUserIdentifier.java
diff --git a/data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java b/data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java
rename to data-access/servlet/src/main/java/mcutout/webapi/UWSMCutoutWork.java
diff --git a/data-access/servlet/src/main/java/ops/Regrid.java b/data-access/servlet/src/main/java/merge/Regrid.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/Regrid.java
rename to data-access/servlet/src/main/java/merge/Regrid.java
diff --git a/data-access/servlet/src/main/java/ops/Reproject.java b/data-access/servlet/src/main/java/merge/Reproject.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/Reproject.java
rename to data-access/servlet/src/main/java/merge/Reproject.java
diff --git a/data-access/servlet/src/main/java/ops/VlkbAmqp.java b/data-access/servlet/src/main/java/merge/VlkbAmqp.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/VlkbAmqp.java
rename to data-access/servlet/src/main/java/merge/VlkbAmqp.java
diff --git a/data-access/servlet/src/main/java/ops/amqp/JsonDecoder.java b/data-access/servlet/src/main/java/merge/amqp/JsonDecoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/amqp/JsonDecoder.java
rename to data-access/servlet/src/main/java/merge/amqp/JsonDecoder.java
diff --git a/data-access/servlet/src/main/java/ops/amqp/JsonEncoder.java b/data-access/servlet/src/main/java/merge/amqp/JsonEncoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/amqp/JsonEncoder.java
rename to data-access/servlet/src/main/java/merge/amqp/JsonEncoder.java
diff --git a/data-access/servlet/src/main/java/ops/amqp/JsonEncoderMerge.java b/data-access/servlet/src/main/java/merge/amqp/JsonEncoderMerge.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/amqp/JsonEncoderMerge.java
rename to data-access/servlet/src/main/java/merge/amqp/JsonEncoderMerge.java
diff --git a/data-access/servlet/src/main/java/ops/amqp/RpcOverAmqp.java b/data-access/servlet/src/main/java/merge/amqp/RpcOverAmqp.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/amqp/RpcOverAmqp.java
rename to data-access/servlet/src/main/java/merge/amqp/RpcOverAmqp.java
diff --git a/data-access/servlet/src/main/java/webapi/UWSMerge.java b/data-access/servlet/src/main/java/merge/webapi/UWSMerge.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/UWSMerge.java
rename to data-access/servlet/src/main/java/merge/webapi/UWSMerge.java
diff --git a/data-access/servlet/src/main/java/webapi/UWSMergeWork.java b/data-access/servlet/src/main/java/merge/webapi/UWSMergeWork.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/UWSMergeWork.java
rename to data-access/servlet/src/main/java/merge/webapi/UWSMergeWork.java
diff --git a/data-access/servlet/src/main/java/ops/Soda.java b/data-access/servlet/src/main/java/soda/Soda.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/Soda.java
rename to data-access/servlet/src/main/java/soda/Soda.java
diff --git a/data-access/servlet/src/main/java/ops/SodaImpl.java b/data-access/servlet/src/main/java/soda/SodaImpl.java
similarity index 100%
rename from data-access/servlet/src/main/java/ops/SodaImpl.java
rename to data-access/servlet/src/main/java/soda/SodaImpl.java
diff --git a/data-access/servlet/src/main/java/webapi/ServletCutout.java b/data-access/servlet/src/main/java/soda/webapi/ServletCutout.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/ServletCutout.java
rename to data-access/servlet/src/main/java/soda/webapi/ServletCutout.java
diff --git a/data-access/servlet/src/main/java/webapi/Settings.java b/data-access/servlet/src/main/java/soda/webapi/Settings.java
similarity index 100%
rename from data-access/servlet/src/main/java/webapi/Settings.java
rename to data-access/servlet/src/main/java/soda/webapi/Settings.java
--
GitLab