Refactor org.geoserver.catalog.rest to org.geoserver.rest.catalog

geoserver · Apr 5, 2017 · 6ead910 · 6ead910
1 parent c965008
commit 6ead910
Show file tree

Hide file tree

Showing 82 changed files with 58 additions and 97 deletions.
diff --git a/...xtension/importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportController.java b/...xtension/importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportController.java
@@ -6,7 +6,7 @@
 
 import org.geoserver.catalog.StoreInfo;
 import org.geoserver.catalog.WorkspaceInfo;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.importer.ImportContext;
 import org.geoserver.importer.ImportData;
 import org.geoserver.importer.ImportFilter;

diff --git a/...sion/importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportDataController.java b/...sion/importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportDataController.java
@@ -6,7 +6,7 @@
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.importer.*;
 import org.geoserver.importer.rest.converters.ImportContextJSONConverterWriter;
 import org.geoserver.rest.RestBaseController;

diff --git a/...sion/importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportTaskController.java b/...sion/importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportTaskController.java
@@ -14,7 +14,7 @@
 import org.geoserver.catalog.*;
 import org.geoserver.catalog.impl.LayerInfoImpl;
 import org.geoserver.catalog.impl.StoreInfoImpl;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.importer.*;
 import org.geoserver.importer.rest.converters.ImportContextJSONConverterReader;
 import org.geoserver.importer.rest.converters.ImportContextJSONConverterWriter;

diff --git a/...importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportTransformController.java b/...importer/rest-ng/src/main/java/org/geoserver/importer/rest/ImportTransformController.java
@@ -7,7 +7,7 @@
 import freemarker.template.ObjectWrapper;
 import freemarker.template.Template;
 import org.apache.commons.lang.NotImplementedException;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.importer.ImportTask;
 import org.geoserver.importer.Importer;
 import org.geoserver.importer.transform.ImportTransform;

diff --git a/...rc/main/java/org/geoserver/importer/rest/converters/ImportContextJSONConverterReader.java b/...rc/main/java/org/geoserver/importer/rest/converters/ImportContextJSONConverterReader.java
@@ -21,7 +21,7 @@
 import org.geoserver.catalog.StoreInfo;
 import org.geoserver.catalog.StyleInfo;
 import org.geoserver.catalog.WorkspaceInfo;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.config.util.XStreamPersister;
 import org.geoserver.importer.Archive;
 import org.geoserver.importer.Database;

diff --git a/...rc/main/java/org/geoserver/importer/rest/converters/ImportContextJSONConverterWriter.java b/...rc/main/java/org/geoserver/importer/rest/converters/ImportContextJSONConverterWriter.java
@@ -22,7 +22,7 @@
 import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.catalog.StoreInfo;
 import org.geoserver.catalog.StyleInfo;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.config.util.XStreamPersister;
 import org.geoserver.config.util.XStreamPersister.Callback;
 import org.geoserver.config.util.XStreamPersisterFactory;

diff --git a/src/restconfig-ng/src/main/java/org/geoserver/rest/LocalSettingsController.java b/src/restconfig-ng/src/main/java/org/geoserver/rest/LocalSettingsController.java
@@ -3,7 +3,7 @@
 import freemarker.template.ObjectWrapper;
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.WorkspaceInfo;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.config.*;
 import org.geoserver.config.impl.SettingsInfoImpl;
 import org.geoserver.config.util.XStreamPersister;

diff --git a/src/restconfig-ng/src/main/java/org/geoserver/rest/SettingsController.java b/src/restconfig-ng/src/main/java/org/geoserver/rest/SettingsController.java
@@ -1,18 +1,14 @@
 package org.geoserver.rest;
 
 import freemarker.template.ObjectWrapper;
-import org.geoserver.catalog.Catalog;
-import org.geoserver.catalog.WorkspaceInfo;
-import org.geoserver.catalog.rest.CatalogController;
+import org.geoserver.rest.catalog.CatalogController;
 import org.geoserver.config.*;
-import org.geoserver.config.impl.SettingsInfoImpl;
 import org.geoserver.config.util.XStreamPersister;
 import org.geoserver.ows.util.OwsUtils;
 import org.geoserver.rest.converters.XStreamMessageConverter;
 import org.geoserver.rest.wrapper.RestWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.bind.annotation.*;

diff --git a/...oserver/catalog/rest/AboutController.java → ...oserver/rest/catalog/AboutController.java b/...oserver/catalog/rest/AboutController.java → ...oserver/rest/catalog/AboutController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;

diff --git a/...r/catalog/rest/AboutStatusController.java → ...r/rest/catalog/AboutStatusController.java b/...r/catalog/rest/AboutStatusController.java → ...r/rest/catalog/AboutStatusController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.lang.reflect.Type;
 import java.util.List;

