Merge remote-tracking branch 'origin/develop' into readme-update

Trihydro · Jun 27, 2023 · a7ca783 · a7ca783
2 parents 720152d + 2e64568
commit a7ca783
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 27 deletions.
diff --git a/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/dds/CASClient.java b/jpo-ode-core/src/main/java/us/dot/its/jpo/ode/dds/CASClient.java
@@ -142,7 +142,7 @@ private String getTicketGrantingTicket(String server, String username,
  try {
  httpClient.close();
  } catch (HttpException e) {
- logger.warn(http, e);
+ logger.error(http, e);
  }
  }
  }
@@ -175,7 +175,7 @@ private String getServiceTicket(String server, String ticketGrantingTicket,
  try {
  httpClient.close();
  } catch (HttpException e) {
- logger.warn(http, e);
+ logger.error(http, e);
  }
  }
  }
@@ -208,7 +208,7 @@ private String getServiceCall(String service, String serviceTicket)
  try {
  httpClient.close();
  } catch (HttpException e) {
- logger.warn(http, e);
+ logger.error(http, e);
  }
  }
  }

diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/OdePluginImpl.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/OdePluginImpl.java
@@ -92,7 +92,7 @@ private void loadAllClasses(File file) throws OdePluginException {
  try {
  loader.close();
  } catch (IOException e) {
- logger.debug("Error closing URLClassLoader: {}", e);
+ logger.error("Error closing URLClassLoader: {}", e);
  }
  }
  }

diff --git a/...java/us/dot/its/jpo/ode/plugin/j2735/builders/TravelerMessageFromHumanToAsnConverter.java b/...java/us/dot/its/jpo/ode/plugin/j2735/builders/TravelerMessageFromHumanToAsnConverter.java
@@ -251,7 +251,7 @@ public static long translateISOTimeStampToMinuteOfYear(String isoTime) {
  startMinute = (int) Duration.between(DateTimeUtils.isoDateTime(startYear, 1, 1, 0, 0, 0, 0), zDateTime)
  .toMinutes();
  } catch (Exception e) { // NOSONAR
- logger.warn("Failed to parse datetime {}, defaulting to unknown value {}", isoTime, startMinute);
+ logger.error("Failed to parse datetime {}, defaulting to unknown value {}", isoTime, startMinute);
  }
 
  return startMinute;
