Project

General

Profile

« Previous | Next » 

Revision 8810

add support for v2 DataONE API.

View differences:

SolrQueryAccessFilterTest.java
19 19
import junit.framework.TestSuite;
20 20

  
21 21
import org.apache.http.HttpResponse;
22
import org.dataone.client.D1Client;
23
import org.dataone.client.D1RestClient;
24
import org.dataone.client.MNode;
25
import org.dataone.client.ObjectFormatCache;
26
import org.dataone.client.RestClient;
22
import org.dataone.client.v2.itk.D1Client;
23
import org.dataone.client.v2.MNode;
24
import org.dataone.client.v2.formats.ObjectFormatCache;
25
import org.dataone.client.rest.RestClient;
27 26
import org.dataone.client.auth.CertificateManager;
28 27
import org.dataone.configuration.Settings;
29 28
import org.dataone.service.types.v1.AccessPolicy;
......
34 33
import org.dataone.service.types.v1.Session;
35 34
import org.dataone.service.types.v1.Subject;
36 35
import org.dataone.service.types.v1.SubjectInfo;
37
import org.dataone.service.types.v1.SystemMetadata;
36
import org.dataone.service.types.v2.SystemMetadata;
38 37
import org.dataone.service.util.Constants;
39 38
import org.junit.Before;
40 39
import org.w3c.dom.Document;
......
263 262
        assertTrue(title.equals(TITLE));
264 263
        
265 264
        //Use the libclient without the session, the user shouldn't query the document since its certificate is distrusted and it will be considered as the public.
266
        org.dataone.service.types.v1.Node node = MNodeService.getInstance(request).getCapabilities();
265
        org.dataone.service.types.v2.Node node = MNodeService.getInstance(request).getCapabilities();
267 266
        CertificateManager.getInstance().setCertificateLocation(INTRUSTCERTFILE);
268 267
        String baseURL = node.getBaseURL();
269 268
        System.out.println("================The base url is "+baseURL);
......
275 274
        }
276 275
        System.out.println("================The MODIFIED base url is "+baseURL);
277 276
        MNode mnNode = D1Client.getMN(baseURL);
278
        input = mnNode.query(SOLR, generateQuery(id.getValue()));
277
        input = mnNode.query(querySession, SOLR, generateQuery(id.getValue()));
279 278
        doc = generateDoc(input);
280 279
        String resultId2 = extractElementValue(doc, IDXPATH);
281 280
        assertTrue("In the testDistrustCertificate method, the query result id should be null", resultId2==null);
......
365 364
        String query = generateQuery(id.getValue());
366 365
        MNodeService service = MNodeService.getInstance(request);
367 366
        service.setSession(session);
368
        InputStream input = service.query(SOLR, query);
367
        InputStream input = service.query(session, SOLR, query);
369 368
        return input;
370 369
    }
371 370
    

Also available in: Unified diff