new fields in mdstore beans

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java

@@ -2,12 +2,15 @@
 package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
 @Entity
 @Table(name = "mdstores")
@@ -38,6 +41,13 @@ public class MDStore implements Serializable {
 	@Column(name = "api_id")
 	private String apiId;
 
+	@Column(name = "hdfs_path")
+	private String hdfsPath;
+
+	@Column(name = "creation_date")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date creationDate;
+
 	public String getId() {
 		return id;
 	}
@@ -94,9 +104,28 @@ public class MDStore implements Serializable {
 		this.apiId = apiId;
 	}
 
+	public String getHdfsPath() {
+		return hdfsPath;
+	}
+
+	public void setHdfsPath(final String hdfsPath) {
+		this.hdfsPath = hdfsPath;
+	}
+
+	public Date getCreationDate() {
+		return creationDate;
+	}
+
+	public void setCreationDate(final Date creationDate) {
+		this.creationDate = creationDate;
+	}
+
 	public static MDStore newInstance(
-		final String format, final String layout, final String interpretation) {
+		final String format,
-		return newInstance(format, layout, interpretation, null, null, null);
+		final String layout,
+		final String interpretation,
+		final String hdfsBasePath) {
+		return newInstance(format, layout, interpretation, null, null, null, hdfsBasePath);
 	}
 
 	public static MDStore newInstance(
@@ -105,15 +134,23 @@ public class MDStore implements Serializable {
 		final String interpretation,
 		final String dsName,
 		final String dsId,
-		final String apiId) {
+		final String apiId,
+		final String hdfsBasePath) {
+
+		final String mdId = "md-" + UUID.randomUUID();
+
 		final MDStore md = new MDStore();
-		md.setId("md-" + UUID.randomUUID());
+		md.setId(mdId);
 		md.setFormat(format);
 		md.setLayout(layout);
 		md.setInterpretation(interpretation);
+		md.setCreationDate(new Date());
 		md.setDatasourceName(dsName);
 		md.setDatasourceId(dsId);
 		md.setApiId(apiId);
+		md.setHdfsPath(String.format("%s/%s", hdfsBasePath, mdId));
+
 		return md;
 	}
+
 }

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java

@@ -38,15 +38,22 @@ public class MDStoreVersion implements Serializable {
 	@Column(name = "size")
 	private long size = 0;
 
-	public static MDStoreVersion newInstance(final String mdId, final boolean writing) {
+	@Column(name = "hdfs_path")
-		final MDStoreVersion t = new MDStoreVersion();
+	private String hdfsPath;
-		t.setId(mdId + "-" + new Date().getTime());
+
-		t.setMdstore(mdId);
+	public static MDStoreVersion newInstance(final String mdId, final boolean writing, final String hdfsBasePath) {
-		t.setLastUpdate(null);
+		final MDStoreVersion v = new MDStoreVersion();
-		t.setWriting(writing);
+
-		t.setReadCount(0);
+		final String versionId = mdId + "-" + new Date().getTime();
-		t.setSize(0);
+		v.setId(versionId);
-		return t;
+		v.setMdstore(mdId);
+		v.setLastUpdate(null);
+		v.setWriting(writing);
+		v.setReadCount(0);
+		v.setSize(0);
+		v.setHdfsPath(String.format("%s/%s/%s", hdfsBasePath, mdId, versionId));
+
+		return v;
 	}
 
 	public String getId() {
@@ -96,4 +103,12 @@ public class MDStoreVersion implements Serializable {
 	public void setSize(final long size) {
 		this.size = size;
 	}
+
+	public String getHdfsPath() {
+		return hdfsPath;
+	}
+
+	public void setHdfsPath(final String hdfsPath) {
+		this.hdfsPath = hdfsPath;
+	}
 }

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java

@@ -43,6 +43,10 @@ public class MDStoreWithInfo implements Serializable {
 	@Column(name = "current_version")
 	private String currentVersion;
 
+	@Column(name = "creation_date")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date creationDate;
+
 	@Column(name = "lastupdate")
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date lastUpdate;
@@ -53,6 +57,9 @@ public class MDStoreWithInfo implements Serializable {
 	@Column(name = "n_versions")
 	private long numberOfVersions = 0;
 
+	@Column(name = "hdfs_path")
+	private String hdfsPath;
+
 	public String getId() {
 		return id;
 	}
@@ -117,6 +124,14 @@ public class MDStoreWithInfo implements Serializable {
 		this.currentVersion = currentVersion;
 	}
 
+	public Date getCreationDate() {
+		return creationDate;
+	}
+
+	public void setCreationDate(final Date creationDate) {
+		this.creationDate = creationDate;
+	}
+
 	public Date getLastUpdate() {
 		return lastUpdate;
 	}
@@ -140,4 +155,12 @@ public class MDStoreWithInfo implements Serializable {
 	public void setNumberOfVersions(final long numberOfVersions) {
 		this.numberOfVersions = numberOfVersions;
 	}
+
+	public String getHdfsPath() {
+		return hdfsPath;
+	}
+
+	public void setHdfsPath(final String hdfsPath) {
+		this.hdfsPath = hdfsPath;
+	}
 }