-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CE-225: Award => grant, org name/ID to Organization object #684
Conversation
…an organization name and ID
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #684 +/- ##
=============================================
- Coverage 86.70% 86.69% -0.01%
+ Complexity 5397 5395 -2
=============================================
Files 242 242
Lines 18286 18276 -10
Branches 2674 2674
=============================================
- Hits 15855 15845 -10
Misses 1962 1962
Partials 469 469 |
|
||
/** | ||
* A funding reference for a resource, including the funding body and the grant | ||
* awarded. | ||
* A funding reference for a resource, including the funding body and the grant. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just so I understand this change - it seems like it's tightening the requirements for who can be a funder. With the old funderID and funderName, an individual could be a funder, but now only orgs are allowed. Similarly, award
seems more general than grant
, and so it seems some funding sources can no longer be represented
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Correct. This brings the CE schema terminology in closer alignment with schema.org, which will be more helpful when generating search engine indexable content for static narratives. Although sources like DataCite and Crossref use 'award' and 'grant' interchangeably, 'award' is commonly used to refer to prizes, which is not what we want to represent here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a little worried that this makes things a bit too specific - the workspace has always been written with the philosophy that it's not a a KBase specific service and could work for all kinds of data. I guess it's easier to open things up later vs. tighten them down though, so for now...
src/us/kbase/workspace/database/provenance/FundingReference.java
Outdated
Show resolved
Hide resolved
src/us/kbase/workspace/test/database/provenance/FundingReferenceTest.java
Outdated
Show resolved
Hide resolved
src/us/kbase/workspace/test/database/provenance/FundingReferenceTest.java
Outdated
Show resolved
Hide resolved
} | ||
public void buildFailNullFunder() throws Exception { | ||
buildFundingRefFailWithError( | ||
FundingReference.getBuilder((Organization) null), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's no need for this cast as there isn't another getBuilder
method with a different type, but it's only minor cruft and so NBD. Same with the one in the test below.
Some schema changes brought about after aligning the schema with schema.org:
I'll need to update the spec and the generated classes but have a few other schema alterations to make, so will do them first.