diff options
author | Denes Nemeth <denes.nemeth@nokia.com> | 2018-03-24 14:00:54 +0100 |
---|---|---|
committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-03-25 21:32:03 +0200 |
commit | c82c886215ed34953a51dff0710c6bd15cb80ee4 (patch) | |
tree | 783f928ba8e033bbf55b6cffa343c7ea47c40b59 /nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java | |
parent | 1489e4215e075ab3ffe8f7158559a38778cd0b34 (diff) |
Removing jackson to mitigate cve-2017-4995
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-728
Change-Id: Ib495d4706361cc39527dfe86463aa505d9564afa
Diffstat (limited to 'nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java')
-rw-r--r-- | nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java index 0d078d0b..277be9c4 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java @@ -24,7 +24,8 @@ import com.nokia.cbam.lcm.v32.api.VnfsApi; import com.nokia.cbam.lcm.v32.model.OperationExecution; import com.nokia.cbam.lcm.v32.model.OperationType; import com.nokia.cbam.lcm.v32.model.VnfInfo; -import org.apache.http.HttpStatus; +import java.util.*; +import javax.servlet.http.HttpServletResponse; import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.core.SelfRegistrationManager; import org.onap.vnfmdriver.model.JobDetailInfo; import org.onap.vnfmdriver.model.JobDetailInfoResponseDescriptor; @@ -34,8 +35,9 @@ import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletResponse; -import java.util.*; +import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static java.util.Optional.empty; +import static java.util.Optional.of; import static com.google.common.base.Splitter.on; import static com.google.common.collect.Iterables.find; @@ -43,8 +45,6 @@ import static com.google.common.collect.Iterables.tryFind; import static com.google.common.collect.Lists.newArrayList; import static com.nokia.cbam.lcm.v32.model.OperationStatus.FAILED; import static com.nokia.cbam.lcm.v32.model.OperationStatus.STARTED; -import static java.util.Optional.empty; -import static java.util.Optional.of; import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.SEPARATOR; import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.buildFatalFailure; import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.SystemFunctions.systemFunctions; @@ -109,11 +109,11 @@ public class JobManager { String jobId = vnfId + SEPARATOR + UUID.randomUUID().toString(); synchronized (this) { if (preparingForShutDown) { - response.setStatus(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.setStatus(SC_SERVICE_UNAVAILABLE); throw buildFatalFailure(logger, "The service is preparing to shut down"); } if (!selfRegistrationManager.isReady()) { - response.setStatus(HttpStatus.SC_SERVICE_UNAVAILABLE); + response.setStatus(SC_SERVICE_UNAVAILABLE); throw buildFatalFailure(logger, "The service is not yet ready"); } } @@ -285,7 +285,7 @@ public class JobManager { } private boolean isCurrentOperationTriggeredByJob(String jobId, OperationExecutionsApi cbamOperationExecutionApi, OperationExecution operationExecution) { - if(OperationType.MODIFY_INFO.equals(operationExecution.getOperationType())){ + if (OperationType.MODIFY_INFO.equals(operationExecution.getOperationType())) { //the modify info is never triggered by an external job return false; } |