diff --git a/modules/apps/asset/asset-link-service/src/main/java/com/liferay/asset/link/service/impl/AssetLinkLocalServiceImpl.java b/modules/apps/asset/asset-link-service/src/main/java/com/liferay/asset/link/service/impl/AssetLinkLocalServiceImpl.java index b2048eadf159d3..5cba761833ec20 100644 --- a/modules/apps/asset/asset-link-service/src/main/java/com/liferay/asset/link/service/impl/AssetLinkLocalServiceImpl.java +++ b/modules/apps/asset/asset-link-service/src/main/java/com/liferay/asset/link/service/impl/AssetLinkLocalServiceImpl.java @@ -572,7 +572,8 @@ private void _addDeletionSystemEvent(AssetLink assetLink) { _systemEventLocalService.addSystemEvent( 0, assetEntry.getGroupId(), stagedModelType.getClassName(), stagedAssetLink.getPrimaryKey(), stagedAssetLink.getUuid(), - null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } catch (PortalException portalException) { throw new RuntimeException(portalException); diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/service/impl/CalendarBookingLocalServiceImpl.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/service/impl/CalendarBookingLocalServiceImpl.java index 6f16b47e9c5306..75fe3552f8225c 100644 --- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/service/impl/CalendarBookingLocalServiceImpl.java +++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/service/impl/CalendarBookingLocalServiceImpl.java @@ -1200,7 +1200,7 @@ public CalendarBooking updateCalendarBooking( userId, calendarBooking.getGroupId(), CalendarBooking.class.getName(), calendarBooking.getCalendarBookingId(), - calendarBooking.getUuid(), null, + calendarBooking.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } diff --git a/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyFolderStagedModelRepository.java b/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyFolderStagedModelRepository.java index 0aaa6c267f23d7..7f97032b2c3f10 100644 --- a/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyFolderStagedModelRepository.java +++ b/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyFolderStagedModelRepository.java @@ -85,8 +85,8 @@ public void deleteStagedModel(DummyFolder dummyFolder) systemEventLocalService.addSystemEvent( 0, dummyFolder.getGroupId(), dummyFolder.getModelClassName(), dummyFolder.getPrimaryKey(), dummyFolder.getUuid(), - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + StringPool.BLANK, StringPool.BLANK, + SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } diff --git a/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyReferenceStagedModelRepository.java b/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyReferenceStagedModelRepository.java index d3d3e2027e5d73..15ded5aab5d981 100644 --- a/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyReferenceStagedModelRepository.java +++ b/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyReferenceStagedModelRepository.java @@ -83,8 +83,8 @@ public void deleteStagedModel(DummyReference dummyReference) 0, dummyReference.getGroupId(), dummyReference.getModelClassName(), dummyReference.getPrimaryKey(), dummyReference.getUuid(), - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + StringPool.BLANK, StringPool.BLANK, + SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } diff --git a/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyStagedModelRepository.java b/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyStagedModelRepository.java index 34be24fc1e2782..8512235149cf84 100644 --- a/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyStagedModelRepository.java +++ b/modules/apps/export-import/export-import-test-util/src/main/java/com/liferay/exportimport/test/util/internal/exportimport/staged/model/repository/DummyStagedModelRepository.java @@ -83,7 +83,8 @@ public void deleteStagedModel(Dummy dummy) throws PortalException { systemEventLocalService.addSystemEvent( 0, dummy.getGroupId(), dummy.getModelClassName(), dummy.getPrimaryKey(), dummy.getUuid(), StringPool.BLANK, - SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + StringPool.BLANK, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } } diff --git a/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/internal/change/tracking/test/SystemEventTableReferenceDefinitionTest.java b/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/internal/change/tracking/test/SystemEventTableReferenceDefinitionTest.java index 8e664246e97209..f6ec115eed5413 100644 --- a/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/internal/change/tracking/test/SystemEventTableReferenceDefinitionTest.java +++ b/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/internal/change/tracking/test/SystemEventTableReferenceDefinitionTest.java @@ -43,7 +43,7 @@ protected CTModel addCTModel() throws Exception { return _systemEventLocalService.addSystemEvent( TestPropsValues.getUserId(), TestPropsValues.getGroupId(), Group.class.getName(), RandomTestUtil.nextLong(), - PortalUUIDUtil.generate(), StringPool.BLANK, + PortalUUIDUtil.generate(), StringPool.BLANK, StringPool.BLANK, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } diff --git a/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/system/event/test/SystemEventCheckTest.java b/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/system/event/test/SystemEventCheckTest.java index 0bc59787468a0c..1f2ed1a08da60f 100644 --- a/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/system/event/test/SystemEventCheckTest.java +++ b/modules/apps/export-import/export-import-test/src/testIntegration/java/com/liferay/exportimport/system/event/test/SystemEventCheckTest.java @@ -116,7 +116,7 @@ protected SystemEvent addSystemEvent() throws Exception { return SystemEventLocalServiceUtil.addSystemEvent( TestPropsValues.getUserId(), _group.getGroupId(), Group.class.getName(), RandomTestUtil.nextLong(), - PortalUUIDUtil.generate(), StringPool.BLANK, + PortalUUIDUtil.generate(), StringPool.BLANK, StringPool.BLANK, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java index 74bca3aa9818d2..4d4c21a887cdf1 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/trash/JournalArticleTrashHandler.java @@ -16,6 +16,7 @@ import com.liferay.journal.service.JournalArticleResourceLocalService; import com.liferay.journal.service.JournalFolderLocalService; import com.liferay.journal.util.JournalHelper; +import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.json.JSONUtil; @@ -80,8 +81,8 @@ public SystemEvent addDeletionSystemEvent( return _systemEventLocalService.addSystemEvent( userId, groupId, getSystemEventClassName(), classPK, classUuid, - referrerClassName, SystemEventConstants.TYPE_DELETE, - extraDataJSONObject.toString()); + StringPool.BLANK, referrerClassName, + SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } @Override diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java index 4410c2e704ffe2..cef8dfd0f91a20 100644 --- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java +++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/service/impl/JournalArticleLocalServiceImpl.java @@ -1383,8 +1383,8 @@ public JournalArticle deleteArticle( if (articleResource != null) { _systemEventLocalService.addSystemEvent( 0, article.getGroupId(), article.getModelClassName(), - article.getPrimaryKey(), articleResource.getUuid(), null, - SystemEventConstants.TYPE_DELETE, + article.getPrimaryKey(), articleResource.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, JSONUtil.put( "assetTitle", article.getTitle(article.getDefaultLanguageId()) @@ -1471,7 +1471,7 @@ public void deleteArticle( _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), articleResource.getResourcePrimKey(), articleResource.getUuid(), - null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, JSONUtil.put( "assetTitle", assetTitle ).toString()); @@ -1528,7 +1528,8 @@ public void deleteArticles(long groupId) throws PortalException { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), articleResource.getResourcePrimKey(), articleResource.getUuid(), - null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } } @@ -1602,7 +1603,8 @@ public void deleteArticles( _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), articleResource.getResourcePrimKey(), articleResource.getUuid(), - null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } } diff --git a/modules/apps/object/object-service/src/main/java/com/liferay/object/model/impl/ObjectEntryImpl.java b/modules/apps/object/object-service/src/main/java/com/liferay/object/model/impl/ObjectEntryImpl.java index b908cb06069ec3..287ab3f8de9cf2 100644 --- a/modules/apps/object/object-service/src/main/java/com/liferay/object/model/impl/ObjectEntryImpl.java +++ b/modules/apps/object/object-service/src/main/java/com/liferay/object/model/impl/ObjectEntryImpl.java @@ -5,6 +5,7 @@ package com.liferay.object.model.impl; +import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.friendly.url.model.FriendlyURLEntry; import com.liferay.friendly.url.service.FriendlyURLEntryLocalServiceUtil; import com.liferay.object.constants.ObjectEntryFolderConstants; @@ -27,6 +28,7 @@ import com.liferay.portal.kernel.service.ClassNameLocalServiceUtil; import com.liferay.portal.kernel.service.CompanyLocalServiceUtil; import com.liferay.portal.kernel.util.LocaleUtil; +import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.Validator; import java.io.Serializable; @@ -98,6 +100,12 @@ public long getNonzeroGroupId() throws PortalException { return groupId; } + @Override + public StagedModelType getStagedModelType() { + return new StagedModelType( + PortalUtil.getClassNameId(getModelClassName())); + } + @Override public String getTitleValue() throws PortalException { ObjectDefinition objectDefinition = diff --git a/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectEntryLocalServiceTest.java b/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectEntryLocalServiceTest.java index 979bad8d4fbdac..48dd6891fc573a 100644 --- a/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectEntryLocalServiceTest.java +++ b/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectEntryLocalServiceTest.java @@ -112,6 +112,8 @@ import com.liferay.portal.kernel.model.ModelListener; import com.liferay.portal.kernel.model.ResourceConstants; import com.liferay.portal.kernel.model.Role; +import com.liferay.portal.kernel.model.SystemEvent; +import com.liferay.portal.kernel.model.SystemEventConstants; import com.liferay.portal.kernel.model.User; import com.liferay.portal.kernel.model.role.RoleConstants; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -127,6 +129,7 @@ import com.liferay.portal.kernel.service.ResourcePermissionLocalService; import com.liferay.portal.kernel.service.RoleLocalService; import com.liferay.portal.kernel.service.ServiceContext; +import com.liferay.portal.kernel.service.SystemEventLocalService; import com.liferay.portal.kernel.service.UserLocalService; import com.liferay.portal.kernel.service.WorkflowDefinitionLinkLocalService; import com.liferay.portal.kernel.test.AssertUtils; @@ -155,6 +158,7 @@ import com.liferay.portal.kernel.util.LocaleThreadLocal; import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.MapUtil; +import com.liferay.portal.kernel.util.Portal; import com.liferay.portal.kernel.util.PortalUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.kernel.util.StringUtil; @@ -3119,6 +3123,19 @@ public void testDeleteObjectEntry() throws Exception { _objectEntryLocalService.deleteObjectEntry( objectEntry1.getObjectEntryId()); + List systemEvents = + _systemEventLocalService.getSystemEvents( + 0, _portal.getClassNameId(objectEntry1.getModelClassName()), + objectEntry1.getPrimaryKey()); + + SystemEvent systemEvent = systemEvents.get(0); + + Assert.assertEquals( + objectEntry1.getExternalReferenceCode(), + systemEvent.getClassExternalReferenceCode()); + Assert.assertEquals( + SystemEventConstants.TYPE_DELETE, systemEvent.getType()); + AssertUtils.assertFailure( NoSuchObjectEntryException.class, "No ObjectEntry exists with the primary key " + @@ -3126,8 +3143,6 @@ public void testDeleteObjectEntry() throws Exception { () -> _objectEntryLocalService.deleteObjectEntry( objectEntry1.getObjectEntryId())); - _objectEntryLocalService.deleteObjectEntry(objectEntry1); - AssertUtils.assertFailure( NoSuchObjectEntryException.class, "No ObjectEntry exists with the primary key " + @@ -5708,6 +5723,9 @@ private ObjectValidationRule _updateObjectValidationRule( @Inject private ObjectValidationRuleLocalService _objectValidationRuleLocalService; + @Inject + private Portal _portal; + @Inject private ResourceActions _resourceActions; @@ -5717,6 +5735,9 @@ private ObjectValidationRule _updateObjectValidationRule( @Inject private RoleLocalService _roleLocalService; + @Inject + private SystemEventLocalService _systemEventLocalService; + @Inject private UserLocalService _userLocalService; diff --git a/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/anonymizer/test/SystemEventUADAnonymizerTest.java b/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/anonymizer/test/SystemEventUADAnonymizerTest.java index 1ef8ed80ef9595..d5bd324d8271f0 100644 --- a/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/anonymizer/test/SystemEventUADAnonymizerTest.java +++ b/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/anonymizer/test/SystemEventUADAnonymizerTest.java @@ -53,8 +53,8 @@ protected SystemEvent addBaseModel(long userId, boolean deleteAfterTestRun) SystemEvent systemEvent = _systemEventLocalService.addSystemEvent( userId, TestPropsValues.getGroupId(), Group.class.getName(), RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + StringPool.BLANK, StringPool.BLANK, + SystemEventConstants.TYPE_DELETE, StringPool.BLANK); if (deleteAfterTestRun) { _systemEvents.add(systemEvent); diff --git a/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/exporter/test/SystemEventUADExporterTest.java b/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/exporter/test/SystemEventUADExporterTest.java index 709a5e8603568b..9d154730e955b0 100644 --- a/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/exporter/test/SystemEventUADExporterTest.java +++ b/modules/apps/portal/portal-uad-test/src/testIntegration/java/com/liferay/portal/uad/exporter/test/SystemEventUADExporterTest.java @@ -45,8 +45,8 @@ protected SystemEvent addBaseModel(long userId) throws Exception { SystemEvent systemEvent = _systemEventLocalService.addSystemEvent( userId, TestPropsValues.getGroupId(), Group.class.getName(), RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + StringPool.BLANK, StringPool.BLANK, + SystemEventConstants.TYPE_DELETE, StringPool.BLANK); _systemEvents.add(systemEvent); diff --git a/modules/apps/staging/staging-impl/src/main/java/com/liferay/staging/internal/service/LayoutLocalServiceStagingAdvice.java b/modules/apps/staging/staging-impl/src/main/java/com/liferay/staging/internal/service/LayoutLocalServiceStagingAdvice.java index 380dd23f0a76ad..6ce31a88439090 100644 --- a/modules/apps/staging/staging-impl/src/main/java/com/liferay/staging/internal/service/LayoutLocalServiceStagingAdvice.java +++ b/modules/apps/staging/staging-impl/src/main/java/com/liferay/staging/internal/service/LayoutLocalServiceStagingAdvice.java @@ -471,7 +471,7 @@ protected void doDeleteLayout( _systemEventLocalService.addSystemEvent( 0, layout.getGroupId(), Layout.class.getName(), - layout.getPlid(), layout.getUuid(), null, + layout.getPlid(), layout.getUuid(), null, null, SystemEventConstants.TYPE_DELETE, systemEventHierarchyEntry.getExtraData()); } diff --git a/modules/apps/trash/trash-api/src/main/java/com/liferay/trash/BaseTrashHandler.java b/modules/apps/trash/trash-api/src/main/java/com/liferay/trash/BaseTrashHandler.java index 1bae0afaa21cbe..6e1fa280b758bb 100644 --- a/modules/apps/trash/trash-api/src/main/java/com/liferay/trash/BaseTrashHandler.java +++ b/modules/apps/trash/trash-api/src/main/java/com/liferay/trash/BaseTrashHandler.java @@ -58,8 +58,8 @@ public SystemEvent addDeletionSystemEvent( return SystemEventLocalServiceUtil.addSystemEvent( userId, groupId, getSystemEventClassName(), classPK, classUuid, - referrerClassName, SystemEventConstants.TYPE_DELETE, - extraDataJSONObject.toString()); + StringPool.BLANK, referrerClassName, + SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } @Override diff --git a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java index 301cf8d6c5c68b..18c526f57d83eb 100644 --- a/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java +++ b/modules/apps/wiki/wiki-service/src/main/java/com/liferay/wiki/service/impl/WikiPageLocalServiceImpl.java @@ -713,8 +713,8 @@ public void deletePage(WikiPage page) throws PortalException { if (pageResource != null) { _systemEventLocalService.addSystemEvent( 0, page.getGroupId(), page.getModelClassName(), - page.getPrimaryKey(), pageResource.getUuid(), null, - SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + page.getPrimaryKey(), pageResource.getUuid(), StringPool.BLANK, + null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } diff --git a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/SystemEventPersistenceTest.java b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/SystemEventPersistenceTest.java index d553f05d45625e..96f8482a132fed 100644 --- a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/SystemEventPersistenceTest.java +++ b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/SystemEventPersistenceTest.java @@ -132,6 +132,9 @@ public void testUpdateExisting() throws Exception { newSystemEvent.setClassUuid(RandomTestUtil.randomString()); + newSystemEvent.setClassExternalReferenceCode( + RandomTestUtil.randomString()); + newSystemEvent.setReferrerClassNameId(RandomTestUtil.nextLong()); newSystemEvent.setParentSystemEventId(RandomTestUtil.nextLong()); @@ -174,6 +177,9 @@ public void testUpdateExisting() throws Exception { existingSystemEvent.getClassPK(), newSystemEvent.getClassPK()); Assert.assertEquals( existingSystemEvent.getClassUuid(), newSystemEvent.getClassUuid()); + Assert.assertEquals( + existingSystemEvent.getClassExternalReferenceCode(), + newSystemEvent.getClassExternalReferenceCode()); Assert.assertEquals( existingSystemEvent.getReferrerClassNameId(), newSystemEvent.getReferrerClassNameId()); @@ -250,9 +256,9 @@ protected OrderByComparator getOrderByComparator() { "SystemEvent", "mvccVersion", true, "ctCollectionId", true, "systemEventId", true, "groupId", true, "companyId", true, "userId", true, "userName", true, "createDate", true, "classNameId", true, - "classPK", true, "classUuid", true, "referrerClassNameId", true, - "parentSystemEventId", true, "systemEventSetKey", true, "type", - true); + "classPK", true, "classUuid", true, "classExternalReferenceCode", + true, "referrerClassNameId", true, "parentSystemEventId", true, + "systemEventSetKey", true, "type", true); } @Test @@ -489,6 +495,9 @@ protected SystemEvent addSystemEvent() throws Exception { systemEvent.setClassUuid(RandomTestUtil.randomString()); + systemEvent.setClassExternalReferenceCode( + RandomTestUtil.randomString()); + systemEvent.setReferrerClassNameId(RandomTestUtil.nextLong()); systemEvent.setParentSystemEventId(RandomTestUtil.nextLong()); diff --git a/portal-impl/src/META-INF/portal-hbm.xml b/portal-impl/src/META-INF/portal-hbm.xml index 3c953afe836439..dab83e1fb0e0ce 100644 --- a/portal-impl/src/META-INF/portal-hbm.xml +++ b/portal-impl/src/META-INF/portal-hbm.xml @@ -940,6 +940,7 @@ + diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml index 2de39b0a22f790..0105c284d68fb4 100644 --- a/portal-impl/src/META-INF/portal-model-hints.xml +++ b/portal-impl/src/META-INF/portal-model-hints.xml @@ -1471,6 +1471,7 @@ + diff --git a/portal-impl/src/com/liferay/portal/model/impl/SystemEventCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/SystemEventCacheModel.java index d5eeb6ea566f16..bf19facf512790 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/SystemEventCacheModel.java +++ b/portal-impl/src/com/liferay/portal/model/impl/SystemEventCacheModel.java @@ -68,7 +68,7 @@ public void setMvccVersion(long mvccVersion) { @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(35); sb.append("{mvccVersion="); sb.append(mvccVersion); @@ -92,6 +92,8 @@ public String toString() { sb.append(classPK); sb.append(", classUuid="); sb.append(classUuid); + sb.append(", classExternalReferenceCode="); + sb.append(classExternalReferenceCode); sb.append(", referrerClassNameId="); sb.append(referrerClassNameId); sb.append(", parentSystemEventId="); @@ -142,6 +144,14 @@ public SystemEvent toEntityModel() { systemEventImpl.setClassUuid(classUuid); } + if (classExternalReferenceCode == null) { + systemEventImpl.setClassExternalReferenceCode(""); + } + else { + systemEventImpl.setClassExternalReferenceCode( + classExternalReferenceCode); + } + systemEventImpl.setReferrerClassNameId(referrerClassNameId); systemEventImpl.setParentSystemEventId(parentSystemEventId); systemEventImpl.setSystemEventSetKey(systemEventSetKey); @@ -181,6 +191,7 @@ public void readExternal(ObjectInput objectInput) classPK = objectInput.readLong(); classUuid = objectInput.readUTF(); + classExternalReferenceCode = objectInput.readUTF(); referrerClassNameId = objectInput.readLong(); @@ -226,6 +237,13 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException { objectOutput.writeUTF(classUuid); } + if (classExternalReferenceCode == null) { + objectOutput.writeUTF(""); + } + else { + objectOutput.writeUTF(classExternalReferenceCode); + } + objectOutput.writeLong(referrerClassNameId); objectOutput.writeLong(parentSystemEventId); @@ -253,6 +271,7 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException { public long classNameId; public long classPK; public String classUuid; + public String classExternalReferenceCode; public long referrerClassNameId; public long parentSystemEventId; public long systemEventSetKey; diff --git a/portal-impl/src/com/liferay/portal/model/impl/SystemEventModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/SystemEventModelImpl.java index 378b6f4e6cff65..334e23bdfc1037 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/SystemEventModelImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/SystemEventModelImpl.java @@ -68,7 +68,9 @@ public class SystemEventModelImpl {"companyId", Types.BIGINT}, {"userId", Types.BIGINT}, {"userName", Types.VARCHAR}, {"createDate", Types.TIMESTAMP}, {"classNameId", Types.BIGINT}, {"classPK", Types.BIGINT}, - {"classUuid", Types.VARCHAR}, {"referrerClassNameId", Types.BIGINT}, + {"classUuid", Types.VARCHAR}, + {"classExternalReferenceCode", Types.VARCHAR}, + {"referrerClassNameId", Types.BIGINT}, {"parentSystemEventId", Types.BIGINT}, {"systemEventSetKey", Types.BIGINT}, {"type_", Types.INTEGER}, {"extraData", Types.CLOB} @@ -89,6 +91,7 @@ public class SystemEventModelImpl TABLE_COLUMNS_MAP.put("classNameId", Types.BIGINT); TABLE_COLUMNS_MAP.put("classPK", Types.BIGINT); TABLE_COLUMNS_MAP.put("classUuid", Types.VARCHAR); + TABLE_COLUMNS_MAP.put("classExternalReferenceCode", Types.VARCHAR); TABLE_COLUMNS_MAP.put("referrerClassNameId", Types.BIGINT); TABLE_COLUMNS_MAP.put("parentSystemEventId", Types.BIGINT); TABLE_COLUMNS_MAP.put("systemEventSetKey", Types.BIGINT); @@ -97,7 +100,7 @@ public class SystemEventModelImpl } public static final String TABLE_SQL_CREATE = - "create table SystemEvent (mvccVersion LONG default 0 not null,ctCollectionId LONG default 0 not null,systemEventId LONG not null,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,classNameId LONG,classPK LONG,classUuid VARCHAR(75) null,referrerClassNameId LONG,parentSystemEventId LONG,systemEventSetKey LONG,type_ INTEGER,extraData TEXT null,primary key (systemEventId, ctCollectionId))"; + "create table SystemEvent (mvccVersion LONG default 0 not null,ctCollectionId LONG default 0 not null,systemEventId LONG not null,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,classNameId LONG,classPK LONG,classUuid VARCHAR(75) null,classExternalReferenceCode VARCHAR(75) null,referrerClassNameId LONG,parentSystemEventId LONG,systemEventSetKey LONG,type_ INTEGER,extraData TEXT null,primary key (systemEventId, ctCollectionId))"; public static final String TABLE_SQL_DROP = "drop table SystemEvent"; @@ -285,6 +288,9 @@ private static class AttributeGetterFunctionsHolder { attributeGetterFunctions.put("classPK", SystemEvent::getClassPK); attributeGetterFunctions.put( "classUuid", SystemEvent::getClassUuid); + attributeGetterFunctions.put( + "classExternalReferenceCode", + SystemEvent::getClassExternalReferenceCode); attributeGetterFunctions.put( "referrerClassNameId", SystemEvent::getReferrerClassNameId); attributeGetterFunctions.put( @@ -343,6 +349,10 @@ private static class AttributeSetterBiConsumersHolder { attributeSetterBiConsumers.put( "classUuid", (BiConsumer)SystemEvent::setClassUuid); + attributeSetterBiConsumers.put( + "classExternalReferenceCode", + (BiConsumer) + SystemEvent::setClassExternalReferenceCode); attributeSetterBiConsumers.put( "referrerClassNameId", (BiConsumer) @@ -595,6 +605,27 @@ public void setClassUuid(String classUuid) { _classUuid = classUuid; } + @Override + public String getClassExternalReferenceCode() { + if (_classExternalReferenceCode == null) { + return ""; + } + else { + return _classExternalReferenceCode; + } + } + + @Override + public void setClassExternalReferenceCode( + String classExternalReferenceCode) { + + if (_columnOriginalValues == Collections.EMPTY_MAP) { + _setColumnOriginalValues(); + } + + _classExternalReferenceCode = classExternalReferenceCode; + } + @Override public long getReferrerClassNameId() { return _referrerClassNameId; @@ -757,6 +788,8 @@ public Object clone() { systemEventImpl.setClassNameId(getClassNameId()); systemEventImpl.setClassPK(getClassPK()); systemEventImpl.setClassUuid(getClassUuid()); + systemEventImpl.setClassExternalReferenceCode( + getClassExternalReferenceCode()); systemEventImpl.setReferrerClassNameId(getReferrerClassNameId()); systemEventImpl.setParentSystemEventId(getParentSystemEventId()); systemEventImpl.setSystemEventSetKey(getSystemEventSetKey()); @@ -793,6 +826,8 @@ public SystemEvent cloneWithOriginalValues() { this.getColumnOriginalValue("classPK")); systemEventImpl.setClassUuid( this.getColumnOriginalValue("classUuid")); + systemEventImpl.setClassExternalReferenceCode( + this.getColumnOriginalValue("classExternalReferenceCode")); systemEventImpl.setReferrerClassNameId( this.getColumnOriginalValue("referrerClassNameId")); systemEventImpl.setParentSystemEventId( @@ -920,6 +955,18 @@ public CacheModel toCacheModel() { systemEventCacheModel.classUuid = null; } + systemEventCacheModel.classExternalReferenceCode = + getClassExternalReferenceCode(); + + String classExternalReferenceCode = + systemEventCacheModel.classExternalReferenceCode; + + if ((classExternalReferenceCode != null) && + (classExternalReferenceCode.length() == 0)) { + + systemEventCacheModel.classExternalReferenceCode = null; + } + systemEventCacheModel.referrerClassNameId = getReferrerClassNameId(); systemEventCacheModel.parentSystemEventId = getParentSystemEventId(); @@ -1008,6 +1055,7 @@ private static class EscapedModelProxyProviderFunctionHolder { private long _classNameId; private long _classPK; private String _classUuid; + private String _classExternalReferenceCode; private long _referrerClassNameId; private long _parentSystemEventId; private long _systemEventSetKey; @@ -1055,6 +1103,8 @@ private void _setColumnOriginalValues() { _columnOriginalValues.put("classNameId", _classNameId); _columnOriginalValues.put("classPK", _classPK); _columnOriginalValues.put("classUuid", _classUuid); + _columnOriginalValues.put( + "classExternalReferenceCode", _classExternalReferenceCode); _columnOriginalValues.put("referrerClassNameId", _referrerClassNameId); _columnOriginalValues.put("parentSystemEventId", _parentSystemEventId); _columnOriginalValues.put("systemEventSetKey", _systemEventSetKey); @@ -1105,15 +1155,17 @@ public static long getColumnBitmask(String columnName) { columnBitmasks.put("classUuid", 1024L); - columnBitmasks.put("referrerClassNameId", 2048L); + columnBitmasks.put("classExternalReferenceCode", 2048L); + + columnBitmasks.put("referrerClassNameId", 4096L); - columnBitmasks.put("parentSystemEventId", 4096L); + columnBitmasks.put("parentSystemEventId", 8192L); - columnBitmasks.put("systemEventSetKey", 8192L); + columnBitmasks.put("systemEventSetKey", 16384L); - columnBitmasks.put("type_", 16384L); + columnBitmasks.put("type_", 32768L); - columnBitmasks.put("extraData", 32768L); + columnBitmasks.put("extraData", 65536L); _columnBitmasks = Collections.unmodifiableMap(columnBitmasks); } diff --git a/portal-impl/src/com/liferay/portal/service.xml b/portal-impl/src/com/liferay/portal/service.xml index bfada4454fad05..e34f2d158c3cf7 100644 --- a/portal-impl/src/com/liferay/portal/service.xml +++ b/portal-impl/src/com/liferay/portal/service.xml @@ -2355,6 +2355,7 @@ + diff --git a/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java index a19d68a632d38f..c09667cdde4c3e 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java @@ -40,8 +40,8 @@ public class SystemEventLocalServiceImpl @Override public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String referrerClassName, int type, - String extraData) + String classUuid, String classExternalReferenceCode, + String referrerClassName, int type, String extraData) throws PortalException { if (userId == 0) { @@ -65,18 +65,21 @@ else if (groupId > 0) { return addSystemEvent( userId, companyId, groupId, className, classPK, classUuid, - referrerClassName, type, extraData, userName); + classExternalReferenceCode, referrerClassName, type, extraData, + userName); } @Override public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String referrerClassName, int type, String extraData) + String classExternalReferenceCode, String referrerClassName, + int type, String extraData) throws PortalException { return addSystemEvent( - 0, companyId, 0, className, classPK, classUuid, referrerClassName, - type, extraData, StringPool.BLANK); + 0, companyId, 0, className, classPK, classUuid, + classExternalReferenceCode, referrerClassName, type, extraData, + StringPool.BLANK); } @Override @@ -160,8 +163,9 @@ public boolean validateGroup(long groupId) throws PortalException { protected SystemEvent addSystemEvent( long userId, long companyId, long groupId, String className, - long classPK, String classUuid, String referrerClassName, int type, - String extraData, String userName) + long classPK, String classUuid, String classExternalReferenceCode, + String referrerClassName, int type, String extraData, + String userName) throws PortalException { SystemEventHierarchyEntry systemEventHierarchyEntry = @@ -220,6 +224,7 @@ protected SystemEvent addSystemEvent( systemEvent.setClassName(className); systemEvent.setClassPK(classPK); systemEvent.setClassUuid(classUuid); + systemEvent.setClassExternalReferenceCode(classExternalReferenceCode); systemEvent.setReferrerClassName(referrerClassName); long parentSystemEventId = 0; diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/SystemEventPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/SystemEventPersistenceImpl.java index 1cacad9d2d121d..1b1e7f84d9c144 100644 --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/SystemEventPersistenceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/SystemEventPersistenceImpl.java @@ -3124,6 +3124,7 @@ public List getUniqueIndexColumnNames() { ctStrictColumnNames.add("classNameId"); ctStrictColumnNames.add("classPK"); ctMergeColumnNames.add("classUuid"); + ctMergeColumnNames.add("classExternalReferenceCode"); ctMergeColumnNames.add("referrerClassNameId"); ctMergeColumnNames.add("parentSystemEventId"); ctMergeColumnNames.add("systemEventSetKey"); diff --git a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java index 945c9637d8e70b..7900ce0edb49e5 100644 --- a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java +++ b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java @@ -15,6 +15,7 @@ import com.liferay.portal.kernel.mass.delete.MassDeleteCacheThreadLocal; import com.liferay.portal.kernel.model.AuditedModel; import com.liferay.portal.kernel.model.ClassedModel; +import com.liferay.portal.kernel.model.ExternalReferenceCodeModel; import com.liferay.portal.kernel.model.Group; import com.liferay.portal.kernel.model.GroupedModel; import com.liferay.portal.kernel.model.StagedModel; @@ -116,6 +117,9 @@ protected void afterReturning( long classPK = getClassPK(classedModel); + String classExternalReferenceCode = getClassExternalReferenceCode( + classedModel); + SystemEventHierarchyEntry systemEventHierarchyEntry = SystemEventHierarchyEntryThreadLocal.peek(); @@ -126,14 +130,16 @@ protected void afterReturning( SystemEventLocalServiceUtil.addSystemEvent( 0, groupId, systemEventHierarchyEntry.getClassName(), classPK, systemEventHierarchyEntry.getUuid(), - referrerClassName, systemEvent.type(), + classExternalReferenceCode, referrerClassName, + systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } else { SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), systemEventHierarchyEntry.getClassName(), classPK, - systemEventHierarchyEntry.getUuid(), referrerClassName, + systemEventHierarchyEntry.getUuid(), + classExternalReferenceCode, referrerClassName, systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } @@ -141,13 +147,14 @@ protected void afterReturning( else if (group != null) { SystemEventLocalServiceUtil.addSystemEvent( 0, groupId, className, classPK, getUuid(classedModel), - referrerClassName, systemEvent.type(), StringPool.BLANK); + classExternalReferenceCode, referrerClassName, + systemEvent.type(), StringPool.BLANK); } else { SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), className, classPK, - getUuid(classedModel), referrerClassName, systemEvent.type(), - StringPool.BLANK); + getUuid(classedModel), classExternalReferenceCode, + referrerClassName, systemEvent.type(), StringPool.BLANK); } } @@ -179,6 +186,20 @@ protected void duringFinally( getClassName(classedModel), classPK); } + protected String getClassExternalReferenceCode(ClassedModel classedModel) { + String externalReferenceCode = null; + + if (classedModel instanceof ExternalReferenceCodeModel) { + ExternalReferenceCodeModel externalReferenceCodeModel = + (ExternalReferenceCodeModel)classedModel; + + externalReferenceCode = + externalReferenceCodeModel.getExternalReferenceCode(); + } + + return externalReferenceCode; + } + protected String getClassName(ClassedModel classedModel) { String className = classedModel.getModelClassName(); diff --git a/portal-impl/src/com/liferay/portal/upgrade/v7_4_x/PortalUpgradeProcessRegistryImpl.java b/portal-impl/src/com/liferay/portal/upgrade/v7_4_x/PortalUpgradeProcessRegistryImpl.java index 8757fecc4afb08..fdd628d19c643c 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v7_4_x/PortalUpgradeProcessRegistryImpl.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v7_4_x/PortalUpgradeProcessRegistryImpl.java @@ -563,6 +563,11 @@ protected String[][] getTableAndPrimaryKeyColumnNames() { new Version(31, 14, 2), UpgradeProcessFactory.alterColumnType( "AssetVocabulary", "visibilityType", "INTEGER")); + + upgradeVersionTreeMap.put( + new Version(31, 15, 0), + UpgradeProcessFactory.addColumns( + "SystemEvent", "classExternalReferenceCode VARCHAR(75) null")); } } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portlet/expando/service/impl/ExpandoColumnLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/expando/service/impl/ExpandoColumnLocalServiceImpl.java index 591a90c49cca93..30a80161758714 100644 --- a/portal-impl/src/com/liferay/portlet/expando/service/impl/ExpandoColumnLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/expando/service/impl/ExpandoColumnLocalServiceImpl.java @@ -427,8 +427,8 @@ protected void addDeletionSystemEvent(ExpandoColumn expandoColumn) { _systemEventLocalService.addSystemEvent( stagedExpandoColumn.getCompanyId(), stagedModelType.getClassName(), - stagedExpandoColumn.getPrimaryKey(), StringPool.BLANK, null, - SystemEventConstants.TYPE_DELETE, + stagedExpandoColumn.getPrimaryKey(), StringPool.BLANK, + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } catch (PortalException portalException) { diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java index 13cc543ca57dc4..fc3a08eee5bbeb 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java +++ b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java @@ -240,6 +240,22 @@ public interface SystemEventModel */ public void setClassUuid(String classUuid); + /** + * Returns the class external reference code of this system event. + * + * @return the class external reference code of this system event + */ + @AutoEscape + public String getClassExternalReferenceCode(); + + /** + * Sets the class external reference code of this system event. + * + * @param classExternalReferenceCode the class external reference code of this system event + */ + public void setClassExternalReferenceCode( + String classExternalReferenceCode); + /** * Returns the referrer class name ID of this system event. * diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventTable.java b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventTable.java index 013d122327f735..690913afc1edac 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventTable.java +++ b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventTable.java @@ -46,6 +46,10 @@ public class SystemEventTable extends BaseTable { "classPK", Long.class, Types.BIGINT, Column.FLAG_DEFAULT); public final Column classUuid = createColumn( "classUuid", String.class, Types.VARCHAR, Column.FLAG_DEFAULT); + public final Column classExternalReferenceCode = + createColumn( + "classExternalReferenceCode", String.class, Types.VARCHAR, + Column.FLAG_DEFAULT); public final Column referrerClassNameId = createColumn( "referrerClassNameId", Long.class, Types.BIGINT, diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventWrapper.java index 7536b62a530f21..1d0fa92143df63 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventWrapper.java +++ b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventWrapper.java @@ -45,6 +45,8 @@ public Map getModelAttributes() { attributes.put("classNameId", getClassNameId()); attributes.put("classPK", getClassPK()); attributes.put("classUuid", getClassUuid()); + attributes.put( + "classExternalReferenceCode", getClassExternalReferenceCode()); attributes.put("referrerClassNameId", getReferrerClassNameId()); attributes.put("parentSystemEventId", getParentSystemEventId()); attributes.put("systemEventSetKey", getSystemEventSetKey()); @@ -122,6 +124,13 @@ public void setModelAttributes(Map attributes) { setClassUuid(classUuid); } + String classExternalReferenceCode = (String)attributes.get( + "classExternalReferenceCode"); + + if (classExternalReferenceCode != null) { + setClassExternalReferenceCode(classExternalReferenceCode); + } + Long referrerClassNameId = (Long)attributes.get("referrerClassNameId"); if (referrerClassNameId != null) { @@ -158,6 +167,16 @@ public SystemEvent cloneWithOriginalValues() { return wrap(model.cloneWithOriginalValues()); } + /** + * Returns the class external reference code of this system event. + * + * @return the class external reference code of this system event + */ + @Override + public String getClassExternalReferenceCode() { + return model.getClassExternalReferenceCode(); + } + /** * Returns the fully qualified class name of this system event. * @@ -358,6 +377,18 @@ public void persist() { model.persist(); } + /** + * Sets the class external reference code of this system event. + * + * @param classExternalReferenceCode the class external reference code of this system event + */ + @Override + public void setClassExternalReferenceCode( + String classExternalReferenceCode) { + + model.setClassExternalReferenceCode(classExternalReferenceCode); + } + @Override public void setClassName(String className) { model.setClassName(className); diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/packageinfo b/portal-kernel/src/com/liferay/portal/kernel/model/packageinfo index 169e2b363346a3..0cb85f279a271a 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/model/packageinfo +++ b/portal-kernel/src/com/liferay/portal/kernel/model/packageinfo @@ -1 +1 @@ -version 39.0.0 \ No newline at end of file +version 39.1.0 \ No newline at end of file diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalService.java index d9f7661c64cce4..095392ff224900 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalService.java +++ b/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalService.java @@ -62,13 +62,14 @@ public interface SystemEventLocalService */ public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String referrerClassName, int type, - String extraData) + String classUuid, String classExternalReferenceCode, + String referrerClassName, int type, String extraData) throws PortalException; public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String referrerClassName, int type, String extraData) + String classExternalReferenceCode, String referrerClassName, + int type, String extraData) throws PortalException; /** diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceUtil.java index d930dc5f443068..1e17e242435a3c 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceUtil.java +++ b/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceUtil.java @@ -37,23 +37,24 @@ public class SystemEventLocalServiceUtil { */ public static SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String referrerClassName, int type, - String extraData) + String classUuid, String classExternalReferenceCode, + String referrerClassName, int type, String extraData) throws PortalException { return getService().addSystemEvent( - userId, groupId, className, classPK, classUuid, referrerClassName, - type, extraData); + userId, groupId, className, classPK, classUuid, + classExternalReferenceCode, referrerClassName, type, extraData); } public static SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String referrerClassName, int type, String extraData) + String classExternalReferenceCode, String referrerClassName, + int type, String extraData) throws PortalException { return getService().addSystemEvent( - companyId, className, classPK, classUuid, referrerClassName, type, - extraData); + companyId, className, classPK, classUuid, + classExternalReferenceCode, referrerClassName, type, extraData); } /** diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceWrapper.java index db7451faa26aa2..749394c6d2d4ec 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceWrapper.java +++ b/portal-kernel/src/com/liferay/portal/kernel/service/SystemEventLocalServiceWrapper.java @@ -34,24 +34,25 @@ public SystemEventLocalServiceWrapper( @Override public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String referrerClassName, int type, - String extraData) + String classUuid, String classExternalReferenceCode, + String referrerClassName, int type, String extraData) throws com.liferay.portal.kernel.exception.PortalException { return _systemEventLocalService.addSystemEvent( - userId, groupId, className, classPK, classUuid, referrerClassName, - type, extraData); + userId, groupId, className, classPK, classUuid, + classExternalReferenceCode, referrerClassName, type, extraData); } @Override public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String referrerClassName, int type, String extraData) + String classExternalReferenceCode, String referrerClassName, + int type, String extraData) throws com.liferay.portal.kernel.exception.PortalException { return _systemEventLocalService.addSystemEvent( - companyId, className, classPK, classUuid, referrerClassName, type, - extraData); + companyId, className, classPK, classUuid, + classExternalReferenceCode, referrerClassName, type, extraData); } /** diff --git a/sql/portal-tables.sql b/sql/portal-tables.sql index 1af3ab2b86849e..33269df1a1506a 100644 --- a/sql/portal-tables.sql +++ b/sql/portal-tables.sql @@ -1401,6 +1401,7 @@ create table SystemEvent ( classNameId LONG, classPK LONG, classUuid VARCHAR(75) null, + classExternalReferenceCode VARCHAR(75) null, referrerClassNameId LONG, parentSystemEventId LONG, systemEventSetKey LONG,