[CamelCase] changed the names of the elements in camel case Snapshot 8.0.0

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dhp-dump-schema</artifactId>
     <packaging>jar</packaging>
-    <version>7.1.3</version>
+    <version>8.0.0-SNAPSHOT</version>
 
     <groupId>eu.dnetlib.dhp</groupId>
 

src/main/java/eu/dnetlib/dhp/oa/model/Author.java

@@ -21,7 +21,7 @@ import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
  */
 public class Author implements Serializable {
 
-	private String fullname;
+	private String fullName;
 
 	private String name;
 
@@ -32,12 +32,12 @@ public class Author implements Serializable {
 	@JsonSchema(description = "The author's persistent identifiers")
 	private AuthorPid pid;
 
-	public String getFullname() {
-		return fullname;
+	public String getFullName() {
+		return fullName;
 	}
 
-	public void setFullname(String fullname) {
-		this.fullname = fullname;
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
 	}
 
 	public String getName() {

src/main/java/eu/dnetlib/dhp/oa/model/ImpactIndicators.java

@@ -9,9 +9,9 @@ import java.io.Serializable;
  */
 public class ImpactIndicators implements Serializable {
 	Score influence;
-	Score influence_alt;
+	Score influenceAlt;
 	Score popularity;
-	Score popularity_alt;
+	Score popularityAlt;
 	Score impulse;
 
 	public Score getInfluence() {
@@ -22,12 +22,12 @@ public class ImpactIndicators implements Serializable {
 		this.influence = influence;
 	}
 
-	public Score getInfluence_alt() {
-		return influence_alt;
+	public Score getInfluenceAlt() {
+		return influenceAlt;
 	}
 
-	public void setInfluence_alt(Score influence_alt) {
-		this.influence_alt = influence_alt;
+	public void setInfluenceAlt(Score influenceAlt) {
+		this.influenceAlt = influenceAlt;
 	}
 
 	public Score getPopularity() {
@@ -38,12 +38,12 @@ public class ImpactIndicators implements Serializable {
 		this.popularity = popularity;
 	}
 
-	public Score getPopularity_alt() {
-		return popularity_alt;
+	public Score getPopularityAlt() {
+		return popularityAlt;
 	}
 
-	public void setPopularity_alt(Score popularity_alt) {
-		this.popularity_alt = popularity_alt;
+	public void setPopularityAlt(Score popularityAlt) {
+		this.popularityAlt = popularityAlt;
 	}
 
 	public Score getImpulse() {

src/main/java/eu/dnetlib/dhp/oa/model/Instance.java

@@ -38,7 +38,7 @@ public class Instance implements Serializable {
 	private String license;
 
 	@JsonSchema(description = "The accessRights for this materialization of the result")
-	private AccessRight accessright;
+	private AccessRight accessRight;
 
 	@JsonSchema(
 		description = "The specific sub-type of this instance (see https://api.openaire.eu/vocabularies/dnet:result_typologies following the links)")
@@ -50,10 +50,10 @@ public class Instance implements Serializable {
 
 	@JsonSchema(
 		description = "The money spent to make this book or article available in Open Access. Source for this information is the OpenAPC initiative.")
-	private APC articleprocessingcharge;
+	private APC articleProcessingCharge;
 
 	@JsonSchema(description = "Date of the research product")
-	private String publicationdate;// dateofacceptance;
+	private String publicationDate;// dateofacceptance;
 
 	@JsonSchema(
 		description = "If this instance has been peer-reviewed or not. Allowed values are peerReviewed, " +
@@ -70,12 +70,12 @@ public class Instance implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public AccessRight getAccessright() {
-		return accessright;
+	public AccessRight getAccessRight() {
+		return accessRight;
 	}
 
-	public void setAccessright(AccessRight accessright) {
-		this.accessright = accessright;
+	public void setAccessRight(AccessRight accessRight) {
+		this.accessRight = accessRight;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -97,12 +97,12 @@ public class Instance implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public String getPublicationdate() {
-		return publicationdate;
+	public String getPublicationDate() {
+		return publicationDate;
 	}
 
-	public void setPublicationdate(String publicationdate) {
-		this.publicationdate = publicationdate;
+	public void setPublicationDate(String publicationDate) {
+		this.publicationDate = publicationDate;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -115,12 +115,12 @@ public class Instance implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public APC getArticleprocessingcharge() {
-		return articleprocessingcharge;
+	public APC getArticleProcessingCharge() {
+		return articleProcessingCharge;
 	}
 
-	public void setArticleprocessingcharge(APC articleprocessingcharge) {
-		this.articleprocessingcharge = articleprocessingcharge;
+	public void setArticleProcessingCharge(APC articleProcessingCharge) {
+		this.articleProcessingCharge = articleProcessingCharge;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/eu/dnetlib/dhp/oa/model/Result.java

@@ -137,23 +137,23 @@ public class Result implements Serializable {
 
 	@JsonSchema(
 		description = "A name or title by which a scientific result is known. May be the title of a publication, of a dataset or the name of a piece of software.")
-	private String maintitle;
+	private String mainTitle;
 
 	@JsonSchema(description = "Explanatory or alternative name by which a scientific result is known.")
-	private String subtitle;
+	private String subTitle;
 
 	private List<String> description;
 
 	@JsonSchema(
 		description = "Main date of the research product: typically the publication or issued date. In case of a research result with different versions with different dates, the date of the result is selected as the most frequent well-formatted date. If not available, then the most recent and complete date among those that are well-formatted. For statistics, the year is extracted and the result is counted only among the result of that year. Example: Pre-print date: 2019-02-03, Article date provided by repository: 2020-02, Article date provided by Crossref: 2020, OpenAIRE will set as date 2019-02-03, because it’s the most recent among the complete and well-formed dates. If then the repository updates the metadata and set a complete date (e.g. 2020-02-12), then this will be the new date for the result because it becomes the most recent most complete date. However, if OpenAIRE then collects the pre-print from another repository with date 2019-02-03, then this will be the “winning date” because it becomes the most frequent well-formatted date.")
-	private String publicationdate; // dateofacceptance;
+	private String publicationDate; // dateofacceptance;
 
 	@JsonSchema(
 		description = "The name of the entity that holds, archives, publishes prints, distributes, releases, issues, or produces the resource.")
 	private String publisher;
 
 	@JsonSchema(description = "Date when the embargo ends and this result turns Open Access")
-	private String embargoenddate;
+	private String embargoEndDate;
 
 	@JsonSchema(description = "See definition of Dublin Core field dc:source")
 	private List<String> source;
@@ -166,7 +166,7 @@ public class Result implements Serializable {
 	private List<String> coverage;
 
 	@JsonSchema(description = "The openest of the access rights of this result.")
-	private BestAccessRight bestaccessright;
+	private BestAccessRight bestAccessRight;
 
 	@JsonSchema(
 		description = "Container has information about the conference or journal where the result has been presented or published")
@@ -183,11 +183,11 @@ public class Result implements Serializable {
 
 	@JsonSchema(
 		description = "Only for results with type 'software': Information on the person responsible for providing further information regarding the resource")
-	private List<String> contactperson; // orp
+	private List<String> contactPerson; // orp
 
 	@JsonSchema(
 		description = "Only for results with type 'software': Information on the group responsible for providing further information regarding the resource")
-	private List<String> contactgroup; // orp
+	private List<String> contactGroup; // orp
 
 	@JsonSchema(
 		description = "Only for results with type 'other': tool useful for the interpretation and/or re-used of the research product")
@@ -212,10 +212,10 @@ public class Result implements Serializable {
 	private List<ResultPid> pid;
 
 	@JsonSchema(description = "When OpenAIRE collected the record the last time")
-	private String dateofcollection;
+	private String dateOfCollection;
 
 	@JsonSchema(description = "Timestamp of last update of the record in OpenAIRE")
-	private Long lastupdatetimestamp;
+	private Long lastUpdateTimeStamp;
 
 	@JsonSchema(description = "Indicators computed for this result, for example UsageCount ones")
 	private Indicator indicators;
@@ -230,12 +230,12 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public Long getLastupdatetimestamp() {
-		return lastupdatetimestamp;
+	public Long getLastUpdateTimeStamp() {
+		return lastUpdateTimeStamp;
 	}
 
-	public void setLastupdatetimestamp(Long lastupdatetimestamp) {
-		this.lastupdatetimestamp = lastupdatetimestamp;
+	public void setLastUpdateTimeStamp(Long lastUpdateTimeStamp) {
+		this.lastUpdateTimeStamp = lastUpdateTimeStamp;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -266,12 +266,12 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public String getDateofcollection() {
-		return dateofcollection;
+	public String getDateOfCollection() {
+		return dateOfCollection;
 	}
 
-	public void setDateofcollection(String dateofcollection) {
-		this.dateofcollection = dateofcollection;
+	public void setDateOfCollection(String dateOfCollection) {
+		this.dateOfCollection = dateOfCollection;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -329,21 +329,21 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public String getMaintitle() {
-		return maintitle;
+	public String getMainTitle() {
+		return mainTitle;
 	}
 
-	public void setMaintitle(String maintitle) {
-		this.maintitle = maintitle;
+	public void setMainTitle(String mainTitle) {
+		this.mainTitle = mainTitle;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public String getSubtitle() {
-		return subtitle;
+	public String getSubTitle() {
+		return subTitle;
 	}
 
-	public void setSubtitle(String subtitle) {
-		this.subtitle = subtitle;
+	public void setSubTitle(String subTitle) {
+		this.subTitle = subTitle;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -356,12 +356,12 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public String getPublicationdate() {
-		return publicationdate;
+	public String getPublicationDate() {
+		return publicationDate;
 	}
 
-	public void setPublicationdate(String publicationdate) {
-		this.publicationdate = publicationdate;
+	public void setPublicationDate(String publicationDate) {
+		this.publicationDate = publicationDate;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -374,12 +374,12 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public String getEmbargoenddate() {
-		return embargoenddate;
+	public String getEmbargoEndDate() {
+		return embargoEndDate;
 	}
 
-	public void setEmbargoenddate(String embargoenddate) {
-		this.embargoenddate = embargoenddate;
+	public void setEmbargoEndDate(String embargoEndDate) {
+		this.embargoEndDate = embargoEndDate;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -419,12 +419,12 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public BestAccessRight getBestaccessright() {
-		return bestaccessright;
+	public BestAccessRight getBestAccessRight() {
+		return bestAccessRight;
 	}
 
-	public void setBestaccessright(BestAccessRight bestaccessright) {
-		this.bestaccessright = bestaccessright;
+	public void setBestAccessRight(BestAccessRight bestAccessRight) {
+		this.bestAccessRight = bestAccessRight;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -455,21 +455,21 @@ public class Result implements Serializable {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public List<String> getContactperson() {
-		return contactperson;
+	public List<String> getContactPerson() {
+		return contactPerson;
 	}
 
-	public void setContactperson(List<String> contactperson) {
-		this.contactperson = contactperson;
+	public void setContactPerson(List<String> contactPerson) {
+		this.contactPerson = contactPerson;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public List<String> getContactgroup() {
-		return contactgroup;
+	public List<String> getContactGroup() {
+		return contactGroup;
 	}
 
-	public void setContactgroup(List<String> contactgroup) {
-		this.contactgroup = contactgroup;
+	public void setContactGroup(List<String> contactGroup) {
+		this.contactGroup = contactGroup;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/eu/dnetlib/dhp/oa/model/community/CommunityInstance.java

@@ -18,26 +18,26 @@ import eu.dnetlib.dhp.oa.model.Instance;
  */
 public class CommunityInstance extends Instance {
 	@JsonSchema(description = "Information about the source from which the instance can be viewed or downloaded.")
-	private CfHbKeyValue hostedby;
+	private CfHbKeyValue hostedBy;
 
 	@JsonSchema(description = "Information about the source from which the record has been collected")
-	private CfHbKeyValue collectedfrom;
+	private CfHbKeyValue collectedFrom;
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public CfHbKeyValue getHostedby() {
-		return hostedby;
+	public CfHbKeyValue getHostedBy() {
+		return hostedBy;
 	}
 
-	public void setHostedby(CfHbKeyValue hostedby) {
-		this.hostedby = hostedby;
+	public void setHostedBy(CfHbKeyValue hostedBy) {
+		this.hostedBy = hostedBy;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public CfHbKeyValue getCollectedfrom() {
-		return collectedfrom;
+	public CfHbKeyValue getCollectedFrom() {
+		return collectedFrom;
 	}
 
-	public void setCollectedfrom(CfHbKeyValue collectedfrom) {
-		this.collectedfrom = collectedfrom;
+	public void setCollectedFrom(CfHbKeyValue collectedFrom) {
+		this.collectedFrom = collectedFrom;
 	}
 }

src/main/java/eu/dnetlib/dhp/oa/model/community/CommunityResult.java

@@ -30,7 +30,7 @@ public class CommunityResult extends Result {
 	private List<Context> context;
 
 	@JsonSchema(description = "Information about the sources from which the record has been collected")
-	protected List<CfHbKeyValue> collectedfrom;
+	protected List<CfHbKeyValue> collectedFrom;
 
 	@JsonSchema(
 		description = "Each instance is one specific materialisation or version of the result. For example, you can have one result with three instance: one is the pre-print, one is the post-print, one is te published version")
@@ -46,12 +46,12 @@ public class CommunityResult extends Result {
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)
-	public List<CfHbKeyValue> getCollectedfrom() {
-		return collectedfrom;
+	public List<CfHbKeyValue> getCollectedFrom() {
+		return collectedFrom;
 	}
 
-	public void setCollectedfrom(List<CfHbKeyValue> collectedfrom) {
-		this.collectedfrom = collectedfrom;
+	public void setCollectedFrom(List<CfHbKeyValue> collectedFrom) {
+		this.collectedFrom = collectedFrom;
 	}
 
 	@JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/eu/dnetlib/dhp/oa/model/graph/Datasource.java

@@ -45,11 +45,11 @@ public class Datasource implements Serializable {
 
 	@JsonSchema(
 		description = "The type of the datasource. See https://api.openaire.eu/vocabularies/dnet:datasource_typologies")
-	private DatasourceSchemeValue datasourcetype; // value
+	private DatasourceSchemeValue datasourceType; // value
 
 	@JsonSchema(
 		description = "OpenAIRE guidelines the data source comply with. See also https://guidelines.openaire.eu.")
-	private String openairecompatibility; // value
+	private String openaireCompatibility; // value
 
 	@JsonSchema(description = "The official name of the datasource")
 	private String officialname; // string
@@ -163,20 +163,20 @@ public class Datasource implements Serializable {
 		this.pid = pid;
 	}
 
-	public DatasourceSchemeValue getDatasourcetype() {
-		return datasourcetype;
+	public DatasourceSchemeValue getDatasourceType() {
+		return datasourceType;
 	}
 
-	public void setDatasourcetype(DatasourceSchemeValue datasourcetype) {
-		this.datasourcetype = datasourcetype;
+	public void setDatasourceType(DatasourceSchemeValue datasourceType) {
+		this.datasourceType = datasourceType;
 	}
 
-	public String getOpenairecompatibility() {
-		return openairecompatibility;
+	public String getOpenaireCompatibility() {
+		return openaireCompatibility;
 	}
 
-	public void setOpenairecompatibility(String openairecompatibility) {
-		this.openairecompatibility = openairecompatibility;
+	public void setOpenaireCompatibility(String openaireCompatibility) {
+		this.openaireCompatibility = openaireCompatibility;
 	}
 
 	public String getOfficialname() {

src/main/java/eu/dnetlib/dhp/oa/model/graph/Funder.java

@@ -11,13 +11,13 @@ import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
 public class Funder extends eu.dnetlib.dhp.oa.model.Funder {
 
 	@JsonSchema(description = "Description of the funding stream")
-	private Fundings funding_stream;
+	private Fundings fundingStream;
 
-	public Fundings getFunding_stream() {
-		return funding_stream;
+	public Fundings getFundingStream() {
+		return fundingStream;
 	}
 
-	public void setFunding_stream(Fundings funding_stream) {
-		this.funding_stream = funding_stream;
+	public void setFundingStream(Fundings fundingStream) {
+		this.fundingStream = fundingStream;
 	}
 }

src/main/java/eu/dnetlib/dhp/oa/model/graph/Granted.java

@@ -15,10 +15,10 @@ public class Granted implements Serializable {
 	private String currency;
 
 	@JsonSchema(description = "The total cost of the project")
-	private float totalcost;
+	private float totalCost;
 
 	@JsonSchema(description = "The funded amount")
-	private float fundedamount;
+	private float fundedAmount;
 
 	public String getCurrency() {
 		return currency;
@@ -28,34 +28,34 @@ public class Granted implements Serializable {
 		this.currency = currency;
 	}
 
-	public float getTotalcost() {
-		return totalcost;
+	public float getTotalCost() {
+		return totalCost;
 	}
 
-	public void setTotalcost(float totalcost) {
-		this.totalcost = totalcost;
+	public void setTotalCost(float totalCost) {
+		this.totalCost = totalCost;
 	}
 
-	public float getFundedamount() {
-		return fundedamount;
+	public float getFundedAmount() {
+		return fundedAmount;
 	}
 
-	public void setFundedamount(float fundedamount) {
-		this.fundedamount = fundedamount;
+	public void setFundedAmount(float fundedAmount) {
+		this.fundedAmount = fundedAmount;
 	}
 
 	public static Granted newInstance(String currency, float totalcost, float fundedamount) {
 		Granted granted = new Granted();
 		granted.currency = currency;
-		granted.totalcost = totalcost;
-		granted.fundedamount = fundedamount;
+		granted.totalCost = totalcost;
+		granted.fundedAmount = fundedamount;
 		return granted;
 	}
 
 	public static Granted newInstance(String currency, float fundedamount) {
 		Granted granted = new Granted();
 		granted.currency = currency;
-		granted.fundedamount = fundedamount;
+		granted.fundedAmount = fundedamount;
 		return granted;
 	}
 }

src/main/java/eu/dnetlib/dhp/oa/model/graph/Organization.java

@@ -19,12 +19,12 @@ import eu.dnetlib.dhp.oa.model.Country;
  * - private List<OrganizationPid> pid to store the list of pids for the organization
  */
 public class Organization implements Serializable {
-	private String legalshortname;
-	private String legalname;
-	private String websiteurl;
+	private String legalShortName;
+	private String legalName;
+	private String websiteUrl;
 
 	@JsonSchema(description = "Alternative names that identify the organisation")
-	private List<String> alternativenames;
+	private List<String> alternativeNames;
 
 	@JsonSchema(description = "The organisation country")
 	private Country country;
@@ -35,36 +35,36 @@ public class Organization implements Serializable {
 	@JsonSchema(description = "Persistent identifiers for the organisation i.e. isni 0000000090326370")
 	private List<OrganizationPid> pid;
 
-	public String getLegalshortname() {
-		return legalshortname;
+	public String getLegalShortName() {
+		return legalShortName;
 	}
 
-	public void setLegalshortname(String legalshortname) {
-		this.legalshortname = legalshortname;
+	public void setLegalShortName(String legalShortName) {
+		this.legalShortName = legalShortName;
 	}
 
-	public String getLegalname() {
-		return legalname;
+	public String getLegalName() {
+		return legalName;
 	}
 
-	public void setLegalname(String legalname) {
-		this.legalname = legalname;
+	public void setLegalName(String legalName) {
+		this.legalName = legalName;
 	}
 
-	public String getWebsiteurl() {
-		return websiteurl;
+	public String getWebsiteUrl() {
+		return websiteUrl;
 	}
 
-	public void setWebsiteurl(String websiteurl) {
-		this.websiteurl = websiteurl;
+	public void setWebsiteUrl(String websiteUrl) {
+		this.websiteUrl = websiteUrl;
 	}
 
-	public List<String> getAlternativenames() {
-		return alternativenames;
+	public List<String> getAlternativeNames() {
+		return alternativeNames;
 	}
 
-	public void setAlternativenames(List<String> alternativenames) {
-		this.alternativenames = alternativenames;
+	public void setAlternativeNames(List<String> alternativeNames) {
+		this.alternativeNames = alternativeNames;
 	}
 
 	public Country getCountry() {

src/main/java/eu/dnetlib/dhp/oa/model/graph/Project.java

@@ -39,22 +39,22 @@ import com.github.imifou.jsonschema.module.addon.annotation.JsonSchema;
 public class Project implements Serializable {
 	private String id;
 
-	private String websiteurl;
+	private String websiteUrl;
 	private String code;
 	private String acronym;
 	private String title;
 
-	private String startdate;
+	private String startDate;
 
-	private String enddate;
+	private String endDate;
 
-	private String callidentifier;
+	private String callIdentifier;
 
 	private String keywords;
 
-	private boolean openaccessmandateforpublications;
+	private boolean openAccessMandateForPublications;
 
-	private boolean openaccessmandatefordataset;
+	private boolean openAccessMandateForDataset;
 	private List<String> subject;
 
 	@JsonSchema(description = "Funding information for the project")
@@ -66,18 +66,8 @@ public class Project implements Serializable {
 	private Granted granted;
 
 	@JsonSchema(description = "The h2020 programme funding the project")
-	private List<Programme> h2020programme;
+	private List<Programme> h2020Programme;
 
-//	@JsonSchema(description = "Indicators computed for this project, for example UsageCount ones")
-//	private Indicator indicators;
-//
-//	public Indicator getIndicators() {
-//		return indicators;
-//	}
-//
-//	public void setIndicators(Indicator indicators) {
-//		this.indicators = indicators;
-//	}
 
 	public String getId() {
 		return id;
@@ -87,12 +77,12 @@ public class Project implements Serializable {
 		this.id = id;
 	}
 
-	public String getWebsiteurl() {
-		return websiteurl;
+	public String getWebsiteUrl() {
+		return websiteUrl;
 	}
 
-	public void setWebsiteurl(String websiteurl) {
-		this.websiteurl = websiteurl;
+	public void setWebsiteUrl(String websiteUrl) {
+		this.websiteUrl = websiteUrl;
 	}
 
 	public String getCode() {
@@ -119,28 +109,28 @@ public class Project implements Serializable {
 		this.title = title;
 	}
 
-	public String getStartdate() {
-		return startdate;
+	public String getStartDate() {
+		return startDate;
 	}
 
-	public void setStartdate(String startdate) {
-		this.startdate = startdate;
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
 	}
 
-	public String getEnddate() {
-		return enddate;
+	public String getEndDate() {
+		return endDate;
 	}
 
-	public void setEnddate(String enddate) {
-		this.enddate = enddate;
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
 	}
 
-	public String getCallidentifier() {
-		return callidentifier;
+	public String getCallIdentifier() {
+		return callIdentifier;
 	}
 
-	public void setCallidentifier(String callidentifier) {
-		this.callidentifier = callidentifier;
+	public void setCallIdentifier(String callIdentifier) {
+		this.callIdentifier = callIdentifier;
 	}
 
 	public String getKeywords() {
@@ -151,20 +141,20 @@ public class Project implements Serializable {
 		this.keywords = keywords;
 	}
 
-	public boolean isOpenaccessmandateforpublications() {
-		return openaccessmandateforpublications;
+	public boolean isOpenAccessMandateForPublications() {
+		return openAccessMandateForPublications;
 	}
 
-	public void setOpenaccessmandateforpublications(boolean openaccessmandateforpublications) {
-		this.openaccessmandateforpublications = openaccessmandateforpublications;
+	public void setOpenAccessMandateForPublications(boolean openAccessMandateForPublications) {
+		this.openAccessMandateForPublications = openAccessMandateForPublications;
 	}
 
-	public boolean isOpenaccessmandatefordataset() {
-		return openaccessmandatefordataset;
+	public boolean isOpenAccessMandateForDataset() {
+		return openAccessMandateForDataset;
 	}
 
-	public void setOpenaccessmandatefordataset(boolean openaccessmandatefordataset) {
-		this.openaccessmandatefordataset = openaccessmandatefordataset;
+	public void setOpenAccessMandateForDataset(boolean openAccessMandateForDataset) {
+		this.openAccessMandateForDataset = openAccessMandateForDataset;
 	}
 
 	public List<String> getSubject() {
@@ -199,11 +189,11 @@ public class Project implements Serializable {
 		this.granted = granted;
 	}
 
-	public List<Programme> getH2020programme() {
-		return h2020programme;
+	public List<Programme> getH2020Programme() {
+		return h2020Programme;
 	}
 
-	public void setH2020programme(List<Programme> h2020programme) {
-		this.h2020programme = h2020programme;
+	public void setH2020Programme(List<Programme> h2020Programme) {
+		this.h2020Programme = h2020Programme;
 	}
 }

src/main/java/eu/dnetlib/dhp/oa/model/graph/Relation.java

@@ -28,7 +28,7 @@ public class Relation implements Serializable {
 	private String targetType;
 
 	@JsonSchema(description = "To represent the semantics of a relation between two entities")
-	private RelType reltype;
+	private RelType relType;
 
 	@JsonSchema(description = "The reason why OpenAIRE holds the relation ")
 	private Provenance provenance;
@@ -72,12 +72,12 @@ public class Relation implements Serializable {
 		this.targetType = targetType;
 	}
 
-	public RelType getReltype() {
-		return reltype;
+	public RelType getRelType() {
+		return relType;
 	}
 
-	public void setReltype(RelType reltype) {
-		this.reltype = reltype;
+	public void setRelType(RelType relType) {
+		this.relType = relType;
 	}
 
 	public Provenance getProvenance() {
@@ -107,7 +107,7 @@ public class Relation implements Serializable {
 	@Override
 	public int hashCode() {
 
-		return Objects.hash(source, target, reltype.getType() + ":" + reltype.getName());
+		return Objects.hash(source, target, relType.getType() + ":" + relType.getName());
 	}
 
 	public static Relation newInstance(String source, String sourceType, String target, String targetType,
@@ -117,7 +117,7 @@ public class Relation implements Serializable {
 		relation.sourceType = sourceType;
 		relation.target = target;
 		relation.targetType = targetType;
-		relation.reltype = reltype;
+		relation.relType = reltype;
 		relation.provenance = provenance;
 		return relation;
 	}

src/main/java/eu/dnetlib/dhp/oa/model/graph/ResearchInitiative.java

@@ -37,14 +37,14 @@ public class ResearchInitiative implements Serializable {
 
 	@JsonSchema(
 		description = "The URL of the Zenodo community associated to the Research community/Research infrastructure")
-	private String zenodo_community;
+	private String zenodoCommunity;
 
-	public String getZenodo_community() {
-		return zenodo_community;
+	public String getZenodoCommunity() {
+		return zenodoCommunity;
 	}
 
-	public void setZenodo_community(String zenodo_community) {
-		this.zenodo_community = zenodo_community;
+	public void setZenodoCommunity(String zenodoCommunity) {
+		this.zenodoCommunity = zenodoCommunity;
 	}
 
 	public String getType() {