Merge branch 'develop' into Feature/configuration-page

CDOT-CV · Feb 14, 2025 · 483188b · 483188b
2 parents 032df34 + af46c93
commit 483188b
Show file tree

Hide file tree

Showing 106 changed files with 1,268 additions and 631 deletions.
diff --git a/...tersection-api/api/src/main/java/us/dot/its/jpo/ode/api/ConflictMonitorApiProperties.java b/...tersection-api/api/src/main/java/us/dot/its/jpo/ode/api/ConflictMonitorApiProperties.java
@@ -103,8 +103,7 @@ public class ConflictMonitorApiProperties {
     private boolean enableEmails;
     private boolean enableReports;
 
-    @Autowired
-    BuildProperties buildProperties;
+    private BuildProperties buildProperties;
 
     @Getter
     @Setter
@@ -115,6 +114,11 @@ public class ConflictMonitorApiProperties {
     private String dockerHostIP = null;
     private static final String DEFAULT_CONNECT_PORT = "8083";
 
+    @Autowired
+    public ConflictMonitorApiProperties(BuildProperties buildProperties) {
+        this.buildProperties = buildProperties;
+    }
+
     public int getMaximumResponseSize() {
         return maximumResponseSize;
     }

diff --git a/services/intersection-api/api/src/main/java/us/dot/its/jpo/ode/api/KafkaConfiguration.java b/services/intersection-api/api/src/main/java/us/dot/its/jpo/ode/api/KafkaConfiguration.java
@@ -20,8 +20,14 @@
 @ConfigurationProperties(prefix = "kafka.topics")
 public class KafkaConfiguration {
 
+    private final ConflictMonitorApiProperties properties;
+    private final KafkaAdmin admin;
+
     @Autowired
-    private ConflictMonitorApiProperties properties;
+    public KafkaConfiguration(ConflictMonitorApiProperties properties, KafkaAdmin admin) {
+        this.properties = properties;
+        this.admin = admin;
+    }
 
     @Bean(name = "createKafkaTopics")
     public KafkaAdmin.NewTopics createKafkaTopics() {
@@ -130,7 +136,4 @@ public void setCreateTopics(List<Map<String, Object>> createTopics) {
         this.createTopics = createTopics;
     }
 
-    @Autowired
-    private KafkaAdmin admin;
-
 }
diff --git a/.../assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java b/.../assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java
@@ -15,14 +15,17 @@
 @Component
 public class ConnectionOfTravelAssessmentRepositoryImpl implements ConnectionOfTravelAssessmentRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final String collectionName = "CmConnectionOfTravelAssessment";
 
+    @Autowired
+    public ConnectionOfTravelAssessmentRepositoryImpl(MongoTemplate mongoTemplate, ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 
@@ -45,19 +48,18 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
         if (latest) {
             query.with(Sort.by(Sort.Direction.DESC, "assessmentGeneratedAt"));
             query.limit(1);
-        }else{
+        } else {
             query.limit(props.getMaximumResponseSize());
         }
         return query;
     }
 
-
     public long getQueryResultCount(Query query) {
         return mongoTemplate.count(query, ConnectionOfTravelAssessment.class, collectionName);
     }
 
-    // Removes the result limit on a count query. 
-    public long getQueryFullCount(Query query){
+    // Removes the result limit on a count query.
+    public long getQueryFullCount(Query query) {
         int limit = query.getLimit();
         query.limit(-1);
         long count = mongoTemplate.count(query, ConnectionOfTravelAssessment.class, collectionName);

diff --git a/...sments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java b/...sments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java
@@ -20,14 +20,18 @@
 @Component
 public class LaneDirectionOfTravelAssessmentRepositoryImpl implements LaneDirectionOfTravelAssessmentRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private String collectionName = "CmLaneDirectionOfTravelAssessment";
 
+    @Autowired
+    public LaneDirectionOfTravelAssessmentRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java b/...api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java
@@ -17,14 +17,18 @@
 @Component
 public class StopLineStopAssessmentRepositoryImpl implements StopLineStopAssessmentRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private String collectionName = "CmStopLineStopAssessment";
 
+    @Autowired
+    public StopLineStopAssessmentRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...sors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java b/...sors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java
@@ -17,14 +17,18 @@
 @Component
 public class SignalStateEventAssessmentRepositoryImpl implements SignalStateEventAssessmentRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private String collectionName = "CmSignalStateEventAssessment";
 
+    @Autowired
+    public SignalStateEventAssessmentRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...-api/api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java b/...-api/api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java
@@ -21,16 +21,20 @@
 @Component
 public class OdeBsmJsonRepositoryImpl implements OdeBsmJsonRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final ObjectMapper mapper = DateJsonMapper.getInstance()
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     private final String collectionName = "OdeBsmJson";
 
+    @Autowired
+    public OdeBsmJsonRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     /**
      * Calculate the latitude range for a given center point and distance
      * 

diff --git a/...va/us/dot/its/jpo/ode/api/accessors/config/DefaultConfig/DefaultConfigRepositoryImpl.java b/...va/us/dot/its/jpo/ode/api/accessors/config/DefaultConfig/DefaultConfigRepositoryImpl.java
@@ -17,11 +17,15 @@
 @Component
 public class DefaultConfigRepositoryImpl implements DefaultConfigRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
     private final String collectionName = "CmDefaultConfig";
 
+    private final MongoTemplate mongoTemplate;
+
+    @Autowired
+    public DefaultConfigRepositoryImpl(MongoTemplate mongoTemplate) {
+        this.mongoTemplate = mongoTemplate;
+    }
+
     public Query getQuery(String id) {
         Query query = new Query();
 

diff --git a/...its/jpo/ode/api/accessors/config/IntersectionConfig/IntersectionConfigRepositoryImpl.java b/...its/jpo/ode/api/accessors/config/IntersectionConfig/IntersectionConfigRepositoryImpl.java
@@ -16,11 +16,15 @@
 @Component
 public class IntersectionConfigRepositoryImpl implements IntersectionConfigRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
+    private final MongoTemplate mongoTemplate;
 
     private final String collectionName = "CmIntersectionConfig";
 
+    @Autowired
+    public IntersectionConfigRepositoryImpl(MongoTemplate mongoTemplate) {
+        this.mongoTemplate = mongoTemplate;
+    }
+
     public Query getQuery(String key, Integer roadRegulatorID, Integer intersectionID) {
         Query query = new Query();
 

diff --git a/...rc/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java b/...rc/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java
@@ -29,16 +29,20 @@
 @Component
 public class BsmEventRepositoryImpl implements BsmEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
     private final String collectionName = "CmBsmEvents";
 
     private ObjectMapper mapper = DateJsonMapper.getInstance()
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
+
     @Autowired
-    ConflictMonitorApiProperties props;
+    public BsmEventRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
 
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();

diff --git a/...s/BsmMessageCountProgressionEventRepository/BsmMessageCountProgressionRepositoryImpl.java b/...s/BsmMessageCountProgressionEventRepository/BsmMessageCountProgressionRepositoryImpl.java
@@ -17,14 +17,18 @@
 @Component
 public class BsmMessageCountProgressionRepositoryImpl implements BsmMessageCountProgressionEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final String collectionName = "CmBsmMessageCountProgressionEvents";
 
+    @Autowired
+    public BsmMessageCountProgressionRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...e/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java b/...e/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java
@@ -24,14 +24,18 @@
 @Component
 public class ConnectionOfTravelEventRepositoryImpl implements ConnectionOfTravelEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final String collectionName = "CmConnectionOfTravelEvent";
 
+    @Autowired
+    public ConnectionOfTravelEventRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...ntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java b/...ntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java
@@ -23,14 +23,18 @@
 public class IntersectionReferenceAlignmentEventRepositoryImpl
         implements IntersectionReferenceAlignmentEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final String collectionName = "CmIntersectionReferenceAlignmentEvents";
 
+    @Autowired
+    public IntersectionReferenceAlignmentEventRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java b/...accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java
@@ -31,17 +31,21 @@
 @Component
 public class LaneDirectionOfTravelEventRepositoryImpl implements LaneDirectionOfTravelEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final Quantity<Length> one_centimeter = Quantities.getQuantity(1, MetricPrefix.CENTI(Units.METRE));
     private final Double ONE_CENTIMETER_IN_FEET = one_centimeter.to(USCustomary.FOOT).getValue().doubleValue();
 
     private final String collectionName = "CmLaneDirectionOfTravelEvent";
 
+    @Autowired
+    public LaneDirectionOfTravelEventRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/.../ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java b/.../ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java
@@ -23,14 +23,18 @@
 @Component
 public class MapBroadcastRateEventRepositoryImpl implements MapBroadcastRateEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final String collectionName = "CmMapBroadcastRateEvents";
 
+    @Autowired
+    public MapBroadcastRateEventRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();
 

diff --git a/...s/MapMessageCountProgressionEventRepository/MapMessageCountProgressionRepositoryImpl.java b/...s/MapMessageCountProgressionEventRepository/MapMessageCountProgressionRepositoryImpl.java
@@ -17,14 +17,18 @@
 @Component
 public class MapMessageCountProgressionRepositoryImpl implements MapMessageCountProgressionEventRepository {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    ConflictMonitorApiProperties props;
+    private final MongoTemplate mongoTemplate;
+    private final ConflictMonitorApiProperties props;
 
     private final String collectionName = "CmMapMessageCountProgressionEvents";
 
+    @Autowired
+    public MapMessageCountProgressionRepositoryImpl(MongoTemplate mongoTemplate,
+            ConflictMonitorApiProperties props) {
+        this.mongoTemplate = mongoTemplate;
+        this.props = props;
+    }
+
     public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest) {
         Query query = new Query();