diff options
| author |   Jerry Flood <jflood@att.com> | 2020-01-22 07:02:20 -0500 |
|---|---|---|
| committer | Jerry Flood <jflood@att.com> | 2020-01-22 09:41:50 -0500 |
| commit | 4504d02f860b740a17a3d72c19ef5d04803896e6 (patch) | |
| tree | c6cb8a00c1d1dde0ba4c83f5c2b6f05d43268cac /cmso-service/src/main | |
| parent | 8ca99e970af44e64ed6bd73f1e7b66e49b35cc60 (diff) | |
Update robot docker build
Issue-ID: OPTFRA-681
Change-Id: Id72cdaad6c8ab8ddcb448ff9b5b3c10a7566b76d
Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-service/src/main')
5 files changed, 9 insertions, 5 deletions
diff --git a/cmso-service/src/main/java/org/onap/observations/Mdc.java b/cmso-service/src/main/java/org/onap/observations/Mdc.java index d6e729e..3885a52 100644 --- a/cmso-service/src/main/java/org/onap/observations/Mdc.java +++ b/cmso-service/src/main/java/org/onap/observations/Mdc.java @@ -175,7 +175,7 @@ public class Mdc { * @return the map */ public static Map<String, String> save() { - return MDC.getCopyOfContextMap(); + return MDC.getCopyOfContextMap(); } /** diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/Mdc.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/Mdc.java index 503f42c..5e2ebcf 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/common/Mdc.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/Mdc.java @@ -40,6 +40,7 @@ import static com.att.eelf.configuration.Configuration.MDC_RESPONSE_DESC; import static com.att.eelf.configuration.Configuration.MDC_STATUS_CODE;
import static com.att.eelf.configuration.Configuration.MDC_TARGET_ENTITY;
import static com.att.eelf.configuration.Configuration.MDC_TARGET_SERVICE_NAME;
+
import com.att.eelf.utils.Stopwatch;
import java.net.URI;
import java.util.Date;
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmsoClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmsoClient.java index f6197a3..9dfffb4 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmsoClient.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmsoClient.java @@ -181,7 +181,8 @@ public class CmsoClient { updateScheduleStatus(cmSchedule, schedule);
}
- private void processScheduleResponse200(ChangeManagementSchedule cmSchedule, Schedule schedule, Response response){
+ private void processScheduleResponse200(ChangeManagementSchedule cmSchedule, Schedule schedule,
+ Response response) {
JsonNode node = response.readEntity(JsonNode.class);
log.info("Message returned from VID callback: " + node.toString());
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java index f663240..ebbc178 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/DispatchJob.java @@ -140,8 +140,10 @@ public class DispatchJob { // Validate ticket is still active with tm
//
// TODO
- if (cmSchedule.getTmChangeId() != null && !cmSchedule.getTmChangeId().equals("") && !isChangeApproved(schedule, cmSchedule, scheduleImmediateEnabled)) {
- return false;
+ if (cmSchedule.getTmChangeId() != null
+ && !cmSchedule.getTmChangeId().equals("")
+ && !isChangeApproved(schedule, cmSchedule, scheduleImmediateEnabled)) {
+ return false;
}
// *******************************************************************
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java b/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java index 804fe68..192239b 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/filters/CmsoClientFilters.java @@ -73,7 +73,7 @@ public class CmsoClientFilters implements ClientRequestFilter, ClientResponseFil String transactionId = (String) headers.getFirst(MessageHeaders.HeadersEnum.TransactionID.toString()); String mdcId = MDC.get(MDC_KEY_REQUEST_ID); if ((transactionId == null || "".equals(transactionId)) && (mdcId != null)) { - headers.add(HeadersEnum.TransactionID.toString(), mdcId); + headers.add(HeadersEnum.TransactionID.toString(), mdcId); } headers.add(HeadersEnum.FromAppID.toString(), appId); } |