v2.0 Release: ODE 2025 Q1 Integration and Other Updates

README.md

@@ -98,28 +98,28 @@ This will create the `target` folder under each module. From here, create a new
 ```
 .
 ├── cv-data-controller
-│   ├── cv-data-controller-1.4.0-SNAPSHOT.jar
+│   ├── cv-data-controller-x.x.x.jar
 │   ├── Dockerfile
 ├── cv-data-tasks
-│   ├── cv-data-tasks-1.4.0-SNAPSHOT.jar
+│   ├── cv-data-tasks-x.x.x.jar
 │   ├── Dockerfile
 ├── docker-compose.yml
 ├── ode-data-logger
 │   ├── Dockerfile
-│   ├── ode-data-logger-1.4.0-SNAPSHOT.jar
+│   ├── ode-data-logger-x.x.x.jar
 ├── ode-mongo-logger
 │   ├── Dockerfile
-│   ├── ode-mongo-logger-1.4.0-SNAPSHOT.jar
+│   ├── ode-mongo-logger-x.x.x.jar
 ├── ode-wrapper
 │   ├── Dockerfile
-│   ├── ode-wrapper-1.4.0-SNAPSHOT.jar
+│   ├── ode-wrapper-x.x.x.jar
 ├── ode-wrapper-docs
 │   └── swagger-ui-master
 │       ├── Dockerfile
 │       ├── (swagger folder structure)
 └── tim-refresh
     ├── Dockerfile   
-    ├── tim-refresh-1.4.0-SNAPSHOT.jar
+    ├── tim-refresh-x.x.x.jar
 
 ```
 

cert-expiration/Dockerfile

@@ -2,4 +2,4 @@ FROM maven:3.8-eclipse-temurin-21-alpine
 
 ADD . /home/timm/timm_applications/cert-expiration
 
-CMD java -jar /home/timm/timm_applications/cert-expiration/cert-expiration-1.4.0-SNAPSHOT.jar
+CMD java -jar /home/timm/timm_applications/cert-expiration/cert-expiration-2.0.0.jar

cert-expiration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.timm</groupId>
         <artifactId>tim-manager</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cert-expiration</artifactId>

cv-data-controller/Dockerfile

@@ -2,4 +2,4 @@ FROM maven:3.8-eclipse-temurin-21-alpine
 
 ADD . /home/timm/timm_applications/cv-data-controller
 
-CMD java --add-opens java.base/java.lang=ALL-UNNAMED -jar /home/timm/timm_applications/cv-data-controller/cv-data-controller-1.4.0-SNAPSHOT.jar
+CMD java --add-opens java.base/java.lang=ALL-UNNAMED -jar /home/timm/timm_applications/cv-data-controller/cv-data-controller-2.0.0.jar

cv-data-controller/README.md

