Skip to content
Snippets Groups Projects
Commit 68f5fe38 authored by Tobias Pietzsch's avatar Tobias Pietzsch
Browse files

Constants defines reserved names ("json", "manager") that cannot be used

as dataset names.
parent bb136bb4
No related branches found
No related tags found
No related merge requests found
...@@ -256,6 +256,9 @@ public class BigDataServer ...@@ -256,6 +256,9 @@ public class BigDataServer
private static void tryAddDataset( final HashMap< String, String > datasetNameToXML, final String name, final String xmlpath ) throws IllegalArgumentException private static void tryAddDataset( final HashMap< String, String > datasetNameToXML, final String name, final String xmlpath ) throws IllegalArgumentException
{ {
for ( final String reserved : Constants.RESERVED_CONTEXT_NAMES )
if ( name.equals( reserved ) )
throw new IllegalArgumentException( "Cannot use dataset name: \"" + name + "\" (reserved for internal use)." );
if ( datasetNameToXML.containsKey( name ) ) if ( datasetNameToXML.containsKey( name ) )
throw new IllegalArgumentException( "Duplicate dataset name: \"" + name + "\"" ); throw new IllegalArgumentException( "Duplicate dataset name: \"" + name + "\"" );
if ( Files.notExists( Paths.get( xmlpath ) ) ) if ( Files.notExists( Paths.get( xmlpath ) ) )
......
package bdv.server;
public class Constants
{
public static final String DATASETLIST_CONTEXT_NAME = "json";
public static final String MANAGER_CONTEXT_NAME = "manager";
public static final String[] RESERVED_CONTEXT_NAMES = new String[]
{
DATASETLIST_CONTEXT_NAME,
MANAGER_CONTEXT_NAME
};
}
...@@ -25,7 +25,7 @@ public class JsonHandler extends ContextHandler ...@@ -25,7 +25,7 @@ public class JsonHandler extends ContextHandler
public JsonHandler( final Server server, final ContextHandlerCollection handlers ) throws IOException, URISyntaxException public JsonHandler( final Server server, final ContextHandlerCollection handlers ) throws IOException, URISyntaxException
{ {
this.server = server; this.server = server;
setContextPath( "/json" ); setContextPath( "/" + Constants.DATASETLIST_CONTEXT_NAME );
} }
@Override @Override
......
package bdv.server; package bdv.server;
import mpicbg.spim.data.SpimDataException; import mpicbg.spim.data.SpimDataException;
import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup; import org.antlr.stringtemplate.StringTemplateGroup;
import org.eclipse.jetty.server.ConnectorStatistics; import org.eclipse.jetty.server.ConnectorStatistics;
...@@ -15,6 +16,7 @@ import org.eclipse.jetty.util.log.Log; ...@@ -15,6 +16,7 @@ import org.eclipse.jetty.util.log.Log;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
...@@ -48,7 +50,7 @@ public class ManagerHandler extends ContextHandler ...@@ -48,7 +50,7 @@ public class ManagerHandler extends ContextHandler
this.handlers = handlers; this.handlers = handlers;
this.statHandler = statHandler; this.statHandler = statHandler;
this.connectorStats = connectorStats; this.connectorStats = connectorStats;
setContextPath( "/manager" ); setContextPath( "/" + Constants.MANAGER_CONTEXT_NAME );
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment