Ignore:
Timestamp:
2012-05-22T13:01:04+12:00 (12 years ago)
Author:
sjm84
Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

    r24440 r25635  
    321321   *  otherwise true.
    322322   */
    323   private boolean isValidParam(HashMap param_map, HashSet valid_strs) {
    324     ArrayList param_list = new ArrayList(param_map.keySet());
     323  private boolean isValidParam(HashMap<String, String> param_map, HashSet<String> valid_strs) {
     324    ArrayList<String> param_list = new ArrayList<String>(param_map.keySet());
    325325    for(int i=0; i<param_list.size(); i++) {
    326       if (valid_strs.contains((String)param_list.get(i)) == false) {
     326      if (valid_strs.contains(param_list.get(i)) == false) {
    327327        return false;
    328328      }
    … …  
    333333    // option: from, until, set, metadataPrefix, resumptionToken
    334334    // exceptions: badArgument, badResumptionToken, cannotDisseminateFormat, noRecordMatch, and noSetHierarchy
    335     HashSet valid_strs = new HashSet();
     335    HashSet<String> valid_strs = new HashSet<String>();
    336336    valid_strs.add(OAIXML.FROM);
    337337    valid_strs.add(OAIXML.UNTIL);
    … …  
    347347    String token = "";
    348348   
    349     HashMap param_map = OAIXML.getParamMap(params);   
     349    HashMap<String, String> param_map = OAIXML.getParamMap(params);   
    350350    if (!isValidParam(param_map, valid_strs)) {
    351351    logger.error("One of the params is invalid");
    … …  
    353353    }
    354354    // param keys are valid, but if there are any date params, check they're of the right format
    355     String from = (String)param_map.get(OAIXML.FROM);
     355    String from = param_map.get(OAIXML.FROM);
    356356    if(from != null) { 
    357357    Date from_date = OAIXML.getDate(from);
    … …  
    361361    }
    362362    }
    363     String until = (String)param_map.get(OAIXML.UNTIL);
     363    String until = param_map.get(OAIXML.UNTIL);
    364364    if(until != null) {
    365365    Date until_date = OAIXML.getDate(until);
    … …  
    389389    if(request_set == true) {
    390390      boolean set_supported = false;
    391       String set_spec_str = (String)param_map.get(OAIXML.SET);
     391      String set_spec_str = param_map.get(OAIXML.SET);
    392392      // get the collection name
    393393      //if setSpec is supported by this repository, it must be in the form: site_name:coll_name
    … …  
    409409    if(param_map.containsKey(OAIXML.RESUMPTION_TOKEN)) {
    410410        // validate resumptionToken
    411       token = (String)param_map.get(OAIXML.RESUMPTION_TOKEN);
     411      token = param_map.get(OAIXML.RESUMPTION_TOKEN);
    412412      logger.info("has resumptionToken" + token);
    413413      if(OAIXML.containsToken(token) == false) {
    … …  
    424424   
    425425    //Now that we got a prefix, check and see if it's supported by this repository
    426     String prefix_value = (String)param_map.get(OAIXML.METADATA_PREFIX);
     426    String prefix_value = param_map.get(OAIXML.METADATA_PREFIX);
    427427    if (containsMetadataPrefix(prefix_value) == false) {
    428428      logger.error("requested prefix is not found in OAIConfig.xml");
    … …  
    434434    String verb = req.getAttribute(OAIXML.TO);
    435435    NodeList param_list = req.getElementsByTagName(OAIXML.PARAM);
    436     ArrayList retain_param_list = new ArrayList();
     436    ArrayList<Element> retain_param_list = new ArrayList<Element>();
    437437    for (int j=0; j<param_list.getLength(); j++) {
    438438      Element e = OAIXML.duplicateElement(msg.getOwnerDocument(), (Element)param_list.item(j), true);
    … …  
    449449          msg.appendChild(req);
    450450          for (int j=0; j<retain_param_list.size(); j++) {
    451             req.appendChild((Element)retain_param_list.get(j));
     451            req.appendChild(retain_param_list.get(j));
    452452          }
    453453        }
    … …  
    538538    // option: from, until, set, metadataPrefix, and resumptionToken
    539539    // exceptions: badArgument, badResumptionToken, cannotDisseminateFormat, noRecordMatch, and noSetHierarchy
    540     HashSet valid_strs = new HashSet();
     540    HashSet<String> valid_strs = new HashSet<String>();
    541541    valid_strs.add(OAIXML.FROM);
    542542    valid_strs.add(OAIXML.UNTIL);
    … …  
    558558    }
    559559   
    560     HashMap param_map = OAIXML.getParamMap(params);   
     560    HashMap<String, String> param_map = OAIXML.getParamMap(params);   
    561561    if (!isValidParam(param_map, valid_strs)) {
    562562    logger.error("One of the params is invalid");
    … …  
    564564    }
    565565    // param keys are valid, but if there are any date params, check they're of the right format
    566     String from = (String)param_map.get(OAIXML.FROM);
     566    String from = param_map.get(OAIXML.FROM);
    567567    if(from != null) { 
    568568    Date from_date = OAIXML.getDate(from);
    … …  
    572572    }
    573573    }
    574     String until = (String)param_map.get(OAIXML.UNTIL);
     574    String until = param_map.get(OAIXML.UNTIL);
    575575    Date until_date = null;
    576576    if(until != null) {
    … …  
    601601    if(request_set == true) {
    602602      boolean set_supported = false;
    603       String set_spec_str = (String)param_map.get(OAIXML.SET);
     603      String set_spec_str = param_map.get(OAIXML.SET);
    604604      // get the collection name
    605605      //if setSpec is supported by this repository, it must be in the form: site_name:coll_name
    … …  
    630630      //    store a new token if necessary.
    631631        //}     
    632       token = (String)param_map.get(OAIXML.RESUMPTION_TOKEN);
     632      token = param_map.get(OAIXML.RESUMPTION_TOKEN);
    633633      logger.info("has resumptionToken: " + token);
    634634      if(OAIXML.containsToken(token) == false) {
    … …  
    671671   
    672672    //Now that we got a prefix, check and see if it's supported by this repository
    673     String prefix_value = (String)param_map.get(OAIXML.METADATA_PREFIX);
     673    String prefix_value = param_map.get(OAIXML.METADATA_PREFIX);
    674674    if (containsMetadataPrefix(prefix_value) == false) {
    675675    logger.error("requested prefix is not found in OAIConfig.xml");
    … …  
    682682    String verb = req.getAttribute(OAIXML.TO);
    683683    NodeList param_list = req.getElementsByTagName(OAIXML.PARAM);
    684     ArrayList retain_param_list = new ArrayList();
     684    ArrayList<Element> retain_param_list = new ArrayList<Element>();
    685685    for (int j=0; j<param_list.getLength(); j++) {
    686686      Element e = OAIXML.duplicateElement(msg.getOwnerDocument(), (Element)param_list.item(j), true);
    … …  
    698698          msg.appendChild(req);
    699699          for (int j=0; j<retain_param_list.size(); j++) {
    700             req.appendChild((Element)retain_param_list.get(j));
     700            req.appendChild(retain_param_list.get(j));
    701701          }
    702702        }
    … …  
    747747      getRecords(list_records, record_list, 0, resume_after);
    748748      //An incomplete list is sent; append a resumptionToken element
    749       Element token_elem = createResumptionTokenElement(num_records, 0, resume_after, true, (String)param_map.get(OAIXML.METADATA_PREFIX));
     749      Element token_elem = createResumptionTokenElement(num_records, 0, resume_after, true, param_map.get(OAIXML.METADATA_PREFIX));
    750750      //store this token
    751751      OAIXML.addToken(token_elem);
    … …  
    768768        getRecords(list_records, record_list, cursor, num_records);
    769769        //An incomplete list is sent; append a resumptionToken element
    770     token_elem = createResumptionTokenElement(num_records, cursor, -1, false, (String)param_map.get(OAIXML.METADATA_PREFIX));
     770    token_elem = createResumptionTokenElement(num_records, cursor, -1, false, param_map.get(OAIXML.METADATA_PREFIX));
    771771    list_records.appendChild(token_elem);
    772772
    … …  
    775775        //append required records to list_records (list is incomplete)
    776776        getRecords(list_records, record_list, cursor, cursor + resume_after);
    777         token_elem = createResumptionTokenElement(num_records, cursor, cursor + resume_after, true, (String)param_map.get(OAIXML.METADATA_PREFIX));
     777        token_elem = createResumptionTokenElement(num_records, cursor, cursor + resume_after, true, param_map.get(OAIXML.METADATA_PREFIX));
    778778        //store this token
    779779        OAIXML.addToken(token_elem);
    … …  
    10131013    Element get_record = OAIXML.createElement(OAIXML.GET_RECORD);
    10141014
    1015     HashSet valid_strs = new HashSet();
     1015    HashSet<String> valid_strs = new HashSet<String>();
    10161016    valid_strs.add(OAIXML.IDENTIFIER);
    10171017    valid_strs.add(OAIXML.METADATA_PREFIX);
    … …  
    10191019    Element req = (Element)GSXML.getChildByTagName(msg, GSXML.REQUEST_ELEM);
    10201020    NodeList params = GSXML.getChildrenByTagName(req, OAIXML.PARAM);
    1021     HashMap param_map = OAIXML.getParamMap(params);   
     1021    HashMap<String, String> param_map = OAIXML.getParamMap(params);   
    10221022   
    10231023    if(!isValidParam(param_map, valid_strs) ||
    … …  
    10291029    }
    10301030   
    1031     String prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);
    1032     String identifier = (String)param_map.get(OAIXML.IDENTIFIER);
     1031    String prefix = param_map.get(OAIXML.METADATA_PREFIX);
     1032    String identifier = param_map.get(OAIXML.IDENTIFIER);
    10331033   
    10341034    // verify the metadata prefix
Note: See TracChangeset for help on using the changeset viewer.