minor change

3dcitydb · Nov 18, 2024 · 6aec71a · 6aec71a
1 parent d6ff8b1
commit 6aec71a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/.../model/encoding/EnvelopeConfigReader.java → ...citydb/model/encoding/EnvelopeReader.java b/.../model/encoding/EnvelopeConfigReader.java → ...citydb/model/encoding/EnvelopeReader.java
@@ -32,7 +32,7 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-public class EnvelopeConfigReader implements ObjectReader<Envelope> {
+public class EnvelopeReader implements ObjectReader<Envelope> {
     @Override
     public Envelope readObject(JSONReader jsonReader, Type type, Object o, long l) {
         if (jsonReader.isObject()) {

diff --git a/.../model/encoding/EnvelopeConfigWriter.java → ...citydb/model/encoding/EnvelopeWriter.java b/.../model/encoding/EnvelopeConfigWriter.java → ...citydb/model/encoding/EnvelopeWriter.java
@@ -30,7 +30,7 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-public class EnvelopeConfigWriter implements ObjectWriter<Envelope> {
+public class EnvelopeWriter implements ObjectWriter<Envelope> {
     @Override
     public void write(JSONWriter jsonWriter, Object o, Object o1, Type type, long l) {
         if (o instanceof Envelope envelope) {

diff --git a/...ydb/query/feature/FeatureTypesReader.java → ...db/model/encoding/PrefixedNameReader.java b/...ydb/query/feature/FeatureTypesReader.java → ...db/model/encoding/PrefixedNameReader.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package org.citydb.query.feature;
+package org.citydb.model.encoding;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONReader;
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class FeatureTypesReader implements ObjectReader<List<PrefixedName>> {
+public class PrefixedNameReader implements ObjectReader<List<PrefixedName>> {
     @Override
     public List<PrefixedName> readObject(JSONReader jsonReader, Type type, Object o, long l) {
         if (jsonReader.isArray()) {

diff --git a/...ydb/query/feature/FeatureTypesWriter.java → ...db/model/encoding/PrefixedNameWriter.java b/...ydb/query/feature/FeatureTypesWriter.java → ...db/model/encoding/PrefixedNameWriter.java
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package org.citydb.query.feature;
+package org.citydb.model.encoding;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
@@ -31,7 +31,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class FeatureTypesWriter implements ObjectWriter<List<PrefixedName>> {
+public class PrefixedNameWriter implements ObjectWriter<List<PrefixedName>> {
     @Override
     public void write(JSONWriter jsonWriter, Object o, Object o1, Type type, long l) {
         if (o instanceof List<?> list) {

diff --git a/citydb-query/src/main/java/module-info.java b/citydb-query/src/main/java/module-info.java
@@ -10,7 +10,6 @@
     exports org.citydb.query.builder.schema;
     exports org.citydb.query.builder.sql;
     exports org.citydb.query.executor;
-    exports org.citydb.query.feature;
     exports org.citydb.query.filter;
     exports org.citydb.query.filter.common;
     exports org.citydb.query.filter.encoding;

diff --git a/citydb-query/src/main/java/org/citydb/query/Query.java b/citydb-query/src/main/java/org/citydb/query/Query.java
@@ -27,9 +27,9 @@
 import org.citydb.database.schema.FeatureType;
 import org.citydb.model.common.Name;
 import org.citydb.model.common.PrefixedName;
+import org.citydb.model.encoding.PrefixedNameReader;
+import org.citydb.model.encoding.PrefixedNameWriter;
 import org.citydb.model.feature.FeatureTypeProvider;
-import org.citydb.query.feature.FeatureTypesReader;
-import org.citydb.query.feature.FeatureTypesWriter;
 import org.citydb.query.filter.Filter;
 import org.citydb.query.filter.encoding.FilterConfigReader;
 import org.citydb.query.filter.encoding.FilterConfigWriter;
@@ -43,7 +43,7 @@
 
 @SerializableConfig(name = "query")
 public class Query {
-    @JSONField(serializeUsing = FeatureTypesWriter.class, deserializeUsing = FeatureTypesReader.class)
+    @JSONField(serializeUsing = PrefixedNameWriter.class, deserializeUsing = PrefixedNameReader.class)
     private List<PrefixedName> featureTypes;
     @JSONField(serializeUsing = FilterConfigWriter.class, deserializeUsing = FilterConfigReader.class)
     private Filter filter;

diff --git a/citydb-tiling/src/main/java/org/citydb/tiling/Tiling.java b/citydb-tiling/src/main/java/org/citydb/tiling/Tiling.java
@@ -28,8 +28,8 @@
 import org.citydb.database.geometry.GeometryException;
 import org.citydb.database.srs.SpatialReference;
 import org.citydb.database.srs.SrsException;
-import org.citydb.model.encoding.EnvelopeConfigReader;
-import org.citydb.model.encoding.EnvelopeConfigWriter;
+import org.citydb.model.encoding.EnvelopeReader;
+import org.citydb.model.encoding.EnvelopeWriter;
 import org.citydb.model.geometry.Envelope;
 import org.citydb.tiling.options.TileMatrixOrigin;
 
@@ -39,7 +39,7 @@
 
 @SerializableConfig(name = "tilingOptions")
 public class Tiling {
-    @JSONField(serializeUsing = EnvelopeConfigWriter.class, deserializeUsing = EnvelopeConfigReader.class)
+    @JSONField(serializeUsing = EnvelopeWriter.class, deserializeUsing = EnvelopeReader.class)
     private Envelope extent;
     private TilingScheme scheme;
     @JSONField(serializeFeatures = JSONWriter.Feature.WriteEnumUsingToString)