#6 reflected changes replacing sourceFileId with resource_uuid

Author: tigreped

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/ImportLogDAO.java

@@ -29,8 +29,8 @@ public interface ImportLogDAO {
 	public ImportLogModel loadLast();
 
 	/**
-	 * Load the last inserted ImportLogModel for a specific sourceFileId
+	 * Load the last inserted ImportLogModel for a specific resource_uuid
 	 * @return ImportLogModel or null if nothing is found
 	 */
-	public ImportLogModel loadLastFrom(String sourceFileId);
+	public ImportLogModel loadLastFrom(String resource_uuid);
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/OccurrenceDAO.java

@@ -40,12 +40,12 @@ public interface OccurrenceDAO {
 
 	/**
 	 * Load a specific Occurrence into an OccurrenceModel
-	 * @param sourceFileId
+	 * @param resource_uuid
 	 * @param dwcaId
 	 * @param deepLoad Do we need to load the raw model?
 	 * @return
 	 */
-	public OccurrenceModel load(String sourceFileId, String dwcaId, boolean deepLoad);
+	public OccurrenceModel load(String resource_uuid, String dwcaId, boolean deepLoad);
 
 	/**
 	 * Load a specific Occurrence into an OccurrenceModel but only filled columns specified by columnList.

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/ResourceDAO.java

@@ -13,11 +13,11 @@ public interface ResourceDAO {
 	public List<ResourceModel> loadResources();
 
 	/**
-	 * Load a ResourceModel from a sourcefileid
-	 * @param sourcefileid
+	 * Load a ResourceModel from a resource_uuid
+	 * @param resource_uuid
 	 * @return ResourceModel or null if nothing is found
 	 */
-	public ResourceModel load(String sourcefileid);
+	public ResourceModel load(String resource_uuid);
 
 	/**
 	 * Save a ResourceModel

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/ResourceInformationDAO.java

@@ -25,9 +25,9 @@ public interface ResourceInformationDAO {
 	public ResourceInformationModel load(Integer auto_id);
 
 	/**
-	 * Load a list of ResourceInformationModel for a sourcefileid.
-	 * More than one Information could be linked to the same sourcefileid.
-	 * @param sourcefileid
+	 * Load a list of ResourceInformationModel for a resource_uuid.
+	 * More than one Information could be linked to the same resource_uuid.
+	 * @param resource_uuid
 	 * @return ResourceInformationModel list or an empty list if nothing is found
 	 */
 	public List<ResourceInformationModel> load(String resource_uuid);

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateImportLogDAO.java

@@ -57,9 +57,9 @@ public ImportLogModel loadLast(){
 	}
 
 	@Override
-	public ImportLogModel loadLastFrom(String sourceFileId){
+	public ImportLogModel loadLastFrom(String resource_uuid){
 		Criteria c = sessionFactory.getCurrentSession().createCriteria(ImportLogModel.class);
-		c.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourceFileId));
+		c.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resource_uuid));
 		c.addOrder(Order.desc(MANAGED_ID));
 		c.setMaxResults(1);
 		return (ImportLogModel)c.uniqueResult();

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateOccurrenceDAO.java

@@ -91,9 +91,9 @@ public OccurrenceModel load(int auto_id, boolean deepLoad) {
 	}
 
 	@Override
-	public OccurrenceModel load(String sourceFileId, String dwcaId, boolean deepLoad){
+	public OccurrenceModel load(String resource_uuid, String dwcaId, boolean deepLoad){
 		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(OccurrenceModel.class);
-		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourceFileId));
+		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resource_uuid));
 		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.DWCA_ID, dwcaId));
 
 		if(deepLoad){

Diff for: src/main/java/net/canadensys/dataportal/occurrence/dao/impl/HibernateResourceDAO.java

@@ -42,9 +42,9 @@ public boolean save(ResourceModel resourceModel) {
 	}
 
 	@Override
-	public ResourceModel load(String sourcefileid) {
+	public ResourceModel load(String resource_uuid) {
 		Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(ResourceModel.class);
-		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.SOURCE_FILE_ID, sourcefileid));
+		searchCriteria.add(Restrictions.eq(OccurrenceFieldConstants.RESOURCE_UUID, resource_uuid));
 		return (ResourceModel)searchCriteria.uniqueResult();
 	}
 

Diff for: src/main/java/net/canadensys/dataportal/occurrence/model/ImportLogModel.java

@@ -29,7 +29,7 @@ public class ImportLogModel implements Serializable{
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "import_log_id_seq")
 	private Integer id;
-	private String sourcefileid;
+	private String resource_uuid;
 	private Integer record_quantity;
 	private String updated_by;
 	private Integer import_process_duration_ms;
@@ -41,12 +41,7 @@ public Integer getId() {
 	public void setId(Integer id) {
 		this.id = id;
 	}
-	public String getSourcefileid() {
-		return sourcefileid;
-	}
-	public void setSourcefileid(String sourcefileid) {
-		this.sourcefileid = sourcefileid;
-	}
+	
 	public Integer getRecord_quantity() {
 		return record_quantity;
 	}
@@ -75,9 +70,18 @@ public void setEvent_end_date_time(Date event_end_date_time) {
 	public String toString() {
 		return new ToStringBuilder(this).
 	       append("id", id).
-	       append("sourceFileId", sourcefileid).
+	       append("resource_uuid", resource_uuid).
 	       append("recordQuantity", record_quantity).
 	       append("updated_by", updated_by).
 	       toString();
 	 }
+	public String getResource_uuid() {
+		return resource_uuid;
+	}
+	public void setResource_uuid(String resource_uuid) {
+		this.resource_uuid = resource_uuid;
+	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
 }

Diff for: src/main/java/net/canadensys/dataportal/occurrence/model/OccurrenceExtensionModel.java

@@ -24,8 +24,6 @@ public class OccurrenceExtensionModel {
 	@NaturalId
 	private String dwcaid;
 	@NaturalId
-	private String sourcefileid;
-	@NaturalId
 	private String resource_uuid;
 
 	private String ext_type;
@@ -48,13 +46,6 @@ public void setDwcaid(String dwcaid) {
 		this.dwcaid = dwcaid;
 	}
 
-	public String getSourcefileid() {
-		return sourcefileid;
-	}
-	public void setSourcefileid(String sourcefileid) {
-		this.sourcefileid = sourcefileid;
-	}
-	
 	public String getResource_uuid() {
 		return resource_uuid;
 	}