ODE-745 Renamed J2735TravelerInformationMessage to OdeTravelerInforma…

…tionMessage

jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeTimPayload.java

@@ -1,25 +1,25 @@
 package us.dot.its.jpo.ode.model;
 
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage;
 
 public class OdeTimPayload extends OdeMsgPayload {
 
  private static final long serialVersionUID = 7061315628111448390L;
 
  public OdeTimPayload() {
- this(new J2735TravelerInformationMessage());
+ this(new OdeTravelerInformationMessage());
  }
 
- public OdeTimPayload(J2735TravelerInformationMessage tim) {
+ public OdeTimPayload(OdeTravelerInformationMessage tim) {
  super(tim);
  this.setData(tim);
  }
 
- public J2735TravelerInformationMessage getTim() {
- return (J2735TravelerInformationMessage) getData();
+ public OdeTravelerInformationMessage getTim() {
+ return (OdeTravelerInformationMessage) getData();
  }
 
- public void setTim(J2735TravelerInformationMessage tim) {
+ public void setTim(OdeTravelerInformationMessage tim) {
  setData(tim);
  }
 

jpo-ode-core/src/main/java/us/dot/its/jpo/ode/model/OdeTravelerInputData.java

@@ -1,18 +1,18 @@
 package us.dot.its.jpo.ode.model;
 
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage;
 import us.dot.its.jpo.ode.plugin.j2735.timstorage.TravelerInputDataBase;
 
 public class OdeTravelerInputData extends TravelerInputDataBase {
 
  private static final long serialVersionUID = 8769107278440796699L;
 
- private J2735TravelerInformationMessage tim;
- public J2735TravelerInformationMessage getTim() {
+ private OdeTravelerInformationMessage tim;
+ public OdeTravelerInformationMessage getTim() {
  return tim;
  }
 
- public void setTim(J2735TravelerInformationMessage tim) {
+ public void setTim(OdeTravelerInformationMessage tim) {
  this.tim = tim;
  }
 

jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/J2735TravelerInformationMessage.java → jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/OdeTravelerInformationMessage.java

@@ -10,7 +10,7 @@
 import us.dot.its.jpo.ode.plugin.j2735.timstorage.FrameType;
 import us.dot.its.jpo.ode.plugin.j2735.timstorage.MutcdCode;
 
-public class J2735TravelerInformationMessage extends OdeObject {
+public class OdeTravelerInformationMessage extends OdeObject {
  private static final long serialVersionUID = -200529140190872305L;
 
  @Expose

jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/TimFieldValidator.java

@@ -2,8 +2,8 @@
 
 import java.math.BigDecimal;
 
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage.DataFrame.MsgId;
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage.DataFrame.RoadSignID;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage.DataFrame.MsgId;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage.DataFrame.RoadSignID;
 import us.dot.its.jpo.ode.util.CodecUtils;
 
 public class TimFieldValidator {

jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/TravelerInformationFromAsnToHumanConverter.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage;
 import us.dot.its.jpo.ode.util.DateTimeUtils;
 
 public class TravelerInformationFromAsnToHumanConverter {
@@ -11,8 +11,8 @@ private TravelerInformationFromAsnToHumanConverter() {
  throw new UnsupportedOperationException();
  }
 
- public static J2735TravelerInformationMessage genericTim(JsonNode asnTim) {
- J2735TravelerInformationMessage genericTim = new J2735TravelerInformationMessage();
+ public static OdeTravelerInformationMessage genericTim(JsonNode asnTim) {
+ OdeTravelerInformationMessage genericTim = new OdeTravelerInformationMessage();
 
  genericTim.setMsgCnt(asnTim.get("msgCnt").asInt());
 

jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/oss/OssTIMHeaderBuilder.java

@@ -13,7 +13,7 @@
 import us.dot.its.jpo.ode.j2735.dsrc.TravelerDataFrame;
 import us.dot.its.jpo.ode.j2735.dsrc.TravelerDataFrame.MsgId;
 import us.dot.its.jpo.ode.j2735.dsrc.TravelerInfoType;
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage;
 import us.dot.its.jpo.ode.plugin.j2735.TimFieldValidator;
 import us.dot.its.jpo.ode.util.DateTimeUtils;
 
@@ -23,7 +23,7 @@ private OssTIMHeaderBuilder() {
  }
 
  public static TravelerDataFrame buildTimHeader(
- J2735TravelerInformationMessage.DataFrame inputDataFrame,
+ OdeTravelerInformationMessage.DataFrame inputDataFrame,
  TravelerDataFrame dataFrame) throws ParseException{
  TimFieldValidator.validateHeaderIndex(inputDataFrame.getSspTimRights());
  dataFrame.setSspTimRights(new SSPindex(inputDataFrame.getSspTimRights()));
@@ -38,13 +38,13 @@ public static TravelerDataFrame buildTimHeader(
  return dataFrame;
  }
 
- public static MsgId getMessageId(J2735TravelerInformationMessage.DataFrame dataFrame) {
+ public static MsgId getMessageId(OdeTravelerInformationMessage.DataFrame dataFrame) {
  MsgId msgId = new MsgId();
  TimFieldValidator.validateMessageID(dataFrame.getMsgId());
 
- us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage.DataFrame.MsgId msgId2 = dataFrame.getMsgId();
+ us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage.DataFrame.MsgId msgId2 = dataFrame.getMsgId();
  if (msgId2 != null) {
- us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage.DataFrame.RoadSignID roadSignID2 = msgId2.getRoadSignID();
+ us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage.DataFrame.RoadSignID roadSignID2 = msgId2.getRoadSignID();
  if (roadSignID2 != null) {
  msgId.setChosenFlag(MsgId.roadSignID_chosen);
  RoadSignID roadSignID = new RoadSignID();

jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/oss/OssTravelerInformation.java

@@ -1,7 +1,7 @@
 package us.dot.its.jpo.ode.plugin.j2735.oss;
 
 import us.dot.its.jpo.ode.j2735.dsrc.TravelerInformation;
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage;
 import us.dot.its.jpo.ode.util.CodecUtils;
 import us.dot.its.jpo.ode.util.DateTimeUtils;
 
@@ -11,8 +11,8 @@ private OssTravelerInformation() {
  throw new UnsupportedOperationException();
  }
 
- public static J2735TravelerInformationMessage genericTim(TravelerInformation asnTim) {
- J2735TravelerInformationMessage genericTim = new J2735TravelerInformationMessage();
+ public static OdeTravelerInformationMessage genericTim(TravelerInformation asnTim) {
+ OdeTravelerInformationMessage genericTim = new OdeTravelerInformationMessage();
 
  genericTim.setMsgCnt(asnTim.getMsgCnt().intValue());
 

jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/oss/OssTravelerMessageBuilder.java

@@ -93,7 +93,7 @@
 import us.dot.its.jpo.ode.j2735.dsrc.WorkZone;
 import us.dot.its.jpo.ode.j2735.dsrc.Zoom;
 import us.dot.its.jpo.ode.j2735.itis.ITIScodesAndText;
-import us.dot.its.jpo.ode.plugin.j2735.J2735TravelerInformationMessage;
+import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage;
 import us.dot.its.jpo.ode.plugin.j2735.TimFieldValidator;
 import us.dot.its.jpo.ode.util.CodecUtils;
 import us.dot.its.jpo.ode.util.DateTimeUtils;
@@ -103,7 +103,7 @@ public class OssTravelerMessageBuilder {
  private TravelerInformation travelerInfo;
 
  public TravelerInformation buildTravelerInformation(
- J2735TravelerInformationMessage tim)
+ OdeTravelerInformationMessage tim)
  throws ParseException, EncodeFailedException, EncodeNotSupportedException, IllegalArgumentException {
 
  travelerInfo = new TravelerInformation();
@@ -122,14 +122,14 @@ public TravelerInformation buildTravelerInformation(
  }
 
  private TravelerDataFrameList buildDataFrames(
- J2735TravelerInformationMessage tim) 
+ OdeTravelerInformationMessage tim) 
  throws ParseException {
  TravelerDataFrameList dataFrames = new TravelerDataFrameList();
 
  TimFieldValidator.validateFrameCount(tim.getDataframes().length);
  int len = tim.getDataframes().length;
  for (int i = 0; i < len; i++) {
- J2735TravelerInformationMessage.DataFrame inputDataFrame = tim.getDataframes()[i];
+ OdeTravelerInformationMessage.DataFrame inputDataFrame = tim.getDataframes()[i];
  TravelerDataFrame dataFrame = new TravelerDataFrame();
 
  // Part I, header
@@ -176,7 +176,7 @@ public String encodeTravelerInformationToMessageFrameHex() throws EncodeFailedEx
  return CodecUtils.toHex(bytes);
  }
 
- public Content buildContent(J2735TravelerInformationMessage.DataFrame inputDataFrame) {
+ public Content buildContent(OdeTravelerInformationMessage.DataFrame inputDataFrame) {
  String contentType = inputDataFrame.getContent();
  String[] codes = inputDataFrame.getItems();
  Content content = new Content();
@@ -259,9 +259,9 @@ public GenericSignage buildGenericSignage(String[] codes) {
  return gs;
  }
 
- private Regions buildRegions(J2735TravelerInformationMessage.DataFrame.Region[] inputRegions) {
+ private Regions buildRegions(OdeTravelerInformationMessage.DataFrame.Region[] inputRegions) {
  Regions regions = new Regions();
- for (J2735TravelerInformationMessage.DataFrame.Region inputRegion : inputRegions) {
+ for (OdeTravelerInformationMessage.DataFrame.Region inputRegion : inputRegions) {
  GeographicalPath geoPath = new GeographicalPath();
  Description description = new Description();
  TimFieldValidator.validateGeoName(inputRegion.getName());
@@ -353,7 +353,7 @@ private Regions buildRegions(J2735TravelerInformationMessage.DataFrame.Region[]
  }
 
  public RegionList buildRegionOffsets(
- J2735TravelerInformationMessage.DataFrame.Region.OldRegion.RegionPoint.RegionList[] list) {
+ OdeTravelerInformationMessage.DataFrame.Region.OldRegion.RegionPoint.RegionList[] list) {
  RegionList myList = new RegionList();
  for (int i = 0; i < list.length; i++) {
  RegionOffsets ele = new RegionOffsets();
@@ -368,7 +368,7 @@ public RegionList buildRegionOffsets(
  return myList;
  }
 
- public Circle buildGeoCircle(J2735TravelerInformationMessage.DataFrame.Region.Geometry geo) {
+ public Circle buildGeoCircle(OdeTravelerInformationMessage.DataFrame.Region.Geometry geo) {
  Circle circle = new Circle();
  circle.setCenter(OssPosition3D.position3D(geo.getCircle().getPosition()));
  TimFieldValidator.validateRadius(geo.getCircle().getRadius());
@@ -378,7 +378,7 @@ public Circle buildGeoCircle(J2735TravelerInformationMessage.DataFrame.Region.Ge
  return circle;
  }
 
- public Circle buildOldCircle(J2735TravelerInformationMessage.DataFrame.Region.OldRegion reg) {
+ public Circle buildOldCircle(OdeTravelerInformationMessage.DataFrame.Region.OldRegion reg) {
  Circle circle = new Circle();
  circle.setCenter(OssPosition3D.position3D(reg.getCircle().getPosition()));
  TimFieldValidator.validateRadius(reg.getCircle().getRadius());
@@ -388,11 +388,11 @@ public Circle buildOldCircle(J2735TravelerInformationMessage.DataFrame.Region.Ol
  return circle;
  }
 
- public NodeListXY buildNodeXYList(J2735TravelerInformationMessage.NodeXY[] inputNodes) {
+ public NodeListXY buildNodeXYList(OdeTravelerInformationMessage.NodeXY[] inputNodes) {
  NodeListXY nodeList = new NodeListXY();
  NodeSetXY nodes = new NodeSetXY();
  for (int i = 0; i < inputNodes.length; i++) {
- J2735TravelerInformationMessage.NodeXY point = inputNodes[i];
+ OdeTravelerInformationMessage.NodeXY point = inputNodes[i];
 
  NodeXY node = new NodeXY();
  NodeOffsetPointXY nodePoint = new NodeOffsetPointXY();
@@ -451,31 +451,31 @@ public NodeListXY buildNodeXYList(J2735TravelerInformationMessage.NodeXY[] input
 
  if (point.getAttributes().getLocalNodes().length > 0) {
  NodeAttributeXYList localNodeList = new NodeAttributeXYList();
- for (J2735TravelerInformationMessage.LocalNode localNode : point.getAttributes().getLocalNodes()) {
+ for (OdeTravelerInformationMessage.LocalNode localNode : point.getAttributes().getLocalNodes()) {
  localNodeList.add(new NodeAttributeXY(localNode.getType()));
  }
  attributes.setLocalNode(localNodeList);
  }
 
  if (point.getAttributes().getDisabledLists().length > 0) {
  SegmentAttributeXYList disabledNodeList = new SegmentAttributeXYList();
- for (J2735TravelerInformationMessage.DisabledList disabledList : point.getAttributes().getDisabledLists()) {
+ for (OdeTravelerInformationMessage.DisabledList disabledList : point.getAttributes().getDisabledLists()) {
  disabledNodeList.add(new SegmentAttributeXY(disabledList.getType()));
  }
  attributes.setDisabled(disabledNodeList);
  }
 
  if (point.getAttributes().getEnabledLists().length > 0) {
  SegmentAttributeXYList enabledNodeList = new SegmentAttributeXYList();
- for (J2735TravelerInformationMessage.EnabledList enabledList : point.getAttributes().getEnabledLists()) {
+ for (OdeTravelerInformationMessage.EnabledList enabledList : point.getAttributes().getEnabledLists()) {
  enabledNodeList.add(new SegmentAttributeXY(enabledList.getType()));
  }
  attributes.setEnabled(enabledNodeList);
  }
 
  if (point.getAttributes().getDataLists().length > 0) {
  LaneDataAttributeList dataNodeList = new LaneDataAttributeList();
- for (J2735TravelerInformationMessage.DataList dataList : point.getAttributes().getDataLists()) {
+ for (OdeTravelerInformationMessage.DataList dataList : point.getAttributes().getDataLists()) {
 
  LaneDataAttribute dataAttribute = new LaneDataAttribute();
 
@@ -486,7 +486,7 @@ public NodeListXY buildNodeXYList(J2735TravelerInformationMessage.NodeXY[] input
  dataAttribute.setLaneAngle(OssMergeDivergeNodeAngle.mergeDivergeNodeAngle(dataList.getLaneAngle()));
 
  SpeedLimitList speedDataList = new SpeedLimitList();
- for (J2735TravelerInformationMessage.SpeedLimits speedLimit : dataList.getSpeedLimits()) {
+ for (OdeTravelerInformationMessage.SpeedLimits speedLimit : dataList.getSpeedLimits()) {
  speedDataList.add(new RegulatorySpeedLimit(new SpeedLimitType(speedLimit.getType()),
  OssVelocity.velocity(speedLimit.getVelocity())));
  }
@@ -511,7 +511,7 @@ public NodeListXY buildNodeXYList(J2735TravelerInformationMessage.NodeXY[] input
  return nodeList;
  }
 
- private NodeListXY buildComputedLane(J2735TravelerInformationMessage.ComputedLane inputLane) {
+ private NodeListXY buildComputedLane(OdeTravelerInformationMessage.ComputedLane inputLane) {
  NodeListXY nodeList = new NodeListXY();
 
  ComputedLane computedLane = new ComputedLane();
@@ -542,11 +542,11 @@ private NodeListXY buildComputedLane(J2735TravelerInformationMessage.ComputedLan
  return nodeList;
  }
 
- public NodeListLL buildNodeLLList(J2735TravelerInformationMessage.NodeXY[] inputNodes) {
+ public NodeListLL buildNodeLLList(OdeTravelerInformationMessage.NodeXY[] inputNodes) {
  NodeListLL nodeList = new NodeListLL();
  NodeSetLL nodes = new NodeSetLL();
  for (int i = 0; i < inputNodes.length; i++) {
- J2735TravelerInformationMessage.NodeXY point = inputNodes[i];
+ OdeTravelerInformationMessage.NodeXY point = inputNodes[i];
 
  NodeLL node = new NodeLL();
  NodeOffsetPointLL nodePoint = new NodeOffsetPointLL();
@@ -611,31 +611,31 @@ public NodeListLL buildNodeLLList(J2735TravelerInformationMessage.NodeXY[] input
 
  if (point.getAttributes().getLocalNodes().length > 0) {
  NodeAttributeLLList localNodeList = new NodeAttributeLLList();
- for (J2735TravelerInformationMessage.LocalNode localNode : point.getAttributes().getLocalNodes()) {
+ for (OdeTravelerInformationMessage.LocalNode localNode : point.getAttributes().getLocalNodes()) {
  localNodeList.add(new NodeAttributeLL(localNode.getType()));
  }
  attributes.setLocalNode(localNodeList);
  }
 
  if (point.getAttributes().getDisabledLists().length > 0) {
  SegmentAttributeLLList disabledNodeList = new SegmentAttributeLLList();
- for (J2735TravelerInformationMessage.DisabledList disabledList : point.getAttributes().getDisabledLists()) {
+ for (OdeTravelerInformationMessage.DisabledList disabledList : point.getAttributes().getDisabledLists()) {
  disabledNodeList.add(new SegmentAttributeLL(disabledList.getType()));
  }
  attributes.setDisabled(disabledNodeList);
  }
 
  if (point.getAttributes().getEnabledLists().length > 0) {
  SegmentAttributeLLList enabledNodeList = new SegmentAttributeLLList();
- for (J2735TravelerInformationMessage.EnabledList enabledList : point.getAttributes().getEnabledLists()) {
+ for (OdeTravelerInformationMessage.EnabledList enabledList : point.getAttributes().getEnabledLists()) {
  enabledNodeList.add(new SegmentAttributeLL(enabledList.getType()));
  }
  attributes.setEnabled(enabledNodeList);
  }
 
  if (point.getAttributes().getDataLists().length > 0) {
  LaneDataAttributeList dataNodeList = new LaneDataAttributeList();
- for (J2735TravelerInformationMessage.DataList dataList : point.getAttributes().getDataLists()) {
+ for (OdeTravelerInformationMessage.DataList dataList : point.getAttributes().getDataLists()) {
 
  LaneDataAttribute dataAttribute = new LaneDataAttribute();
 
@@ -646,7 +646,7 @@ public NodeListLL buildNodeLLList(J2735TravelerInformationMessage.NodeXY[] input
  dataAttribute.setLaneAngle(OssMergeDivergeNodeAngle.mergeDivergeNodeAngle(dataList.getLaneAngle()));
 
  SpeedLimitList speedDataList = new SpeedLimitList();
- for (J2735TravelerInformationMessage.SpeedLimits speedLimit : dataList.getSpeedLimits()) {
+ for (OdeTravelerInformationMessage.SpeedLimits speedLimit : dataList.getSpeedLimits()) {
  speedDataList.add(new RegulatorySpeedLimit(new SpeedLimitType(speedLimit.getType()),
  OssVelocity.velocity(speedLimit.getVelocity())));
  }