Merge "Issue #765 fix so data can be retrieved with or without hdfFileId" into development
Former-commit-id:918185f564
[formerlyaa6c81a2c7
] [formerly918185f564
[formerlyaa6c81a2c7
] [formerlycee183e89c
[formerly 29f61577c289229802f89b96b53735782986366b]]] Former-commit-id:cee183e89c
Former-commit-id:ba9aa5df02
[formerly80faa5abf8
] Former-commit-id:19798acee1
This commit is contained in:
commit
3749ef4534
2 changed files with 19 additions and 2 deletions
|
@ -52,6 +52,8 @@ public abstract class ServerSpecificPersistablePluginDataObject extends
|
|||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Integer hdfFileId;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
|
@ -66,4 +68,21 @@ public abstract class ServerSpecificPersistablePluginDataObject extends
|
|||
super();
|
||||
}
|
||||
|
||||
// TODO Setting hdf file id on ingest has been disabled in preparation
|
||||
// of removing it altogether since it is OBE. After deployed sites have
|
||||
// had this version for long enough that all data with hdfFileId has null
|
||||
// hdfFileIds, then the getters/setters should be removed everywhere
|
||||
// and this class can be deleted from the inheritance hierarchy. An
|
||||
// update script will be needed at that time to drop the hdfFileId column.
|
||||
|
||||
@Override
|
||||
public Integer getHdfFileId() {
|
||||
return hdfFileId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setHdfFileId(Integer hdfFileId) {
|
||||
this.hdfFileId = hdfFileId;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -56,7 +56,6 @@ import com.raytheon.uf.common.serialization.SerializationException;
|
|||
import com.raytheon.uf.common.serialization.SerializationUtil;
|
||||
import com.raytheon.uf.common.time.util.TimeUtil;
|
||||
import com.raytheon.uf.common.util.FileUtil;
|
||||
import com.raytheon.uf.edex.core.EDEXUtil;
|
||||
import com.raytheon.uf.edex.core.EdexException;
|
||||
import com.raytheon.uf.edex.core.props.PropertiesFactory;
|
||||
import com.raytheon.uf.edex.database.DataAccessLayerException;
|
||||
|
@ -201,7 +200,6 @@ public abstract class PluginDao extends CoreDao {
|
|||
for (PluginDataObject pdo : records) {
|
||||
if (pdo instanceof IPersistable) {
|
||||
IPersistable persistable = (IPersistable) pdo;
|
||||
persistable.setHdfFileId(EDEXUtil.getServerId());
|
||||
|
||||
// get the directory
|
||||
String directory = HDF5_DIR
|
||||
|
|
Loading…
Add table
Reference in a new issue