diff --git a/...g/rest/AbstractStoreUploadController.java → ...atalog/AbstractStoreUploadController.java b/...g/rest/AbstractStoreUploadController.java → ...atalog/AbstractStoreUploadController.java
@@ -1,4 +1,4 @@
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...er/catalog/rest/AdminRequestCallback.java → ...er/rest/catalog/AdminRequestCallback.java b/...er/catalog/rest/AdminRequestCallback.java → ...er/rest/catalog/AdminRequestCallback.java
@@ -3,7 +3,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

diff --git a/...rver/catalog/rest/AvailableResources.java → ...rver/rest/catalog/AvailableResources.java b/...rver/catalog/rest/AvailableResources.java → ...rver/rest/catalog/AvailableResources.java
@@ -1,4 +1,4 @@
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.util.AbstractCollection;
 import java.util.Collection;

diff --git a/...log/rest/AvailableResourcesConverter.java → .../catalog/AvailableResourcesConverter.java b/...log/rest/AvailableResourcesConverter.java → .../catalog/AvailableResourcesConverter.java
@@ -1,13 +1,10 @@
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
-import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import org.geoserver.rest.converters.BaseMessageConverter;

diff --git a/...erver/catalog/rest/CatalogController.java → ...erver/rest/catalog/CatalogController.java b/...erver/catalog/rest/CatalogController.java → ...erver/rest/catalog/CatalogController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.CatalogBuilder;

diff --git a/...rver/catalog/rest/CoverageController.java → ...rver/rest/catalog/CoverageController.java b/...rver/catalog/rest/CoverageController.java → ...rver/rest/catalog/CoverageController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;

diff --git a/...catalog/rest/CoverageStoreController.java → ...rest/catalog/CoverageStoreController.java b/...catalog/rest/CoverageStoreController.java → ...rest/catalog/CoverageStoreController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.lang.reflect.Type;

diff --git a/...log/rest/CoverageStoreFileController.java → .../catalog/CoverageStoreFileController.java b/...log/rest/CoverageStoreFileController.java → .../catalog/CoverageStoreFileController.java
@@ -1,4 +1,4 @@
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ver/catalog/rest/DataStoreController.java → ...ver/rest/catalog/DataStoreController.java b/...ver/catalog/rest/DataStoreController.java → ...ver/rest/catalog/DataStoreController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.lang.reflect.Type;

diff --git a/...catalog/rest/DataStoreFileController.java → ...rest/catalog/DataStoreFileController.java b/...catalog/rest/DataStoreFileController.java → ...rest/catalog/DataStoreFileController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import org.geoserver.catalog.*;
 import org.geoserver.platform.GeoServerExtensions;

diff --git a/...alog/rest/FeatureCollectionConverter.java → ...t/catalog/FeatureCollectionConverter.java b/...alog/rest/FeatureCollectionConverter.java → ...t/catalog/FeatureCollectionConverter.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 

diff --git a/...r/catalog/rest/FeatureTypeController.java → ...r/rest/catalog/FeatureTypeController.java b/...r/catalog/rest/FeatureTypeController.java → ...r/rest/catalog/FeatureTypeController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.io.Serializable;

diff --git a/...catalog/rest/FormatCollectionWrapper.java → ...rest/catalog/FormatCollectionWrapper.java b/...catalog/rest/FormatCollectionWrapper.java → ...rest/catalog/FormatCollectionWrapper.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import org.geotools.data.simple.SimpleFeatureCollection;
 

diff --git a/...g/rest/GMLFeatureCollectionConverter.java → ...atalog/GMLFeatureCollectionConverter.java b/...g/rest/GMLFeatureCollectionConverter.java → ...atalog/GMLFeatureCollectionConverter.java
@@ -2,13 +2,12 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.geoserver.catalog.rest.FormatCollectionWrapper.XMLCollectionWrapper;
 import org.geotools.GML;
 import org.geotools.GML.Version;
 import org.geotools.data.simple.SimpleFeatureCollection;
@@ -38,7 +37,7 @@ public void write(Object t, MediaType contentType, HttpOutputMessage outputMessa
     @Override
     public boolean canWrite(Class clazz, MediaType mediaType) {
         return (SimpleFeatureCollection.class.isAssignableFrom(clazz)
-                | XMLCollectionWrapper.class.isAssignableFrom(clazz))
+                | FormatCollectionWrapper.XMLCollectionWrapper.class.isAssignableFrom(clazz))
                 && getSupportedMediaTypes().contains(mediaType);
     }
 

diff --git a/...st/GeoJSONFeatureCollectionConverter.java → ...og/GeoJSONFeatureCollectionConverter.java b/...st/GeoJSONFeatureCollectionConverter.java → ...og/GeoJSONFeatureCollectionConverter.java
@@ -2,13 +2,12 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.geoserver.catalog.rest.FormatCollectionWrapper.JSONCollectionWrapper;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.geojson.feature.FeatureJSON;
 import org.springframework.http.HttpOutputMessage;
