introduce db-id, optimize maintenance tool

Author: TomBlock

core/src/main/java/com/bc/fiduceo/core/SatelliteObservation.java

@@ -30,6 +30,7 @@
 
 public class SatelliteObservation {
 
+    private int id;
     private Date startTime;
     private Date stopTime;
     private Geometry geoBounds;
@@ -41,6 +42,7 @@ public class SatelliteObservation {
 
     public SatelliteObservation() {
         nodeType = NodeType.UNDEFINED;
+        id = -1;
     }
 
     public Geometry getGeoBounds() {
@@ -106,4 +108,12 @@ public void setVersion(String version) {
     public String getVersion() {
         return version;
     }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
 }

core/src/main/java/com/bc/fiduceo/db/H2Driver.java

@@ -112,13 +112,13 @@ public void insert(SatelliteObservation observation) throws SQLException {
     @Override
     public AbstractBatch updatePathBatch(SatelliteObservation satelliteObservation, String newPath, AbstractBatch batch) throws SQLException {
         if (batch == null) {
-            final PreparedStatement preparedStatement = connection.prepareStatement("UPDATE SATELLITE_OBSERVATION SET DataFile = ?  WHERE DataFile = ? ");
+            final PreparedStatement preparedStatement = connection.prepareStatement("UPDATE SATELLITE_OBSERVATION SET DataFile = ?  WHERE ID = ? ");
             batch = new JdbcBatch(preparedStatement);
         }
 
         final PreparedStatement preparedStatement = (PreparedStatement) batch.getStatement();
         preparedStatement.setString(1, newPath);
-        preparedStatement.setString(2, satelliteObservation.getDataFilePath().toString());
+        preparedStatement.setInt(2, satelliteObservation.getId());
         preparedStatement.addBatch();
 
         return batch;
@@ -139,9 +139,6 @@ public List<SatelliteObservation> get() throws SQLException {
 
     @Override
     public List<SatelliteObservation> get(QueryParameter parameter) throws SQLException {
-
-        //org.h2.tools.Server.startWebServer(connection);
-
         final Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
         final String sql = createSql(parameter);
         final ResultSet resultSet = statement.executeQuery(sql);
@@ -154,6 +151,7 @@ public List<SatelliteObservation> get(QueryParameter parameter) throws SQLExcept
             final SatelliteObservation observation = new SatelliteObservation();
 
             final int observationId = resultSet.getInt("id");
+            observation.setId(observationId);
 
             final Timestamp startDate = resultSet.getTimestamp("StartDate");
             observation.setStartTime(TimeUtils.toDate(startDate));
@@ -199,8 +197,6 @@ public List<SatelliteObservation> get(QueryParameter parameter) throws SQLExcept
             resultList.add(observation);
         }
 
-        //org.h2.tools.Server.startWebServer(connection);
-
         return resultList;
     }
 

core/src/main/java/com/bc/fiduceo/db/PostGISDriver.java

@@ -157,13 +157,13 @@ public void insert(SatelliteObservation observation) throws SQLException {
     @Override
     public AbstractBatch updatePathBatch(SatelliteObservation satelliteObservation, String newPath, AbstractBatch batch) throws SQLException {
         if (batch == null) {
-            final PreparedStatement preparedStatement = connection.prepareStatement("UPDATE SATELLITE_OBSERVATION SET DataFile = ? WHERE DataFile = ?");
+            final PreparedStatement preparedStatement = connection.prepareStatement("UPDATE SATELLITE_OBSERVATION SET DataFile = ? WHERE ID = ?");
             batch = new JdbcBatch(preparedStatement);
         }
 
         final PreparedStatement preparedStatement = (PreparedStatement) batch.getStatement();
         preparedStatement.setString(1, newPath);
-        preparedStatement.setString(2, satelliteObservation.getDataFilePath().toString());
+        preparedStatement.setInt(2, satelliteObservation.getId());
         preparedStatement.addBatch();
 
         return batch;
@@ -203,6 +203,7 @@ public List<SatelliteObservation> get(QueryParameter parameter) throws SQLExcept
 
                 currentId = observationId;
                 currentObservation = new SatelliteObservation();
+                currentObservation.setId(currentId);
 
                 final Timestamp startDate = resultSet.getTimestamp("StartDate");
                 currentObservation.setStartTime(TimeUtils.toDate(startDate));

core/src/test/java/com/bc/fiduceo/core/SatelliteObservationTest.java

@@ -37,6 +37,7 @@ public void setUp() {
     @Test
     public void testConstructor() {
         assertEquals(NodeType.UNDEFINED, observation.getNodeType());
+        assertEquals(-1, observation.getId());
     }
 
     @Test

core/src/test/java/com/bc/fiduceo/db/StorageTest_SatelliteObservation.java

@@ -41,10 +41,7 @@
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public abstract class StorageTest_SatelliteObservation {