/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 6284

Added by ben leinfelder over 13 years ago

simplify the MN rest servlet mapping to match CN mappings - also streamlined the handler code to share extra path info parsing

     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/*</url-pattern>
     	</servlet-mapping>
     	<!-- MNCore-->
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/monitor/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/log/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/node</url-pattern>
     	</servlet-mapping>
     	<!-- MNRead-->
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/meta/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/object/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/checksum/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/error</url-pattern>
     	</servlet-mapping>
     	<!-- MNAuthorization -->
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/isAuthorized/*</url-pattern>
     	</servlet-mapping>
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/accessRules/*</url-pattern>
     	</servlet-mapping>
     	<!-- MNReplication -->
     	<servlet-mapping>
     		<servlet-name>MNRestServlet</servlet-name>
     		<url-pattern>/d1/mn/replicate/*</url-pattern>
     	</servlet-mapping>
      <!-- uncomment this if you want the admin servlet -->
       <servlet-mapping>
         <servlet-name>AdminServlet</servlet-name>

         	super.handle(httpVerb);
             try {
                 String resourcePrefix = RESOURCE_BASE_URL + "/mn/";
             	String resource = request.getServletPath();
             	// get the resource
                 String resource = request.getPathInfo();
                 resource = resource.substring(resource.indexOf("/") + 1);
                 if (resource.endsWith(resourcePrefix)) {
                 // default to node info
                 if (resource.equals("")) {
                     resource = RESOURCE_NODE;
+                }
                 else {
                 	// remove prefix
                     resource = resource.substring(resource.indexOf(resourcePrefix) + resourcePrefix.length());
                     resource = resource.trim();
                 // get the rest of the path info
                 String extra = null;
                 if (resource.lastIndexOf("/") != -1) {
                     extra = resource.substring(resource.lastIndexOf("/") + 1);
+                }
                 logMetacat.debug("handling verb " + httpVerb + " request with resource '" + resource + "'");
-...
                 if (resource != null) {
                     if (resource.equals(RESOURCE_NODE)) {
                     if (resource.startsWith(RESOURCE_NODE)) {
                         // node response
                         node();
                         status = true;
                     } else if (resource.equals(RESOURCE_ACCESS_RULES)) {
                     } else if (resource.startsWith(RESOURCE_ACCESS_RULES)) {
                         if (httpVerb == POST) {
     	                	// set the access rules
     	                    setAccess();
     	                    status = true;
     	                    logMetacat.debug("done setting access");
+                        }
                     } else if (resource.equals(RESOURCE_IS_AUTHORIZED)) {
                     } else if (resource.startsWith(RESOURCE_IS_AUTHORIZED)) {
                         if (httpVerb == GET) {
     	                	// check the access rules
                         	String objectId = request.getPathInfo();
                             if (objectId != null && objectId.length() > 1) {
                                 objectId = request.getPathInfo().substring(1);
+                            }
     	                    isAuthorized(objectId);
     	                    isAuthorized(extra);
     	                    status = true;
     	                    logMetacat.debug("done getting access");
+                        }
                     } else if (resource.equals(RESOURCE_META)) {
                     } else if (resource.startsWith(RESOURCE_META)) {
                         logMetacat.debug("Using resource 'meta'");
                         String objectId = request.getPathInfo();
                         if (objectId != null && objectId.length() > 1) {
                             objectId = request.getPathInfo().substring(1);
+                        }
                         // get
                         if (httpVerb == GET) {
                             getSystemMetadataObject(objectId);
                             getSystemMetadataObject(extra);
                             status = true;
+                        }
                     } else if (resource.equals(RESOURCE_OBJECTS)) {
                     } else if (resource.startsWith(RESOURCE_OBJECTS)) {
                         logMetacat.debug("Using resource 'object'");
                         String objectId = request.getPathInfo();
                         if (objectId != null && objectId.length() > 1) {
                             objectId = request.getPathInfo().substring(1);
                         } else {
                             objectId = null;
+                        }
                         logMetacat.debug("objectId: " + objectId);
                         logMetacat.debug("objectId: " + extra);
                         logMetacat.debug("verb:" + httpVerb);
                         if (httpVerb == GET) {
                             getObject(objectId);
                             getObject(extra);
                             status = true;
                         } else if (httpVerb == POST) {
                             putObject(objectId, FUNCTION_NAME_INSERT);
                             putObject(extra, FUNCTION_NAME_INSERT);
                             status = true;
                         } else if (httpVerb == PUT) {
                             putObject(objectId, FUNCTION_NAME_UPDATE);
                             putObject(extra, FUNCTION_NAME_UPDATE);
                             status = true;
                         } else if (httpVerb == DELETE) {
                             deleteObject(objectId);
                             deleteObject(extra);
                             status = true;
                         } else if (httpVerb == HEAD) {
                             describeObject(objectId);
                             describeObject(extra);
                             status = true;
+                        }
                     } else if (resource.equals(RESOURCE_LOG)) {
                     } else if (resource.startsWith(RESOURCE_LOG)) {
                         logMetacat.debug("Using resource 'log'");
                         // handle log events
                         if (httpVerb == GET) {
                             getLog();
                             status = true;
+                        }
                     } else if (resource.equals(RESOURCE_CHECKSUM)) {
                     } else if (resource.startsWith(RESOURCE_CHECKSUM)) {
                         logMetacat.debug("Using resource 'checksum'");
                         // handle checksum requests
                         if (httpVerb == GET) {
                             checksum();
                             checksum(extra);
                             status = true;
+                        }
                     } else if (resource.startsWith(RESOURCE_MONITOR)) {
                         // there are various parts to monitoring
                         if (httpVerb == GET) {
                         	// health monitoring calls
                             status = monitor();
                             status = monitor(extra);
+                        }
                     } else if (resource.equals(RESOURCE_REPLICATE)) {
                     } else if (resource.startsWith(RESOURCE_REPLICATE)) {
                     	if (httpVerb == POST) {
     	                    logMetacat.debug("processing replicate request");
     	                    replicate();
     	                    status = true;
+                    	}
                     } else if (resource.equals(RESOURCE_ERROR)) {
                     } else if (resource.startsWith(RESOURCE_ERROR)) {
     	                // sync error
     	                if (httpVerb == POST) {
     	                    syncError();
-...
          * @throws IOException
          * @throws JiBXException
          */
         private boolean monitor() throws NotFound, ParseException, NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest, InsufficientResources, UnsupportedType, IOException, JiBXException {
         private boolean monitor(String pathInfo) throws NotFound, ParseException, NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest, InsufficientResources, UnsupportedType, IOException, JiBXException {
         	logMetacat.debug("processing monitor request");
             String pathInfo = request.getPathInfo();
             logMetacat.debug("verb is GET");
             logMetacat.debug("pathInfo is " + pathInfo);
             pathInfo = pathInfo.substring(1);
             if (pathInfo.toLowerCase().equals("ping")) {
                 logMetacat.debug("processing ping request");
-...
          * @throws NotFound
          * @throws InvalidRequest
          */
         private void checksum() throws NotImplemented, JiBXException, IOException, InvalidToken, ServiceFailure, NotAuthorized, NotFound, InvalidRequest {
         private void checksum(String guid) throws NotImplemented, JiBXException, IOException, InvalidToken, ServiceFailure, NotAuthorized, NotFound, InvalidRequest {
         	String checksumAlgorithm = "MD5";
             String guid = request.getPathInfo();
             if (guid != null && guid.length() > 1) {
                 guid = request.getPathInfo().substring(1); // trim the slash
+            }
             Identifier guidid = new Identifier();
             guidid.setValue(guid);
             try {

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 6284

Added by ben leinfelder over 13 years ago