Changeset 2196


Ignore:
Timestamp:
09/04/12 14:31:56 (12 years ago)
Author:
oschonef
Message:
  • make constant private (should never have been public)
  • move RECORD_DATA_PARSER_SCHEMA_ANY constant to a better place

HEADS UP: may break existing code

Location:
SRUClient/trunk/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRURecordDataParser.java

    r2168 r2196  
    2323/**
    2424 * A parser to parse record data and create appropriate Java objects.
    25  * 
     25 *
    2626 */
    2727public interface SRURecordDataParser {
    28     /** constant record data schema parser to match any schema */
    29     public static final String RECORD_DATA_PARSER_SCHEMA_ANY = "*";
    30 
    31 
    3228    /**
    3329     * The record schema this parser is able to process.
    34      * 
     30     *
    3531     * @return the record schema this parser is able to process
    3632     */
     
    4036    /**
    4137     * Parse a record data into a Java object.
    42      * 
     38     *
    4339     * @param reader
    4440     *            a {@link XMLStreamReader} to parse the record data
  • SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java

    r2168 r2196  
    11421142        SRURecordDataParser parser = parsers.get(schema);
    11431143        if (parser == null) {
    1144             parser = parsers.get(SRURecordDataParser.RECORD_DATA_PARSER_SCHEMA_ANY);
     1144            parser = parsers.get(SRUClientConstants.RECORD_DATA_PARSER_SCHEMA_ANY);
    11451145        }
    11461146        return parser;
  • SRUClient/trunk/src/main/java/eu/clarin/sru/fcs/ClarinFederatedContentSearchRecordData.java

    r2163 r2196  
    5353    @Override
    5454    public String getRecordSchema() {
    55         return ClarinFederatedContentSearchRecordParser.FCS_NS;
     55        return RECORD_SCHEMA;
    5656    }
    5757
  • SRUClient/trunk/src/main/java/eu/clarin/sru/fcs/ClarinFederatedContentSearchRecordParser.java

    r2191 r2196  
    3636    private static final Logger logger =
    3737            LoggerFactory.getLogger(ClarinFederatedContentSearchRecordParser.class);
    38     public static final String FCS_NS =
     38    private static final String FCS_NS =
    3939            ClarinFederatedContentSearchRecordData.RECORD_SCHEMA;
    4040    private static final String FCS_KWIC_NS = "http://clarin.eu/fcs/1.0/kwic";
  • SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestSimpleClient.java

    r2165 r2196  
    4444             * just use one dump handler for each request.
    4545             * A real application should be smarter here and use the
    46              * appropriate handler 
     46             * appropriate handler
    4747             */
    4848            SRUDefaultHandlerAdapter handler = new SRUDefaultHandlerAdapter() {
     
    105105                            new Object[] { identifier, position,
    106106                                    data.getRecordSchema() });
    107                     if (ClarinFederatedContentSearchRecordParser.FCS_NS
     107                    if (ClarinFederatedContentSearchRecordData.RECORD_SCHEMA
    108108                            .equals(data.getRecordSchema())) {
    109109                        ClarinFederatedContentSearchRecordData record = (ClarinFederatedContentSearchRecordData) data;
     
    166166                logger.error("a fatal error occured while performing 'searchRetrieve' request", e);
    167167            }
    168            
     168
    169169            logger.info("done");
    170170        } else {
Note: See TracChangeset for help on using the changeset viewer.