From c70ab99c3e958f74acc452530b9128291a73a980 Mon Sep 17 00:00:00 2001 From: carlo cancellieri Date: Mon, 15 Apr 2013 16:29:58 +0200 Subject: [PATCH] deprecate GSResourceEncoder.setMetadata in flavour of specializations --- .../rest/encoder/GSResourceEncoder.java | 22 ++++++++++++++++--- .../encoder/coverage/GSCoverageEncoder.java | 12 +++++++--- .../encoder/feature/GSFeatureTypeEncoder.java | 5 ++++- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java index cc999be..947150b 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java @@ -97,10 +97,26 @@ public abstract class GSResourceEncoder metadata.add(key, dimensionInfo.getRoot()); } - public void setMetadata(String key, XmlElement dimensionInfo) { - metadata.set(key, dimensionInfo.getRoot()); - } + /** + * @deprecated Use {@link #setMetadataDimension(String, GSDimensionInfoEncoder)} this method will be set as protected for internal use only + * @param key + * @param dimensionInfo + */ + public void setMetadata(String key, XmlElement dimensionInfo) { + metadata.set(key, dimensionInfo.getRoot()); + } + /** + * @param key + * @param dimensionInfo + */ + protected void addMetadataDimension(String key, GSDimensionInfoEncoder dimensionInfo) { + metadata.add(key, dimensionInfo.getRoot()); + } + + public void setMetadataDimension(String key, GSDimensionInfoEncoder dimensionInfo) { + metadata.set(key, dimensionInfo.getRoot()); + } /** * @param key diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoder.java index f07f5bf..f08c13a 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/coverage/GSCoverageEncoder.java @@ -43,13 +43,19 @@ public class GSCoverageEncoder extends GSResourceEncoder { } /** - * @param key - * @param dimensionInfo - */ + * @param key + * @param dimensionInfo + * @deprecated Use {@link GSResourceEncoder#addMetadataDimension(String, GSDimensionInfoEncoder)} this method will be removed soon + */ protected void addMetadata(String key, GSDimensionInfoEncoder dimensionInfo) { super.addMetadata(key, dimensionInfo); } + /** + * @deprecated Use {@link GSResourceEncoder#setMetadataDimension(String, GSDimensionInfoEncoder)} this method will be removed soon + * @param key + * @param dimensionInfo + */ public void setMetadata(String key, GSDimensionInfoEncoder dimensionInfo) { super.setMetadata(key, dimensionInfo); } diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureTypeEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureTypeEncoder.java index 6b797b3..090f256 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureTypeEncoder.java +++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/feature/GSFeatureTypeEncoder.java @@ -26,6 +26,7 @@ package it.geosolutions.geoserver.rest.encoder.feature; import it.geosolutions.geoserver.rest.encoder.GSResourceEncoder; +import it.geosolutions.geoserver.rest.encoder.metadata.GSDimensionInfoEncoder; import it.geosolutions.geoserver.rest.encoder.metadata.GSFeatureDimensionInfoEncoder; import it.geosolutions.geoserver.rest.encoder.metadata.virtualtable.GSVirtualTableEncoder; @@ -49,7 +50,9 @@ public class GSFeatureTypeEncoder extends GSResourceEncoder { addContent(attributes); } + /** + * @deprecated Use {@link GSResourceEncoder#addMetadataDimension(String, GSDimensionInfoEncoder)} this method will be removed soon * @param key * @param dimensionInfo * @@ -60,7 +63,7 @@ public class GSFeatureTypeEncoder extends GSResourceEncoder { /** - * + * @deprecated Use {@link GSResourceEncoder#setMetadataDimension(String, GSDimensionInfoEncoder)} this method will be removed soon * @param key * @param dimensionInfo *