@@ -39,7 +38,7 @@ public void write(Object t, MediaType contentType, HttpOutputMessage outputMessa
     @Override
     public boolean canWrite(Class clazz, MediaType mediaType) {
         return (SimpleFeatureCollection.class.isAssignableFrom(clazz) && getSupportedMediaTypes().contains(mediaType))
-                || JSONCollectionWrapper.class.isAssignableFrom(clazz);
+                || FormatCollectionWrapper.JSONCollectionWrapper.class.isAssignableFrom(clazz);
     }
 
 }
diff --git a/...oserver/catalog/rest/LayerController.java → ...oserver/rest/catalog/LayerController.java b/...oserver/catalog/rest/LayerController.java → ...oserver/rest/catalog/LayerController.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -15,7 +15,6 @@
 import org.geoserver.catalog.CatalogBuilder;
 import org.geoserver.catalog.CatalogInfo;
 import org.geoserver.catalog.CoverageInfo;
-import org.geoserver.catalog.CoverageStoreInfo;
 import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.ResourceInfo;

diff --git a/...er/catalog/rest/LayerGroupController.java → ...er/rest/catalog/LayerGroupController.java b/...er/catalog/rest/LayerGroupController.java → ...er/rest/catalog/LayerGroupController.java
@@ -3,7 +3,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.CatalogBuilder;
@@ -27,7 +27,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;

diff --git a/...server/catalog/rest/MapJSONConverter.java → ...server/rest/catalog/MapJSONConverter.java b/...server/catalog/rest/MapJSONConverter.java → ...server/rest/catalog/MapJSONConverter.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

diff --git a/...oserver/catalog/rest/MapXMLConverter.java → ...oserver/rest/catalog/MapXMLConverter.java b/...oserver/catalog/rest/MapXMLConverter.java → ...oserver/rest/catalog/MapXMLConverter.java
@@ -2,13 +2,12 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

diff --git a/.../org/geoserver/catalog/rest/NamedMap.java → .../org/geoserver/rest/catalog/NamedMap.java b/.../org/geoserver/catalog/rest/NamedMap.java → .../org/geoserver/rest/catalog/NamedMap.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.util.LinkedHashMap;
 

diff --git a/...ver/catalog/rest/NamespaceController.java → ...ver/rest/catalog/NamespaceController.java b/...ver/catalog/rest/NamespaceController.java → ...ver/rest/catalog/NamespaceController.java
@@ -1,4 +1,4 @@
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -13,7 +13,6 @@
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.CatalogBuilder;
 import org.geoserver.catalog.CatalogInfo;
-import org.geoserver.catalog.CoverageInfo;
 import org.geoserver.catalog.NamespaceInfo;
 import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.catalog.WorkspaceInfo;
@@ -22,7 +21,6 @@
 import org.geoserver.rest.ResourceNotFoundException;
 import org.geoserver.rest.RestBaseController;
 import org.geoserver.rest.RestException;
-import org.geoserver.rest.converters.FreemarkerHTMLMessageConverter;
 import org.geoserver.rest.converters.XStreamMessageConverter;
 import org.geoserver.rest.wrapper.RestWrapper;
 import org.geotools.util.logging.Logging;
@@ -53,7 +51,6 @@
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
 import freemarker.template.SimpleHash;
-import freemarker.template.Template;
 import freemarker.template.TemplateModelException;
 
 @RestController

diff --git a/...g/rest/RestConfigurationLockCallback.java → ...atalog/RestConfigurationLockCallback.java b/...g/rest/RestConfigurationLockCallback.java → ...atalog/RestConfigurationLockCallback.java
@@ -3,7 +3,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

diff --git a/...g/geoserver/catalog/rest/StringsList.java → ...g/geoserver/rest/catalog/StringsList.java b/...g/geoserver/catalog/rest/StringsList.java → ...g/geoserver/rest/catalog/StringsList.java
@@ -1,4 +1,4 @@
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import java.util.List;
 

diff --git a/...atalog/rest/StringsListJSONConverter.java → ...est/catalog/StringsListJSONConverter.java b/...atalog/rest/StringsListJSONConverter.java → ...est/catalog/StringsListJSONConverter.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import net.sf.json.JSONObject;
 import org.geoserver.rest.converters.BaseMessageConverter;

diff --git a/...catalog/rest/StringsListXMLConverter.java → ...rest/catalog/StringsListXMLConverter.java b/...catalog/rest/StringsListXMLConverter.java → ...rest/catalog/StringsListXMLConverter.java
@@ -2,7 +2,7 @@
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
-package org.geoserver.catalog.rest;
+package org.geoserver.rest.catalog;
 
 import com.thoughtworks.xstream.XStream;
 import org.geoserver.config.util.SecureXStream;