diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi')
15 files changed, 152 insertions, 193 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java index 942dae0507..f8add1dacf 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java @@ -3,24 +3,34 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; public class AuditActivateServiceExternalApiEventFactory extends AuditExternalApiEventFactory { - protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" + + private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" + " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\""; - public AuditActivateServiceExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.ACTIVATE_SERVICE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); + public AuditActivateServiceExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData, String invariantUuid, User modifier) { + super(AuditingActionEnum.ACTIVATE_SERVICE_BY_API, commonFields, resourceCommonInfo, distributionData, + ResourceVersionInfo.newBuilder() + .build(), + ResourceVersionInfo.newBuilder() + .build(), + invariantUuid, modifier, null); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getResourceType(), event.getConsumerId(), - event.getResourceURL(), event.getModifier(), event.getStatus(), event.getServiceInstanceId(), - event.getInvariantUuid(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getResourceType(), event.getConsumerId(), + event.getResourceURL(), event.getModifier(), event.getStatus(), + event.getServiceInstanceId(), event.getInvariantUuid(), event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java index 5e6256368e..0199c4ff7c 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java @@ -1,25 +1,34 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; -import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; -public abstract class AuditAssetExternalApiEventFactory extends AuditExternalApiEventFactory { +public class AuditAssetExternalApiEventFactory extends AuditExternalApiEventFactory { - protected static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" RESOURCE_NAME = \"%s\" " + + private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" RESOURCE_NAME = \"%s\" " + "RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\" STATUS = \"%s\" DESC = \"%s\""; - public AuditAssetExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); + public AuditAssetExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData) { + super(action, commonFields, resourceCommonInfo, distributionData, + ResourceVersionInfo.newBuilder() + .build(), + ResourceVersionInfo.newBuilder() + .build(), + null, null, null); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceURL(), event.getResourceName(), - event.getResourceType(), event.getServiceInstanceId(), event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(), event.getResourceName(), + event.getResourceType(), event.getServiceInstanceId(), event.getStatus(), event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java deleted file mode 100644 index 1a41d7d5f8..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditAssetGetMetadataExternalApiEventFactory extends AuditAssetExternalApiEventFactory { - - public AuditAssetGetMetadataExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.GET_ASSET_METADATA, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java index 13558881c5..d759ca2ba1 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java @@ -1,24 +1,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; -import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; -public abstract class AuditAssetListExternalApiEventFactory extends AuditExternalApiEventFactory { +public class AuditAssetListExternalApiEventFactory extends AuditExternalApiEventFactory { - protected static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\""; + private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\""; - public AuditAssetListExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); + public AuditAssetListExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, + DistributionData distributionData) { + super(action, commonFields, new ResourceCommonInfo(), distributionData, + ResourceVersionInfo.newBuilder() + .build(), + ResourceVersionInfo.newBuilder() + .build(), + null, null, null); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceURL(), - event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(), + event.getStatus(), event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java index 060cbd395e..1306efefa7 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java @@ -3,25 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; public class AuditChangeLifecycleExternalApiEventFactory extends AuditExternalApiEventFactory { - protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" + + private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" + " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\"" + " PREV_STATE = \"%s\" CURR_STATE = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" STATUS = \"%s\" DESC = \"%s\""; - public AuditChangeLifecycleExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); + public AuditChangeLifecycleExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams, + String invariantUuid, User modifier) { + super(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API, commonFields, resourceCommonInfo, distributionData, prevParams, currParams, + invariantUuid, modifier, null); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(), - event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), event.getPrevState(), - event.getCurrState(), event.getServiceInstanceId(), event.getInvariantUuid(), event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(), + event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), + event.getPrevState(), event.getCurrState(), event.getServiceInstanceId(), event.getInvariantUuid(), + event.getStatus(), event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java index 07bac13495..f01d18cf22 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java @@ -3,26 +3,37 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; public class AuditCreateResourceExternalApiEventFactory extends AuditExternalApiEventFactory { private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" + - " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" + - " PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\""; + " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" CURR_VERSION = \"%s\" CURR_STATE = \"%s\" CURR_ARTIFACT_UUID = \"%s\" " + + "STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\""; - public AuditCreateResourceExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.CREATE_RESOURCE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); + public AuditCreateResourceExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData, ResourceVersionInfo currResourceVersionInfo, + String invariantUuid, User modifier) { + super(AuditingActionEnum.CREATE_RESOURCE_BY_API, commonFields, resourceCommonInfo, distributionData, + ResourceVersionInfo.newBuilder() + .build(), + currResourceVersionInfo, + invariantUuid, modifier, null); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(), - event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), event.getPrevState(), - event.getCurrState(), event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), event.getStatus(), - event.getServiceInstanceId(), event.getInvariantUuid(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), + event.getConsumerId(), event.getResourceURL(), event.getModifier(), + event.getCurrVersion(), event.getCurrState(), event.getCurrArtifactUuid(), + event.getStatus(), event.getServiceInstanceId(), event.getInvariantUuid(), + event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java index fd8be4cc47..a519130a04 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java @@ -3,25 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; -public abstract class AuditCrudExternalApiArtifactEventFactory extends AuditExternalApiEventFactory { +public class AuditCrudExternalApiArtifactEventFactory extends AuditExternalApiEventFactory { private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" + " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" ARTIFACT_DATA = \"%s\"" + " STATUS = \"%s\" DESC = \"%s\""; - public AuditCrudExternalApiArtifactEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, + public AuditCrudExternalApiArtifactEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid, User modifier, String artifactData) { - super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, + super(action, commonFields, resourceCommonInfo, distributionData, prevParams, currParams, invariantUuid, modifier, artifactData); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(), - event.getResourceURL(), event.getModifier(), event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), - event.getArtifactData(), event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), + event.getConsumerId(), event.getResourceURL(), event.getModifier(), + event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), event.getArtifactData(), + event.getStatus(), event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java deleted file mode 100644 index c2827b1e5d..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditDeleteArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory { - - public AuditDeleteArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.ARTIFACT_DELETE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java index 134dfd2921..b09f51c8ec 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java @@ -3,21 +3,31 @@ package org.openecomp.sdc.be.auditing.impl.externalapi; import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; public class AuditDownloadArtifactExternalApiEventFactory extends AuditExternalApiEventFactory { - private static final String LOG_STR = "CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\""; + private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\""; - public AuditDownloadArtifactExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.DOWNLOAD_ARTIFACT, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); + public AuditDownloadArtifactExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData, ResourceVersionInfo currResourceVersionInfo, + User modifier) { + super(AuditingActionEnum.DOWNLOAD_ARTIFACT, commonFields, resourceCommonInfo, distributionData, + ResourceVersionInfo.newBuilder() + .build(), + currResourceVersionInfo, null, modifier, null); } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getConsumerId(), event.getResourceURL(),event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(), + event.getStatus(), event.getDesc()}; } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java index 4e233dee27..9974fee9a7 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java @@ -6,17 +6,23 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.ExternalApiEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; +import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo; +import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo; +import org.openecomp.sdc.common.util.ThreadLocalsHolder; public abstract class AuditExternalApiEventFactory extends AuditBaseEventFactory { protected final ExternalApiEvent event; - public AuditExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, + public AuditExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo, + DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid, User modifier, String artifactData) { super(action); - event = new ExternalApiEvent(getAction().getName(), commonFields, resourceType, resourceName, consumerId, resourceUrl, + if (commonAuditData.getRequestId() == null) { + commonAuditData.setRequestId(ThreadLocalsHolder.getUuid()); + } + event = new ExternalApiEvent(getAction().getName(), commonAuditData, resourceCommonInfo, distributionData, prevParams, currParams, AuditBaseEventFactory.buildUserName(modifier), invariantUuid, artifactData) ; } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java deleted file mode 100644 index e97614551f..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditGetAssetListExternalApiEventFactory extends AuditAssetListExternalApiEventFactory { - - public AuditGetAssetListExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.GET_ASSET_LIST, commonFields, resourceType, resourceName, - consumerId, resourceUrl, prevParams, currParams, invariantUuid, modifier, artifactData); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java deleted file mode 100644 index 379124dc4a..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditGetFilteredAssetListExternalApiEventFactory extends AuditAssetListExternalApiEventFactory { - - public AuditGetFilteredAssetListExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.GET_FILTERED_ASSET_LIST, commonFields, resourceType, resourceName, - consumerId, resourceUrl, prevParams, currParams, invariantUuid, modifier, artifactData); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java deleted file mode 100644 index 168cd1b150..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditGetToscaModelExternalApiEventFactory extends AuditAssetExternalApiEventFactory { - - public AuditGetToscaModelExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.GET_TOSCA_MODEL, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java deleted file mode 100644 index 5af8ff3d0d..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditUpdateArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory { - - public AuditUpdateArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.ARTIFACT_UPDATE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java deleted file mode 100644 index 02af363f46..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.externalapi; - -import org.openecomp.sdc.be.model.User; -import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; -import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData; - -public class AuditUploadArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory { - - public AuditUploadArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName, - String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, - String invariantUuid, User modifier, String artifactData) { - super(AuditingActionEnum.ARTIFACT_UPLOAD_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams, - invariantUuid, modifier, artifactData); - } -} |