@@ -277,7 +277,7 @@ public static void replaceDataFrameTimestamp(ObjectNode dataFrame) {
  startMinute = (int) ChronoUnit.MINUTES.between(DateTimeUtils.isoDateTime(startYear, 1, 1, 0, 0, 0, 0),
  zDateTime);
  } catch (Exception e) {
- logger.warn("Failed to startDateTime {}, defaulting to unknown value {}.", startDateTime, startMinute);
+ logger.error("Failed to startDateTime {}, defaulting to unknown value {}.", startDateTime, startMinute);
  }
 
  dataFrame.put("startYear", startYear);

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeProperties.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeProperties.java
@@ -216,15 +216,15 @@ void initialize() {
  } catch (UnknownHostException e) {
  // Let's just use a random hostname
  hostname = UUID.randomUUID().toString();
- logger.info("Unknown host error: {}, using random", e);
+ logger.error("Unknown host error: {}, using random", e);
  }
  hostId = hostname;
  logger.info("Host ID: {}", hostId);
  EventLogger.logger.info("Initializing services on host {}", hostId);
 
  if (kafkaBrokers == null) {
 
- logger.info("ode.kafkaBrokers property not defined. Will try DOCKER_HOST_IP => {}", kafkaBrokers);
+ logger.warn("ode.kafkaBrokers property not defined. Will try DOCKER_HOST_IP => {}", kafkaBrokers);
 
  String dockerIp = CommonUtils.getEnvironmentVariable("DOCKER_HOST_IP");
 

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/heartbeat/RsuSnmp.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/heartbeat/RsuSnmp.java
@@ -40,7 +40,7 @@ private RsuSnmp() {
  public static String sendSnmpV3Request(String ip, String oid, Snmp snmp, String username) {
 
  if (ip == null || oid == null || snmp == null) {
- logger.debug("Invalid SNMP request parameter");
+ logger.warn("Invalid SNMP request parameter");
  throw new IllegalArgumentException("Invalid SNMP request parameter");
  }
 
@@ -68,16 +68,16 @@ public static String sendSnmpV3Request(String ip, String oid, Snmp snmp, String
  snmp.close();
  } catch (Exception e) {
  responseEvent = null;
- logger.debug("SNMP4J library exception", e);
+ logger.error("SNMP4J library exception", e);
  }
 
  // Interpret snmp response
  String stringResponse;
  if (responseEvent == null) {
- logger.debug("SNMP connection error");
+ logger.error("SNMP connection error");
  stringResponse = "[ERROR] SNMP connection error";
  } else if (responseEvent.getResponse() == null) {
- logger.debug("Empty SNMP response");
+ logger.error("Empty SNMP response");
  stringResponse = "[ERROR] Empty SNMP response";
  } else {
  stringResponse = responseEvent.getResponse().getVariableBindings().toString();

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/storage/FileSystemStorageService.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/storage/FileSystemStorageService.java
@@ -124,7 +124,7 @@ public Resource loadAsResource(String filename) {
  @Override
  public void deleteAll() {
  FileSystemUtils.deleteRecursively(rootLocation.toFile());
- EventLogger.logger.error("Deleting {}", this.rootLocation);
+ EventLogger.logger.info("Deleting {}", this.rootLocation);
  }
 
  @Override

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/bsm/BsmReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/bsm/BsmReceiver.java
@@ -104,9 +104,6 @@ public void run() {
  public byte[] removeHeader(byte[] packet) {
  String hexPacket = HexUtils.toHexString(packet);
 
- // logger.debug("BSM packet length: {}, start index: {}",
- // hexPacket.length(), startIndex);
-
  int startIndex = hexPacket.indexOf(BSM_START_FLAG);
  if (startIndex == 0) {
  logger.debug("Message is raw BSM with no headers.");

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/map/MapReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/map/MapReceiver.java
@@ -105,8 +105,6 @@ public void run() {
  public byte[] removeHeader(byte[] packet) {
  String hexPacket = HexUtils.toHexString(packet);
 
- // logger.debug("MAP packet: {}", hexPacket);
-
  int startIndex = hexPacket.indexOf(MAP_START_FLAG);
  if (startIndex == 0) {
  logger.debug("Message is raw MAP with no headers.");

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/spat/SpatReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/spat/SpatReceiver.java
@@ -104,8 +104,6 @@ public void run() {
  public byte[] removeHeader(byte[] packet) {
  String hexPacket = HexUtils.toHexString(packet);
 
- //logger.debug("SPAT packet: {}", hexPacket);
-
  int startIndex = hexPacket.indexOf(SPAT_START_FLAG);
  if (startIndex == 0) {
  logger.debug("Message is raw SPAT with no headers.");

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/srm/SrmReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/srm/SrmReceiver.java
@@ -105,8 +105,6 @@ public void run() {
  public byte[] removeHeader(byte[] packet) {
  String hexPacket = HexUtils.toHexString(packet);
 
- //logger.debug("SRM packet: {}", hexPacket);
-
  int startIndex = hexPacket.indexOf(SRM_START_FLAG);
  if (startIndex == 0) {
  logger.debug("Message is raw SRM with no headers.");

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/ssm/SsmReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/ssm/SsmReceiver.java
@@ -105,8 +105,6 @@ public void run() {
  public byte[] removeHeader(byte[] packet) {
  String hexPacket = HexUtils.toHexString(packet);
 
- //logger.debug("SSM packet: {}", hexPacket);
-
  int startIndex = hexPacket.indexOf(SSM_START_FLAG);
  if (startIndex == 0) {
  logger.debug("Message is raw SSM with no headers.");

diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/tim/TimReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/tim/TimReceiver.java
@@ -114,8 +114,6 @@ public void run() {
  public byte[] removeHeader(byte[] packet) {
  String hexPacket = HexUtils.toHexString(packet);
 
- //logger.debug("TIM packet: {}", hexPacket);
-
  int startIndex = hexPacket.indexOf(TIM_START_FLAG);
  if (startIndex == 0) {
  logger.info("Message is raw TIM with no headers.");

diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimDepositControllerTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimDepositControllerTest.java
@@ -63,7 +63,7 @@ public void emptyRequestShouldReturnEmptyError() {
 
  @Test
  public void invalidJsonSyntaxShouldReturnJsonSyntaxError() {
- ResponseEntity<String> actualResponse = testTimDepositController.postTim("{\"invalid\":\"json\"}}");
+ ResponseEntity<String> actualResponse = testTimDepositController.postTim("{\"in\"va}}}on\"}}");
  assertEquals("{\"error\":\"Malformed or non-compliant JSON syntax.\"}", actualResponse.getBody());
  }
 
@@ -160,4 +160,11 @@ public void testSuccessfulMessageReturnsSuccessMessagePut(@Capturing TimTransmog
  assertEquals("{\"success\":\"true\"}", actualResponse.getBody());
  }
 
+ @Test
+ public void testDepositingTimWithExtraProperties(@Capturing TimTransmogrifier capturingTimTransmogrifier, @Capturing XmlUtils capturingXmlUtils) {
+ String timToSubmit = "{\"request\":{\"rsus\":[],\"snmp\":{},\"randomProp1\":true,\"randomProp2\":\"hello world\"},\"tim\":{\"msgCnt\":\"13\",\"timeStamp\":\"2017-03-13T01:07:11-05:00\",\"randomProp3\":123,\"randomProp4\":{\"nestedProp1\":\"foo\",\"nestedProp2\":\"bar\"}}}";
+ ResponseEntity<String> actualResponse = testTimDepositController.postTim(timToSubmit);
+ assertEquals("{\"success\":\"true\"}", actualResponse.getBody());
+ }
+
 }