diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category')
5 files changed, 52 insertions, 58 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java deleted file mode 100644 index 84c3a0392d..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.category; - -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; - -public class AuditAddCategoryEventFactory extends AuditCategoryEventFactory { - - public AuditAddCategoryEventFactory(CommonAuditData commonFields, User modifier, - String categoryName, String subCategoryName, String groupingName, String resourceType) { - super(AuditingActionEnum.ADD_CATEGORY, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java deleted file mode 100644 index 6ee7624ddf..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.category; - -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; - -public class AuditAddGroupingCategoryEventFactory extends AuditCategoryEventFactory { - - public AuditAddGroupingCategoryEventFactory(CommonAuditData commonFields, User modifier, String categoryName, - String subCategoryName, String groupingName, String resourceType) { - super(AuditingActionEnum.ADD_GROUPING, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java deleted file mode 100644 index 241d0c0fc5..0000000000 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openecomp.sdc.be.auditing.impl.category; - -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; - -public class AuditAddSubCategoryEventFactory extends AuditCategoryEventFactory { - - public AuditAddSubCategoryEventFactory(CommonAuditData commonFields, User modifier, - String categoryName, String subCategoryName, String groupingName, String resourceType) { - super(AuditingActionEnum.ADD_SUB_CATEGORY, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType); - } -} diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java index 9a2d7b09a8..d4827f8938 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java @@ -7,17 +7,40 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.be.resources.data.auditing.CategoryEvent; import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; -public abstract class AuditCategoryEventFactory extends AuditBaseEventFactory { +public class AuditCategoryEventFactory extends AuditBaseEventFactory { + private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" CATEGORY_NAME = \"%s\" SUB_CATEGORY_NAME = \"%s\"" + + " GROUPING_NAME = \"%s\" RESOURCE_TYPE = \"%s\" STATUS = \"%s\" DESC = \"%s\""; private final CategoryEvent event; - protected static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" CATEGORY_NAME = \"%s\" SUB_CATEGORY_NAME = \"%s\"" + - " GROUPING_NAME = \"%s\" RESOURCE_TYPE = \"%s\" STATUS = \"%s\" DESC = \"%s\""; + + private AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String categoryName, + String subCategoryName, String groupingName, String resourceType) { + super(action); + event = new CategoryEvent(getAction().getName(), commonFields, modifier, categoryName, + subCategoryName, groupingName, resourceType); + } + + public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, + String categoryName, String subCategoryName, String groupingName, String resourceType) { + this(action, commonFields, buildUserName(modifier), categoryName, subCategoryName, groupingName, resourceType); + } + + public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String categoryName, + String subCategoryName, String groupingName, String resourceType, String timestamp) { + this(action, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType); + event.setTimestamp1(timestamp); + } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getCategoryName(), event.getSubCategoryName(), - event.getGroupingName(), event.getResourceType(), event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getModifier(), event.getCategoryName(), event.getSubCategoryName(), + event.getGroupingName(), event.getResourceType(), event.getStatus(), event.getDesc()}; } @Override @@ -25,10 +48,5 @@ public abstract class AuditCategoryEventFactory extends AuditBaseEventFactory { return event; } - public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, - String categoryName, String subCategoryName, String groupingName, String resourceType) { - super(action); - event = new CategoryEvent(getAction().getName(), commonFields, buildUserName(modifier), categoryName, - subCategoryName, groupingName, resourceType); - } + } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java index 8c4de3c43d..a007174b32 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java @@ -9,13 +9,31 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; public class AuditGetCategoryHierarchyEventFactory extends AuditBaseEventFactory { + private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\""; private final GetCategoryHierarchyEvent event; - protected static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\""; + public AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, User modifier, String details) { + this(commonFields, buildUserName(modifier), details); + } + + public AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, String modifier, String details, String timestamp) { + this(commonFields, modifier, details); + this.event.setTimestamp1(timestamp); + } + + private AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, String modifier, String details) { + super(AuditingActionEnum.GET_CATEGORY_HIERARCHY); + event = new GetCategoryHierarchyEvent(getAction().getName(), commonFields, modifier, details); + } @Override - public String getLogMessage() { - return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc()); + public String getLogPattern() { + return LOG_STR; + } + + @Override + public String[] getLogMessageParams() { + return new String[] {event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc()}; } @Override @@ -23,8 +41,5 @@ public class AuditGetCategoryHierarchyEventFactory extends AuditBaseEventFactory return event; } - public AuditGetCategoryHierarchyEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, String details) { - super(action); - event = new GetCategoryHierarchyEvent(getAction().getName(), commonFields, buildUserName(modifier), details); - } + } |