From 37b662ac205699946da960806cbb98e6fcb74489 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Mon, 7 Feb 2022 10:35:41 +0100
Subject: [PATCH] move vs dnet_services

---
 .../dsm/domain/db/DatasourceApiDbEntry.java         | 13 ++++++++-----
 .../openaire/dsm/domain/db/DatasourceDbEntry.java   |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceApiDbEntry.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceApiDbEntry.java
index 5b719b1f..59acddeb 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceApiDbEntry.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceApiDbEntry.java
@@ -1,14 +1,17 @@
 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.JsonIgnore;
+
 import io.swagger.annotations.ApiModel;
 
 @Entity
 @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)")
 public class DatasourceApiDbEntry {
 
@@ -169,7 +172,7 @@ public class DatasourceApiDbEntry {
 		return id;
 	}
 
-	public void setId(String id) {
+	public void setId(final String id) {
 		this.id = id;
 	}
 
@@ -177,7 +180,7 @@ public class DatasourceApiDbEntry {
 		return collectedfrom;
 	}
 
-	public void setCollectedfrom(String collectedfrom) {
+	public void setCollectedfrom(final String collectedfrom) {
 		this.collectedfrom = collectedfrom;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceDbEntry.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceDbEntry.java
index 490c7af4..32d72a77 100755
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceDbEntry.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/db/DatasourceDbEntry.java
@@ -4,17 +4,18 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
-import eu.dnetlib.enabling.datasources.common.Datasource;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.SelectBeforeUpdate;
 
+import eu.dnetlib.enabling.datasources.common.Datasource;
+
 /**
  * Datasource
  */
 @Entity
 @DynamicUpdate
 @SelectBeforeUpdate
-@Table(name = "dsm_datasources")
+@Table(name = "dsm_services")
 public class DatasourceDbEntry extends Datasource<OrganizationDbEntry, IdentityDbEntry> {
 
 	@Transient