Skip to content

Commit

Permalink
Complete Resource MOVE and COPY
Browse files Browse the repository at this point in the history
  • Loading branch information
@jodygarnett
jodygarnett committed Mar 31, 2017
1 parent f01a3ee commit 3de5e93
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 28 deletions.
24 changes: 23 additions & 1 deletion src/platform/src/main/java/org/geoserver/util/IOUtils.java
View file
Expand Up @@ -8,6 +8,7 @@
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
Expand All @@ -29,6 +30,7 @@
import java.util.zip.ZipOutputStream;

import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.StringBuilderWriter;
import org.geotools.util.logging.Logging;

/**
Expand Down Expand Up @@ -96,7 +98,27 @@ public static void filteredCopy(File from, File to, Map<String, String> filters)
throws IOException {
filteredCopy(new BufferedReader(new FileReader(from)), to, filters);
}

/**
* Capture contents of {@link InputStream} as a String.
* @param input InputStream, closed after use.
* @return contents of input
*/
public static String toString(InputStream input) throws IOException {
if( input == null){
return null;
}
ByteArrayOutputStream output;
try {
output = new ByteArrayOutputStream();
copy( input, output );
}
finally {
input.close();
input.close();
}
return output.toString();
}

/**
* Copies from a reader to a file by performing a filtering on certain
* specified tokens. In particular, each key in the filters map will be
Expand Down
97 changes: 70 additions & 27 deletions src/restconfig-ng/src/main/java/org/geoserver/rest/resources/ResourceController.java
View file
Expand Up @@ -13,9 +13,9 @@
import org.geoserver.ows.URLMangler;
import org.geoserver.ows.util.ResponseUtils;
import org.geoserver.platform.resource.Resource;
import org.geoserver.platform.resource.Resource.Type;
import org.geoserver.platform.resource.ResourceStore;
import org.geoserver.platform.resource.ResourceStoreFactory;
import org.geoserver.platform.resource.Resource.Type;
import org.geoserver.rest.ObjectToMapWrapper;
import org.geoserver.rest.RequestInfo;
import org.geoserver.rest.ResourceNotFoundException;
Expand Down Expand Up @@ -119,16 +119,25 @@ protected Resource resource(HttpServletRequest request) {
}
return resources.get(path);
}


/**
* Look up operation query string value, defaults to {@link Operation#DEFAULT} if not provided.
* @param request
* @return operation defined by query string, or {@link Operation#DEFAULT} if not provided
*/
protected static Operation operation(HttpServletRequest request) {
Operation operation = Operation.DEFAULT;
String strOp = RESTUtils.getQueryStringValue(request, "operation");
if (strOp != null) {
String operation = RESTUtils.getQueryStringValue(request, "operation");
if (operation != null) {
operation = operation.trim().toUpperCase();
try {
operation = Operation.valueOf(strOp.trim().toUpperCase());
} catch (IllegalArgumentException e) {}
return Operation.valueOf(operation);
} catch (IllegalArgumentException e) {
throw new IllegalStateException("Unknown operation '"+operation+"' requested");
}
}
else {
return Operation.DEFAULT;
}
return operation;
}

protected static MediaType getFormat(HttpServletRequest request) {
Expand Down Expand Up @@ -204,42 +213,76 @@ public Object resourceGet(HttpServletRequest request, HttpServletResponse respon
return result;
}
/**
* Upload or modify resource contents.
* Upload or modify resource contents:
* <ul>
* <li>{@link Operation#DEFAULT}: update resource contents; creating if needed.</li>
* <li>{@link Operation#MOVE}: moves resource to new location.</li>
* <li>{@link Operation#COPY}: copy resource to new location.</li>
* <li>{@link Operation#DEFAULT}: update resource contents (creating if needed).</li>
* <li>{@link Operation#MOVE}: moves a resource, indicated by request body, to this location.</li>
* <li>{@link Operation#COPY}: duplicates a resource, indicated by request body, to this location</li>
* </ul>
* @paarm request
* @param response {@link HttpStatus#CREATED} for a new resource, or {@link HttpStatus#OK} when updating existing resource
*/
@PutMapping(consumes = {MediaType.ALL_VALUE})
@ResponseStatus(HttpStatus.CREATED)
public void resourcePut(HttpServletRequest request,HttpServletResponse response){
Resource resource = resource(request);
Resource directory = resource.parent();
String filenName = resource.name();

if (resource.getType() == Type.DIRECTORY) {
throw new RestException("Attempting to write data to a directory.", HttpStatus.METHOD_NOT_ALLOWED );
}
Operation operation = operation(request);
if (operation == Operation.METADATA ){
throw new RestException("Attempting to write data to metadata.", HttpStatus.METHOD_NOT_ALLOWED );
}

boolean isNew = resource.getType() == Type.UNDEFINED;
if (operation == Operation.COPY || operation == Operation.MOVE) {
// TODO: move me right round, like a record player, round round!
throw new RestException("Not yet implemented resource "+operation.name(), HttpStatus.NOT_IMPLEMENTED);
}
else if (operation == Operation.METADATA ){
throw new RestException("Attempting to write data to metadata.", HttpStatus.METHOD_NOT_ALLOWED );
String path = null;
try {
path = IOUtils.toString( request.getInputStream());
} catch (IOException e) {
throw new RestException("Unable to read content:" + e.getMessage(),
HttpStatus.INTERNAL_SERVER_ERROR, e);
}
Resource source = resources.get(path);
if( source.getType() == Type.UNDEFINED){
throw new RestException("Unable to locate '" + path + "'.", HttpStatus.NOT_FOUND);
}
if ( operation == Operation.MOVE){
boolean moved = source.renameTo(resource);
if(!moved){
throw new RestException("Rename operation failed.", HttpStatus.INTERNAL_SERVER_ERROR);
}
}
else { // COPY
if( source.getType() == Type.DIRECTORY){
throw new RestException("Cannot copy directory.", HttpStatus.METHOD_NOT_ALLOWED);
}
try {
IOUtils.copy( source.in(), resource.out());
} catch (IOException e) {
throw new RestException("Copy operation failed:"+e, HttpStatus.INTERNAL_SERVER_ERROR,e);
}

}
}
try {
IOUtils.copy( request.getInputStream(), resource.out());
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.fine("PUT resource: " + resource.path());
else if (operation == Operation.DEFAULT){
try {
IOUtils.copy( request.getInputStream(), resource.out());
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.fine("PUT resource: " + resource.path());
}
} catch (IOException e) {
throw new RestException(
"Unable to read content to '" + resource.path() + "':" + e.getMessage(),
HttpStatus.INTERNAL_SERVER_ERROR, e);
}
} catch (IOException e) {
throw new RestException(
"Unable to copy content to '" + resource.path() + "':" + e.getMessage(),
HttpStatus.INTERNAL_SERVER_ERROR, e);
}
else {
throw new IllegalStateException("Unexpected operation '"+operation+"'");
}

// fill in correct status / header details
if(isNew){
response.setStatus(HttpStatus.CREATED.value());
}
Expand Down

0 comments on commit 3de5e93

Please sign in to comment.