import org.openecomp.sdc.health.data.HealthInfo;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
-import org.openecomp.sdcrests.health.types.HealthInfoDtos;
-import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
SessionContextProviderFactory.getInstance().createInterface().create("public");
try {
- MdcUtil.initMdc(LoggerServiceName.Health_check.toString());
Collection<HealthInfo> healthInfos = healthCheckManager.checkHealth();
healthCheckResult.setComponentsInfo(healthInfos);
boolean someIsDown = healthInfos.stream()
} catch (Exception ex) {
logger.error("Health check failed", ex);
Response.ResponseBuilder responseBuilder = new ResponseBuilderImpl();
- GenericCollectionWrapper<HealthInfoDtos> results = new GenericCollectionWrapper<>();
HealthInfo healthInfo = new HealthInfo(org.openecomp.sdc.health.data.MonitoredModules.BE,
HealthCheckStatus.DOWN,
"", "Failed to perform Health Check");
import org.openecomp.sdc.itempermissions.ItemPermissionsManagerFactory;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.notification.dtos.Event;
import org.openecomp.sdc.notification.factories.NotificationPropagationManagerFactory;
import org.openecomp.sdc.notification.services.NotificationPropagationManager;
@Override
public Response getActivityLog(String itemId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_List_Activity_Log.toString());
-
GenericCollectionWrapper<ActivityLogDto> results = new GenericCollectionWrapper<>();
MapActivityLogEntityToDto mapper = new MapActivityLogEntityToDto();
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.notification.dao.types.NotificationEntity;
import org.openecomp.sdc.notification.dtos.NotificationsStatus;
import org.openecomp.sdc.notification.exceptons.NotificationNotExistException;
@Override
public Response getNotifications(String user, UUID lastDelivered, UUID endOfPage) {
- MdcUtil.initMdc(LoggerServiceName.notifications.toString());
NotificationsStatus notificationsStatus = notificationsService
.getNotificationsStatus(user, lastDelivered, selectionLimit, endOfPage);
MapNotificationsStatusToDto converter = new MapNotificationsStatusToDto();
@Override
public Response getNewNotificationsByOwnerId(String user, String eventId, String limitStr) {
- MdcUtil.initMdc(LoggerServiceName.notifications.toString());
-
int limit = selectionLimit;
if (Objects.nonNull(limitStr)) {
package org.openecomp.sdcrests.vendorlicense.rest.services;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
private VendorLicenseManager vendorLicenseManager =
VendorLicenseManagerFactory.getInstance().createInterface();
- public static final String parent = "EntitlementPool";
+ private static final String PARENT = "EntitlementPool";
@Override
public Response createLimit(LimitRequestDto request,
String versionId,
String entitlementPoolId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_LIMIT.toString());
Version version = new Version(versionId);
vendorLicenseManager
.getEntitlementPool(new EntitlementPoolEntity(vlmId, version, entitlementPoolId));
limitEntity.setVendorLicenseModelId(vlmId);
limitEntity.setVersion(version);
limitEntity.setEpLkgId(entitlementPoolId);
- limitEntity.setParent(parent);
+ limitEntity.setParent(PARENT);
LimitEntity createdLimit = vendorLicenseManager.createLimit(limitEntity);
MapLimitEntityToLimitCreationDto mapper = new MapLimitEntityToLimitCreationDto();
LimitCreationDto createdLimitDto = mapper.applyMapping(createdLimit, LimitCreationDto.class);
- /*StringWrapperResponse result =
- createdLimit != null ? new StringWrapperResponse(createdLimit.getId())
- : null;*/
- //return Response.ok(result).build();
return Response.ok(createdLimitDto != null ? createdLimitDto : null).build();
}
@Override
public Response listLimits(String vlmId, String versionId, String entitlementPoolId, String
user) {
- MdcUtil.initMdc(LoggerServiceName.List_EP.toString());
Version version = new Version(versionId);
vendorLicenseManager
.getEntitlementPool(new EntitlementPoolEntity(vlmId, version, entitlementPoolId));
@Override
public Response getLimit(String vlmId, String versionId, String entitlementPoolId,
String limitId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_LIMIT.toString());
-
Version version = new Version(versionId);
vendorLicenseManager
.getEntitlementPool(new EntitlementPoolEntity(vlmId, version, entitlementPoolId));
String entitlementPoolId,
String limitId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_LIMIT.toString());
-
Version version = new Version(versionId);
vendorLicenseManager
.getEntitlementPool(new EntitlementPoolEntity(vlmId, version, entitlementPoolId));
limitEntity.setVersion(version);
limitEntity.setEpLkgId(entitlementPoolId);
limitEntity.setId(limitId);
- limitEntity.setParent(parent);
+ limitEntity.setParent(PARENT);
vendorLicenseManager.updateLimit(limitEntity);
return Response.ok().build();
*/
public Response deleteLimit(String vlmId, String versionId, String entitlementPoolId,
String limitId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_LIMIT.toString());
-
Version version = new Version(versionId);
vendorLicenseManager.getEntitlementPool(
new EntitlementPoolEntity(vlmId, version, entitlementPoolId));
limitInput.setVersion(version);
limitInput.setEpLkgId(entitlementPoolId);
limitInput.setId(limitId);
- limitInput.setParent(parent);
+ limitInput.setParent(PARENT);
vendorLicenseManager.deleteLimit(limitInput);
return Response.ok().build();
package org.openecomp.sdcrests.vendorlicense.rest.services;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
* @return the response
*/
public Response listEntitlementPools(String vlmId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_EP.toString());
Collection<EntitlementPoolEntity> entitlementPools =
vendorLicenseManager.listEntitlementPools(vlmId, new Version(versionId));
*/
public Response createEntitlementPool(EntitlementPoolRequestDto request, String vlmId,
String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_EP.toString());
EntitlementPoolEntity entitlementPoolEntity =
new MapEntitlementPoolRequestDtoToEntitlementPoolEntity()
.applyMapping(request, EntitlementPoolEntity.class);
*/
public Response updateEntitlementPool(EntitlementPoolRequestDto request, String vlmId,
String versionId, String entitlementPoolId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_EP.toString());
EntitlementPoolEntity entitlementPoolEntity =
new MapEntitlementPoolRequestDtoToEntitlementPoolEntity()
.applyMapping(request, EntitlementPoolEntity.class);
*/
public Response getEntitlementPool(String vlmId, String versionId, String entitlementPoolId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_EP.toString());
EntitlementPoolEntity epInput = new EntitlementPoolEntity();
epInput.setVendorLicenseModelId(vlmId);
epInput.setVersion(new Version(versionId));
*/
public Response deleteEntitlementPool(String vlmId, String versionId, String entitlementPoolId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_EP.toString());
EntitlementPoolEntity epInput = new EntitlementPoolEntity();
epInput.setVendorLicenseModelId(vlmId);
epInput.setId(entitlementPoolId);
package org.openecomp.sdcrests.vendorlicense.rest.services;
import org.openecomp.core.utilities.CommonMethods;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
@Override
public Response listFeatureGroups(String vlmId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_FG.toString());
Collection<FeatureGroupEntity> featureGroupEntities =
vendorLicenseManager.listFeatureGroups(vlmId, new Version(versionId));
@Override
public Response createFeatureGroup(FeatureGroupRequestDto request, String vlmId, String versionId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_FG.toString());
FeatureGroupEntity featureGroupEntity = new MapFeatureGroupDescriptorDtoToFeatureGroupEntity()
.applyMapping(request, FeatureGroupEntity.class);
featureGroupEntity.setVendorLicenseModelId(vlmId);
@Override
public Response updateFeatureGroup(FeatureGroupUpdateRequestDto request, String vlmId,
String versionId, String featureGroupId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_FG.toString());
FeatureGroupEntity featureGroupEntity = new MapFeatureGroupDescriptorDtoToFeatureGroupEntity()
.applyMapping(request, FeatureGroupEntity.class);
featureGroupEntity.setVendorLicenseModelId(vlmId);
@Override
public Response getFeatureGroup(String vlmId, String versionId, String featureGroupId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_FG.toString());
FeatureGroupEntity fgInput = new FeatureGroupEntity();
fgInput.setVendorLicenseModelId(vlmId);
fgInput.setVersion(new Version(versionId));
@Override
public Response deleteFeatureGroup(String vlmId, String versionId, String featureGroupId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_FG.toString());
FeatureGroupEntity fgInput = new FeatureGroupEntity();
fgInput.setVendorLicenseModelId(vlmId);
fgInput.setVersion(new Version(versionId));
package org.openecomp.sdcrests.vendorlicense.rest.services;
import org.openecomp.core.utilities.CommonMethods;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
* @return the response
*/
public Response listLicenseAgreements(String vlmId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_LA.toString());
Collection<LicenseAgreementEntity> licenseAgreements =
vendorLicenseManager.listLicenseAgreements(vlmId, new Version(versionId));
*/
public Response createLicenseAgreement(LicenseAgreementRequestDto request, String vlmId,
String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_LA.toString());
LicenseAgreementEntity licenseAgreementEntity =
new MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity()
.applyMapping(request, LicenseAgreementEntity.class);
*/
public Response updateLicenseAgreement(LicenseAgreementUpdateRequestDto request, String vlmId,
String versionId, String licenseAgreementId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_LA.toString());
LicenseAgreementEntity licenseAgreementEntity =
new MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity()
.applyMapping(request, LicenseAgreementEntity.class);
*/
public Response getLicenseAgreement(String vlmId, String versionId, String licenseAgreementId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_LA.toString());
LicenseAgreementModel licenseAgreementModel = vendorLicenseManager
.getLicenseAgreementModel(vlmId, new Version(versionId), licenseAgreementId);
*/
public Response deleteLicenseAgreement(String vlmId, String versionId, String licenseAgreementId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_LA.toString());
vendorLicenseManager.deleteLicenseAgreement(vlmId, new Version(versionId), licenseAgreementId);
return Response.ok().build();
}
package org.openecomp.sdcrests.vendorlicense.rest.services;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
private VendorLicenseManager vendorLicenseManager =
VendorLicenseManagerFactory.getInstance().createInterface();
- public static final String parent = "LicenseKeyGroup";
+ private static final String PARENT = "LicenseKeyGroup";
@Override
String versionId,
String licenseKeyGroupId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_LIMIT.toString());
Version version = new Version(versionId);
vendorLicenseManager.getLicenseKeyGroup(
new LicenseKeyGroupEntity(vlmId, version, licenseKeyGroupId));
limitEntity.setVendorLicenseModelId(vlmId);
limitEntity.setVersion(version);
limitEntity.setEpLkgId(licenseKeyGroupId);
- limitEntity.setParent(parent);
+ limitEntity.setParent(PARENT);
LimitEntity createdLimit = vendorLicenseManager.createLimit(limitEntity);
MapLimitEntityToLimitCreationDto mapper = new MapLimitEntityToLimitCreationDto();
LimitCreationDto createdLimitDto = mapper.applyMapping(createdLimit, LimitCreationDto.class);
- /*StringWrapperResponse result =
- createdLimit != null ? new StringWrapperResponse(createdLimit.getId())
- : null;*/
- //return Response.ok(result).build();
return Response.ok(createdLimitDto != null ? createdLimitDto : null).build();
}
@Override
public Response listLimits(String vlmId, String versionId, String licenseKeyGroupId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.List_EP.toString());
Version version = new Version(versionId);
vendorLicenseManager
.getLicenseKeyGroup(new LicenseKeyGroupEntity(vlmId, version, licenseKeyGroupId));
String licenseKeyGroupId,
String limitId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_LIMIT.toString());
-
Version version = new Version(versionId);
vendorLicenseManager
.getLicenseKeyGroup(new LicenseKeyGroupEntity(vlmId, version, licenseKeyGroupId));
limitEntity.setVersion(version);
limitEntity.setEpLkgId(licenseKeyGroupId);
limitEntity.setId(limitId);
- limitEntity.setParent(parent);
+ limitEntity.setParent(PARENT);
vendorLicenseManager.updateLimit(limitEntity);
return Response.ok().build();
*/
public Response deleteLimit(String vlmId, String versionId, String licenseKeyGroupId,
String limitId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_LIMIT.toString());
-
Version version = new Version(versionId);
vendorLicenseManager
.getLicenseKeyGroup(new LicenseKeyGroupEntity(vlmId, version, licenseKeyGroupId));
limitInput.setVersion(version);
limitInput.setEpLkgId(licenseKeyGroupId);
limitInput.setId(limitId);
- limitInput.setParent(parent);
+ limitInput.setParent(PARENT);
vendorLicenseManager.deleteLimit(limitInput);
return Response.ok().build();
@Override
public Response getLimit(String vlmId, String versionId, String licenseKeyGroupId,
String limitId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_LIMIT.toString());
Version version = new Version(versionId);
vendorLicenseManager
.getLicenseKeyGroup(new LicenseKeyGroupEntity(vlmId, version, licenseKeyGroupId));
package org.openecomp.sdcrests.vendorlicense.rest.services;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorlicense.VendorLicenseManager;
import org.openecomp.sdc.vendorlicense.VendorLicenseManagerFactory;
import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
* @return the response
*/
public Response listLicenseKeyGroups(String vlmId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_LKG.toString());
Collection<LicenseKeyGroupEntity> licenseKeyGroups =
vendorLicenseManager.listLicenseKeyGroups(vlmId, new Version(versionId));
*/
public Response createLicenseKeyGroup(LicenseKeyGroupRequestDto request, String vlmId,
String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_LKG.toString());
LicenseKeyGroupEntity licenseKeyGroupEntity =
new MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity()
.applyMapping(request, LicenseKeyGroupEntity.class);
public Response updateLicenseKeyGroup(LicenseKeyGroupRequestDto request, String vlmId,
String versionId,
String licenseKeyGroupId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_LKG.toString());
LicenseKeyGroupEntity licenseKeyGroupEntity =
new MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity()
.applyMapping(request, LicenseKeyGroupEntity.class);
*/
public Response getLicenseKeyGroup(String vlmId, String versionId, String licenseKeyGroupId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_LKG.toString());
LicenseKeyGroupEntity lkgInput = new LicenseKeyGroupEntity();
lkgInput.setVendorLicenseModelId(vlmId);
lkgInput.setVersion(new Version(versionId));
*/
public Response deleteLicenseKeyGroup(String vlmId, String versionId, String licenseKeyGroupId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_LKG.toString());
LicenseKeyGroupEntity lkgInput = new LicenseKeyGroupEntity();
lkgInput.setVendorLicenseModelId(vlmId);
lkgInput.setVersion(new Version(versionId));
import org.openecomp.sdc.itempermissions.impl.types.PermissionTypes;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.messages.AuditMessages;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.notification.dtos.Event;
import org.openecomp.sdc.notification.factories.NotificationPropagationManagerFactory;
import org.openecomp.sdc.notification.services.NotificationPropagationManager;
@Validated
public class VendorLicenseModelsImpl implements VendorLicenseModels {
- private static final String VLM_ID = "VLM id";
private static final String SUBMIT_ITEM_ACTION = "Submit_Item";
private static final String SUBMIT_HEALED_VERSION_ERROR =
"VLM Id %s: Error while submitting version %s created based on Certified version %s for healing purpose.";
@Override
public Response listLicenseModels(String versionStatus, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_VLM.toString());
-
Predicate<Item> itemPredicate;
if (VersionStatus.Certified.name().equals(versionStatus)) {
itemPredicate = item -> ItemType.vlm.name().equals(item.getType()) &&
@Override
public Response createLicenseModel(VendorLicenseModelRequestDto request, String user) {
- LOGGER.audit(AuditMessages.AUDIT_MSG + AuditMessages.CREATE_VLM + request.getVendorName());
- MdcUtil.initMdc(LoggerServiceName.Create_VLM.toString());
Item item = new Item();
item.setType(ItemType.vlm.name());
@Override
public Response updateLicenseModel(VendorLicenseModelRequestDto request, String vlmId,
String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_VLM.toString());
-
VendorLicenseModelEntity vlm =
new MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity()
.applyMapping(request, VendorLicenseModelEntity.class);
@Override
public Response getLicenseModel(String vlmId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_VLM.toString());
-
Version version = versioningManager.get(vlmId, new Version(versionId));
VendorLicenseModelEntity vlm = vendorLicenseManager.getVendorLicenseModel(vlmId, version);
vlm.setWritetimeMicroSeconds(version.getModificationTime().getTime());
@Override
public Response deleteLicenseModel(String vlmId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_VLM.toString());
vendorLicenseManager.deleteVendorLicenseModel(vlmId, new Version(versionId));
return Response.ok().build();
}
}
private void submit(String vlmId, Version version, String message, String user) {
- MdcUtil.initMdc(LoggerServiceName.Submit_VLM.toString());
- LOGGER.audit(AuditMessages.AUDIT_MSG + AuditMessages.SUBMIT_VLM + vlmId);
vendorLicenseManager.validate(vlmId, version);
versioningManager.submit(vlmId, version, message);
package org.openecomp.sdcrests.vsp.rest.services;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentDependencyModelManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentDependencyModelManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentDependencyModelEntity;
@Override
public Response create(ComponentDependencyModel request, String vspId, String versionId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.CREATE_COMPONENT_DEPENDENCY_MODEL.toString());
-
final Version version = new Version(versionId);
ComponentDependencyModelEntity modelEntity =
@Override
public Response list(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.GET_LIST_COMPONENT_DEPENDENCY.toString());
+
Version vspVersion = new Version(versionId);
Collection<ComponentDependencyModelEntity> componentDependencies =
@Override
public Response delete(String vspId, String versionId, String dependencyId, String user) {
- MdcUtil.initMdc(LoggerServiceName.DELETE_COMPONENT_DEPENDENCY.toString());
+
Version vspVersion = new Version(versionId);
componentDependencyModelManager.delete(vspId, vspVersion, dependencyId);
return Response.ok().build();
public Response update(ComponentDependencyModel request, String vspId, String versionId, String
dependencyId, String user) {
- MdcUtil.initMdc(LoggerServiceName.UPDATE_COMPONENT_DEPENDENCY.toString());
-
final Version version = new Version(versionId);
ComponentDependencyModelEntity modelEntity =
new MapComponentDependencyModelRequestToEntity().applyMapping(request,
@Override
public Response get(String vspId, String version, String dependencyId, String user) {
- MdcUtil.initMdc(LoggerServiceName.GET_COMPONENT_DEPENDENCY.toString());
+
ComponentDependencyModelEntity componentDependencyModelEntity = componentDependencyModelManager
.get(vspId, new Version(version), dependencyId);
import org.openecomp.core.enrichment.types.MonitoringUploadType;
import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
import org.openecomp.sdc.common.errors.Messages;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.messages.AuditMessages;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.MonitoringUploadsManager;
monitoringUploadsManager = MonitoringUploadsManagerFactory.getInstance().createInterface();
private ComponentManager componentManager =
ComponentManagerFactory.getInstance().createInterface();
- private static final Logger logger =
- LoggerFactory.getLogger(ComponentMonitoringUploadsImpl.class);
@Override
public Response upload(Attachment attachment,
String vspId, String versionId, String componentId, String type,
String user) throws Exception {
- MdcUtil.initMdc(LoggerServiceName.Upload_Monitoring_Artifact.toString());
- logger.audit(AuditMessages.AUDIT_MSG + String.format(AuditMessages
- .UPLOAD_MONITORING_FILE, type, vspId, componentId));
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
@Override
public Response delete(String vspId, String versionId, String componentId,
String type, String user) throws Exception {
- MdcUtil.initMdc(LoggerServiceName.Delete_Monitoring_Artifact.toString());
MonitoringUploadType monitoringUploadType = getMonitoringUploadType(vspId, componentId, type);
@Override
public Response list(String vspId, String versionId, String componentId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Monitoring_Artifacts.toString());
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
import org.openecomp.sdc.activitylog.dao.type.ActivityType;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.messages.AuditMessages;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.ProcessManager;
private ActivityLogManager activityLogManager =
ActivityLogManagerFactory.getInstance().createInterface();
- private static final Logger logger =
- LoggerFactory.getLogger(ComponentProcessesImpl.class);
-
@Override
public Response list(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Component_Processes.toString());
+
Version version = new Version(versionId);
validateComponentExistence(vspId, version, componentId, user);
Collection<ProcessEntity> processes = processManager.listProcesses(vspId, version, componentId);
@Override
public Response deleteList(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_List_Component_Processes.toString());
+
Version version = new Version(versionId);
validateComponentExistence(vspId, version, componentId, user);
processManager.deleteProcesses(vspId, version, componentId);
@Override
public Response create(ProcessRequestDto request, String vspId, String versionId,
String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Component_Processes.toString());
+
ProcessEntity process =
new MapProcessRequestDtoToProcessEntity().applyMapping(request, ProcessEntity.class);
process.setVspId(vspId);
@Override
public Response get(String vspId, String versionId, String componentId, String processId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Component_Processes.toString());
+
Version version = new Version(versionId);
validateComponentExistence(vspId, version, componentId, user);
ProcessEntity process = processManager.getProcess(vspId, version, componentId, processId);
@Override
public Response delete(String vspId, String versionId, String componentId, String processId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Component_Processes.toString());
+
Version version = new Version(versionId);
validateComponentExistence(vspId, version, componentId, user);
processManager.deleteProcess(vspId, version, componentId, processId);
public Response update(ProcessRequestDto request, String vspId, String versionId,
String componentId,
String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Component_Processes.toString());
+
ProcessEntity process =
new MapProcessRequestDtoToProcessEntity().applyMapping(request, ProcessEntity.class);
process.setVspId(vspId);
@Override
public Response getUploadedFile(String vspId, String versionId, String componentId,
String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Uploaded_File_Component_Processes.toString());
+
Version vspVersion = new Version(versionId);
validateComponentExistence(vspId, vspVersion, componentId, user);
File file = processManager.getProcessArtifact(vspId, vspVersion, componentId, processId);
public Response deleteUploadedFile(String vspId, String versionId, String componentId,
String processId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Uploaded_File_Component_Processes.toString());
+
Version version = new Version(versionId);
validateComponentExistence(vspId, version, componentId, user);
processManager.deleteProcessArtifact(vspId, version, componentId, processId);
public Response uploadFile(Attachment attachment, String vspId, String versionId,
String componentId,
String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Upload_File_Component_Processes.toString());
- logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.UPLOAD_PROCESS_ARTIFACT + vspId);
+
Version version = new Version(versionId);
validateComponentExistence(vspId, version, componentId, user);
processManager.uploadProcessArtifact(attachment.getObject(InputStream.class),
package org.openecomp.sdcrests.vsp.rest.services;
import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity;
@Override
public Response list(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Components.toString());
+
Collection<ComponentEntity> components =
componentManager.listComponents(vspId, new Version(versionId));
@Override
public Response deleteList(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_List_Components.toString());
componentManager.deleteComponents(vspId, new Version(versionId));
return Response.ok().build();
}
@Override
public Response create(ComponentRequestDto request, String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Component.toString());
+
ComponentEntity component =
new MapComponentRequestDtoToComponentEntity().applyMapping(request, ComponentEntity.class);
component.setVspId(vspId);
@Override
public Response get(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Component.toString());
+
CompositionEntityResponse<ComponentData> response =
componentManager.getComponent(vspId, new Version(versionId), componentId);
@Override
public Response delete(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Component.toString());
componentManager.deleteComponent(vspId, new Version(versionId), componentId);
return Response.ok().build();
}
public Response update(ComponentRequestDto request, String vspId, String versionId,
String componentId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Component.toString());
ComponentEntity componentEntity =
new MapComponentRequestDtoToComponentEntity().applyMapping(request, ComponentEntity.class);
componentEntity.setVspId(vspId);
@Override
public Response getQuestionnaire(String vspId, String versionId, String componentId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_Component.toString());
QuestionnaireResponse questionnaireResponse =
componentManager.getQuestionnaire(vspId, new Version(versionId), componentId);
@Override
public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId,
String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_Component.toString());
componentManager
.updateQuestionnaire(vspId, new Version(versionId), componentId, questionnaireData);
return Response.ok().build();
package org.openecomp.sdcrests.vsp.rest.services;
import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.ComputeManager;
@Override
public Response list(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Computes.toString());
+
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
Collection<ListComputeResponse> computes =
@Override
public Response get(String vspId, String versionId, String componentId, String computeId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Compute.toString());
+
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
CompositionEntityResponse<ComputeData> response =
@Override
public Response create(ComputeDetailsDto request, String vspId, String versionId,
String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Compute.toString());
+
ComputeEntity compute = new MapComputeDetailsDtoToComputeEntity().applyMapping(request,
ComputeEntity.class);
compute.setVspId(vspId);
@Override
public Response update(ComputeDetailsDto request, String vspId, String versionId,
String componentId, String computeFlavorId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Compute.toString());
+
ComputeEntity compute =
new MapComputeDetailsDtoToComputeEntity().applyMapping(request, ComputeEntity.class);
compute.setVspId(vspId);
@Override
public Response delete(String vspId, String versionId, String componentId, String computeFlavorId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Compute.toString());
+
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
computetManager.deleteCompute(vspId, version, componentId, computeFlavorId);
@Override
public Response getQuestionnaire(String vspId, String versionId, String componentId,
String computeFlavorId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_Compute.toString());
+
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
QuestionnaireResponse questionnaireResponse =
@Override
public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId,
String componentId, String computeFlavorId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_Compute.toString());
+
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
computetManager.updateComputeQuestionnaire(vspId, version, componentId, computeFlavorId,
package org.openecomp.sdcrests.vsp.rest.services;
import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.DeploymentFlavorManager;
import org.openecomp.sdc.vendorsoftwareproduct.DeploymentFlavorManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.DeploymentFlavorEntity;
@Override
public Response create(DeploymentFlavorRequestDto request, String vspId, String versionId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Deployment_Flavor.toString());
DeploymentFlavorEntity deploymentFlavorEntity =
new MapDeploymentFlavorRequestDtoToDeploymentFlavorEntity()
.applyMapping(request, DeploymentFlavorEntity.class);
@Override
public Response list(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_List_Deployment_flavor.toString());
Collection<DeploymentFlavorEntity> deploymentFlavors =
deploymentFlavorManager.listDeploymentFlavors(vspId, new Version(versionId));
@Override
public Response get(String vspId, String versionId, String deploymentFlavorId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Deployment_flavor.toString());
CompositionEntityResponse<DeploymentFlavor> response = deploymentFlavorManager
.getDeploymentFlavor(vspId, new Version(versionId), deploymentFlavorId);
@Override
public Response getSchema(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Deployment_flavor.toString());
CompositionEntityResponse<DeploymentFlavor> response = deploymentFlavorManager
.getDeploymentFlavorSchema(vspId, new Version(versionId));
return Response.ok(response).build();
@Override
public Response delete(String vspId, String versionId, String deploymentFlavorId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Deployment_flavor.toString());
Version version = new Version(versionId);
deploymentFlavorManager.deleteDeploymentFlavor(vspId, version, deploymentFlavorId);
return Response.ok().build();
@Override
public Response update(DeploymentFlavorRequestDto request, String vspId, String versionId,
String deploymentFlavorId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Deployment_flavor.toString());
DeploymentFlavorEntity deploymentFlavorEntity =
new MapDeploymentFlavorRequestDtoToDeploymentFlavorEntity().applyMapping(request,
DeploymentFlavorEntity.class);
import org.apache.commons.collections.CollectionUtils;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.ImageManager;
@Override
public Response create(ImageRequestDto request, String vspId, String versionId,
String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Image.toString());
ImageEntity image =
new MapImageRequestDtoToImageEntity().applyMapping(request, ImageEntity.class);
image.setVspId(vspId);
@Override
public Response getImageSchema(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.GET_Image_Schema.toString());
CompositionEntityResponse<Image> response = imageManager.getImageSchema(vspId);
return Response.ok(response).build();
}
@Override
public Response get(String vspId, String versionId, String componentId, String imageId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.GET_Image.toString());
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
CompositionEntityResponse<Image> response =
@Override
public Response list(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Images.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
Collection<ImageEntity> images = imageManager.listImages(vspId, vspVersion, componentId);
@Override
public Response delete(String vspId, String versionId, String componentId, String imageId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Image.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
imageManager.deleteImage(vspId, vspVersion, componentId, imageId);
@Override
public Response update(ImageRequestDto request, String vspId, String versionId,
String componentId, String imageId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Image.toString());
ImageEntity imageEntity = new MapImageRequestDtoToImageEntity().applyMapping(request,
ImageEntity.class);
imageEntity.setVspId(vspId);
@Override
public Response getQuestionnaire(String vspId, String versionId, String componentId,
String imageId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_Compute.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
QuestionnaireResponse questionnaireResponse =
@Override
public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId,
String componentId, String imageId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_Compute.toString());
Version version = new Version(versionId);
componentManager.validateComponentExistence(vspId, version, componentId);
imageManager.updateImageQuestionnaire(vspId, version, componentId, imageId, questionnaireData);
package org.openecomp.sdcrests.vsp.rest.services;
import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.NetworkManager;
import org.openecomp.sdc.vendorsoftwareproduct.NetworkManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NetworkEntity;
@Override
public Response list(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Network.toString());
Collection<NetworkEntity> networks =
networkManager.listNetworks(vspId, new Version(versionId));
@Override
public Response create(NetworkRequestDto request, String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Network.toString());
NetworkEntity network =
new MapNetworkRequestDtoToNetworkEntity().applyMapping(request, NetworkEntity.class);
network.setVspId(vspId);
@Override
public Response get(String vspId, String versionId, String networkId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Network.toString());
CompositionEntityResponse<Network> response =
networkManager.getNetwork(vspId,
new Version(versionId), networkId
@Override
public Response delete(String vspId, String versionId, String networkId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Network.toString());
networkManager
.deleteNetwork(vspId, new Version(versionId),
networkId);
@Override
public Response update(NetworkRequestDto request, String vspId, String versionId,
String networkId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Network.toString());
NetworkEntity networkEntity =
new MapNetworkRequestDtoToNetworkEntity().applyMapping(request, NetworkEntity.class);
networkEntity.setVspId(vspId);
package org.openecomp.sdcrests.vsp.rest.services;
import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.NicManager;
@Override
public Response list(String vspId, String versionId, String componentId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_nics.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
Collection<NicEntity> nics = nicManager.listNics(vspId, vspVersion, componentId);
@Override
public Response create(NicRequestDto request, String vspId, String versionId, String componentId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_nic.toString());
NicEntity nic = new MapNicRequestDtoToNicEntity().applyMapping(request, NicEntity.class);
nic.setVspId(vspId);
nic.setVersion(new Version(versionId));
@Override
public Response get(String vspId, String versionId, String componentId, String nicId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_nic.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
CompositionEntityResponse<Nic> response =
@Override
public Response delete(String vspId, String versionId, String componentId, String nicId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_nic.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
nicManager.deleteNic(vspId, vspVersion, componentId, nicId);
public Response update(NicRequestDto request, String vspId, String versionId, String componentId,
String nicId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_nic.toString());
NicEntity nicEntity = new MapNicRequestDtoToNicEntity().applyMapping(request, NicEntity.class);
nicEntity.setVspId(vspId);
nicEntity.setVersion(new Version(versionId));
@Override
public Response getQuestionnaire(String vspId, String versionId, String componentId, String nicId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_nic.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
QuestionnaireResponse questionnaireResponse =
public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId,
String componentId,
String nicId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_nic.toString());
Version vspVersion = new Version(versionId);
componentManager.validateComponentExistence(vspId, vspVersion, componentId);
nicManager
import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
import org.openecomp.sdc.activitylog.dao.type.ActivityType;
import org.openecomp.sdc.common.errors.Messages;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.messages.AuditMessages;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManager;
import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManagerFactory;
import org.openecomp.sdc.vendorsoftwareproduct.types.OrchestrationTemplateActionResponse;
private ActivityLogManager activityLogManager =
ActivityLogManagerFactory.getInstance().createInterface();
- private static final Logger logger =
- LoggerFactory.getLogger(OrchestrationTemplateCandidateImpl.class);
-
@Override
public Response upload(String vspId, String versionId, Attachment fileToUpload, String user) {
- MdcUtil.initMdc(LoggerServiceName.Upload_File.toString());
- logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.UPLOAD_HEAT + vspId);
String filename = fileToUpload.getContentDisposition().getParameter("filename");
UploadFileResponse uploadFileResponse = candidateManager
package org.openecomp.sdcrests.vsp.rest.services;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
-import org.openecomp.sdc.logging.messages.AuditMessages;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
import org.openecomp.sdcrests.vendorsoftwareproducts.types.ProcessRequestDto;
import org.openecomp.sdcrests.vsp.rest.ComponentProcesses;
import org.openecomp.sdcrests.vsp.rest.Processes;
@Scope(value = "prototype")
public class ProcessesImpl implements Processes {
- private static final Logger logger = LoggerFactory.getLogger(ProcessesImpl.class);
@Autowired
private ComponentProcesses componentProcesses;
@Override
public Response list(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Processes.toString());
return componentProcesses.list(vspId, versionId, null, user);
}
@Override
public Response deleteList(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_List_Processes.toString());
return componentProcesses.deleteList(vspId, versionId, null, user);
}
@Override
public Response create(ProcessRequestDto request, String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_Process.toString());
return componentProcesses.create(request, vspId, versionId, null, user);
}
@Override
public Response get(String vspId, String versionId, String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Processes.toString());
return componentProcesses.get(vspId, versionId, null, processId, user);
}
@Override
public Response delete(String vspId, String versionId, String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Processes.toString());
return componentProcesses.delete(vspId, versionId, null, processId, user);
}
@Override
public Response update(ProcessRequestDto request, String vspId, String versionId,
String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Process.toString());
return componentProcesses.update(request, vspId, versionId, null, processId, user);
}
@Override
public Response getUploadedFile(String vspId, String versionId, String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Uploaded_File_Processes.toString());
return componentProcesses.getUploadedFile(vspId, versionId, null, processId, user);
}
@Override
public Response deleteUploadedFile(String vspId, String versionId, String processId,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_Uploaded_File_Processes.toString());
return componentProcesses.deleteUploadedFile(vspId, versionId, null, processId, user);
}
@Override
public Response uploadFile(Attachment attachment, String vspId, String versionId,
String processId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Upload_File_Processes.toString());
- logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.UPLOAD_PROCESS_ARTIFACT + vspId);
return componentProcesses.uploadFile(attachment, vspId, versionId, null, processId, user);
}
}
package org.openecomp.sdcrests.vsp.rest.services;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION;
-import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_USER;
-import static org.openecomp.sdc.logging.messages.AuditMessages.SUBMIT_VSP_ERROR;
-import static org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants.UniqueValues.VENDOR_SOFTWARE_PRODUCT_NAME;
-import static org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants.VALIDATION_VSP_NAME;
-import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.ITEM_ID;
-import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.ITEM_NAME;
-import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.SUBMIT_DESCRIPTION;
-import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.VERSION_ID;
-import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.VERSION_NAME;
-
import org.apache.commons.collections4.MapUtils;
import org.openecomp.core.util.UniqueValueUtil;
import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
import org.openecomp.sdc.itempermissions.impl.types.PermissionTypes;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.MdcUtil;
import org.openecomp.sdc.logging.messages.AuditMessages;
-import org.openecomp.sdc.logging.types.LoggerConstants;
-import org.openecomp.sdc.logging.types.LoggerErrorCode;
-import org.openecomp.sdc.logging.types.LoggerServiceName;
-import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
import org.openecomp.sdc.notification.dtos.Event;
import org.openecomp.sdc.notification.factories.NotificationPropagationManagerFactory;
import org.openecomp.sdc.notification.services.NotificationPropagationManager;
import java.util.Optional;
import java.util.function.Predicate;
+import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION;
+import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_USER;
+import static org.openecomp.sdc.logging.messages.AuditMessages.SUBMIT_VSP_ERROR;
+import static org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants.UniqueValues.VENDOR_SOFTWARE_PRODUCT_NAME;
+import static org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants.VALIDATION_VSP_NAME;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.ITEM_ID;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.ITEM_NAME;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.SUBMIT_DESCRIPTION;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.VERSION_ID;
+import static org.openecomp.sdc.versioning.VersioningNotificationConstansts.VERSION_NAME;
+
@Named
@Service("vendorSoftwareProducts")
@Override
public Response createVsp(VspRequestDto vspRequestDto, String user) {
- MdcUtil.initMdc(LoggerServiceName.Create_VSP.toString());
- LOGGER.audit(AuditMessages.AUDIT_MSG + AuditMessages.CREATE_VSP + vspRequestDto.getName());
OnboardingMethod onboardingMethod = null;
try {
@Override
public Response listVsps(String versionStatus, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_VSP.toString());
-
Predicate<Item> itemPredicate;
if (VersionStatus.Certified.name().equals(versionStatus)) {
itemPredicate = item -> ItemType.vsp.name().equals(item.getType())
@Override
public Response getVsp(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_VSP.toString());
-
Version version = versioningManager.get(vspId, new Version(versionId));
VspDetails vspDetails = vendorSoftwareProductManager.getVsp(vspId, version);
vspDetails.setWritetimeMicroSeconds(version.getModificationTime().getTime());
@Override
public Response updateVsp(String vspId, String versionId, VspDescriptionDto vspDescriptionDto,
String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_VSP.toString());
VspDetails vspDetails =
new MapVspDescriptionDtoToVspDetails().applyMapping(vspDescriptionDto, VspDetails.class);
vspDetails.setId(vspId);
@Override
public Response deleteVsp(String vspId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Delete_VSP.toString());
vendorSoftwareProductManager.deleteVsp(vspId);
return Response.ok().build();
@Override
public Response getOrchestrationTemplate(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Uploaded_File.toString());
byte[] orchestrationTemplateFile =
vendorSoftwareProductManager.getOrchestrationTemplateFile(vspId, new Version(versionId));
@Override
public Response listPackages(String category, String subCategory, String user) {
- MdcUtil.initMdc(LoggerServiceName.List_Packages.toString());
List<PackageInfo> packageInfoList =
vendorSoftwareProductManager.listPackages(category, subCategory);
@Override
public Response getTranslatedFile(String vspId, String versionName, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Translated_File.toString());
-
List<Version> versions = versioningManager.list(vspId);
Version version;
- if (versionName == null) {
- version = versions.stream().filter(ver -> VersionStatus.Certified == ver.getStatus())
- .max(Comparator.comparingDouble(o -> Double.parseDouble(o.getName()))).orElseThrow(() -> {
- return new CoreException(new PackageNotFoundErrorBuilder(vspId).build());
- });
- } else {
+ if (versionName == null) version = versions.stream().filter(ver -> VersionStatus.Certified == ver.getStatus())
+ .max(Comparator.comparingDouble(o -> Double.parseDouble(o.getName())))
+ .orElseThrow(() -> new CoreException(new PackageNotFoundErrorBuilder(vspId).build()));
+ else {
version = versions.stream().filter(ver -> versionName.equals(ver.getName()))
- .findFirst().orElseThrow(() -> {
- return new CoreException(new PackageNotFoundErrorBuilder(vspId).build());
- });
+ .findFirst().orElseThrow(() -> new CoreException(new PackageNotFoundErrorBuilder(vspId).build()));
if (version.getStatus() != VersionStatus.Certified) {
throw new CoreException(new RequestedVersionInvalidErrorBuilder().build());
@Override
public Response getQuestionnaire(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_VSP.toString());
QuestionnaireResponse questionnaireResponse =
vendorSoftwareProductManager.getVspQuestionnaire(vspId, new Version(versionId));
@Override
public Response updateQuestionnaire(String questionnaireData, String vspId, String
versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Update_Questionnaire_VSP.toString());
vendorSoftwareProductManager
.updateVspQuestionnaire(vspId, new Version(versionId), questionnaireData);
return Response.ok().build();
@Override
public Response getVspInformationArtifact(String vspId, String versionId, String user) {
- MdcUtil.initMdc(LoggerServiceName.Get_Information_Artifact.toString());
File textInformationArtifact =
vendorSoftwareProductManager.getInformationArtifact(vspId, new Version(versionId));
private Optional<ValidationResponse> submit(String vspId, Version version, String message,
String user) throws IOException {
- MdcUtil.initMdc(LoggerServiceName.Submit_VSP.toString());
- LOGGER.audit(AuditMessages.AUDIT_MSG + AuditMessages.SUBMIT_VSP + vspId);
ValidationResponse validationResponse = vendorSoftwareProductManager.validate(vspId, version);
Map<String, List<ErrorMessage>> compilationErrors =
}
private Response createPackage(String vspId, Version version) throws IOException {
- MdcUtil.initMdc(LoggerServiceName.Create_Package.toString());
-
Version retrievedVersion = versioningManager.get(vspId, version);
if (retrievedVersion.getStatus() != VersionStatus.Certified) {
throw new CoreException(
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
+++ /dev/null
-/*
- * Copyright © 2016-2017 European Support Limited
- *
- * Licensed 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License 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.
- */
-
-package org.openecomp.sdc.logging.context.impl;
-
-import org.openecomp.sdc.logging.types.LoggerConstants;
-import org.slf4j.MDC;
-
-
-public class MdcDataErrorMessage {
-
- private final String targetEntity;
- private final String targetServiceName;
- private final String errorDescription;
- private final String level;
- private final String errorCode;
-
- /**
- * Instantiates a new Mdc data error message.
- *
- * @param targetEntity the target entity
- * @param targetServiceName the target service name
- * @param errorCategory the error category
- * @param errorCode the error code
- * @param errorDescription the error description
- */
- public MdcDataErrorMessage(String targetEntity, String targetServiceName, String errorCategory,
- String errorCode, String errorDescription) {
- this.level = errorCategory;
- this.errorCode = errorCode;
- this.targetEntity = targetEntity;
- this.targetServiceName = targetServiceName;
- this.errorDescription = errorDescription;
-
- this.setMdcValues();
- }
-
- /**
- * Create error message and update mdc.
- *
- * @param targetEntity the target entity
- * @param targetServiceName the target service name
- * @param level the level
- * @param errorCode the error code
- * @param errorDescription the error description
- */
- public static void createErrorMessageAndUpdateMdc(String targetEntity, String targetServiceName,
- String level, String errorCode,
- String errorDescription) {
- // don't remove this line although it seems useless
- new MdcDataErrorMessage(targetEntity, targetServiceName, level, errorCode, errorDescription);
- }
-
- public void setMdcValues() {
- MDC.put(LoggerConstants.ERROR_CATEGORY, this.level);
- MDC.put(LoggerConstants.ERROR_CODE, this.errorCode);
- MDC.put(LoggerConstants.TARGET_ENTITY, this.targetEntity);
- MDC.put(LoggerConstants.TARGET_SERVICE_NAME, this.targetServiceName);
- MDC.put(LoggerConstants.ERROR_DESCRIPTION, this.errorDescription);
- }
-}
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.common</groupId>
Code Review / sdc.git / commitdiff