From cd511983c03db207d696f6ba88b28cf1b73f890d Mon Sep 17 00:00:00 2001
From: Carl Schroedl <cschroedl@usgs.gov>
Date: Tue, 20 Sep 2016 14:27:53 -0500
Subject: [PATCH] Revert "Switching to formal XML body construction via
 GS*Encoder classes. #199"

This reverts commit e218762e8614205a06a8ad5fb9a0372c60bb819c.
---
 .../rest/GeoServerRESTPublisher.java          | 22 +++++--------------
 .../encoder/coverage/GSCoverageEncoder.java   |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
index f4e157e..9223844 100644
--- a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
+++ b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
@@ -3263,7 +3263,7 @@ public class GeoServerRESTPublisher {
      * @param calculationMode
      * @return true if recalculation succeeded, false otherwise.
      */
-    private boolean recalculateBBox(StoreType type, GSResourceEncoder renc, String workspace, String storeName, String layerName, BBoxRecalculationMode calculationMode){
+    private boolean recalculateBBox(StoreType type, String xmlElementName, String workspace, String storeName, String layerName, BBoxRecalculationMode calculationMode, boolean enabled){
         
         String baseUrl = restURL + "/rest/workspaces/" + workspace + "/" +
                 type.getType().toLowerCase() +"s/" + storeName + "/" +
@@ -3283,12 +3283,8 @@ public class GeoServerRESTPublisher {
 //        GSWorkspaceEncoder wsenc = new GSWorkspaceEncoder(workspace);
         
 //        String body = wsenc.toString();
-//        String body = "<" + xmlElementName +"><name>" + layerName + "</name>" + 
-//                "<enabled>" + enabled + "</enabled></" + xmlElementName + ">";
-        renc.remove(GSResourceEncoder.KEYWORDS);
-        renc.remove(GSResourceEncoder.METADATA);
-        renc.remove(GSResourceEncoder.METADATALINKS);
-        String body = renc.toString();
+        String body = "<" + xmlElementName +"><name>" + layerName + "</name>" + 
+                "<enabled>" + enabled + "</enabled></" + xmlElementName + ">";
         String sendResult = HTTPUtils.putXml(sUrl, body, gsuser, gspass);
         boolean success = sendResult != null;
         return success;
@@ -3303,11 +3299,7 @@ public class GeoServerRESTPublisher {
      * @return true if successful, false otherwise
      */
     public boolean recalculateFeatureTypeBBox(String workspace, String storeName, String layerName, BBoxRecalculationMode calculationMode, boolean enabled){
-        GSFeatureTypeEncoder fenc = new GSFeatureTypeEncoder();
-        fenc.remove(GSFeatureTypeEncoder.ATTRIBUTES);
-        fenc.setName(layerName);
-        fenc.setEnabled(enabled);
-        return recalculateBBox(StoreType.DATASTORES, fenc, workspace, storeName, layerName, calculationMode);
+        return recalculateBBox(StoreType.DATASTORES, "featureType", workspace, storeName, layerName, calculationMode, enabled);
     }
     
     /**
@@ -3319,10 +3311,6 @@ public class GeoServerRESTPublisher {
      * @return true if successful, false otherwise
      */
     public boolean recalculateCoverageBBox(String workspace, String storeName, String layerName, BBoxRecalculationMode calculationMode, boolean enabled){
-        GSCoverageEncoder cenc = new GSCoverageEncoder();
-        cenc.remove(GSCoverageEncoder.SUPPORTED_FORMATS);
-        cenc.setName(layerName);
-        cenc.setEnabled(enabled);
-        return recalculateBBox(StoreType.COVERAGESTORES, cenc, workspace, storeName, layerName, calculationMode);
+        return recalculateBBox(StoreType.COVERAGESTORES, "coverage", workspace, storeName, layerName, calculationMode, enabled);
     }
 }
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 796e122..4b506e1 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
@@ -44,7 +44,7 @@ public class GSCoverageEncoder extends GSResourceEncoder {
     public final static String NATIVECOVERAGENAME = "nativeCoverageName";
 
     private final static String NATIVE_FORMAT="nativeFormat";
-    public final static String SUPPORTED_FORMATS="supportedFormats";
+    private final static String SUPPORTED_FORMATS="supportedFormats";
         
     private final static String REQUEST_SRS="requestSRS";
     private final static String RESPONSE_SRS="responseSRS";