Revision 32741
Added by Alessia Bardi over 9 years ago
modules/dnet-openaire-http-api-client/trunk/src/main/java/eu/dnetlib/api/client/ApiClientImpl.java | ||
---|---|---|
23 | 23 |
log.debug("Request for entity: " + entityType + ", model: " + apiModel + ", URL: " + requestURI.toString()); |
24 | 24 |
URIBuilder builder; |
25 | 25 |
try { |
26 |
builder = new URIBuilder(requestURI).addParameter("model", apiModel.name()); |
|
26 |
builder = new URIBuilder(requestURI); |
|
27 |
if (apiModel != ApiModel.none) { |
|
28 |
builder.addParameter("model", apiModel.name()); |
|
29 |
} |
|
27 | 30 |
return restTemplate.getForObject(builder.build(), String.class); |
28 | 31 |
} catch (URISyntaxException e) { |
29 | 32 |
throw new IllegalArgumentException(e); |
... | ... | |
36 | 39 |
log.debug("Request for entity: " + entityType + ", model: " + apiModel + ", URL: " + requestURI.toString()); |
37 | 40 |
URIBuilder builder; |
38 | 41 |
try { |
39 |
builder = new URIBuilder(requestURI).addParameter("model", apiModel.name()); |
|
42 |
builder = new URIBuilder(requestURI); |
|
43 |
if (apiModel != ApiModel.none) { |
|
44 |
builder.addParameter("model", apiModel.name()); |
|
45 |
} |
|
40 | 46 |
return restTemplate.getForObject(builder.build(), Source.class); |
41 | 47 |
} catch (URISyntaxException e) { |
42 | 48 |
throw new IllegalArgumentException(e); |
43 | 49 |
} |
44 | 50 |
} |
45 |
|
|
46 | 51 |
} |
modules/dnet-openaire-http-api-client/trunk/src/main/java/eu/dnetlib/api/client/ApiModel.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.api.client; |
2 | 2 |
|
3 | 3 |
public enum ApiModel { |
4 |
openaire, sygma |
|
4 |
openaire, sygma, none
|
|
5 | 5 |
} |
Also available in: Unified diff
allow no model param for requests for projects