D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move vs dnet_services

This commit is contained in:
Michele Artini 2022-02-07 10:35:41 +01:00
parent 33bd9c396f
commit 37b662ac20
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceApiDbEntry.java
View File

@ -1,14 +1,17 @@
package eu.dnetlib.openaire.dsm.domain.db; package eu.dnetlib.openaire.dsm.domain.db;
import javax.persistence.*; import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@Entity @Entity
@JsonAutoDetect @JsonAutoDetect
@Table(name = "dsm_datasource_api") @Table(name = "dsm_service_api")
@ApiModel(value = "DatasourceApi model", description = "describes a joint view between datasources and their API (1:N)") @ApiModel(value = "DatasourceApi model", description = "describes a joint view between datasources and their API (1:N)")
public class DatasourceApiDbEntry { public class DatasourceApiDbEntry {
@ -169,7 +172,7 @@ public class DatasourceApiDbEntry {
return id; return id;
} }
public void setId(String id) { public void setId(final String id) {
this.id = id; this.id = id;
} }
@ -177,7 +180,7 @@ public class DatasourceApiDbEntry {
return collectedfrom; return collectedfrom;
} }
public void setCollectedfrom(String collectedfrom) { public void setCollectedfrom(final String collectedfrom) {
this.collectedfrom = collectedfrom; this.collectedfrom = collectedfrom;
} }
} }

5
apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceDbEntry.java
View File

@ -4,17 +4,18 @@ import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import eu.dnetlib.enabling.datasources.common.Datasource;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.SelectBeforeUpdate; import org.hibernate.annotations.SelectBeforeUpdate;
import eu.dnetlib.enabling.datasources.common.Datasource;
/** /**
* Datasource * Datasource
*/ */
@Entity @Entity
@DynamicUpdate @DynamicUpdate
@SelectBeforeUpdate @SelectBeforeUpdate
@Table(name = "dsm_datasources") @Table(name = "dsm_services")
public class DatasourceDbEntry extends Datasource<OrganizationDbEntry, IdentityDbEntry> { public class DatasourceDbEntry extends Datasource<OrganizationDbEntry, IdentityDbEntry> {
@Transient @Transient