diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectActionModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectActionModelListener.java index 84481ff26ff43d..14033d2c3e5117 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectActionModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectActionModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectAction; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -39,16 +41,14 @@ public class ObjectActionModelListener extends BaseModelListener { public void onBeforeCreate(ObjectAction objectAction) throws ModelListenerException { - auditObjectAction( - null, objectAction.getObjectActionId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectAction); } @Override public void onBeforeRemove(ObjectAction objectAction) throws ModelListenerException { - auditObjectAction( - null, objectAction.getObjectActionId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectAction); } @Override @@ -56,20 +56,40 @@ public void onBeforeUpdate( ObjectAction originalObjectAction, ObjectAction objectAction) throws ModelListenerException { - auditObjectAction( - _getModifiedAttributes(originalObjectAction, objectAction), - objectAction.getObjectActionId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectAction.class.getName(), + objectAction.getObjectActionId(), + _getModifiedAttributes( + originalObjectAction, objectAction))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectAction( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectAction objectAction) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectAction.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectAction.class.getName(), + objectAction.getObjectActionId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "active", objectAction.isActive() + ).put( + "name", objectAction.getName() + ).put( + "parameters", objectAction.getParameters() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectDefinitionModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectDefinitionModelListener.java index 9cf4bc2b20dad6..b478512e7f7b49 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectDefinitionModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectDefinitionModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectDefinition; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,16 +42,14 @@ public class ObjectDefinitionModelListener public void onBeforeCreate(ObjectDefinition objectDefinition) throws ModelListenerException { - auditObjectDefinition( - null, objectDefinition.getObjectDefinitionId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectDefinition); } @Override public void onBeforeRemove(ObjectDefinition objectDefinition) throws ModelListenerException { - auditObjectDefinition( - null, objectDefinition.getObjectDefinitionId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectDefinition); } @Override @@ -58,20 +58,42 @@ public void onBeforeUpdate( ObjectDefinition objectDefinition) throws ModelListenerException { - auditObjectDefinition( - _getModifiedAttributes(originalObjectDefinition, objectDefinition), - objectDefinition.getObjectDefinitionId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectDefinition.class.getName(), + objectDefinition.getObjectDefinitionId(), + _getModifiedAttributes( + originalObjectDefinition, objectDefinition))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectDefinition( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectDefinition objectDefinition) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectDefinition.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectDefinition.class.getName(), + objectDefinition.getObjectDefinitionId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "active", objectDefinition.isActive() + ).put( + "labelMap", objectDefinition.getLabelMap() + ).put( + "name", objectDefinition.getName() + ).put( + "scope", objectDefinition.getScope() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldModelListener.java index 068228a0b8c9c8..ef8360b6aba80b 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectField; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -39,15 +41,14 @@ public class ObjectFieldModelListener extends BaseModelListener { public void onBeforeCreate(ObjectField objectField) throws ModelListenerException { - auditObjectField(null, objectField.getObjectFieldId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectField); } @Override public void onBeforeRemove(ObjectField objectField) throws ModelListenerException { - auditObjectField( - null, objectField.getObjectFieldId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectField); } @Override @@ -55,20 +56,53 @@ public void onBeforeUpdate( ObjectField originalObjectField, ObjectField objectField) throws ModelListenerException { - auditObjectField( - _getModifiedAttributes(originalObjectField, objectField), - objectField.getObjectFieldId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectField.class.getName(), + objectField.getObjectFieldId(), + _getModifiedAttributes(originalObjectField, objectField))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectField( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectField objectField) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectField.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectField.class.getName(), + objectField.getObjectFieldId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "businessType", objectField.getBusinessType() + ).put( + "DBColumnName", objectField.getDBColumnName() + ).put( + "DBType", objectField.getDBType() + ).put( + "indexed", objectField.isIndexed() + ).put( + "indexedAsKeyword", objectField.isIndexedAsKeyword() + ).put( + "indexedLanguageId", objectField.getIndexedLanguageId() + ).put( + "labelMap", objectField.getLabelMap() + ).put( + "listTypeDefinitionId", objectField.getListTypeDefinitionId() + ).put( + "name", objectField.getName() + ).put( + "required", objectField.isRequired() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldSettingModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldSettingModelListener.java index 12b3fba10531b2..1c3546248973ff 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldSettingModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectFieldSettingModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectFieldSetting; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,17 +42,14 @@ public class ObjectFieldSettingModelListener public void onBeforeCreate(ObjectFieldSetting objectFieldSetting) throws ModelListenerException { - auditObjectFieldSetting( - null, objectFieldSetting.getObjectFieldSettingId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectFieldSetting); } @Override public void onBeforeRemove(ObjectFieldSetting objectFieldSetting) throws ModelListenerException { - auditObjectFieldSetting( - null, objectFieldSetting.getObjectFieldSettingId(), - EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectFieldSetting); } @Override @@ -59,21 +58,40 @@ public void onBeforeUpdate( ObjectFieldSetting objectFieldSetting) throws ModelListenerException { - auditObjectFieldSetting( - _getModifiedAttributes( - originalOObjectFieldSetting, objectFieldSetting), - objectFieldSetting.getObjectFieldSettingId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectFieldSetting.class.getName(), + objectFieldSetting.getObjectFieldSettingId(), + _getModifiedAttributes( + originalOObjectFieldSetting, objectFieldSetting))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectFieldSetting( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectFieldSetting objectFieldSetting) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectFieldSetting.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectFieldSetting.class.getName(), + objectFieldSetting.getObjectFieldSettingId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "name", objectFieldSetting.getName() + ).put( + "objectFieldId", objectFieldSetting.getObjectFieldId() + ).put( + "value", objectFieldSetting.getValue() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutBoxModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutBoxModelListener.java index ea442237dd2c63..6756b7918b122e 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutBoxModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutBoxModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectLayoutBox; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,16 +42,14 @@ public class ObjectLayoutBoxModelListener public void onBeforeCreate(ObjectLayoutBox objectLayoutBox) throws ModelListenerException { - auditObjectLayoutBox( - null, objectLayoutBox.getObjectLayoutBoxId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectLayoutBox); } @Override public void onBeforeRemove(ObjectLayoutBox objectLayoutBox) throws ModelListenerException { - auditObjectLayoutBox( - null, objectLayoutBox.getObjectLayoutBoxId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectLayoutBox); } @Override @@ -58,20 +58,42 @@ public void onBeforeUpdate( ObjectLayoutBox objectLayoutBox) throws ModelListenerException { - auditObjectLayoutBox( - _getModifiedAttributes(originalObjectLayoutBox, objectLayoutBox), - objectLayoutBox.getObjectLayoutBoxId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectLayoutBox.class.getName(), + objectLayoutBox.getObjectLayoutBoxId(), + _getModifiedAttributes( + originalObjectLayoutBox, objectLayoutBox))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectLayoutBox( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectLayoutBox objectLayoutBox) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectLayoutBox.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectLayoutBox.class.getName(), + objectLayoutBox.getObjectLayoutBoxId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "collapsable", objectLayoutBox.isCollapsable() + ).put( + "nameMap", objectLayoutBox.getNameMap() + ).put( + "objectLayoutTabId", objectLayoutBox.getObjectLayoutTabId() + ).put( + "priority", objectLayoutBox.getPriority() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutColumnModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutColumnModelListener.java index 708663cde51499..533d8e19b78765 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutColumnModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutColumnModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectLayoutColumn; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,17 +42,14 @@ public class ObjectLayoutColumnModelListener public void onBeforeCreate(ObjectLayoutColumn objectLayoutColumn) throws ModelListenerException { - auditObjectLayoutColumn( - null, objectLayoutColumn.getObjectLayoutColumnId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectLayoutColumn); } @Override public void onBeforeRemove(ObjectLayoutColumn objectLayoutColumn) throws ModelListenerException { - auditObjectLayoutColumn( - null, objectLayoutColumn.getObjectLayoutColumnId(), - EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectLayoutColumn); } @Override @@ -59,21 +58,42 @@ public void onBeforeUpdate( ObjectLayoutColumn objectLayoutColumn) throws ModelListenerException { - auditObjectLayoutColumn( - _getModifiedAttributes( - originalObjectLayoutColumn, objectLayoutColumn), - objectLayoutColumn.getObjectLayoutColumnId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectLayoutColumn.class.getName(), + objectLayoutColumn.getObjectLayoutColumnId(), + _getModifiedAttributes( + originalObjectLayoutColumn, objectLayoutColumn))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectLayoutColumn( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectLayoutColumn objectLayoutColumn) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectLayoutColumn.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectLayoutColumn.class.getName(), + objectLayoutColumn.getObjectLayoutColumnId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "objectFieldId", objectLayoutColumn.getObjectFieldId() + ).put( + "objectLayoutRowId", objectLayoutColumn.getObjectLayoutRowId() + ).put( + "priority", objectLayoutColumn.getPriority() + ).put( + "size", objectLayoutColumn.getSize() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutModelListener.java index 5ce7259db584fc..9280301c5630fa 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectLayout; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -39,16 +41,14 @@ public class ObjectLayoutModelListener extends BaseModelListener { public void onBeforeCreate(ObjectLayout objectLayout) throws ModelListenerException { - auditObjectLayout( - null, objectLayout.getObjectLayoutId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectLayout); } @Override public void onBeforeRemove(ObjectLayout objectLayout) throws ModelListenerException { - auditObjectLayout( - null, objectLayout.getObjectLayoutId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectLayout); } @Override @@ -56,20 +56,38 @@ public void onBeforeUpdate( ObjectLayout originalObjectLayout, ObjectLayout objectLayout) throws ModelListenerException { - auditObjectLayout( - _getModifiedAttributes(originalObjectLayout, objectLayout), - objectLayout.getObjectLayoutId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectLayout.class.getName(), + objectLayout.getObjectLayoutId(), + _getModifiedAttributes( + originalObjectLayout, objectLayout))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectLayout( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectLayout objectLayout) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectLayout.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectLayout.class.getName(), + objectLayout.getObjectLayoutId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "defaultObjectLayout", objectLayout.isDefaultObjectLayout() + ).put( + "nameMap", objectLayout.getNameMap() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutRowModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutRowModelListener.java index ada8ba6e4b2294..9cecdeab349515 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutRowModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutRowModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectLayoutRow; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,16 +42,14 @@ public class ObjectLayoutRowModelListener public void onBeforeCreate(ObjectLayoutRow objectLayoutRow) throws ModelListenerException { - auditObjectLayoutRow( - null, objectLayoutRow.getObjectLayoutRowId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectLayoutRow); } @Override public void onBeforeRemove(ObjectLayoutRow objectLayoutRow) throws ModelListenerException { - auditObjectLayoutRow( - null, objectLayoutRow.getObjectLayoutRowId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectLayoutRow); } @Override @@ -58,20 +58,38 @@ public void onBeforeUpdate( ObjectLayoutRow objectLayoutRow) throws ModelListenerException { - auditObjectLayoutRow( - _getModifiedAttributes(originalObjectLayoutRow, objectLayoutRow), - objectLayoutRow.getObjectLayoutRowId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectLayoutRow.class.getName(), + objectLayoutRow.getObjectLayoutRowId(), + _getModifiedAttributes( + originalObjectLayoutRow, objectLayoutRow))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectLayoutRow( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectLayoutRow objectLayoutRow) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectLayoutRow.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectLayoutRow.class.getName(), + objectLayoutRow.getObjectLayoutRowId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "objectLayoutBoxId", objectLayoutRow.getObjectLayoutBoxId() + ).put( + "priority", objectLayoutRow.getPriority() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutTabModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutTabModelListener.java index 1dcf782f708c43..45ba23dfdbb539 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutTabModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectLayoutTabModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectLayoutTab; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,16 +42,14 @@ public class ObjectLayoutTabModelListener public void onBeforeCreate(ObjectLayoutTab objectLayoutTab) throws ModelListenerException { - auditObjectLayoutTab( - null, objectLayoutTab.getObjectLayoutTabId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectLayoutTab); } @Override public void onBeforeRemove(ObjectLayoutTab objectLayoutTab) throws ModelListenerException { - auditObjectLayoutTab( - null, objectLayoutTab.getObjectLayoutTabId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectLayoutTab); } @Override @@ -58,20 +58,43 @@ public void onBeforeUpdate( ObjectLayoutTab objectLayoutTab) throws ModelListenerException { - auditObjectLayoutTab( - _getModifiedAttributes(originalObjectLayoutTab, objectLayoutTab), - objectLayoutTab.getObjectLayoutTabId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectLayoutTab.class.getName(), + objectLayoutTab.getObjectLayoutTabId(), + _getModifiedAttributes( + originalObjectLayoutTab, objectLayoutTab))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectLayoutTab( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectLayoutTab objectLayoutTab) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectLayoutTab.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectLayoutTab.class.getName(), + objectLayoutTab.getObjectLayoutTabId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "nameMap", objectLayoutTab.getNameMap() + ).put( + "objectLayoutId", objectLayoutTab.getObjectLayoutId() + ).put( + "objectRelationshipId", + objectLayoutTab.getObjectRelationshipId() + ).put( + "priority", objectLayoutTab.getPriority() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectRelationshipModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectRelationshipModelListener.java index 5e150b30062556..0146779313b29d 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectRelationshipModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectRelationshipModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectRelationship; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,17 +42,14 @@ public class ObjectRelationshipModelListener public void onBeforeCreate(ObjectRelationship objectRelationship) throws ModelListenerException { - auditObjectRelationship( - null, objectRelationship.getObjectRelationshipId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectRelationship); } @Override public void onBeforeRemove(ObjectRelationship objectRelationship) throws ModelListenerException { - auditObjectRelationship( - null, objectRelationship.getObjectRelationshipId(), - EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectRelationship); } @Override @@ -59,21 +58,38 @@ public void onBeforeUpdate( ObjectRelationship objectRelationship) throws ModelListenerException { - auditObjectRelationship( - _getModifiedAttributes( - originalObjectRelationship, objectRelationship), - objectRelationship.getObjectRelationshipId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectRelationship.class.getName(), + objectRelationship.getObjectRelationshipId(), + _getModifiedAttributes( + originalObjectRelationship, objectRelationship))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectRelationship( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectRelationship objectRelationship) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectRelationship.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectRelationship.class.getName(), + objectRelationship.getObjectRelationshipId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "deletionType", objectRelationship.getDeletionType() + ).put( + "labelMap", objectRelationship.getLabelMap() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectValidationRuleModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectValidationRuleModelListener.java index 1b62fbbd5ec69e..40bbb20eae44e3 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectValidationRuleModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectValidationRuleModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectValidationRule; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,18 +42,14 @@ public class ObjectValidationRuleModelListener public void onBeforeCreate(ObjectValidationRule objectValidationRule) throws ModelListenerException { - auditObjectValidationRule( - null, objectValidationRule.getObjectValidationRuleId(), - EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectValidationRule); } @Override public void onBeforeRemove(ObjectValidationRule objectValidationRule) throws ModelListenerException { - auditObjectValidationRule( - null, objectValidationRule.getObjectValidationRuleId(), - EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectValidationRule); } @Override @@ -60,22 +58,44 @@ public void onBeforeUpdate( ObjectValidationRule objectValidationRule) throws ModelListenerException { - auditObjectValidationRule( - _getModifiedAttributes( - originalObjectValidationRule, objectValidationRule), - objectValidationRule.getObjectValidationRuleId(), - EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectValidationRule.class.getName(), + objectValidationRule.getObjectValidationRuleId(), + _getModifiedAttributes( + originalObjectValidationRule, objectValidationRule))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectValidationRule( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectValidationRule objectValidationRule) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectValidationRule.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectValidationRule.class.getName(), + objectValidationRule.getObjectValidationRuleId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "active", objectValidationRule.isActive() + ).put( + "engine", objectValidationRule.getEngine() + ).put( + "errorLabelMap", objectValidationRule.getErrorLabelMap() + ).put( + "nameMap", objectValidationRule.getNameMap() + ).put( + "script", objectValidationRule.getScript() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewColumnModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewColumnModelListener.java index aa03fd0875d7cb..2818caead23a59 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewColumnModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewColumnModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectViewColumn; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,16 +42,14 @@ public class ObjectViewColumnModelListener public void onBeforeCreate(ObjectViewColumn objectViewColumn) throws ModelListenerException { - auditObjectViewColumn( - null, objectViewColumn.getObjectViewColumnId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectViewColumn); } @Override public void onBeforeRemove(ObjectViewColumn objectViewColumn) throws ModelListenerException { - auditObjectViewColumn( - null, objectViewColumn.getObjectViewColumnId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectViewColumn); } @Override @@ -58,20 +58,40 @@ public void onBeforeUpdate( ObjectViewColumn objectViewColumn) throws ModelListenerException { - auditObjectViewColumn( - _getModifiedAttributes(originalObjectViewColumn, objectViewColumn), - objectViewColumn.getObjectViewColumnId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectViewColumn.class.getName(), + objectViewColumn.getObjectViewColumnId(), + _getModifiedAttributes( + originalObjectViewColumn, objectViewColumn))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectViewColumn( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectViewColumn objectViewColumn) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectViewColumn.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectViewColumn.class.getName(), + objectViewColumn.getObjectViewColumnId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "labelMap", objectViewColumn.getLabelMap() + ).put( + "objectFieldName", objectViewColumn.getObjectFieldName() + ).put( + "priority", objectViewColumn.getPriority() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewModelListener.java index a9f8e164f582c4..d0fc8252fe9936 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectView; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -39,14 +41,14 @@ public class ObjectViewModelListener extends BaseModelListener { public void onBeforeCreate(ObjectView objectView) throws ModelListenerException { - auditObjectView(null, objectView.getObjectViewId(), EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectView); } @Override public void onBeforeRemove(ObjectView objectView) throws ModelListenerException { - auditObjectView(null, objectView.getObjectViewId(), EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectView); } @Override @@ -54,20 +56,37 @@ public void onBeforeUpdate( ObjectView originalObjectView, ObjectView objectView) throws ModelListenerException { - auditObjectView( - _getModifiedAttributes(originalObjectView, objectView), - objectView.getObjectViewId(), EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectView.class.getName(), + objectView.getObjectViewId(), + _getModifiedAttributes(originalObjectView, objectView))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectView( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectView objectView) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectView.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectView.class.getName(), + objectView.getObjectViewId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "defaultObjectView", objectView.isDefaultObjectView() + ).put( + "nameMap", objectView.getNameMap() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception); diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewSortColumnModelListener.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewSortColumnModelListener.java index 3683933ebdb6c0..023119b1e8d12b 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewSortColumnModelListener.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/internal/model/listener/ObjectViewSortColumnModelListener.java @@ -15,8 +15,10 @@ package com.liferay.object.internal.model.listener; import com.liferay.object.model.ObjectViewSortColumn; +import com.liferay.portal.kernel.audit.AuditMessage; import com.liferay.portal.kernel.audit.AuditRouter; import com.liferay.portal.kernel.exception.ModelListenerException; +import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.model.BaseModelListener; import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.security.audit.event.generators.constants.EventTypes; @@ -40,18 +42,14 @@ public class ObjectViewSortColumnModelListener public void onBeforeCreate(ObjectViewSortColumn objectViewSortColumn) throws ModelListenerException { - auditObjectViewSortColumn( - null, objectViewSortColumn.getObjectViewSortColumnId(), - EventTypes.ADD); + auditOnCreateOrRemove(EventTypes.ADD, objectViewSortColumn); } @Override public void onBeforeRemove(ObjectViewSortColumn objectViewSortColumn) throws ModelListenerException { - auditObjectViewSortColumn( - null, objectViewSortColumn.getObjectViewSortColumnId(), - EventTypes.DELETE); + auditOnCreateOrRemove(EventTypes.DELETE, objectViewSortColumn); } @Override @@ -60,22 +58,40 @@ public void onBeforeUpdate( ObjectViewSortColumn objectViewSortColumn) throws ModelListenerException { - auditObjectViewSortColumn( - _getModifiedAttributes( - originalObjectViewSortColumn, objectViewSortColumn), - objectViewSortColumn.getObjectViewSortColumnId(), - EventTypes.UPDATE); + try { + _auditRouter.route( + AuditMessageBuilder.buildAuditMessage( + EventTypes.UPDATE, ObjectViewSortColumn.class.getName(), + objectViewSortColumn.getObjectViewSortColumnId(), + _getModifiedAttributes( + originalObjectViewSortColumn, objectViewSortColumn))); + } + catch (Exception exception) { + throw new ModelListenerException(exception); + } } - protected void auditObjectViewSortColumn( - List attributes, long classPK, String eventType) + protected void auditOnCreateOrRemove( + String eventType, ObjectViewSortColumn objectViewSortColumn) throws ModelListenerException { try { - _auditRouter.route( - AuditMessageBuilder.buildAuditMessage( - eventType, ObjectViewSortColumn.class.getName(), classPK, - attributes)); + AuditMessage auditMessage = AuditMessageBuilder.buildAuditMessage( + eventType, ObjectViewSortColumn.class.getName(), + objectViewSortColumn.getObjectViewSortColumnId(), null); + + JSONObject additionalInfoJSONObject = + auditMessage.getAdditionalInfo(); + + additionalInfoJSONObject.put( + "objectFieldName", objectViewSortColumn.getObjectFieldName() + ).put( + "priority", objectViewSortColumn.getPriority() + ).put( + "sortOrder", objectViewSortColumn.getSortOrder() + ); + + _auditRouter.route(auditMessage); } catch (Exception exception) { throw new ModelListenerException(exception);