yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-02 19:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Dataset compliance DAO (#674)

Browse Source
This commit is contained in:
Yi (Alan) Wang 2017-08-16 08:59:22 -07:00 committed by GitHub
parent 6c8a8ce567
commit ab31c4706e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wherehows-dao/src/main/java/wherehows/dao/DatasetsDao.java
View File

@ -139,7 +139,7 @@ public class DatasetsDao {
return record;
}
public void updateDatasetComplianceInfo(JdbcTemplate jdbcTemplate,
public DatasetCompliance updateDatasetComplianceInfo(JdbcTemplate jdbcTemplate,
NamedParameterJdbcTemplate namedParameterJdbcTemplate, int datasetId, JsonNode node, String user)
throws Exception {
@ -148,8 +148,10 @@ public class DatasetsDao {
if (record.getDatasetId() != null && datasetId != record.getDatasetId()) {
throw new IllegalArgumentException("Dataset id doesn't match.");
}
record.setDatasetId(datasetId);
String urn = record.getDatasetUrn() != null ? record.getDatasetUrn() : getDatasetUrnById(jdbcTemplate, datasetId);
record.setDatasetUrn(urn);
Map<String, Object> parameters = new HashMap<>();
parameters.put("id", datasetId);
@ -165,5 +167,7 @@ public class DatasetsDao {
parameters.put("modified_by", user);
parameters.put("modified_time", System.currentTimeMillis() / 1000);
namedParameterJdbcTemplate.update(INSERT_DATASET_COMPLIANCE, parameters);
return record;
}
}

6
wherehows-dao/src/main/java/wherehows/models/DatasetCompliance.java
View File

@ -24,7 +24,7 @@ public class DatasetCompliance {
private String complianceType;
private List<DatasetFieldEntity> complianceEntities;
private String confidentiality;
private Map<String, Object> datasetClassification;
private Map<String, Boolean> datasetClassification;
private Map<String, String> fieldClassification;
private String recordOwnerType;
private Map<String, Object> retentionPolicy;
@ -75,11 +75,11 @@ public class DatasetCompliance {
this.confidentiality = confidentiality;
}
public Map<String, Object> getDatasetClassification() {
public Map<String, Boolean> getDatasetClassification() {
return datasetClassification;
}
public void setDatasetClassification(Map<String, Object> datasetClassification) {
public void setDatasetClassification(Map<String, Boolean> datasetClassification) {
this.datasetClassification = datasetClassification;
}