Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/27/07 15:40:55 (1 year ago)
Author:
agjendem
Message:

- Changed all the GET/SET/UPDATE/DELETE fields to an enum and applied that in that change in the necessary files.
- Removed some warnings about use of static fields that should be referenced in a static way ( e.g. HttpServletResponse.SC_FORBIDDEN)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs-modules/restmodule/web/src/org/openmrs/module/restmodule/web/FindPatientResource.java

    r1411 r2091  
    2525         * Handle all requests to this patient search resource 
    2626         */ 
    27         public void handleRequest(int operation, String restRequest, 
     27        public void handleRequest(Operation operation, String restRequest, 
    2828                        HttpServletRequest request, HttpServletResponse response) 
    2929                        throws ServletException, IOException { 

  • openmrs-modules/restmodule/web/src/org/openmrs/module/restmodule/web/PatientResource.java

    r1411 r2091  
    2525         * Handle all requests to this resource 
    2626         */ 
    27         public void handleRequest(int operation, String restRequest, 
     27        public void handleRequest(Operation operation, String restRequest, 
    2828                        HttpServletRequest request, HttpServletResponse response) 
    2929                        throws ServletException, IOException { 

  • openmrs-modules/restmodule/web/src/org/openmrs/module/restmodule/web/RestResource.java

    r1409 r2091  
    1717 
    1818        // Rest Operations 
    19         public static final int GET = 1; 
    20         public static final int POST = 2; 
    21         public static final int PUT = 3; 
    22         public static final int DELETE = 4; 
    23  
     19        public enum Operation {GET, POST, PUT, DELETE}; 
     20     
    2421        /** 
    2522         * Used to pass request to the given resource 
    …… 
    3633         * @throws IOException 
    3734         */ 
    38         public void handleRequest(int operation, String restRequest, 
     35        public void handleRequest(Operation operation, String restRequest, 
    3936                        HttpServletRequest request, HttpServletResponse response) 
    4037                        throws ServletException, IOException; 

  • openmrs-modules/restmodule/web/src/org/openmrs/module/restmodule/web/RestServlet.java

    r1495 r2091  
    1212import org.openmrs.api.APIAuthenticationException; 
    1313import org.openmrs.module.restmodule.RestUtil; 
     14import org.openmrs.module.restmodule.web.RestResource.Operation; 
    1415 
    1516/** 
    …… 
    4748        protected void doGet(HttpServletRequest request, 
    4849                        HttpServletResponse response) throws ServletException, IOException { 
    49                 handleRequest(RestResource.GET, request, response); 
     50                handleRequest(Operation.GET, request, response); 
    5051        } 
    5152 
    …… 
    5354        protected void doPost(HttpServletRequest request, 
    5455                        HttpServletResponse response) throws ServletException, IOException { 
    55                 handleRequest(RestResource.POST, request, response); 
     56                handleRequest(Operation.POST, request, response); 
    5657        } 
    5758 
    …… 
    5960        protected void doPut(HttpServletRequest request, 
    6061                        HttpServletResponse response) throws ServletException, IOException { 
    61                 handleRequest(RestResource.PUT, request, response); 
     62                handleRequest(Operation.PUT, request, response); 
    6263        } 
    6364 
    …… 
    6566        protected void doDelete(HttpServletRequest request, 
    6667                        HttpServletResponse response) throws ServletException, IOException { 
    67                 handleRequest(RestResource.DELETE, request, response); 
     68                handleRequest(Operation.DELETE, request, response); 
    6869        } 
    6970 
    …… 
    8283         * @throws IOException 
    8384         */ 
    84         private void handleRequest(int operation, HttpServletRequest request, 
     85        private void handleRequest(Operation operation, HttpServletRequest request, 
    8586                        HttpServletResponse response) throws ServletException, IOException { 
    8687 
    …… 
    9394                        response.setHeader("WWW-Authenticate", 
    9495                                        "BASIC realm=\"OpenMRS Rest API\""); 
    95                         response.sendError(response.SC_UNAUTHORIZED); 
     96                        response.sendError(HttpServletResponse.SC_UNAUTHORIZED); 
    9697                        return; 
    9798                } 
    …… 
    117118                                                        restRequest, request, response); 
    118119                                } catch (APIAuthenticationException e) { 
    119                                         response.sendError(response.SC_FORBIDDEN); 
     120                                        response.sendError(HttpServletResponse.SC_FORBIDDEN); 
    120121                                } 
    121122                                return; 
    …… 
    124125                 
    125126                // If no matching resources were found, return an error 
    126                 response.sendError(response.SC_BAD_REQUEST); 
     127                response.sendError(HttpServletResponse.SC_BAD_REQUEST); 
    127128 
    128129        }