@@ -111,6 +111,10 @@ You may configure these values in `cv-data-controller/src/main/resources/applica
 | SERVER_SSL_KEY_STORE_TYPE | CONTROLLER_SERVER_SSL_KEY_STORE_TYPE | server.ssl.keyStoreType | **PROD ONLY** Keystore type (JKS) | JKS |
 | SERVER_SSL_KEY_ALIAS | CONTROLLER_SERVER_SSL_KEY_ALIAS | server.ssl.keyAlias | **PROD ONLY** Alias for Keystore | example.alias |
 
+## Note on Neo4j Database
+The system expects a Neo4j database to be running and accessible at the address specified in the `application.properties` file or the `sample.env` file. The 
+database should be populated with the necessary data for the system to function properly. The database should be running before starting the application.
+
 ## Testing
 To run the unit tests, follow these steps:
 1. Reopen the project in the provided dev container by clicking on the blue button in the bottom left corner of the window and selecting "Reopen in Container"

cv-data-controller/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.timm</groupId>
         <artifactId>tim-manager</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
     <dependencies>
         <dependency>

cv-data-controller/src/main/java/com/trihydro/cvdatacontroller/controller/ActiveTimController.java

@@ -41,6 +41,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.client.HttpServerErrorException;
 import springfox.documentation.annotations.ApiIgnore;
 import us.dot.its.jpo.ode.plugin.j2735.timstorage.FrameType.TravelerInfoType;
 
@@ -74,9 +75,8 @@ public void InjectDependencies(TimDbTables _timDbTables, SQLNullHandler _sqlNull
      * @return List of ActiveTim objects
      */
     @RequestMapping(value = "/expiring", method = RequestMethod.GET, produces = "application/json", headers = "Accept=application/json")
-    public ResponseEntity<List<TimUpdateModel>> GetExpiringActiveTims() throws SQLException {
-        TimUpdateModel activeTim;
-        List<TimUpdateModel> activeTims = new ArrayList<TimUpdateModel>();
+    public ResponseEntity<List<TimUpdateModel>> GetExpiringActiveTims() {
+        List<TimUpdateModel> activeTims = new ArrayList<>();
 
         String selectStatement = "SELECT atim.*, tt.type as tim_type_name, tt.description as tim_type_description";
         selectStatement += ", t.msg_cnt, t.url_b, t.is_satellite, t.sat_record_id, t.packet_id";
@@ -100,72 +100,18 @@ public ResponseEntity<List<TimUpdateModel>> GetExpiringActiveTims() throws SQLEx
         try (Connection connection = dbInteractions.getConnectionPool(); Statement statement = connection.createStatement(); ResultSet rs = statement.executeQuery(selectStatement)) {
             // convert to ActiveTim object
             while (rs.next()) {
-                activeTim = new TimUpdateModel();
-
-                // Active_Tim properties
-                activeTim.setActiveTimId(rs.getLong("ACTIVE_TIM_ID"));
-                activeTim.setTimId(rs.getLong("TIM_ID"));
-                activeTim.setDirection(rs.getString("DIRECTION"));
-                activeTim.setStartDateTime(rs.getString("TIM_START"));
-                activeTim.setEndDateTime(rs.getString("TIM_END"));
-                activeTim.setExpirationDateTime(rs.getString("EXPIRATION_DATE"));
-                activeTim.setSatRecordId(rs.getString("SAT_RECORD_ID"));
-                activeTim.setClientId(rs.getString("CLIENT_ID"));
-                activeTim.setRoute(rs.getString("ROUTE"));
-
-                Coordinate startPoint = null;
-                Coordinate endPoint = null;
-                BigDecimal startLat = rs.getBigDecimal("START_LATITUDE");
-                BigDecimal startLon = rs.getBigDecimal("START_LONGITUDE");
-                if (!rs.wasNull()) {
-                    startPoint = new Coordinate(startLat, startLon);
-                }
-                activeTim.setStartPoint(startPoint);
-
-                BigDecimal endLat = rs.getBigDecimal("END_LATITUDE");
-                BigDecimal endLon = rs.getBigDecimal("END_LONGITUDE");
-                if (!rs.wasNull()) {
-                    endPoint = new Coordinate(endLat, endLon);
-                }
-                activeTim.setEndPoint(endPoint);
-
-                activeTim.setStartDate_Timestamp(rs.getTimestamp("TIM_START", UTCCalendar));
-                activeTim.setEndDate_Timestamp(rs.getTimestamp("TIM_END", UTCCalendar));
-
-                // Tim properties
-                activeTim.setMsgCnt(rs.getInt("MSG_CNT"));
-                activeTim.setUrlB(rs.getString("URL_B"));
-                activeTim.setPacketId(rs.getString("PACKET_ID"));
-
-                // Tim Type properties
-                activeTim.setTimTypeName(rs.getString("TIM_TYPE_NAME"));
-                activeTim.setTimTypeDescription(rs.getString("TIM_TYPE_DESCRIPTION"));
-
-                // Region Properties
-                activeTim.setRegionId(rs.getInt("REGION_ID"));
-                activeTim.setAnchorLat(rs.getBigDecimal("ANCHOR_LAT"));
-                activeTim.setAnchorLong(rs.getBigDecimal("ANCHOR_LONG"));
-
-                activeTim.setLaneWidth(rs.getBigDecimal("LANE_WIDTH"));
-                activeTim.setRegionDirection(rs.getString("REGION_DIRECTION"));
-                activeTim.setDirectionality(rs.getString("DIRECTIONALITY"));
-                activeTim.setClosedPath(rs.getBoolean("CLOSED_PATH"));
-                activeTim.setPathId(rs.getInt("PATH_ID"));
-                activeTim.setRegionDescription(rs.getString("REGION_DESCRIPTION"));
-
-                // DataFrame properties
-                activeTim.setDataFrameId(rs.getInt("DATA_FRAME_ID"));
-                activeTim.setDurationTime(rs.getInt("DURATION_TIME"));
-                activeTim.setNotUsed1((short) 0); // as of J2735 this should be set to 0 and is ignored
-                activeTim.setNotUsed((short) 0); // as of J2735 this should be set to 0 and is ignored
-                activeTim.setNotUsed3((short) 0); // as of J2735 this should be set to 0 and is ignored
-                activeTim.setNotUsed2((short) 0); // as of J2735 this should be set to 0 and is ignored
-                activeTim.setUrl(rs.getString("URL"));
+                var activeTim = buildTimUpdateModelFromResultSet(rs);
 
                 int frameTypeValue = rs.getInt("FRAME_TYPE");
                 if (!rs.wasNull() && frameTypeValue >= 0 && frameTypeValue < TravelerInfoType.values().length) {
                     activeTim.setFrameType(TravelerInfoType.values()[frameTypeValue]);
                 }
+				else {
+                    log.warn("Could not set frame type from value {} for active tim id {}. Assuming Advisory.", frameTypeValue,
+                        activeTim.getActiveTimId());
+					// assume advisory
+					activeTim.setFrameType(TravelerInfoType.advisory);
+				}
 
                 // set dataFrame content. it's required for the ODE, so if we didn't record it,
                 // assume Advisory
@@ -210,72 +156,18 @@ public ResponseEntity<TimUpdateModel> GetUpdateModelFromActiveTimId(@PathVariabl
         try (Connection connection = dbInteractions.getConnectionPool(); Statement statement = connection.createStatement(); ResultSet rs = statement.executeQuery(selectStatement)) {
             // convert to ActiveTim object
             while (rs.next()) {
-                activeTim = new TimUpdateModel();
-
                 // Active_Tim properties
-                activeTim.setActiveTimId(rs.getLong("ACTIVE_TIM_ID"));
-                activeTim.setTimId(rs.getLong("TIM_ID"));
-                activeTim.setDirection(rs.getString("DIRECTION"));
-                activeTim.setStartDateTime(rs.getString("TIM_START"));
-                activeTim.setEndDateTime(rs.getString("TIM_END"));
-                activeTim.setExpirationDateTime(rs.getString("EXPIRATION_DATE"));
-                activeTim.setSatRecordId(rs.getString("SAT_RECORD_ID"));
-                activeTim.setClientId(rs.getString("CLIENT_ID"));
-                activeTim.setRoute(rs.getString("ROUTE"));
-
-                Coordinate startPoint = null;
-                Coordinate endPoint = null;
-                BigDecimal startLat = rs.getBigDecimal("START_LATITUDE");
-                BigDecimal startLon = rs.getBigDecimal("START_LONGITUDE");
-                if (!rs.wasNull()) {
-                    startPoint = new Coordinate(startLat, startLon);
-                }
-                activeTim.setStartPoint(startPoint);
-
-                BigDecimal endLat = rs.getBigDecimal("END_LATITUDE");
-                BigDecimal endLon = rs.getBigDecimal("END_LONGITUDE");
-                if (!rs.wasNull()) {
-                    endPoint = new Coordinate(endLat, endLon);
-                }
-                activeTim.setEndPoint(endPoint);
-
-                activeTim.setStartDate_Timestamp(rs.getTimestamp("TIM_START", UTCCalendar));
-                activeTim.setEndDate_Timestamp(rs.getTimestamp("TIM_END", UTCCalendar));
-
-                // Tim properties
-                activeTim.setMsgCnt(rs.getInt("MSG_CNT"));
-                activeTim.setUrlB(rs.getString("URL_B"));
-                activeTim.setPacketId(rs.getString("PACKET_ID"));
-
-                // Tim Type properties
-                activeTim.setTimTypeName(rs.getString("TIM_TYPE_NAME"));
-                activeTim.setTimTypeDescription(rs.getString("TIM_TYPE_DESCRIPTION"));
-
-                // Region Properties
-                activeTim.setRegionId(rs.getInt("REGION_ID"));
-                activeTim.setAnchorLat(rs.getBigDecimal("ANCHOR_LAT"));
-                activeTim.setAnchorLong(rs.getBigDecimal("ANCHOR_LONG"));
-
-                activeTim.setLaneWidth(rs.getBigDecimal("LANE_WIDTH"));
-                activeTim.setRegionDirection(rs.getString("REGION_DIRECTION"));
-                activeTim.setDirectionality(rs.getString("DIRECTIONALITY"));
-                activeTim.setClosedPath(rs.getBoolean("CLOSED_PATH"));
-                activeTim.setPathId(rs.getInt("PATH_ID"));
-                activeTim.setRegionDescription(rs.getString("REGION_DESCRIPTION"));
-
-                // DataFrame properties
-                activeTim.setDataFrameId(rs.getInt("DATA_FRAME_ID"));
-                activeTim.setDurationTime(rs.getInt("DURATION_TIME"));
-                activeTim.setNotUsed1((short) 0); // as of J2735 2020 this should be set to 0 and is ignored
-                activeTim.setNotUsed((short) 0); // as of J2735 2020 this should be set to 0 and is ignored
-                activeTim.setNotUsed3((short) 0); // as of J2735 2020 this should be set to 0 and is ignored
-                activeTim.setNotUsed2((short) 0); // as of J2735 2020 this should be set to 0 and is ignored
-                activeTim.setUrl(rs.getString("URL"));
+				activeTim = buildTimUpdateModelFromResultSet(rs);
 
                 int frameTypeValue = rs.getInt("FRAME_TYPE");
                 if (!rs.wasNull() && frameTypeValue >= 0 && frameTypeValue < TravelerInfoType.values().length) {
                     activeTim.setFrameType(TravelerInfoType.values()[frameTypeValue]);
                 }
+				else {
+                    log.warn("Could not set frame type from value {} for active tim id {}. Assuming Advisory.", frameTypeValue, activeTimId);
+					// assume advisory
+					activeTim.setFrameType(TravelerInfoType.advisory);
+				}
 
                 // set dataFrame content. it's required for the ODE, so if we didn't record it,
                 // assume Advisory
@@ -373,22 +265,19 @@ public ResponseEntity<List<ActiveTim>> GetActiveTimsNotSent() {
         return ResponseEntity.ok(activeTims);
     }
 
-    @RequestMapping(value = "/expired", method = RequestMethod.GET)
-    public ResponseEntity<List<ActiveTim>> GetExpiredActiveTims() {
-        List<ActiveTim> activeTims = new ArrayList<ActiveTim>();
-
-        String selectStatement = "select * from ACTIVE_TIM";
-        selectStatement += " WHERE TIM_END <= (NOW() AT TIME ZONE 'UTC')";
-
-        try (Connection connection = dbInteractions.getConnectionPool(); Statement statement = connection.createStatement(); ResultSet rs = statement.executeQuery(selectStatement)) {
-            activeTims = getActiveTimFromRS(rs, false);
-        } catch (SQLException e) {
-            log.error("Error getting expired active tims", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(activeTims);
-        }
-
-        return ResponseEntity.ok(activeTims);
-    }
+	@RequestMapping(value = "/expired", method = RequestMethod.GET)
+	public ResponseEntity<List<ActiveTim>> GetExpiredActiveTims(@RequestParam(required = false, defaultValue = "100") Integer limit) {
+		String query = "SELECT * FROM ACTIVE_TIM WHERE TIM_END <= (NOW() AT TIME ZONE 'UTC') LIMIT ?";
+		try (Connection connection = dbInteractions.getConnectionPool(); PreparedStatement preparedStatement = connection.prepareStatement(query)) {
+			preparedStatement.setInt(1, limit);
+			try (ResultSet rs = preparedStatement.executeQuery()) {
+				return ResponseEntity.ok(getActiveTimFromRS(rs, false));
+			}
+		} catch (SQLException e) {
+            log.error("Error retrieving expired active tims", e);
+			throw new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "Error retrieving expired active tims");
+		}
+	}
 
     @RequestMapping(value = "/indices-rsu/{rsuTarget}", method = RequestMethod.GET)
     public ResponseEntity<List<Integer>> GetActiveTimIndicesByRsu(@PathVariable String rsuTarget) {
@@ -1134,4 +1023,63 @@ public ResponseEntity<Boolean> MarkForDeletion(@PathVariable Long activeTimId) {
         }
         return ResponseEntity.ok(success);
     }
+
+	private TimUpdateModel buildTimUpdateModelFromResultSet(ResultSet rs) throws SQLException {
+        TimUpdateModel timUpdateModel = new TimUpdateModel();
+		timUpdateModel.setActiveTimId(rs.getLong("ACTIVE_TIM_ID"));
+		timUpdateModel.setTimId(rs.getLong("TIM_ID"));
+		timUpdateModel.setDirection(rs.getString("DIRECTION"));
+		timUpdateModel.setStartDateTime(rs.getString("TIM_START"));
+		timUpdateModel.setEndDateTime(rs.getString("TIM_END"));
+		timUpdateModel.setExpirationDateTime(rs.getString("EXPIRATION_DATE"));
+		timUpdateModel.setSatRecordId(rs.getString("SAT_RECORD_ID"));
+		timUpdateModel.setClientId(rs.getString("CLIENT_ID"));
+		timUpdateModel.setRoute(rs.getString("ROUTE"));
+
+		Coordinate startPoint = null;
+		Coordinate endPoint = null;
+		BigDecimal startLat = rs.getBigDecimal("START_LATITUDE");
+		BigDecimal startLon = rs.getBigDecimal("START_LONGITUDE");
+		if (!rs.wasNull()) {
+			startPoint = new Coordinate(startLat, startLon);
+		}
+		timUpdateModel.setStartPoint(startPoint);
+
+		BigDecimal endLat = rs.getBigDecimal("END_LATITUDE");
+		BigDecimal endLon = rs.getBigDecimal("END_LONGITUDE");
+		if (!rs.wasNull()) {
+			endPoint = new Coordinate(endLat, endLon);
+		}
+		timUpdateModel.setEndPoint(endPoint);
+
+		timUpdateModel.setStartDate_Timestamp(rs.getTimestamp("TIM_START", UTCCalendar));
+		timUpdateModel.setEndDate_Timestamp(rs.getTimestamp("TIM_END", UTCCalendar));
+
+		// Tim properties
+		timUpdateModel.setMsgCnt(rs.getInt("MSG_CNT"));
+		timUpdateModel.setUrlB(rs.getString("URL_B"));
+		timUpdateModel.setPacketId(rs.getString("PACKET_ID"));
+
+		// Tim Type properties
+		timUpdateModel.setTimTypeName(rs.getString("TIM_TYPE_NAME"));
+		timUpdateModel.setTimTypeDescription(rs.getString("TIM_TYPE_DESCRIPTION"));
+
+		// Region Properties
+		timUpdateModel.setRegionId(rs.getInt("REGION_ID"));
+		timUpdateModel.setAnchorLat(rs.getBigDecimal("ANCHOR_LAT"));
+		timUpdateModel.setAnchorLong(rs.getBigDecimal("ANCHOR_LONG"));
+
+		timUpdateModel.setLaneWidth(rs.getBigDecimal("LANE_WIDTH"));
+		timUpdateModel.setRegionDirection(rs.getString("REGION_DIRECTION"));
+		timUpdateModel.setDirectionality(rs.getString("DIRECTIONALITY"));
+		timUpdateModel.setClosedPath(rs.getBoolean("CLOSED_PATH"));
+		timUpdateModel.setPathId(rs.getInt("PATH_ID"));
+		timUpdateModel.setRegionDescription(rs.getString("REGION_DESCRIPTION"));
+
+		// DataFrame properties
+		timUpdateModel.setDataFrameId(rs.getInt("DATA_FRAME_ID"));
+		timUpdateModel.setDurationTime(rs.getInt("DURATION_TIME"));
+		timUpdateModel.setUrl(rs.getString("URL"));
+		return timUpdateModel;
+	}
 }