Commit b25b71c57863a834f990d9c77d6b2f53c3bb8614

Authored by Paulo Graça
1 parent 109efda989
Exists in test-v2.0_RC3

Test changes to support v2.0_RC3

Showing 1041 changed files with 101976 additions and 24061 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 1041 files displayed.

.gitignore
... ... @@ -4,3 +4,4 @@
4 4 .classpath
5 5 .project
6 6 .settings/
  7 +/target/
... ...
pom.xml
... ... @@ -4,18 +4,20 @@
4 4  
5 5 <groupId>org.um.dsi.gavea</groupId>
6 6 <artifactId>degois-orcid-client</artifactId>
7   - <version>2.0-rc2</version>
  7 + <version>2.0-rc3</version>
8 8  
9 9 <name>Orcid Client</name>
10 10  
11 11 <properties>
12 12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13 13 <java.version>1.8</java.version>
14   -
  14 + <swagger.version>1.5.9</swagger.version>
15 15 <jersey.version>2.22.1</jersey.version>
16 16 <jaxb2-basics.version>0.9.5</jaxb2-basics.version>
17 17 <log4j.version>2.4</log4j.version>
18 18 <junit.version>4.12</junit.version>
  19 + <apache.commons.version>2.2</apache.commons.version>
  20 +
19 21 </properties>
20 22  
21 23 <dependencies>
... ... @@ -59,63 +61,31 @@
59 61 <version>${junit.version}</version>
60 62 <scope>test</scope>
61 63 </dependency>
  64 + <!-- Swagger -->
  65 + <dependency>
  66 + <groupId>io.swagger</groupId>
  67 + <artifactId>swagger-jersey-jaxrs</artifactId>
  68 + <version>${swagger.version}</version>
  69 + </dependency>
  70 + <!-- http://mvnrepository.com/artifact/io.swagger/swagger-jaxrs -->
  71 + <!-- dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jaxrs</artifactId>
  72 + <version>${swagger.version}</version> </dependency -->
  73 + <dependency>
  74 + <groupId>commons-lang</groupId>
  75 + <artifactId>commons-lang</artifactId>
  76 + <version>2.6</version>
  77 + </dependency>
  78 + <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
  79 + <dependency>
  80 + <groupId>org.jsoup</groupId>
  81 + <artifactId>jsoup</artifactId>
  82 + <version>1.10.1</version>
  83 + </dependency>
