X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=mapper%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fmapper%2Fves%2Fimpl%2FVesRequestHandlerImpl.java;h=044f2df892381429e9490eb3c3bf02c2d5683acf;hb=HEAD;hp=4d842439cc3ca30fc4fbf0c4507e4849f4f40635;hpb=c4ed11115cea02bb72770e74805081ddba12daef;p=oam%2Ftr069-adapter.git diff --git a/mapper/src/main/java/org/commscope/tr069adapter/mapper/ves/impl/VesRequestHandlerImpl.java b/mapper/src/main/java/org/commscope/tr069adapter/mapper/ves/impl/VesRequestHandlerImpl.java index 4d84243..044f2df 100644 --- a/mapper/src/main/java/org/commscope/tr069adapter/mapper/ves/impl/VesRequestHandlerImpl.java +++ b/mapper/src/main/java/org/commscope/tr069adapter/mapper/ves/impl/VesRequestHandlerImpl.java @@ -1,67 +1,82 @@ -package org.commscope.tr069adapter.mapper.ves.impl; - -import org.commscope.tr069adapter.acs.common.DeviceRPCRequest; -import org.commscope.tr069adapter.acs.common.DeviceRPCResponse; -import org.commscope.tr069adapter.acs.common.OperationResponse; -import org.commscope.tr069adapter.mapper.MapperConfigProperties; -import org.commscope.tr069adapter.mapper.model.ErrorCodeDetails; -import org.commscope.tr069adapter.mapper.sync.SynchronizedRequestHandler; -import org.commscope.tr069adapter.mapper.util.ErrorCodeUtil; -import org.commscope.tr069adapter.mapper.util.MapperConstants; -import org.commscope.tr069adapter.mapper.ves.VesRequestHandler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class VesRequestHandlerImpl implements VesRequestHandler { - - private static final Logger LOG = LoggerFactory.getLogger(VesRequestHandlerImpl.class); - - @Autowired - SynchronizedRequestHandler syncHandler; - - @Autowired - MapperConfigProperties config; - - @Autowired - private ErrorCodeUtil errorCodeUtil; - - - @Override - public DeviceRPCResponse handleDeviceConnectivityRequest(DeviceRPCRequest deviceRPCRequest) { - DeviceRPCResponse deviceRPCResponse = syncHandler.performDeviceOperation(deviceRPCRequest); - if (null == deviceRPCResponse) { - return getTimeOutResponse(deviceRPCRequest); - } - - return deviceRPCResponse; - } - - private DeviceRPCResponse getTimeOutResponse(DeviceRPCRequest deviceRPCRequest) { - DeviceRPCResponse timeOutErrorResponse = new DeviceRPCResponse(); - - timeOutErrorResponse.setDeviceDetails(deviceRPCRequest.getDeviceDetails()); - - OperationResponse operationResponse = new OperationResponse(); - operationResponse.setStatus(MapperConstants.DEVICE_REACHABILITY_OP_FAILURE_CODE);// device - // reachable...change - // value 1 to - // some - // constant or - // enum - operationResponse.setOperationCode(deviceRPCRequest.getOpDetails().getOpCode()); - - timeOutErrorResponse.setOperationResponse(operationResponse); - timeOutErrorResponse.setFaultKey(MapperConstants.DEVICE_TIMEOUT_STATUS_CODE); - ErrorCodeDetails errorCodeDetails = - errorCodeUtil.getErrorCodeMetaData(MapperConstants.DEVICE_TIMEOUT_STATUS_CODE); - if (null != errorCodeDetails) { - timeOutErrorResponse.setFaultString(errorCodeDetails.getErrorMessage()); - } else { - timeOutErrorResponse.setFaultString(MapperConstants.DEFAULT_OP_TIMEOUT_MSG); - } - return timeOutErrorResponse; - } -} +/* + * ============LICENSE_START======================================================================== + * ONAP : tr-069-adapter + * ================================================================================================= + * Copyright (C) 2020 CommScope Inc Intellectual Property. + * ================================================================================================= + * This tr-069-adapter software file is distributed by CommScope Inc under the Apache License, + * Version 2.0 (the "License"); you may not use this file except in compliance with the License. You + * may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions and + * limitations under the License. + * ===============LICENSE_END======================================================================= + */ + +package org.commscope.tr069adapter.mapper.ves.impl; + +import org.commscope.tr069adapter.acs.common.DeviceRPCRequest; +import org.commscope.tr069adapter.acs.common.DeviceRPCResponse; +import org.commscope.tr069adapter.acs.common.OperationResponse; +import org.commscope.tr069adapter.mapper.MapperConfigProperties; +import org.commscope.tr069adapter.mapper.model.ErrorCodeDetails; +import org.commscope.tr069adapter.mapper.sync.SynchronizedRequestHandler; +import org.commscope.tr069adapter.mapper.util.ErrorCodeUtil; +import org.commscope.tr069adapter.mapper.util.MapperConstants; +import org.commscope.tr069adapter.mapper.ves.VesRequestHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class VesRequestHandlerImpl implements VesRequestHandler { + + + @Autowired + SynchronizedRequestHandler syncHandler; + + @Autowired + MapperConfigProperties config; + + @Autowired + private ErrorCodeUtil errorCodeUtil; + + + @Override + public DeviceRPCResponse handleDeviceConnectivityRequest(DeviceRPCRequest deviceRPCRequest) { + DeviceRPCResponse deviceRPCResponse = syncHandler.performDeviceOperation(deviceRPCRequest); + if (null == deviceRPCResponse) { + return getTimeOutResponse(deviceRPCRequest); + } + + return deviceRPCResponse; + } + + private DeviceRPCResponse getTimeOutResponse(DeviceRPCRequest deviceRPCRequest) { + DeviceRPCResponse timeOutErrorResponse = new DeviceRPCResponse(); + + timeOutErrorResponse.setDeviceDetails(deviceRPCRequest.getDeviceDetails()); + + OperationResponse operationResponse = new OperationResponse(); + operationResponse.setStatus(MapperConstants.DEVICE_REACHABILITY_OP_FAILURE_CODE);// device + // reachable...change + // value 1 to + // some + // constant or + // enum + operationResponse.setOperationCode(deviceRPCRequest.getOpDetails().getOpCode()); + + timeOutErrorResponse.setOperationResponse(operationResponse); + timeOutErrorResponse.setFaultKey(MapperConstants.DEVICE_TIMEOUT_STATUS_CODE); + ErrorCodeDetails errorCodeDetails = + errorCodeUtil.getErrorCodeMetaData(MapperConstants.DEVICE_TIMEOUT_STATUS_CODE); + if (null != errorCodeDetails) { + timeOutErrorResponse.setFaultString(errorCodeDetails.getErrorMessage()); + } else { + timeOutErrorResponse.setFaultString(MapperConstants.DEFAULT_OP_TIMEOUT_MSG); + } + return timeOutErrorResponse; + } +}