Added request to topic.OdeBroadcastTimJson and updated schema ref…

…erence doc. Also updated jpo-security-svcs module with additional error reporting.

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

@@ -0,0 +1,66 @@
+package us.dot.its.jpo.ode.model;
+
+import us.dot.its.jpo.ode.plugin.ServiceRequest;
+
+public class OdeRequestMsgMetadata extends OdeMsgMetadata {
+
+ /**
+ * 
+ */
+ private static final long serialVersionUID = 1L;
+
+ ServiceRequest request;
+
+ public OdeRequestMsgMetadata() {
+ super();
+ }
+
+ public OdeRequestMsgMetadata(OdeMsgPayload payload) {
+ super(payload);
+ }
+
+ public OdeRequestMsgMetadata(String payloadType, SerialId serialId, String receivedAt) {
+ super(payloadType, serialId, receivedAt);
+ }
+
+ public OdeRequestMsgMetadata(OdeMsgPayload payload, ServiceRequest request) {
+ super(payload);
+ setRequest(request);
+ }
+
+ public ServiceRequest getRequest() {
+ return request;
+ }
+
+ public void setRequest(ServiceRequest request) {
+ this.request = request;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((request == null) ? 0 : request.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (!super.equals(obj))
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ OdeRequestMsgMetadata other = (OdeRequestMsgMetadata) obj;
+ if (request == null) {
+ if (other.request != null)
+ return false;
+ } else if (!request.equals(other.request))
+ return false;
+ return true;
+ }
+
+
+
+}

jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimController.java

@@ -38,6 +38,7 @@
 import us.dot.its.jpo.ode.model.OdeMsgMetadata.GeneratedBy;
 import us.dot.its.jpo.ode.model.OdeMsgPayload;
 import us.dot.its.jpo.ode.model.OdeObject;
+import us.dot.its.jpo.ode.model.OdeRequestMsgMetadata;
 import us.dot.its.jpo.ode.model.OdeTimData;
 import us.dot.its.jpo.ode.model.OdeTimPayload;
 import us.dot.its.jpo.ode.model.OdeTravelerInputData;
@@ -301,7 +302,7 @@ public ResponseEntity<String> depositTim(String jsonString, RequestVerb verb) {
  // Add metadata to message and publish to kafka
  OdeTravelerInformationMessage tim = odeTID.getTim();
  OdeMsgPayload timDataPayload = new OdeMsgPayload(tim);
- OdeMsgMetadata timMetadata = new OdeMsgMetadata(timDataPayload);
+ OdeRequestMsgMetadata timMetadata = new OdeRequestMsgMetadata(timDataPayload, request);
  timMetadata.setRecordGeneratedBy(GeneratedBy.TMC);
 
  try {