62 84 </dependencies>
63 85  
64 86 <build>
65 87 <plugins>
66 88 <plugin>
67   - <groupId>org.jvnet.jaxb2.maven2</groupId>
68   - <artifactId>maven-jaxb2-plugin</artifactId>
69   - <version>0.13.1</version>
70   - <executions>
71   - <execution>
72   - <goals>
73   - <goal>generate</goal>
74   - </goals>
75   - </execution>
76   - </executions>
77   - <configuration>
78   - <noFileHeader>true</noFileHeader>
79   - <generateDirectory>${project.build.directory}/generated-sources</generateDirectory>
80   - <bindingDirectory>${basedir}/src/main/resources/binding</bindingDirectory>
81   - <schemaDirectory>${basedir}/src/main/resources/xsd</schemaDirectory>
82   - <schemaIncludes>
83   - <include>common_2.0_rc2/*.xsd</include>
84   - <include>record_2.0_rc2/*.xsd</include>
85   - </schemaIncludes>
86   - <episode>false</episode>
87   - <args>
88   - <arg>-Xsetters</arg>
89   - <arg>-Xvalue-constructor</arg>
90   - <arg>-XtoString</arg>
91   - <arg>-extension</arg>
92   - <arg>-Xnamespace-prefix</arg>
93   - </args>
94   - </configuration>
95   - <dependencies>
96   - <dependency>
97   - <groupId>org.glassfish.jaxb</groupId>
98   - <artifactId>jaxb-core</artifactId>
99   - <version>2.2.11</version>
100   - </dependency>
101   - <dependency>
102   - <groupId>org.jvnet.jaxb2_commons</groupId>
103   - <artifactId>jaxb2-basics</artifactId>
104   - <version>${jaxb2-basics.version}</version>
105   - </dependency>
106   - <dependency>
107   - <groupId>org.jvnet.jaxb2_commons</groupId>
108   - <artifactId>jaxb2-value-constructor</artifactId>
109   - <version>3.0</version>
110   - </dependency>
111   - <dependency>
112   - <groupId>org.jvnet.jaxb2_commons</groupId>
113   - <artifactId>jaxb2-namespace-prefix</artifactId>
114   - <version>1.1</version>
115   - </dependency>
116   - </dependencies>
117   - </plugin>
118   - <plugin>
119 89 <groupId>org.apache.maven.plugins</groupId>
120 90 <artifactId>maven-compiler-plugin</artifactId>
121 91 <version>3.3</version>
... ... @@ -133,6 +103,25 @@
133 103 <skipTests>true</skipTests>
134 104 </configuration>
135 105 </plugin>
136   - </plugins>
  106 + <plugin>
  107 + <groupId>org.codehaus.mojo</groupId>
  108 + <artifactId>build-helper-maven-plugin</artifactId>
  109 + <version>1.9.1</version>
  110 + <executions>
  111 + <execution>
  112 + <id>add-source</id>
  113 + <phase>generate-sources</phase>
  114 + <goals>
  115 + <goal>add-source</goal>
  116 + </goals>
  117 + <configuration>
  118 + <sources>
  119 + <source>src/orcid-model/java</source>
  120 + </sources>
  121 + </configuration>
  122 + </execution>
  123 + </executions>
  124 + </plugin>
  125 + </plugins>
137 126 </build>
138 127 </project>
139 128 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/client/OrcidOAuthClient.java
... ... @@ -15,10 +15,17 @@ import org.apache.logging.log4j.Logger;
15 15 import org.um.dsi.gavea.orcid.client.constants.OrcidConstants;
16 16 import org.um.dsi.gavea.orcid.client.exception.OrcidClientException;
17 17 import org.um.dsi.gavea.orcid.client.extend.ScopePathTypeExt;
  18 +import org.um.dsi.gavea.orcid.client.util.RecordUtil;
18 19 import org.um.dsi.gavea.orcid.model.activities.ActivitiesSummary;
  20 +import org.um.dsi.gavea.orcid.model.activities.Educations;
  21 +import org.um.dsi.gavea.orcid.model.activities.Employments;
  22 +import org.um.dsi.gavea.orcid.model.activities.FundingGroup;
  23 +import org.um.dsi.gavea.orcid.model.activities.Fundings;
  24 +import org.um.dsi.gavea.orcid.model.activities.WorkGroup;
  25 +import org.um.dsi.gavea.orcid.model.activities.Works;
19 26 import org.um.dsi.gavea.orcid.model.address.Address;
20 27 import org.um.dsi.gavea.orcid.model.address.Addresses;
21   -import org.um.dsi.gavea.orcid.model.common.ScopePathType;
  28 +import org.orcid.jaxb.model.message.ScopePathType;
22 29 import org.um.dsi.gavea.orcid.model.education.Education;
23 30 import org.um.dsi.gavea.orcid.model.education.EducationSummary;
24 31 import org.um.dsi.gavea.orcid.model.email.Emails;
... ... @@ -41,6 +48,7 @@ import org.um.dsi.gavea.orcid.model.researcherurl.ResearcherUrl;
41 48 import org.um.dsi.gavea.orcid.model.researcherurl.ResearcherUrls;
42 49 import org.um.dsi.gavea.orcid.model.work.Work;
43 50 import org.um.dsi.gavea.orcid.model.work.WorkSummary;
  51 +import org.um.dsi.gavea.orcid.model.bulk.WorkBulk;
44 52  
45 53 public class OrcidOAuthClient extends BaseOrcidOAuthClient {
46 54 private static final long serialVersionUID = -6655680509383446710L;
... ... @@ -165,22 +173,65 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
165 173 Response response = null;
166 174 try {
167 175 response = get(OrcidConstants.ENDPOINT_ACTIVITIES, token, null);
168   -
169   - return response.readEntity(ActivitiesSummary.class);
  176 + return (ActivitiesSummary)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.ActivitiesSummary.class);
170 177 } finally {
171 178 if (response != null)
172 179 response.close();
173 180 }
174 181 }
175 182  
  183 + public Works readWorksActivitiesSummary(final OrcidAccessToken token) throws OrcidClientException {
  184 + Response response = null;
  185 + try {
  186 + //_log.error(RecordUtil.convertToString(bulk));
  187 + response = get(OrcidConstants.ENDPOINT_WORKS, token, null);
  188 + return (Works)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.Works.class);
  189 + } finally {
  190 + if (response != null)
  191 + response.close();
  192 + }
  193 + }
  194 +
  195 + public Educations readEducationsActivitiesSummary(final OrcidAccessToken token) throws OrcidClientException {
  196 + Response response = null;
  197 + try {
  198 + response = get(OrcidConstants.ENDPOINT_EDUCATIONS, token, null);
  199 + return (Educations)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.Educations.class);
  200 + } finally {
  201 + if (response != null)
  202 + response.close();
  203 + }
  204 + }
  205 +
  206 + public Employments readEmploymentsActivitiesSummary(final OrcidAccessToken token) throws OrcidClientException {
  207 + Response response = null;
  208 + try {
  209 + response = get(OrcidConstants.ENDPOINT_EMPLOYMENTS, token, null);
  210 + return (Employments)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.Employments.class);
  211 + } finally {
  212 + if (response != null)
  213 + response.close();
  214 + }
  215 + }
  216 +
  217 + public Fundings readFundingsActivitiesSummary(final OrcidAccessToken token) throws OrcidClientException {
  218 + Response response = null;
  219 + try {
  220 + response = get(OrcidConstants.ENDPOINT_FUNDINGS, token, null);
  221 + return (Fundings)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.Fundings.class);
  222 + } finally {
  223 + if (response != null)
  224 + response.close();
  225 + }
  226 + }
  227 +
176 228  
177 229 /* Address */
178 230 public Addresses readAddresses(final OrcidAccessToken token) throws OrcidClientException {
179 231 Response response = null;
180 232 try {
181 233 response = get(OrcidConstants.ENDPOINT_ADDRESS, token, null);
182   -
183   - return response.readEntity(Addresses.class);
  234 + return (Addresses)response.readEntity(org.orcid.jaxb.model.record_rc3.Addresses.class);
184 235 } finally {
185 236 if (response != null)
186 237 response.close();
... ... @@ -191,8 +242,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
191 242 Response response = null;
192 243 try {
193 244 response = get(OrcidConstants.ENDPOINT_ADDRESS, token, putCode);
194   -
195   - return response.readEntity(Address.class);
  245 + return (Address)response.readEntity(org.orcid.jaxb.model.record_rc3.Address.class);
196 246 } finally {
197 247 if (response != null)
198 248 response.close();
... ... @@ -202,7 +252,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
202 252 public void addAddress(final OrcidAccessToken token, Address address) throws OrcidClientException {
203 253 Response response = null;
204 254 try {
205   - response = post(OrcidConstants.ENDPOINT_ADDRESS, token, Entity.entity(address, MediaType.APPLICATION_XML_TYPE));
  255 + org.orcid.jaxb.model.record_rc3.Address castedAddress = (org.orcid.jaxb.model.record_rc3.Address)address;
  256 + response = post(OrcidConstants.ENDPOINT_ADDRESS, token, Entity.entity(castedAddress, MediaType.APPLICATION_XML_TYPE));
206 257 } finally {
207 258 if (response != null)
208 259 response.close();
... ... @@ -212,7 +263,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
212 263 public void updateAddress(final OrcidAccessToken token, final String putCode, final Address address) throws OrcidClientException {
213 264 Response response = null;
214 265 try {
215   - response = put(OrcidConstants.ENDPOINT_ADDRESS, token, putCode, Entity.entity(address, MediaType.APPLICATION_XML_TYPE));
  266 + org.orcid.jaxb.model.record_rc3.Address castedAddress = (org.orcid.jaxb.model.record_rc3.Address)address;
  267 + response = put(OrcidConstants.ENDPOINT_ADDRESS, token, putCode, Entity.entity(castedAddress, MediaType.APPLICATION_XML_TYPE));
216 268 } finally {
217 269 if (response != null)
218 270 response.close();
... ... @@ -235,8 +287,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
235 287 Response response = null;
236 288 try {
237 289 response = get(OrcidConstants.ENDPOINT_BIOGRAPHY, token, null);
238   -
239   - return response.readEntity(Biography.class);
  290 + return (Biography)response.readEntity(org.orcid.jaxb.model.record_rc3.Biography.class);
240 291 } finally {
241 292 if (response != null)
242 293 response.close();
... ... @@ -249,8 +300,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
249 300 Response response = null;
250 301 try {
251 302 response = get(OrcidConstants.ENDPOINT_EDUCATION, token, putCode);
252   -
253   - return response.readEntity(Education.class);
  303 + return (Education)response.readEntity(org.orcid.jaxb.model.record_rc3.Education.class);
254 304 } finally {
255 305 if (response != null)
256 306 response.close();
... ... @@ -262,7 +312,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
262 312 try {
263 313 response = get(OrcidConstants.ENDPOINT_EDUCATION_SUMMARY, token, putCode);
264 314  
265   - return response.readEntity(EducationSummary.class);
  315 + return (EducationSummary)response.readEntity( org.orcid.jaxb.model.record.summary_rc3.EducationSummary.class);
266 316 } finally {
267 317 if (response != null)
268 318 response.close();
... ... @@ -272,7 +322,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
272 322 public String addEducation(final OrcidAccessToken token, final Education education) throws OrcidClientException {
273 323 Response response = null;
274 324 try {
275   - response = post(OrcidConstants.ENDPOINT_EDUCATION, token, Entity.entity(education, MediaType.APPLICATION_XML_TYPE));
  325 + org.orcid.jaxb.model.record_rc3.Education castedEducation = (org.orcid.jaxb.model.record_rc3.Education)education;
  326 + response = post(OrcidConstants.ENDPOINT_EDUCATION, token, Entity.entity(castedEducation, MediaType.APPLICATION_XML_TYPE));
276 327  
277 328 return retrievePutCode(response);
278 329 } finally {
... ... @@ -284,7 +335,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
284 335 public void updateEducation(final OrcidAccessToken token, final String putCode, final Education education) throws OrcidClientException {
285 336 Response response = null;
286 337 try {
287   - response = put(OrcidConstants.ENDPOINT_EDUCATION, token, putCode, Entity.entity(education, MediaType.APPLICATION_XML_TYPE));
  338 + org.orcid.jaxb.model.record_rc3.Education castedEducation = (org.orcid.jaxb.model.record_rc3.Education)education;
  339 + response = put(OrcidConstants.ENDPOINT_EDUCATION, token, putCode, Entity.entity(castedEducation, MediaType.APPLICATION_XML_TYPE));
288 340 } finally {
289 341 if (response != null)
290 342 response.close();
... ... @@ -300,7 +352,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
300 352 response.close();
301 353 }
302 354 }
303   -
  355 +
304 356  
305 357 /* Email */
306 358 public Emails readEmails(final OrcidAccessToken token) throws OrcidClientException {
... ... @@ -308,7 +360,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
308 360 try {
309 361 response = get(OrcidConstants.ENDPOINT_EMAIL, token, null);
310 362  
311   - return response.readEntity(Emails.class);
  363 + return (Emails)response.readEntity(org.orcid.jaxb.model.record_rc3.Emails.class);
312 364 } finally {
313 365 if (response != null)
314 366 response.close();
... ... @@ -322,7 +374,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
322 374 try {
323 375 response = get(OrcidConstants.ENDPOINT_EMPLOYMENT, token, putCode);
324 376  
325   - return response.readEntity(Employment.class);
  377 + return (Employment)response.readEntity(org.orcid.jaxb.model.record_rc3.Employment.class);
326 378 } finally {
327 379 if (response != null)
328 380 response.close();
... ... @@ -334,7 +386,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
334 386 try {
335 387 response = get(OrcidConstants.ENDPOINT_EMPLOYMENT_SUMMARY, token, putCode);
336 388  
337   - return response.readEntity(EmploymentSummary.class);
  389 + return (EmploymentSummary)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.EmploymentSummary.class);
338 390 } finally {
339 391 if (response != null)
340 392 response.close();
... ... @@ -344,7 +396,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
344 396 public String addEmployment(final OrcidAccessToken token, final Employment employment) throws OrcidClientException {
345 397 Response response = null;
346 398 try {
347   - response = post(OrcidConstants.ENDPOINT_EMPLOYMENT, token, Entity.entity(employment, MediaType.APPLICATION_XML_TYPE));
  399 + org.orcid.jaxb.model.record_rc3.Employment castedEmployment = (org.orcid.jaxb.model.record_rc3.Employment)employment;
  400 + response = post(OrcidConstants.ENDPOINT_EMPLOYMENT, token, Entity.entity(castedEmployment, MediaType.APPLICATION_XML_TYPE));
348 401  
349 402 return retrievePutCode(response);
350 403 } finally {
... ... @@ -356,7 +409,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
356 409 public void updateEmployment(final OrcidAccessToken token, final String putCode, final Employment employment) throws OrcidClientException {
357 410 Response response = null;
358 411 try {
359   - response = put(OrcidConstants.ENDPOINT_EMPLOYMENT, token, putCode, Entity.entity(employment, MediaType.APPLICATION_XML_TYPE));
  412 + org.orcid.jaxb.model.record_rc3.Employment castedEmployment = (org.orcid.jaxb.model.record_rc3.Employment)employment;
  413 + response = put(OrcidConstants.ENDPOINT_EMPLOYMENT, token, putCode, Entity.entity(castedEmployment, MediaType.APPLICATION_XML_TYPE));
360 414 } finally {
361 415 if (response != null)
362 416 response.close();
... ... @@ -380,7 +434,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
380 434 try {
381 435 response = get(OrcidConstants.ENDPOINT_EXTERNAL_IDENTIFIERS, token, putCode);
382 436  
383   - return response.readEntity(ExternalIdentifiers.class);
  437 + return (ExternalIdentifiers)response.readEntity(org.orcid.jaxb.model.record_rc3.ExternalIDs.class);
384 438 } finally {
385 439 if (response != null)
386 440 response.close();
... ... @@ -392,7 +446,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
392 446 try {
393 447 response = get(OrcidConstants.ENDPOINT_EXTERNAL_IDENTIFIERS, token, putCode);
394 448  
395   - return response.readEntity(ExternalIdentifier.class);
  449 + return (ExternalIdentifier)response.readEntity(org.orcid.jaxb.model.record_rc3.ExternalID.class);
396 450 } finally {
397 451 if (response != null)
398 452 response.close();
... ... @@ -402,7 +456,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
402 456 public String addExternalIdentifier(final OrcidAccessToken token, final ExternalIdentifier externalIdentifier) throws OrcidClientException {
403 457 Response response = null;
404 458 try {
405   - response = post(OrcidConstants.ENDPOINT_EXTERNAL_IDENTIFIERS, token, Entity.entity(externalIdentifier, MediaType.APPLICATION_XML_TYPE));
  459 + org.orcid.jaxb.model.record_rc3.ExternalID castedExternalIdentifier = (org.orcid.jaxb.model.record_rc3.ExternalID)externalIdentifier;
  460 + response = post(OrcidConstants.ENDPOINT_EXTERNAL_IDENTIFIERS, token, Entity.entity(castedExternalIdentifier, MediaType.APPLICATION_XML_TYPE));
406 461  
407 462 return retrievePutCode(response);
408 463 } finally {
... ... @@ -414,7 +469,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
414 469 public void updateExternalIdentifier(final OrcidAccessToken token, final String putCode, final ExternalIdentifier externalIdentifier) throws OrcidClientException {
415 470 Response response = null;
416 471 try {
417   - response = put(OrcidConstants.ENDPOINT_EXTERNAL_IDENTIFIERS, token, putCode, Entity.entity(externalIdentifier, MediaType.APPLICATION_XML_TYPE));
  472 + org.orcid.jaxb.model.record_rc3.ExternalID castedExternalIdentifier = (org.orcid.jaxb.model.record_rc3.ExternalID)externalIdentifier;
  473 + response = put(OrcidConstants.ENDPOINT_EXTERNAL_IDENTIFIERS, token, putCode, Entity.entity(castedExternalIdentifier, MediaType.APPLICATION_XML_TYPE));
418 474 } finally {
419 475 if (response != null)
420 476 response.close();
... ... @@ -438,18 +494,19 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
438 494 try {
439 495 response = get(OrcidConstants.ENDPOINT_FUNDING, token, putCode);
440 496  
441   - return response.readEntity(Funding.class);
  497 + return (Funding)response.readEntity(org.orcid.jaxb.model.record_rc3.Funding.class);
442 498 } finally {
443 499 if (response != null)
444 500 response.close();
445 501 }
446 502 }
  503 +
447 504 public FundingSummary readFundingSummary(final OrcidAccessToken token, final String putCode) throws OrcidClientException {
448 505 Response response = null;
449 506 try {
450 507 response = get(OrcidConstants.ENDPOINT_FUNDING_SUMMARY, token, putCode);
451 508  
452   - return response.readEntity(FundingSummary.class);
  509 + return (FundingSummary)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.FundingSummary.class);
453 510 } finally {
454 511 if (response != null)
455 512 response.close();
... ... @@ -459,7 +516,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
459 516 public String addFunding(final OrcidAccessToken token, final Funding funding) throws OrcidClientException {
460 517 Response response = null;
461 518 try {
462   - response = post(OrcidConstants.ENDPOINT_FUNDING, token, Entity.entity(funding, MediaType.APPLICATION_XML_TYPE));
  519 + org.orcid.jaxb.model.record_rc3.Funding castedFunding = (org.orcid.jaxb.model.record_rc3.Funding)funding;
  520 + response = post(OrcidConstants.ENDPOINT_FUNDING, token, Entity.entity(castedFunding, MediaType.APPLICATION_XML_TYPE));
463 521  
464 522 return retrievePutCode(response);
465 523 } finally {
... ... @@ -471,7 +529,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
471 529 public void updateFunding(final OrcidAccessToken token, final String putCode, final Funding funding) throws OrcidClientException {
472 530 Response response = null;
473 531 try {
474   - response = put(OrcidConstants.ENDPOINT_FUNDING, token, putCode, Entity.entity(funding, MediaType.APPLICATION_XML_TYPE));
  532 + org.orcid.jaxb.model.record_rc3.Funding castedFunding = (org.orcid.jaxb.model.record_rc3.Funding)funding;
  533 + response = put(OrcidConstants.ENDPOINT_FUNDING, token, putCode, Entity.entity(castedFunding, MediaType.APPLICATION_XML_TYPE));
475 534 } finally {
476 535 if (response != null)
477 536 response.close();
... ... @@ -495,7 +554,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
495 554 try {
496 555 response = get(OrcidConstants.ENDPOINT_KEYWORDS, token, null);
497 556  
498   - return response.readEntity(Keywords.class);
  557 + return (Keywords)response.readEntity(org.orcid.jaxb.model.record_rc3.Keywords.class);
499 558 } finally {
500 559 if (response != null)
501 560 response.close();
... ... @@ -507,7 +566,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
507 566 try {
508 567 response = get(OrcidConstants.ENDPOINT_KEYWORDS, token, putCode);
509 568  
510   - return response.readEntity(Keyword.class);
  569 + return (Keyword)response.readEntity(org.orcid.jaxb.model.record_rc3.Keyword.class);
511 570 } finally {
512 571 if (response != null)
513 572 response.close();
... ... @@ -517,7 +576,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
517 576 public String addKeyword(final OrcidAccessToken token, final Keyword keyword) throws OrcidClientException {
518 577 Response response = null;
519 578 try {
520   - response = post(OrcidConstants.ENDPOINT_KEYWORDS, token, Entity.entity(keyword, MediaType.APPLICATION_XML_TYPE));
  579 + org.orcid.jaxb.model.record_rc3.Keyword castedKeyword = (org.orcid.jaxb.model.record_rc3.Keyword)keyword;
  580 + response = post(OrcidConstants.ENDPOINT_KEYWORDS, token, Entity.entity(castedKeyword, MediaType.APPLICATION_XML_TYPE));
521 581  
522 582 return retrievePutCode(response);
523 583 } finally {
... ... @@ -529,7 +589,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
529 589 public void updateKeyword(final OrcidAccessToken token, final String putCode, final Keyword keyword) throws OrcidClientException {
530 590 Response response = null;
531 591 try {
532   - response = put(OrcidConstants.ENDPOINT_KEYWORDS, token, putCode, Entity.entity(keyword, MediaType.APPLICATION_XML_TYPE));
  592 + org.orcid.jaxb.model.record_rc3.Keyword castedKeyword = (org.orcid.jaxb.model.record_rc3.Keyword)keyword;
  593 + response = put(OrcidConstants.ENDPOINT_KEYWORDS, token, putCode, Entity.entity(castedKeyword, MediaType.APPLICATION_XML_TYPE));
533 594 } finally {
534 595 if (response != null)
535 596 response.close();
... ... @@ -553,7 +614,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
553 614 try {
554 615 response = get(OrcidConstants.ENDPOINT_OTHER_NAMES, token, null);
555 616  
556   - return response.readEntity(OtherNames.class);
  617 + return (OtherNames)response.readEntity(org.orcid.jaxb.model.record_rc3.OtherNames.class);
557 618 } finally {
558 619 if (response != null)
559 620 response.close();
... ... @@ -565,7 +626,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
565 626 try {
566 627 response = get(OrcidConstants.ENDPOINT_OTHER_NAMES, token, putCode);
567 628  
568   - return response.readEntity(OtherName.class);
  629 + return (OtherName)response.readEntity(org.orcid.jaxb.model.record_rc3.OtherName.class);
569 630 } finally {
570 631 if (response != null)
571 632 response.close();
... ... @@ -575,7 +636,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
575 636 public String addOtherName(final OrcidAccessToken token, final OtherName otherName) throws OrcidClientException {
576 637 Response response = null;
577 638 try {
578   - response = post(OrcidConstants.ENDPOINT_OTHER_NAMES, token, Entity.entity(otherName, MediaType.APPLICATION_XML_TYPE));
  639 + org.orcid.jaxb.model.record_rc3.OtherName castedOtherName = (org.orcid.jaxb.model.record_rc3.OtherName)otherName;
  640 + response = post(OrcidConstants.ENDPOINT_OTHER_NAMES, token, Entity.entity(castedOtherName, MediaType.APPLICATION_XML_TYPE));
579 641  
580 642 return retrievePutCode(response);
581 643 } finally {
... ... @@ -587,7 +649,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
587 649 public void updateOtherName(final OrcidAccessToken token, final String putCode, final OtherName otherName) throws OrcidClientException {
588 650 Response response = null;
589 651 try {
590   - response = put(OrcidConstants.ENDPOINT_OTHER_NAMES, token, putCode, Entity.entity(otherName, MediaType.APPLICATION_XML_TYPE));
  652 + org.orcid.jaxb.model.record_rc3.OtherName castedOtherName = (org.orcid.jaxb.model.record_rc3.OtherName)otherName;
  653 + response = put(OrcidConstants.ENDPOINT_OTHER_NAMES, token, putCode, Entity.entity(castedOtherName, MediaType.APPLICATION_XML_TYPE));
591 654 } finally {
592 655 if (response != null)
593 656 response.close();
... ... @@ -611,7 +674,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
611 674 try {
612 675 response = get(OrcidConstants.ENDPOINT_PEERREVIEW, token, putCode);
613 676  
614   - return response.readEntity(PeerReview.class);
  677 + return (PeerReview)response.readEntity(org.orcid.jaxb.model.record_rc3.PeerReview.class);
615 678 } finally {
616 679 if (response != null)
617 680 response.close();
... ... @@ -622,7 +685,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
622 685 try {
623 686 response = get(OrcidConstants.ENDPOINT_PEERREVIEW_SUMMARY, token, putCode);
624 687  
625   - return response.readEntity(PeerReviewSummary.class);
  688 + return (PeerReviewSummary)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.PeerReviewSummary.class);
626 689 } finally {
627 690 if (response != null)
628 691 response.close();
... ... @@ -632,7 +695,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
632 695 public String addPeerReview(final OrcidAccessToken token, final PeerReview peerReview) throws OrcidClientException {
633 696 Response response = null;
634 697 try {
635   - response = post(OrcidConstants.ENDPOINT_PEERREVIEW, token, Entity.entity(peerReview, MediaType.APPLICATION_XML_TYPE));
  698 + org.orcid.jaxb.model.record_rc3.PeerReview castedPeerReview = (org.orcid.jaxb.model.record_rc3.PeerReview)peerReview;
  699 + response = post(OrcidConstants.ENDPOINT_PEERREVIEW, token, Entity.entity(castedPeerReview, MediaType.APPLICATION_XML_TYPE));
636 700  
637 701 return retrievePutCode(response);
638 702 } finally {
... ... @@ -644,7 +708,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
644 708 public void updatePeerReview(final OrcidAccessToken token, final String putCode, final PeerReview peerReview) throws OrcidClientException {
645 709 Response response = null;
646 710 try {
647   - response = put(OrcidConstants.ENDPOINT_PEERREVIEW, token, putCode, Entity.entity(peerReview, MediaType.APPLICATION_XML_TYPE));
  711 + org.orcid.jaxb.model.record_rc3.PeerReview castedPeerReview = (org.orcid.jaxb.model.record_rc3.PeerReview)peerReview;
  712 + response = put(OrcidConstants.ENDPOINT_PEERREVIEW, token, putCode, Entity.entity(castedPeerReview, MediaType.APPLICATION_XML_TYPE));
648 713 } finally {
649 714 if (response != null)
650 715 response.close();
... ... @@ -668,7 +733,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
668 733 try {
669 734 response = get(OrcidConstants.ENDPOINT_PERSON, token, null);
670 735  
671   - return response.readEntity(Person.class);
  736 + return (Person)response.readEntity(org.orcid.jaxb.model.record_rc3.Person.class);
672 737 } finally {
673 738 if (response != null)
674 739 response.close();
... ... @@ -682,7 +747,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
682 747 try {
683 748 response = get(OrcidConstants.ENDPOINT_PERSONAL_DETAILS, token, null);
684 749  
685   - return response.readEntity(PersonalDetails.class);
  750 + return (PersonalDetails)response.readEntity(org.orcid.jaxb.model.record_rc3.PersonalDetails.class);
686 751 } finally {
687 752 if (response != null)
688 753 response.close();
... ... @@ -696,7 +761,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
696 761 try {
697 762 response = get(OrcidConstants.ENDPOINT_RESEARCHER_URLS, token, null);
698 763  
699   - return response.readEntity(ResearcherUrls.class);
  764 + return (ResearcherUrls)response.readEntity(org.orcid.jaxb.model.record_rc3.ResearcherUrls.class);
700 765 } finally {
701 766 if (response != null)
702 767 response.close();
... ... @@ -708,7 +773,7 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
708 773 try {
709 774 response = get(OrcidConstants.ENDPOINT_RESEARCHER_URLS, token, putCode);
710 775  
711   - return response.readEntity(ResearcherUrl.class);
  776 + return (ResearcherUrl)response.readEntity(org.orcid.jaxb.model.record_rc3.ResearcherUrl.class);
712 777 } finally {
713 778 if (response != null)
714 779 response.close();
... ... @@ -718,7 +783,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
718 783 public String addResearcherUrl(final OrcidAccessToken token, final ResearcherUrl researcherUrl) throws OrcidClientException {
719 784 Response response = null;
720 785 try {
721   - response = post(OrcidConstants.ENDPOINT_RESEARCHER_URLS, token, Entity.entity(researcherUrl, MediaType.APPLICATION_XML_TYPE));
  786 + org.orcid.jaxb.model.record_rc3.ResearcherUrl castedResearcherUrl = (org.orcid.jaxb.model.record_rc3.ResearcherUrl)researcherUrl;
  787 + response = post(OrcidConstants.ENDPOINT_RESEARCHER_URLS, token, Entity.entity(castedResearcherUrl, MediaType.APPLICATION_XML_TYPE));
722 788  
723 789 return retrievePutCode(response);
724 790 } finally {
... ... @@ -730,7 +796,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
730 796 public void updateResearcherUrl(final OrcidAccessToken token, final String putCode, final ResearcherUrl researcherUrl) throws OrcidClientException {
731 797 Response response = null;
732 798 try {
733   - response = put(OrcidConstants.ENDPOINT_RESEARCHER_URLS, token, putCode, Entity.entity(researcherUrl, MediaType.APPLICATION_XML_TYPE));
  799 + org.orcid.jaxb.model.record_rc3.ResearcherUrl castedResearcherUrl = (org.orcid.jaxb.model.record_rc3.ResearcherUrl)researcherUrl;
  800 + response = put(OrcidConstants.ENDPOINT_RESEARCHER_URLS, token, putCode, Entity.entity(castedResearcherUrl, MediaType.APPLICATION_XML_TYPE));
734 801 } finally {
735 802 if (response != null)
736 803 response.close();
... ... @@ -754,19 +821,20 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
754 821 try {
755 822 response = get(OrcidConstants.ENDPOINT_WORK, token, putCode);
756 823  
757   - return response.readEntity(Work.class);
  824 + return (Work)response.readEntity(org.orcid.jaxb.model.record_rc3.Work.class);
758 825 } finally {
759 826 if (response != null)
760 827 response.close();
761 828 }
762 829 }
763 830  
  831 +
764 832 public WorkSummary readWorkSummary(final OrcidAccessToken token, final String putCode) throws OrcidClientException {
765 833 Response response = null;
766 834 try {
767 835 response = get(OrcidConstants.ENDPOINT_WORK_SUMMARY, token, putCode);
768 836  
769   - return response.readEntity(WorkSummary.class);
  837 + return (WorkSummary)response.readEntity(org.orcid.jaxb.model.record.summary_rc3.WorkSummary.class);
770 838 } finally {
771 839 if (response != null)
772 840 response.close();
... ... @@ -776,7 +844,8 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
776 844 public String addWork(final OrcidAccessToken token, final Work work) throws OrcidClientException {
777 845 Response response = null;
778 846 try {
779   - response = post(OrcidConstants.ENDPOINT_WORK, token, Entity.entity(work, MediaType.APPLICATION_XML_TYPE));
  847 + org.orcid.jaxb.model.record_rc3.Work castedWork = (org.orcid.jaxb.model.record_rc3.Work)work;
  848 + response = post(OrcidConstants.ENDPOINT_WORK, token, Entity.entity(castedWork, MediaType.APPLICATION_XML_TYPE));
780 849  
781 850 return retrievePutCode(response);
782 851 } finally {
... ... @@ -784,11 +853,28 @@ public class OrcidOAuthClient extends BaseOrcidOAuthClient {
784 853 response.close();
785 854 }
786 855 }
  856 +
  857 + public void addBulkWorks(final OrcidAccessToken token, final WorkBulk bulk) throws OrcidClientException {
  858 + Response response = null;
  859 + try {
  860 +
  861 + org.orcid.jaxb.model.record_rc3.WorkBulk castedWorkBulk = (org.orcid.jaxb.model.record_rc3.WorkBulk)bulk;
  862 + _log.debug(RecordUtil.convertToString(castedWorkBulk));
  863 + //_log.debug(Entity.entity(bulk, MediaType.APPLICATION_XML_TYPE).toString());
  864 +
  865 + response = post(OrcidConstants.ENDPOINT_WORKS, token, Entity.entity(castedWorkBulk, MediaType.APPLICATION_XML_TYPE));
  866 + //return retrievePutCode(response);
  867 + } finally {
  868 + if (response != null)
  869 + response.close();
  870 + }
  871 + }
787 872  
788 873 public void updateWork(final OrcidAccessToken token, final String putCode, final Work work) throws OrcidClientException {
789 874 Response response = null;
790 875 try {
791   - response = put(OrcidConstants.ENDPOINT_WORK, token, putCode, Entity.entity(work, MediaType.APPLICATION_XML_TYPE));
  876 + org.orcid.jaxb.model.record_rc3.Work castedWork = (org.orcid.jaxb.model.record_rc3.Work)work;
  877 + response = put(OrcidConstants.ENDPOINT_WORK, token, putCode, Entity.entity(castedWork, MediaType.APPLICATION_XML_TYPE));
792 878 } finally {
793 879 if (response != null)
794 880 response.close();
... ...
src/main/java/org/um/dsi/gavea/orcid/client/constants/OrcidConstants.java
... ... @@ -4,7 +4,7 @@ import javax.ws.rs.core.MediaType;
4 4  
5 5 public final class OrcidConstants {
6 6  
7   - public final static String API_VERSION = "v2.0_rc2";
  7 + public final static String API_VERSION = "v2.0_rc3";
8 8  
9 9 public final static String ENDPOINT_OAUTH_AUTHORIZE = "/oauth/authorize";
10 10 public final static String ENDPOINT_OAUTH_TOKEN = "/oauth/token";
... ... @@ -14,12 +14,15 @@ public final class OrcidConstants {
14 14 public final static String ENDPOINT_BIOGRAPHY = "/biography";
15 15 public final static String ENDPOINT_EDUCATION = "/education";
16 16 public final static String ENDPOINT_EDUCATION_SUMMARY = "/education/summary";
  17 + public final static String ENDPOINT_EDUCATIONS = "/educations";
17 18 public final static String ENDPOINT_EMAIL = "/email";
18 19 public final static String ENDPOINT_EMPLOYMENT = "/employment";
  20 + public final static String ENDPOINT_EMPLOYMENTS = "/employments";
19 21 public final static String ENDPOINT_EMPLOYMENT_SUMMARY = "/employment/summary";
20 22 public final static String ENDPOINT_EXTERNAL_IDENTIFIERS = "/external-identifiers";
21 23 public final static String ENDPOINT_FUNDING = "/funding";
22 24 public final static String ENDPOINT_FUNDING_SUMMARY = "/funding/summary";
  25 + public final static String ENDPOINT_FUNDINGS = "/fundings";
23 26 public final static String ENDPOINT_KEYWORDS = "/keywords";
24 27 public final static String ENDPOINT_OTHER_NAMES = "/other-names";
25 28 public final static String ENDPOINT_PEERREVIEW = "/peer-review";
... ... @@ -29,6 +32,7 @@ public final class OrcidConstants {
29 32 public final static String ENDPOINT_RESEARCHER_URLS = "/researcher-urls";
30 33 public final static String ENDPOINT_WORK = "/work";
31 34 public final static String ENDPOINT_WORK_SUMMARY = "/work/summary";
  35 + public final static String ENDPOINT_WORKS = "/works";
32 36  
33 37 public final static String APPLICATION_VND_ORCID_XML = "application/vnd.orcid+xml";
34 38 public final static MediaType APPLICATION_VND_ORCID_XML_TYPE = new MediaType("application", "vnd.orcid+xml");
... ...
src/main/java/org/um/dsi/gavea/orcid/client/exception/OrcidClientException.java
... ... @@ -29,6 +29,13 @@ public class OrcidClientException extends Exception {
29 29 this.developerMessage = "";
30 30 }
31 31  
  32 + public OrcidClientException(int code, String message, int developerErrorCode, String developerMessage) {
  33 + this.code = code;
  34 + this.message = message;
  35 + this.developerErrorCode = BigInteger.valueOf(developerErrorCode);
  36 + this.developerMessage = developerMessage;
  37 + }
  38 +
32 39 public OrcidClientException(int code, String message, BigInteger developerErrorCode, String developerMessage) {
33 40 this.code = code;
34 41 this.message = message;
... ...
src/main/java/org/um/dsi/gavea/orcid/client/extend/ScopePathTypeExt.java
... ... @@ -8,7 +8,7 @@ import java.util.HashSet;
8 8 import java.util.Map;
9 9 import java.util.Set;
10 10  
11   -import org.um.dsi.gavea.orcid.model.common.ScopePathType;
  11 +import org.orcid.jaxb.model.message.ScopePathType;
12 12  
13 13 public class ScopePathTypeExt implements Serializable {
14 14 private static final long serialVersionUID = -7497383493796080293L;
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/ActivitiesSummary.java
... ... @@ -0,0 +1,3 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class ActivitiesSummary extends org.orcid.jaxb.model.record.summary_rc3.ActivitiesSummary {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/Educations.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class Educations
  4 + extends org.orcid.jaxb.model.record.summary_rc3.Educations {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/EducationsCtype.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class EducationsCtype
  4 + extends org.orcid.jaxb.model.record.summary_rc3.Educations {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/Employments.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class Employments
  4 + extends org.orcid.jaxb.model.record.summary_rc3.Employments {}
0 5 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/EmploymentsCtype.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class EmploymentsCtype
  4 + extends org.orcid.jaxb.model.record.summary_rc3.Employments {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/FundingGroup.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class FundingGroup
  4 + extends org.orcid.jaxb.model.record.summary_rc3.FundingGroup {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/Fundings.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class Fundings
  4 + extends org.orcid.jaxb.model.record.summary_rc3.Fundings {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/PeerReviewGroup.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class PeerReviewGroup
  4 + extends org.orcid.jaxb.model.record.summary_rc3.PeerReviewGroup {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/WorkGroup.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class WorkGroup
  4 + extends org.orcid.jaxb.model.record.summary_rc3.WorkGroup {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/activities/Works.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.activities;
  2 +
  3 +public class Works
  4 + extends org.orcid.jaxb.model.record.summary_rc3.Works {}
0 5 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/model/address/Address.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.address;
  2 +
  3 +public class Address
  4 + extends org.orcid.jaxb.model.record_rc3.Address {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/address/Addresses.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.address;
  2 +
  3 +public class Addresses
  4 + extends org.orcid.jaxb.model.record_rc3.Addresses {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/bulk/WorkBulk.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.bulk;
  2 +
  3 +public class WorkBulk
  4 + extends org.orcid.jaxb.model.record_rc3.WorkBulk {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/Address.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class Address
  4 + extends org.orcid.jaxb.model.common_rc3.Address {}
0 5 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/Amount.java
... ... @@ -0,0 +1,6 @@
  1 +
  2 +package org.um.dsi.gavea.orcid.model.common;
  3 +
  4 +
  5 +public class Amount
  6 + extends org.orcid.jaxb.model.common_rc3.Amount {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/ApprovalDate.java
... ... @@ -0,0 +1,5 @@
  1 +
  2 +package org.um.dsi.gavea.orcid.model.common;
  3 +
  4 +public class ApprovalDate
  5 + extends org.orcid.jaxb.model.message.ApprovalDate {};
0 6 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/ArchivedDate.java
... ... @@ -0,0 +1,6 @@
  1 +
  2 +package org.um.dsi.gavea.orcid.model.common;
  3 +
  4 +
  5 +public class ArchivedDate
  6 + extends org.orcid.jaxb.model.notification_rc3.Notification {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/ClientId.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class ClientId
  4 + extends org.orcid.jaxb.model.common_rc3.OrcidIdBase {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/ContributorAttributes.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class ContributorAttributes
  4 + extends org.orcid.jaxb.model.common_rc3.ContributorAttributes {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/ContributorEmail.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class ContributorEmail
  4 + extends org.orcid.jaxb.model.common_rc3.ContributorEmail {}
0 5 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/Country.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class Country
  4 + extends org.orcid.jaxb.model.common_rc3.Country {}
0 5 \ No newline at end of file
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/CreatedDate.java
... ... @@ -0,0 +1,4 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class CreatedDate
  4 + extends org.orcid.jaxb.model.common_rc3.CreatedDate {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/CreditName.java
... ... @@ -0,0 +1,3 @@
  1 +package org.um.dsi.gavea.orcid.model.common;
  2 +
  3 +public class CreditName extends org.orcid.jaxb.model.common_rc3.CreditName {}
... ...
src/main/java/org/um/dsi/gavea/orcid/model/common/DisambiguatedOrganization.java
... ... @@ -0,0 +1,4 @@