From 6cbed13f2b5c4cc69cc8d1d8cff5f75bcf60db60 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Thu, 9 Jan 2025 14:35:57 +0100 Subject: [PATCH 01/25] LPD-45734 service.xml --- portal-impl/src/com/liferay/portal/service.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/portal-impl/src/com/liferay/portal/service.xml b/portal-impl/src/com/liferay/portal/service.xml index bfada4454fad05..76b6db32b2f1fe 100644 --- a/portal-impl/src/com/liferay/portal/service.xml +++ b/portal-impl/src/com/liferay/portal/service.xml @@ -2355,6 +2355,7 @@ + From 602b2c5d938d3de58a6d41877f4dea89e84eff76 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Thu, 9 Jan 2025 15:01:32 +0100 Subject: [PATCH 02/25] LPD-45734 serviceBuilder --- .../test/SystemEventPersistenceTest.java | 13 +++- portal-impl/src/META-INF/portal-hbm.xml | 1 + .../src/META-INF/portal-model-hints.xml | 1 + .../model/impl/SystemEventCacheModel.java | 20 +++++- .../model/impl/SystemEventModelImpl.java | 61 ++++++++++++++++--- .../impl/SystemEventPersistenceImpl.java | 48 +++++++++++++++ .../portal/kernel/model/SystemEventModel.java | 19 +++++- .../portal/kernel/model/SystemEventTable.java | 4 ++ .../kernel/model/SystemEventWrapper.java | 28 +++++++++ sql/portal-tables.sql | 1 + 10 files changed, 184 insertions(+), 12 deletions(-) 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..e24ea4a2cc0a81 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,8 @@ public void testUpdateExisting() throws Exception { newSystemEvent.setClassUuid(RandomTestUtil.randomString()); + newSystemEvent.setExternalReferenceCode(RandomTestUtil.randomString()); + newSystemEvent.setReferrerClassNameId(RandomTestUtil.nextLong()); newSystemEvent.setParentSystemEventId(RandomTestUtil.nextLong()); @@ -174,6 +176,9 @@ public void testUpdateExisting() throws Exception { existingSystemEvent.getClassPK(), newSystemEvent.getClassPK()); Assert.assertEquals( existingSystemEvent.getClassUuid(), newSystemEvent.getClassUuid()); + Assert.assertEquals( + existingSystemEvent.getExternalReferenceCode(), + newSystemEvent.getExternalReferenceCode()); Assert.assertEquals( existingSystemEvent.getReferrerClassNameId(), newSystemEvent.getReferrerClassNameId()); @@ -250,9 +255,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, "externalReferenceCode", true, + "referrerClassNameId", true, "parentSystemEventId", true, + "systemEventSetKey", true, "type", true); } @Test @@ -489,6 +494,8 @@ protected SystemEvent addSystemEvent() throws Exception { systemEvent.setClassUuid(RandomTestUtil.randomString()); + systemEvent.setExternalReferenceCode(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..90b8b938e24f15 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..c1feebe13e98b8 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..cbd9e1c05da672 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(", externalReferenceCode="); + sb.append(externalReferenceCode); sb.append(", referrerClassNameId="); sb.append(referrerClassNameId); sb.append(", parentSystemEventId="); @@ -142,6 +144,13 @@ public SystemEvent toEntityModel() { systemEventImpl.setClassUuid(classUuid); } + if (externalReferenceCode == null) { + systemEventImpl.setExternalReferenceCode(""); + } + else { + systemEventImpl.setExternalReferenceCode(externalReferenceCode); + } + systemEventImpl.setReferrerClassNameId(referrerClassNameId); systemEventImpl.setParentSystemEventId(parentSystemEventId); systemEventImpl.setSystemEventSetKey(systemEventSetKey); @@ -181,6 +190,7 @@ public void readExternal(ObjectInput objectInput) classPK = objectInput.readLong(); classUuid = objectInput.readUTF(); + externalReferenceCode = objectInput.readUTF(); referrerClassNameId = objectInput.readLong(); @@ -226,6 +236,13 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException { objectOutput.writeUTF(classUuid); } + if (externalReferenceCode == null) { + objectOutput.writeUTF(""); + } + else { + objectOutput.writeUTF(externalReferenceCode); + } + objectOutput.writeLong(referrerClassNameId); objectOutput.writeLong(parentSystemEventId); @@ -253,6 +270,7 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException { public long classNameId; public long classPK; public String classUuid; + public String externalReferenceCode; 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..fbc7abc6ada663 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,8 @@ 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}, {"externalReferenceCode", Types.VARCHAR}, + {"referrerClassNameId", Types.BIGINT}, {"parentSystemEventId", Types.BIGINT}, {"systemEventSetKey", Types.BIGINT}, {"type_", Types.INTEGER}, {"extraData", Types.CLOB} @@ -89,6 +90,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("externalReferenceCode", 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 +99,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,externalReferenceCode 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 +287,8 @@ private static class AttributeGetterFunctionsHolder { attributeGetterFunctions.put("classPK", SystemEvent::getClassPK); attributeGetterFunctions.put( "classUuid", SystemEvent::getClassUuid); + attributeGetterFunctions.put( + "externalReferenceCode", SystemEvent::getExternalReferenceCode); attributeGetterFunctions.put( "referrerClassNameId", SystemEvent::getReferrerClassNameId); attributeGetterFunctions.put( @@ -343,6 +347,10 @@ private static class AttributeSetterBiConsumersHolder { attributeSetterBiConsumers.put( "classUuid", (BiConsumer)SystemEvent::setClassUuid); + attributeSetterBiConsumers.put( + "externalReferenceCode", + (BiConsumer) + SystemEvent::setExternalReferenceCode); attributeSetterBiConsumers.put( "referrerClassNameId", (BiConsumer) @@ -595,6 +603,25 @@ public void setClassUuid(String classUuid) { _classUuid = classUuid; } + @Override + public String getExternalReferenceCode() { + if (_externalReferenceCode == null) { + return ""; + } + else { + return _externalReferenceCode; + } + } + + @Override + public void setExternalReferenceCode(String externalReferenceCode) { + if (_columnOriginalValues == Collections.EMPTY_MAP) { + _setColumnOriginalValues(); + } + + _externalReferenceCode = externalReferenceCode; + } + @Override public long getReferrerClassNameId() { return _referrerClassNameId; @@ -757,6 +784,7 @@ public Object clone() { systemEventImpl.setClassNameId(getClassNameId()); systemEventImpl.setClassPK(getClassPK()); systemEventImpl.setClassUuid(getClassUuid()); + systemEventImpl.setExternalReferenceCode(getExternalReferenceCode()); systemEventImpl.setReferrerClassNameId(getReferrerClassNameId()); systemEventImpl.setParentSystemEventId(getParentSystemEventId()); systemEventImpl.setSystemEventSetKey(getSystemEventSetKey()); @@ -793,6 +821,8 @@ public SystemEvent cloneWithOriginalValues() { this.getColumnOriginalValue("classPK")); systemEventImpl.setClassUuid( this.getColumnOriginalValue("classUuid")); + systemEventImpl.setExternalReferenceCode( + this.getColumnOriginalValue("externalReferenceCode")); systemEventImpl.setReferrerClassNameId( this.getColumnOriginalValue("referrerClassNameId")); systemEventImpl.setParentSystemEventId( @@ -920,6 +950,18 @@ public CacheModel toCacheModel() { systemEventCacheModel.classUuid = null; } + systemEventCacheModel.externalReferenceCode = + getExternalReferenceCode(); + + String externalReferenceCode = + systemEventCacheModel.externalReferenceCode; + + if ((externalReferenceCode != null) && + (externalReferenceCode.length() == 0)) { + + systemEventCacheModel.externalReferenceCode = null; + } + systemEventCacheModel.referrerClassNameId = getReferrerClassNameId(); systemEventCacheModel.parentSystemEventId = getParentSystemEventId(); @@ -1008,6 +1050,7 @@ private static class EscapedModelProxyProviderFunctionHolder { private long _classNameId; private long _classPK; private String _classUuid; + private String _externalReferenceCode; private long _referrerClassNameId; private long _parentSystemEventId; private long _systemEventSetKey; @@ -1055,6 +1098,8 @@ private void _setColumnOriginalValues() { _columnOriginalValues.put("classNameId", _classNameId); _columnOriginalValues.put("classPK", _classPK); _columnOriginalValues.put("classUuid", _classUuid); + _columnOriginalValues.put( + "externalReferenceCode", _externalReferenceCode); _columnOriginalValues.put("referrerClassNameId", _referrerClassNameId); _columnOriginalValues.put("parentSystemEventId", _parentSystemEventId); _columnOriginalValues.put("systemEventSetKey", _systemEventSetKey); @@ -1105,15 +1150,17 @@ public static long getColumnBitmask(String columnName) { columnBitmasks.put("classUuid", 1024L); - columnBitmasks.put("referrerClassNameId", 2048L); + columnBitmasks.put("externalReferenceCode", 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/persistence/impl/SystemEventPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/SystemEventPersistenceImpl.java index 1cacad9d2d121d..b6a27f690f8491 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 @@ -19,23 +19,30 @@ import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.Session; import com.liferay.portal.kernel.exception.NoSuchSystemEventException; +import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.model.SystemEvent; import com.liferay.portal.kernel.model.SystemEventTable; +import com.liferay.portal.kernel.sanitizer.Sanitizer; +import com.liferay.portal.kernel.sanitizer.SanitizerException; +import com.liferay.portal.kernel.sanitizer.SanitizerUtil; import com.liferay.portal.kernel.security.auth.CompanyThreadLocal; +import com.liferay.portal.kernel.security.auth.PrincipalThreadLocal; import com.liferay.portal.kernel.service.ServiceContext; import com.liferay.portal.kernel.service.ServiceContextThreadLocal; import com.liferay.portal.kernel.service.persistence.SystemEventPersistence; import com.liferay.portal.kernel.service.persistence.SystemEventUtil; import com.liferay.portal.kernel.service.persistence.change.tracking.helper.CTPersistenceHelperUtil; import com.liferay.portal.kernel.service.persistence.impl.BasePersistenceImpl; +import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.kernel.util.SetUtil; +import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.impl.SystemEventImpl; import com.liferay.portal.model.impl.SystemEventModelImpl; @@ -52,6 +59,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -2592,6 +2600,45 @@ public SystemEvent updateImpl(SystemEvent systemEvent) { SystemEventModelImpl systemEventModelImpl = (SystemEventModelImpl)systemEvent; + if (Validator.isNull(systemEvent.getExternalReferenceCode())) { + systemEvent.setExternalReferenceCode( + String.valueOf(systemEvent.getPrimaryKey())); + } + else { + if (!Objects.equals( + systemEventModelImpl.getColumnOriginalValue( + "externalReferenceCode"), + systemEvent.getExternalReferenceCode())) { + + long userId = GetterUtil.getLong( + PrincipalThreadLocal.getName()); + + if (userId > 0) { + long companyId = systemEvent.getCompanyId(); + + long groupId = systemEvent.getGroupId(); + + long classPK = 0; + + if (!isNew) { + classPK = systemEvent.getPrimaryKey(); + } + + try { + systemEvent.setExternalReferenceCode( + SanitizerUtil.sanitize( + companyId, groupId, userId, + SystemEvent.class.getName(), classPK, + ContentTypes.TEXT_HTML, Sanitizer.MODE_ALL, + systemEvent.getExternalReferenceCode(), null)); + } + catch (SanitizerException sanitizerException) { + throw new SystemException(sanitizerException); + } + } + } + } + if (isNew && (systemEvent.getCreateDate() == null)) { ServiceContext serviceContext = ServiceContextThreadLocal.getServiceContext(); @@ -3124,6 +3171,7 @@ public List getUniqueIndexColumnNames() { ctStrictColumnNames.add("classNameId"); ctStrictColumnNames.add("classPK"); ctMergeColumnNames.add("classUuid"); + ctMergeColumnNames.add("externalReferenceCode"); ctMergeColumnNames.add("referrerClassNameId"); ctMergeColumnNames.add("parentSystemEventId"); ctMergeColumnNames.add("systemEventSetKey"); 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..01f1228db8532b 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java +++ b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java @@ -26,7 +26,7 @@ @ProviderType public interface SystemEventModel extends AttachedModel, BaseModel, CTModel, - MVCCModel, ShardedModel { + ExternalReferenceCodeModel, MVCCModel, ShardedModel { /* * NOTE FOR DEVELOPERS: @@ -240,6 +240,23 @@ public interface SystemEventModel */ public void setClassUuid(String classUuid); + /** + * Returns the external reference code of this system event. + * + * @return the external reference code of this system event + */ + @AutoEscape + @Override + public String getExternalReferenceCode(); + + /** + * Sets the external reference code of this system event. + * + * @param externalReferenceCode the external reference code of this system event + */ + @Override + public void setExternalReferenceCode(String externalReferenceCode); + /** * 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..ebd6b834d6c092 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 externalReferenceCode = + createColumn( + "externalReferenceCode", 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..255e871126ae2f 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,7 @@ public Map getModelAttributes() { attributes.put("classNameId", getClassNameId()); attributes.put("classPK", getClassPK()); attributes.put("classUuid", getClassUuid()); + attributes.put("externalReferenceCode", getExternalReferenceCode()); attributes.put("referrerClassNameId", getReferrerClassNameId()); attributes.put("parentSystemEventId", getParentSystemEventId()); attributes.put("systemEventSetKey", getSystemEventSetKey()); @@ -122,6 +123,13 @@ public void setModelAttributes(Map attributes) { setClassUuid(classUuid); } + String externalReferenceCode = (String)attributes.get( + "externalReferenceCode"); + + if (externalReferenceCode != null) { + setExternalReferenceCode(externalReferenceCode); + } + Long referrerClassNameId = (Long)attributes.get("referrerClassNameId"); if (referrerClassNameId != null) { @@ -228,6 +236,16 @@ public long getCtCollectionId() { return model.getCtCollectionId(); } + /** + * Returns the external reference code of this system event. + * + * @return the external reference code of this system event + */ + @Override + public String getExternalReferenceCode() { + return model.getExternalReferenceCode(); + } + /** * Returns the extra data of this system event. * @@ -423,6 +441,16 @@ public void setCtCollectionId(long ctCollectionId) { model.setCtCollectionId(ctCollectionId); } + /** + * Sets the external reference code of this system event. + * + * @param externalReferenceCode the external reference code of this system event + */ + @Override + public void setExternalReferenceCode(String externalReferenceCode) { + model.setExternalReferenceCode(externalReferenceCode); + } + /** * Sets the extra data of this system event. * diff --git a/sql/portal-tables.sql b/sql/portal-tables.sql index 1af3ab2b86849e..269e0c03f5baf9 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, + externalReferenceCode VARCHAR(75) null, referrerClassNameId LONG, parentSystemEventId LONG, systemEventSetKey LONG, From 6579aaaddb7ee3d1368c03825b9cd5960b92c9f6 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Wed, 15 Jan 2025 13:11:42 +0100 Subject: [PATCH 03/25] LPD-45734 add externalReferenceCode to SystemEventLocalServiceImpl add methods --- .../service/impl/SystemEventLocalServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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..98f3b71bd23711 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java @@ -40,7 +40,7 @@ public class SystemEventLocalServiceImpl @Override public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String referrerClassName, int type, + String classUuid, String externalReferenceCode, String referrerClassName, int type, String extraData) throws PortalException { @@ -64,18 +64,18 @@ else if (groupId > 0) { } return addSystemEvent( - userId, companyId, groupId, className, classPK, classUuid, + userId, companyId, groupId, className, classPK, classUuid, externalReferenceCode, referrerClassName, type, extraData, userName); } @Override public SystemEvent addSystemEvent( - long companyId, String className, long classPK, String classUuid, + long companyId, String className, long classPK, String classUuid, String externalReferenceCode, String referrerClassName, int type, String extraData) throws PortalException { return addSystemEvent( - 0, companyId, 0, className, classPK, classUuid, referrerClassName, + 0, companyId, 0, className, classPK, classUuid, externalReferenceCode, referrerClassName, type, extraData, StringPool.BLANK); } @@ -160,7 +160,7 @@ 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, + long classPK, String classUuid, String externalReferenceCode, String referrerClassName, int type, String extraData, String userName) throws PortalException { @@ -221,6 +221,7 @@ protected SystemEvent addSystemEvent( systemEvent.setClassPK(classPK); systemEvent.setClassUuid(classUuid); systemEvent.setReferrerClassName(referrerClassName); + systemEvent.setExternalReferenceCode(externalReferenceCode); long parentSystemEventId = 0; From 34087b6be1b6e6b6cd4880052a67bd49189b0523 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Wed, 15 Jan 2025 14:03:17 +0100 Subject: [PATCH 04/25] LPD-45734 serviceBuilder --- .../kernel/service/SystemEventLocalService.java | 7 ++++--- .../service/SystemEventLocalServiceUtil.java | 15 ++++++++------- .../service/SystemEventLocalServiceWrapper.java | 15 ++++++++------- 3 files changed, 20 insertions(+), 17 deletions(-) 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..48ca0aa7c1ab22 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 externalReferenceCode, + 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 externalReferenceCode, 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..934e010b85383a 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 externalReferenceCode, + String referrerClassName, int type, String extraData) throws PortalException { return getService().addSystemEvent( - userId, groupId, className, classPK, classUuid, referrerClassName, - type, extraData); + userId, groupId, className, classPK, classUuid, + externalReferenceCode, referrerClassName, type, extraData); } public static SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String referrerClassName, int type, String extraData) + String externalReferenceCode, String referrerClassName, int type, + String extraData) throws PortalException { return getService().addSystemEvent( - companyId, className, classPK, classUuid, referrerClassName, type, - extraData); + companyId, className, classPK, classUuid, externalReferenceCode, + 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..ffaa2a2e969bc0 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 externalReferenceCode, + 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, + externalReferenceCode, referrerClassName, type, extraData); } @Override public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String referrerClassName, int type, String extraData) + String externalReferenceCode, 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, externalReferenceCode, + referrerClassName, type, extraData); } /** From 72a965ebca2608c73c6243e4d37197643eba2bd3 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Wed, 15 Jan 2025 13:01:43 +0100 Subject: [PATCH 05/25] LPD-45734 fix interfaces --- .../link/service/impl/AssetLinkLocalServiceImpl.java | 2 +- .../service/impl/CalendarBookingLocalServiceImpl.java | 2 +- .../repository/DummyFolderStagedModelRepository.java | 2 +- .../repository/DummyReferenceStagedModelRepository.java | 2 +- .../model/repository/DummyStagedModelRepository.java | 2 +- .../test/SystemEventTableReferenceDefinitionTest.java | 2 +- .../internal/trash/JournalArticleTrashHandler.java | 2 ++ .../service/impl/JournalArticleLocalServiceImpl.java | 8 ++++---- .../uad/anonymizer/test/SystemEventUADAnonymizerTest.java | 2 +- .../uad/exporter/test/SystemEventUADExporterTest.java | 2 +- .../internal/service/LayoutLocalServiceStagingAdvice.java | 4 +++- .../wiki/service/impl/WikiPageLocalServiceImpl.java | 2 +- .../service/impl/ExpandoColumnLocalServiceImpl.java | 2 +- 13 files changed, 19 insertions(+), 15 deletions(-) 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..bf090a32a2feea 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 @@ -571,7 +571,7 @@ private void _addDeletionSystemEvent(AssetLink assetLink) { try { _systemEventLocalService.addSystemEvent( 0, assetEntry.getGroupId(), stagedModelType.getClassName(), - stagedAssetLink.getPrimaryKey(), stagedAssetLink.getUuid(), + stagedAssetLink.getPrimaryKey(), stagedAssetLink.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } catch (PortalException 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..1b9b13c2a85ba6 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 @@ -84,7 +84,7 @@ public void deleteStagedModel(DummyFolder dummyFolder) if (_dummyFolders.remove(dummyFolder)) { systemEventLocalService.addSystemEvent( 0, dummyFolder.getGroupId(), dummyFolder.getModelClassName(), - dummyFolder.getPrimaryKey(), dummyFolder.getUuid(), + dummyFolder.getPrimaryKey(), dummyFolder.getUuid(),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..a0827649f06ff0 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 @@ -82,7 +82,7 @@ public void deleteStagedModel(DummyReference dummyReference) systemEventLocalService.addSystemEvent( 0, dummyReference.getGroupId(), dummyReference.getModelClassName(), - dummyReference.getPrimaryKey(), dummyReference.getUuid(), + dummyReference.getPrimaryKey(), dummyReference.getUuid(), 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..b8a1652326e169 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 @@ -82,7 +82,7 @@ public void deleteStagedModel(Dummy dummy) throws PortalException { if (_dummies.remove(dummy)) { systemEventLocalService.addSystemEvent( 0, dummy.getGroupId(), dummy.getModelClassName(), - dummy.getPrimaryKey(), dummy.getUuid(), StringPool.BLANK, + dummy.getPrimaryKey(), dummy.getUuid(), 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..d4f5e9483c5281 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/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..d33012c4644270 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,6 +81,7 @@ public SystemEvent addDeletionSystemEvent( return _systemEventLocalService.addSystemEvent( userId, groupId, getSystemEventClassName(), classPK, classUuid, + StringPool.BLANK, referrerClassName, SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } 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..9f81ef0d0398ae 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,7 +1383,7 @@ public JournalArticle deleteArticle( if (articleResource != null) { _systemEventLocalService.addSystemEvent( 0, article.getGroupId(), article.getModelClassName(), - article.getPrimaryKey(), articleResource.getUuid(), null, + article.getPrimaryKey(), articleResource.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, JSONUtil.put( "assetTitle", @@ -1470,7 +1470,7 @@ public void deleteArticle( if (articleResource != null) { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), - articleResource.getResourcePrimKey(), articleResource.getUuid(), + articleResource.getResourcePrimKey(), articleResource.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, JSONUtil.put( "assetTitle", assetTitle @@ -1527,7 +1527,7 @@ public void deleteArticles(long groupId) throws PortalException { for (JournalArticleResource articleResource : articleResources) { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), - articleResource.getResourcePrimKey(), articleResource.getUuid(), + articleResource.getResourcePrimKey(), articleResource.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } @@ -1601,7 +1601,7 @@ public void deleteArticles( for (JournalArticleResource articleResource : articleResources) { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), - articleResource.getResourcePrimKey(), articleResource.getUuid(), + articleResource.getResourcePrimKey(), articleResource.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } 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..94509e9e2b2dd8 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 @@ -52,7 +52,7 @@ protected SystemEvent addBaseModel(long userId, boolean deleteAfterTestRun) SystemEvent systemEvent = _systemEventLocalService.addSystemEvent( userId, TestPropsValues.getGroupId(), Group.class.getName(), - RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), + RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), StringPool.BLANK, StringPool.BLANK, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); 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..a0f891ca76af8f 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 @@ -44,7 +44,7 @@ public class SystemEventUADExporterTest protected SystemEvent addBaseModel(long userId) throws Exception { SystemEvent systemEvent = _systemEventLocalService.addSystemEvent( userId, TestPropsValues.getGroupId(), Group.class.getName(), - RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), + RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), StringPool.BLANK, StringPool.BLANK, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); 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..bf0af2446cc9a7 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 @@ -10,6 +10,7 @@ import com.liferay.exportimport.kernel.staging.Staging; import com.liferay.layout.page.template.model.LayoutPageTemplateEntry; import com.liferay.layout.page.template.service.LayoutPageTemplateEntryLocalService; +import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.LayoutNameException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; @@ -471,7 +472,8 @@ protected void doDeleteLayout( _systemEventLocalService.addSystemEvent( 0, layout.getGroupId(), Layout.class.getName(), - layout.getPlid(), layout.getUuid(), null, + layout.getPlid(), layout.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, systemEventHierarchyEntry.getExtraData()); } 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..57eed611137ab5 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,7 +713,7 @@ public void deletePage(WikiPage page) throws PortalException { if (pageResource != null) { _systemEventLocalService.addSystemEvent( 0, page.getGroupId(), page.getModelClassName(), - page.getPrimaryKey(), pageResource.getUuid(), null, + page.getPrimaryKey(), pageResource.getUuid(), StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } 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..3b3d6df22b2ce2 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,7 +427,7 @@ protected void addDeletionSystemEvent(ExpandoColumn expandoColumn) { _systemEventLocalService.addSystemEvent( stagedExpandoColumn.getCompanyId(), stagedModelType.getClassName(), - stagedExpandoColumn.getPrimaryKey(), StringPool.BLANK, null, + stagedExpandoColumn.getPrimaryKey(), StringPool.BLANK, StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } From 4fc2e20d9270b78521cefa759f0ba15378af2c61 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Mon, 20 Jan 2025 13:10:44 +0100 Subject: [PATCH 06/25] LPD-45734 fix method calls --- .../exportimport/system/event/test/SystemEventCheckTest.java | 2 +- .../internal/service/LayoutLocalServiceStagingAdvice.java | 3 +-- .../src/main/java/com/liferay/trash/BaseTrashHandler.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) 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/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 bf0af2446cc9a7..54b4b346bc3804 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 @@ -10,7 +10,6 @@ import com.liferay.exportimport.kernel.staging.Staging; import com.liferay.layout.page.template.model.LayoutPageTemplateEntry; import com.liferay.layout.page.template.service.LayoutPageTemplateEntryLocalService; -import com.liferay.petra.string.StringPool; import com.liferay.portal.kernel.exception.LayoutNameException; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.log.Log; @@ -473,7 +472,7 @@ protected void doDeleteLayout( _systemEventLocalService.addSystemEvent( 0, layout.getGroupId(), Layout.class.getName(), layout.getPlid(), layout.getUuid(), - StringPool.BLANK, null, + 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..4d095a5a02dfd2 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 @@ -57,7 +57,7 @@ public SystemEvent addDeletionSystemEvent( JSONObject extraDataJSONObject = JSONUtil.put("inTrash", true); return SystemEventLocalServiceUtil.addSystemEvent( - userId, groupId, getSystemEventClassName(), classPK, classUuid, + userId, groupId, getSystemEventClassName(), classPK, classUuid, StringPool.BLANK, referrerClassName, SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } From aac56e40d47a56c8c3375c0f45cbd2e11c57ba4a Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Mon, 20 Jan 2025 13:11:49 +0100 Subject: [PATCH 07/25] LPD-45734 set externalReferenceCode to systemEvents --- .../portal/systemevent/SystemEventAdvice.java | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java index 945c9637d8e70b..916c6b3296cf0e 100644 --- a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java +++ b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java @@ -116,6 +116,8 @@ protected void afterReturning( long classPK = getClassPK(classedModel); + String externalReferenceCode = getExternalReferenceCode(classedModel); + SystemEventHierarchyEntry systemEventHierarchyEntry = SystemEventHierarchyEntryThreadLocal.peek(); @@ -125,7 +127,7 @@ protected void afterReturning( if (group != null) { SystemEventLocalServiceUtil.addSystemEvent( 0, groupId, systemEventHierarchyEntry.getClassName(), - classPK, systemEventHierarchyEntry.getUuid(), + classPK, systemEventHierarchyEntry.getUuid(), externalReferenceCode, referrerClassName, systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } @@ -133,20 +135,20 @@ protected void afterReturning( SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), systemEventHierarchyEntry.getClassName(), classPK, - systemEventHierarchyEntry.getUuid(), referrerClassName, + systemEventHierarchyEntry.getUuid(), externalReferenceCode, referrerClassName, systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } } else if (group != null) { SystemEventLocalServiceUtil.addSystemEvent( - 0, groupId, className, classPK, getUuid(classedModel), + 0, groupId, className, classPK, getUuid(classedModel), externalReferenceCode, referrerClassName, systemEvent.type(), StringPool.BLANK); } else { SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), className, classPK, - getUuid(classedModel), referrerClassName, systemEvent.type(), + getUuid(classedModel), externalReferenceCode, referrerClassName, systemEvent.type(), StringPool.BLANK); } } @@ -268,6 +270,30 @@ protected String getUuid(ClassedModel classedModel) throws Exception { return (String)getUuidMethod.invoke(classedModel, new Object[0]); } + protected String getExternalReferenceCode(ClassedModel classedModel) throws Exception { + + Class modelClass = classedModel.getClass(); + + String className = modelClass.getName(); + + Method getUuidMethod = null; + + try { + getUuidMethod = modelClass.getMethod("getExternalReferenceCode", new Class[0]); + } + catch (Exception exception) { + if (_log.isDebugEnabled()) { + _log.debug(exception); + } + + _noUUIDClassNames.add(className); + + return StringPool.BLANK; + } + + return (String)getUuidMethod.invoke(classedModel, new Object[0]); + } + protected boolean isValid( AopMethodInvocation aopMethodInvocation, Object[] arguments, int phase) { From 2a3913b3b4c65f067eb8912ce09a9627a5d2b76c Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Thu, 23 Jan 2025 13:33:27 +0100 Subject: [PATCH 08/25] LPD-45734 set modelClassName for Custom ObjectDefinitions --- .../liferay/portal/systemevent/SystemEventAdvice.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java index 916c6b3296cf0e..4c6534e7073910 100644 --- a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java +++ b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java @@ -25,6 +25,7 @@ import com.liferay.portal.kernel.systemevent.SystemEvent; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntry; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntryThreadLocal; +import com.liferay.portal.kernel.util.StringUtil; import java.io.Serializable; @@ -184,12 +185,14 @@ protected void duringFinally( protected String getClassName(ClassedModel classedModel) { String className = classedModel.getModelClassName(); - if (classedModel instanceof StagedModel) { + if (classedModel instanceof StagedModel ) { StagedModel stagedModel = (StagedModel)classedModel; StagedModelType stagedModelType = stagedModel.getStagedModelType(); - className = stagedModelType.getClassName(); + if(!StringUtil.startsWith(className, _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION)) { + className = stagedModelType.getClassName(); + } } return className; @@ -373,4 +376,7 @@ protected boolean isValid( private final Set _noUUIDClassNames = Collections.newSetFromMap( new ConcurrentHashMap<>()); + private static final String _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION = + "com.liferay.object.model.ObjectDefinition#"; + } \ No newline at end of file From ef8e202644c3ac774e28c3d455f4756ea96c2538 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Thu, 23 Jan 2025 14:31:59 +0100 Subject: [PATCH 09/25] LPD-45734 SF --- .../impl/AssetLinkLocalServiceImpl.java | 5 +- .../DummyFolderStagedModelRepository.java | 6 +- .../DummyReferenceStagedModelRepository.java | 6 +- .../DummyStagedModelRepository.java | 5 +- ...stemEventTableReferenceDefinitionTest.java | 2 +- .../trash/JournalArticleTrashHandler.java | 5 +- .../impl/JournalArticleLocalServiceImpl.java | 18 +++-- .../test/SystemEventUADAnonymizerTest.java | 6 +- .../test/SystemEventUADExporterTest.java | 6 +- .../LayoutLocalServiceStagingAdvice.java | 3 +- .../com/liferay/trash/BaseTrashHandler.java | 6 +- .../impl/WikiPageLocalServiceImpl.java | 4 +- .../impl/SystemEventLocalServiceImpl.java | 26 +++--- .../portal/systemevent/SystemEventAdvice.java | 81 ++++++++++--------- .../impl/ExpandoColumnLocalServiceImpl.java | 4 +- 15 files changed, 97 insertions(+), 86 deletions(-) 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 bf090a32a2feea..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 @@ -571,8 +571,9 @@ private void _addDeletionSystemEvent(AssetLink assetLink) { try { _systemEventLocalService.addSystemEvent( 0, assetEntry.getGroupId(), stagedModelType.getClassName(), - stagedAssetLink.getPrimaryKey(), stagedAssetLink.getUuid(), StringPool.BLANK, - null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + stagedAssetLink.getPrimaryKey(), stagedAssetLink.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } catch (PortalException portalException) { throw new RuntimeException(portalException); 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 1b9b13c2a85ba6..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 @@ -84,9 +84,9 @@ public void deleteStagedModel(DummyFolder dummyFolder) if (_dummyFolders.remove(dummyFolder)) { systemEventLocalService.addSystemEvent( 0, dummyFolder.getGroupId(), dummyFolder.getModelClassName(), - dummyFolder.getPrimaryKey(), dummyFolder.getUuid(),StringPool.BLANK, - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + dummyFolder.getPrimaryKey(), dummyFolder.getUuid(), + 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 a0827649f06ff0..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 @@ -82,9 +82,9 @@ public void deleteStagedModel(DummyReference dummyReference) systemEventLocalService.addSystemEvent( 0, dummyReference.getGroupId(), dummyReference.getModelClassName(), - dummyReference.getPrimaryKey(), dummyReference.getUuid(), StringPool.BLANK, - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + dummyReference.getPrimaryKey(), dummyReference.getUuid(), + 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 b8a1652326e169..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 @@ -82,8 +82,9 @@ public void deleteStagedModel(Dummy dummy) throws PortalException { if (_dummies.remove(dummy)) { systemEventLocalService.addSystemEvent( 0, dummy.getGroupId(), dummy.getModelClassName(), - dummy.getPrimaryKey(), dummy.getUuid(), StringPool.BLANK, StringPool.BLANK, - SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + dummy.getPrimaryKey(), dummy.getUuid(), 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 d4f5e9483c5281..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, 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 d33012c4644270..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 @@ -81,9 +81,8 @@ public SystemEvent addDeletionSystemEvent( return _systemEventLocalService.addSystemEvent( userId, groupId, getSystemEventClassName(), classPK, classUuid, - StringPool.BLANK, - 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 9f81ef0d0398ae..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(), StringPool.BLANK, null, - SystemEventConstants.TYPE_DELETE, + article.getPrimaryKey(), articleResource.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, JSONUtil.put( "assetTitle", article.getTitle(article.getDefaultLanguageId()) @@ -1470,8 +1470,8 @@ public void deleteArticle( if (articleResource != null) { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), - articleResource.getResourcePrimKey(), articleResource.getUuid(), StringPool.BLANK, - null, SystemEventConstants.TYPE_DELETE, + articleResource.getResourcePrimKey(), articleResource.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, JSONUtil.put( "assetTitle", assetTitle ).toString()); @@ -1527,8 +1527,9 @@ public void deleteArticles(long groupId) throws PortalException { for (JournalArticleResource articleResource : articleResources) { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), - articleResource.getResourcePrimKey(), articleResource.getUuid(), StringPool.BLANK, - null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + articleResource.getResourcePrimKey(), articleResource.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } } @@ -1601,8 +1602,9 @@ public void deleteArticles( for (JournalArticleResource articleResource : articleResources) { _systemEventLocalService.addSystemEvent( 0, groupId, JournalArticle.class.getName(), - articleResource.getResourcePrimKey(), articleResource.getUuid(), StringPool.BLANK, - null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + articleResource.getResourcePrimKey(), articleResource.getUuid(), + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, + StringPool.BLANK); } } 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 94509e9e2b2dd8..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 @@ -52,9 +52,9 @@ protected SystemEvent addBaseModel(long userId, boolean deleteAfterTestRun) SystemEvent systemEvent = _systemEventLocalService.addSystemEvent( userId, TestPropsValues.getGroupId(), Group.class.getName(), - RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), StringPool.BLANK, - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), + 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 a0f891ca76af8f..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 @@ -44,9 +44,9 @@ public class SystemEventUADExporterTest protected SystemEvent addBaseModel(long userId) throws Exception { SystemEvent systemEvent = _systemEventLocalService.addSystemEvent( userId, TestPropsValues.getGroupId(), Group.class.getName(), - RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), StringPool.BLANK, - StringPool.BLANK, SystemEventConstants.TYPE_DELETE, - StringPool.BLANK); + RandomTestUtil.nextLong(), PortalUUIDUtil.generate(), + 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 54b4b346bc3804..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,8 +471,7 @@ protected void doDeleteLayout( _systemEventLocalService.addSystemEvent( 0, layout.getGroupId(), Layout.class.getName(), - layout.getPlid(), layout.getUuid(), - null, 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 4d095a5a02dfd2..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 @@ -57,9 +57,9 @@ public SystemEvent addDeletionSystemEvent( JSONObject extraDataJSONObject = JSONUtil.put("inTrash", true); return SystemEventLocalServiceUtil.addSystemEvent( - userId, groupId, getSystemEventClassName(), classPK, classUuid, StringPool.BLANK, - referrerClassName, SystemEventConstants.TYPE_DELETE, - extraDataJSONObject.toString()); + userId, groupId, getSystemEventClassName(), classPK, classUuid, + 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 57eed611137ab5..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(), StringPool.BLANK, null, - SystemEventConstants.TYPE_DELETE, StringPool.BLANK); + page.getPrimaryKey(), pageResource.getUuid(), StringPool.BLANK, + null, SystemEventConstants.TYPE_DELETE, StringPool.BLANK); } } 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 98f3b71bd23711..094c2fee11ab4d 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 externalReferenceCode, String referrerClassName, int type, - String extraData) + String classUuid, String externalReferenceCode, + String referrerClassName, int type, String extraData) throws PortalException { if (userId == 0) { @@ -64,19 +64,22 @@ else if (groupId > 0) { } return addSystemEvent( - userId, companyId, groupId, className, classPK, classUuid, externalReferenceCode, - referrerClassName, type, extraData, userName); + userId, companyId, groupId, className, classPK, classUuid, + externalReferenceCode, referrerClassName, type, extraData, + userName); } @Override public SystemEvent addSystemEvent( - long companyId, String className, long classPK, String classUuid, String externalReferenceCode, - String referrerClassName, int type, String extraData) + long companyId, String className, long classPK, String classUuid, + String externalReferenceCode, String referrerClassName, int type, + String extraData) throws PortalException { return addSystemEvent( - 0, companyId, 0, className, classPK, classUuid, externalReferenceCode, referrerClassName, - type, extraData, StringPool.BLANK); + 0, companyId, 0, className, classPK, classUuid, + externalReferenceCode, 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 externalReferenceCode, String referrerClassName, int type, - String extraData, String userName) + long classPK, String classUuid, String externalReferenceCode, + String referrerClassName, int type, String extraData, + String userName) throws PortalException { SystemEventHierarchyEntry systemEventHierarchyEntry = @@ -220,8 +224,8 @@ protected SystemEvent addSystemEvent( systemEvent.setClassName(className); systemEvent.setClassPK(classPK); systemEvent.setClassUuid(classUuid); - systemEvent.setReferrerClassName(referrerClassName); systemEvent.setExternalReferenceCode(externalReferenceCode); + systemEvent.setReferrerClassName(referrerClassName); long parentSystemEventId = 0; diff --git a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java index 4c6534e7073910..328892b9f2db32 100644 --- a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java +++ b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java @@ -128,29 +128,31 @@ protected void afterReturning( if (group != null) { SystemEventLocalServiceUtil.addSystemEvent( 0, groupId, systemEventHierarchyEntry.getClassName(), - classPK, systemEventHierarchyEntry.getUuid(), externalReferenceCode, - referrerClassName, systemEvent.type(), + classPK, systemEventHierarchyEntry.getUuid(), + externalReferenceCode, referrerClassName, + systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } else { SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), systemEventHierarchyEntry.getClassName(), classPK, - systemEventHierarchyEntry.getUuid(), externalReferenceCode, referrerClassName, - systemEvent.type(), + systemEventHierarchyEntry.getUuid(), externalReferenceCode, + referrerClassName, systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } } else if (group != null) { SystemEventLocalServiceUtil.addSystemEvent( - 0, groupId, className, classPK, getUuid(classedModel), externalReferenceCode, - referrerClassName, systemEvent.type(), StringPool.BLANK); + 0, groupId, className, classPK, getUuid(classedModel), + externalReferenceCode, referrerClassName, systemEvent.type(), + StringPool.BLANK); } else { SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), className, classPK, - getUuid(classedModel), externalReferenceCode, referrerClassName, systemEvent.type(), - StringPool.BLANK); + getUuid(classedModel), externalReferenceCode, referrerClassName, + systemEvent.type(), StringPool.BLANK); } } @@ -185,14 +187,15 @@ protected void duringFinally( protected String getClassName(ClassedModel classedModel) { String className = classedModel.getModelClassName(); - if (classedModel instanceof StagedModel ) { + if ((classedModel instanceof StagedModel) && + !StringUtil.startsWith( + className, _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION)) { + StagedModel stagedModel = (StagedModel)classedModel; StagedModelType stagedModelType = stagedModel.getStagedModelType(); - if(!StringUtil.startsWith(className, _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION)) { - className = stagedModelType.getClassName(); - } + className = stagedModelType.getClassName(); } return className; @@ -230,35 +233,18 @@ protected long getCompanyId(ClassedModel classedModel) { return 0; } - protected long getGroupId(ClassedModel classedModel) { - if (!(classedModel instanceof GroupedModel)) { - return 0; - } - - GroupedModel groupedModel = (GroupedModel)classedModel; - - return groupedModel.getGroupId(); - } - - protected String getUuid(ClassedModel classedModel) throws Exception { - if (classedModel instanceof StagedModel) { - StagedModel stagedModel = (StagedModel)classedModel; - - return stagedModel.getUuid(); - } + protected String getExternalReferenceCode(ClassedModel classedModel) + throws Exception { Class modelClass = classedModel.getClass(); String className = modelClass.getName(); - if (_noUUIDClassNames.contains(className)) { - return StringPool.BLANK; - } - Method getUuidMethod = null; try { - getUuidMethod = modelClass.getMethod("getUuid", new Class[0]); + getUuidMethod = modelClass.getMethod( + "getExternalReferenceCode", new Class[0]); } catch (Exception exception) { if (_log.isDebugEnabled()) { @@ -273,16 +259,35 @@ protected String getUuid(ClassedModel classedModel) throws Exception { return (String)getUuidMethod.invoke(classedModel, new Object[0]); } - protected String getExternalReferenceCode(ClassedModel classedModel) throws Exception { + protected long getGroupId(ClassedModel classedModel) { + if (!(classedModel instanceof GroupedModel)) { + return 0; + } + + GroupedModel groupedModel = (GroupedModel)classedModel; + + return groupedModel.getGroupId(); + } + + protected String getUuid(ClassedModel classedModel) throws Exception { + if (classedModel instanceof StagedModel) { + StagedModel stagedModel = (StagedModel)classedModel; + + return stagedModel.getUuid(); + } Class modelClass = classedModel.getClass(); String className = modelClass.getName(); + if (_noUUIDClassNames.contains(className)) { + return StringPool.BLANK; + } + Method getUuidMethod = null; try { - getUuidMethod = modelClass.getMethod("getExternalReferenceCode", new Class[0]); + getUuidMethod = modelClass.getMethod("getUuid", new Class[0]); } catch (Exception exception) { if (_log.isDebugEnabled()) { @@ -364,6 +369,9 @@ protected boolean isValid( return true; } + private static final String _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION = + "com.liferay.object.model.ObjectDefinition#"; + private static final int _PHASE_AFTER_RETURNING = 1; private static final int _PHASE_BEFORE = 0; @@ -376,7 +384,4 @@ protected boolean isValid( private final Set _noUUIDClassNames = Collections.newSetFromMap( new ConcurrentHashMap<>()); - private static final String _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION = - "com.liferay.object.model.ObjectDefinition#"; - } \ 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 3b3d6df22b2ce2..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, StringPool.BLANK, null, - SystemEventConstants.TYPE_DELETE, + stagedExpandoColumn.getPrimaryKey(), StringPool.BLANK, + StringPool.BLANK, null, SystemEventConstants.TYPE_DELETE, extraDataJSONObject.toString()); } catch (PortalException portalException) { From 02749c6570b4a008c9052b8baae5752860b3fb26 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Thu, 23 Jan 2025 15:46:37 +0100 Subject: [PATCH 10/25] LPD-45734 add IntegrationTest --- .../test/ObjectEntryLocalServiceTest.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) 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..bfe02540a5dee5 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,7 @@ 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.User; import com.liferay.portal.kernel.model.role.RoleConstants; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -127,6 +128,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 +157,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; @@ -3993,6 +3996,39 @@ public void testSearchObjectEntries() throws Exception { Assert.assertEquals(0, baseModelSearchResult.getLength()); } + @Test + public void testSystemEventOnObjectEntryDeletion() throws Exception { + ObjectEntry objectEntry = _addObjectEntry( + HashMapBuilder.put( + "emailAddressRequired", "peter@liferay.com" + ).put( + "firstName", "Peter" + ).put( + "listTypeEntryKeyRequired", "listTypeEntryKey1" + ).build()); + + _objectEntryLocalService.deleteObjectEntry( + objectEntry.getObjectEntryId()); + + SystemEvent deletionSystemEvent = + _systemEventLocalService.getSystemEvents( + 0, _portal.getClassNameId(objectEntry.getModelClassName()), + objectEntry.getPrimaryKey() + ).stream( + ).findFirst( + ).orElse( + null + ); + + Assert.assertNotNull(deletionSystemEvent); + + Assert.assertEquals(1, deletionSystemEvent.getType()); + + Assert.assertEquals( + deletionSystemEvent.getExternalReferenceCode(), + objectEntry.getExternalReferenceCode()); + } + @Test public void testUpdateAsset() throws Exception { ObjectField objectField = _objectFieldLocalService.getObjectField( @@ -5708,6 +5744,9 @@ private ObjectValidationRule _updateObjectValidationRule( @Inject private ObjectValidationRuleLocalService _objectValidationRuleLocalService; + @Inject + private Portal _portal; + @Inject private ResourceActions _resourceActions; @@ -5717,6 +5756,9 @@ private ObjectValidationRule _updateObjectValidationRule( @Inject private RoleLocalService _roleLocalService; + @Inject + private SystemEventLocalService _systemEventLocalService; + @Inject private UserLocalService _userLocalService; From 1b8ca2c1b5e80e120789ee56beaf6e282ebcf518 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 13:22:54 +0100 Subject: [PATCH 11/25] LPD-45734 service.xml Rename column to avoid misunderstanding --- portal-impl/src/com/liferay/portal/service.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-impl/src/com/liferay/portal/service.xml b/portal-impl/src/com/liferay/portal/service.xml index 76b6db32b2f1fe..e34f2d158c3cf7 100644 --- a/portal-impl/src/com/liferay/portal/service.xml +++ b/portal-impl/src/com/liferay/portal/service.xml @@ -2355,7 +2355,7 @@ - + From a4a7241077707aadda9faf96b5746e4fa3c0fe7e Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 13:27:34 +0100 Subject: [PATCH 12/25] LPD-45734 serviceBuilder --- .../test/SystemEventPersistenceTest.java | 14 ++--- portal-impl/src/META-INF/portal-hbm.xml | 2 +- .../src/META-INF/portal-model-hints.xml | 2 +- .../model/impl/SystemEventCacheModel.java | 19 +++---- .../model/impl/SystemEventModelImpl.java | 53 ++++++++++--------- .../impl/SystemEventPersistenceImpl.java | 49 +---------------- .../portal/kernel/model/SystemEventModel.java | 17 +++--- .../portal/kernel/model/SystemEventTable.java | 4 +- .../kernel/model/SystemEventWrapper.java | 53 ++++++++++--------- sql/portal-tables.sql | 2 +- 10 files changed, 89 insertions(+), 126 deletions(-) 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 e24ea4a2cc0a81..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,7 +132,8 @@ public void testUpdateExisting() throws Exception { newSystemEvent.setClassUuid(RandomTestUtil.randomString()); - newSystemEvent.setExternalReferenceCode(RandomTestUtil.randomString()); + newSystemEvent.setClassExternalReferenceCode( + RandomTestUtil.randomString()); newSystemEvent.setReferrerClassNameId(RandomTestUtil.nextLong()); @@ -177,8 +178,8 @@ public void testUpdateExisting() throws Exception { Assert.assertEquals( existingSystemEvent.getClassUuid(), newSystemEvent.getClassUuid()); Assert.assertEquals( - existingSystemEvent.getExternalReferenceCode(), - newSystemEvent.getExternalReferenceCode()); + existingSystemEvent.getClassExternalReferenceCode(), + newSystemEvent.getClassExternalReferenceCode()); Assert.assertEquals( existingSystemEvent.getReferrerClassNameId(), newSystemEvent.getReferrerClassNameId()); @@ -255,8 +256,8 @@ 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, "externalReferenceCode", true, - "referrerClassNameId", true, "parentSystemEventId", true, + "classPK", true, "classUuid", true, "classExternalReferenceCode", + true, "referrerClassNameId", true, "parentSystemEventId", true, "systemEventSetKey", true, "type", true); } @@ -494,7 +495,8 @@ protected SystemEvent addSystemEvent() throws Exception { systemEvent.setClassUuid(RandomTestUtil.randomString()); - systemEvent.setExternalReferenceCode(RandomTestUtil.randomString()); + systemEvent.setClassExternalReferenceCode( + RandomTestUtil.randomString()); systemEvent.setReferrerClassNameId(RandomTestUtil.nextLong()); diff --git a/portal-impl/src/META-INF/portal-hbm.xml b/portal-impl/src/META-INF/portal-hbm.xml index 90b8b938e24f15..dab83e1fb0e0ce 100644 --- a/portal-impl/src/META-INF/portal-hbm.xml +++ b/portal-impl/src/META-INF/portal-hbm.xml @@ -940,7 +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 c1feebe13e98b8..0105c284d68fb4 100644 --- a/portal-impl/src/META-INF/portal-model-hints.xml +++ b/portal-impl/src/META-INF/portal-model-hints.xml @@ -1471,7 +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 cbd9e1c05da672..bf19facf512790 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/SystemEventCacheModel.java +++ b/portal-impl/src/com/liferay/portal/model/impl/SystemEventCacheModel.java @@ -92,8 +92,8 @@ public String toString() { sb.append(classPK); sb.append(", classUuid="); sb.append(classUuid); - sb.append(", externalReferenceCode="); - sb.append(externalReferenceCode); + sb.append(", classExternalReferenceCode="); + sb.append(classExternalReferenceCode); sb.append(", referrerClassNameId="); sb.append(referrerClassNameId); sb.append(", parentSystemEventId="); @@ -144,11 +144,12 @@ public SystemEvent toEntityModel() { systemEventImpl.setClassUuid(classUuid); } - if (externalReferenceCode == null) { - systemEventImpl.setExternalReferenceCode(""); + if (classExternalReferenceCode == null) { + systemEventImpl.setClassExternalReferenceCode(""); } else { - systemEventImpl.setExternalReferenceCode(externalReferenceCode); + systemEventImpl.setClassExternalReferenceCode( + classExternalReferenceCode); } systemEventImpl.setReferrerClassNameId(referrerClassNameId); @@ -190,7 +191,7 @@ public void readExternal(ObjectInput objectInput) classPK = objectInput.readLong(); classUuid = objectInput.readUTF(); - externalReferenceCode = objectInput.readUTF(); + classExternalReferenceCode = objectInput.readUTF(); referrerClassNameId = objectInput.readLong(); @@ -236,11 +237,11 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException { objectOutput.writeUTF(classUuid); } - if (externalReferenceCode == null) { + if (classExternalReferenceCode == null) { objectOutput.writeUTF(""); } else { - objectOutput.writeUTF(externalReferenceCode); + objectOutput.writeUTF(classExternalReferenceCode); } objectOutput.writeLong(referrerClassNameId); @@ -270,7 +271,7 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException { public long classNameId; public long classPK; public String classUuid; - public String externalReferenceCode; + 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 fbc7abc6ada663..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,8 @@ public class SystemEventModelImpl {"companyId", Types.BIGINT}, {"userId", Types.BIGINT}, {"userName", Types.VARCHAR}, {"createDate", Types.TIMESTAMP}, {"classNameId", Types.BIGINT}, {"classPK", Types.BIGINT}, - {"classUuid", Types.VARCHAR}, {"externalReferenceCode", Types.VARCHAR}, + {"classUuid", Types.VARCHAR}, + {"classExternalReferenceCode", Types.VARCHAR}, {"referrerClassNameId", Types.BIGINT}, {"parentSystemEventId", Types.BIGINT}, {"systemEventSetKey", Types.BIGINT}, {"type_", Types.INTEGER}, @@ -90,7 +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("externalReferenceCode", 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); @@ -99,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,externalReferenceCode 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"; @@ -288,7 +289,8 @@ private static class AttributeGetterFunctionsHolder { attributeGetterFunctions.put( "classUuid", SystemEvent::getClassUuid); attributeGetterFunctions.put( - "externalReferenceCode", SystemEvent::getExternalReferenceCode); + "classExternalReferenceCode", + SystemEvent::getClassExternalReferenceCode); attributeGetterFunctions.put( "referrerClassNameId", SystemEvent::getReferrerClassNameId); attributeGetterFunctions.put( @@ -348,9 +350,9 @@ private static class AttributeSetterBiConsumersHolder { "classUuid", (BiConsumer)SystemEvent::setClassUuid); attributeSetterBiConsumers.put( - "externalReferenceCode", + "classExternalReferenceCode", (BiConsumer) - SystemEvent::setExternalReferenceCode); + SystemEvent::setClassExternalReferenceCode); attributeSetterBiConsumers.put( "referrerClassNameId", (BiConsumer) @@ -604,22 +606,24 @@ public void setClassUuid(String classUuid) { } @Override - public String getExternalReferenceCode() { - if (_externalReferenceCode == null) { + public String getClassExternalReferenceCode() { + if (_classExternalReferenceCode == null) { return ""; } else { - return _externalReferenceCode; + return _classExternalReferenceCode; } } @Override - public void setExternalReferenceCode(String externalReferenceCode) { + public void setClassExternalReferenceCode( + String classExternalReferenceCode) { + if (_columnOriginalValues == Collections.EMPTY_MAP) { _setColumnOriginalValues(); } - _externalReferenceCode = externalReferenceCode; + _classExternalReferenceCode = classExternalReferenceCode; } @Override @@ -784,7 +788,8 @@ public Object clone() { systemEventImpl.setClassNameId(getClassNameId()); systemEventImpl.setClassPK(getClassPK()); systemEventImpl.setClassUuid(getClassUuid()); - systemEventImpl.setExternalReferenceCode(getExternalReferenceCode()); + systemEventImpl.setClassExternalReferenceCode( + getClassExternalReferenceCode()); systemEventImpl.setReferrerClassNameId(getReferrerClassNameId()); systemEventImpl.setParentSystemEventId(getParentSystemEventId()); systemEventImpl.setSystemEventSetKey(getSystemEventSetKey()); @@ -821,8 +826,8 @@ public SystemEvent cloneWithOriginalValues() { this.getColumnOriginalValue("classPK")); systemEventImpl.setClassUuid( this.getColumnOriginalValue("classUuid")); - systemEventImpl.setExternalReferenceCode( - this.getColumnOriginalValue("externalReferenceCode")); + systemEventImpl.setClassExternalReferenceCode( + this.getColumnOriginalValue("classExternalReferenceCode")); systemEventImpl.setReferrerClassNameId( this.getColumnOriginalValue("referrerClassNameId")); systemEventImpl.setParentSystemEventId( @@ -950,16 +955,16 @@ public CacheModel toCacheModel() { systemEventCacheModel.classUuid = null; } - systemEventCacheModel.externalReferenceCode = - getExternalReferenceCode(); + systemEventCacheModel.classExternalReferenceCode = + getClassExternalReferenceCode(); - String externalReferenceCode = - systemEventCacheModel.externalReferenceCode; + String classExternalReferenceCode = + systemEventCacheModel.classExternalReferenceCode; - if ((externalReferenceCode != null) && - (externalReferenceCode.length() == 0)) { + if ((classExternalReferenceCode != null) && + (classExternalReferenceCode.length() == 0)) { - systemEventCacheModel.externalReferenceCode = null; + systemEventCacheModel.classExternalReferenceCode = null; } systemEventCacheModel.referrerClassNameId = getReferrerClassNameId(); @@ -1050,7 +1055,7 @@ private static class EscapedModelProxyProviderFunctionHolder { private long _classNameId; private long _classPK; private String _classUuid; - private String _externalReferenceCode; + private String _classExternalReferenceCode; private long _referrerClassNameId; private long _parentSystemEventId; private long _systemEventSetKey; @@ -1099,7 +1104,7 @@ private void _setColumnOriginalValues() { _columnOriginalValues.put("classPK", _classPK); _columnOriginalValues.put("classUuid", _classUuid); _columnOriginalValues.put( - "externalReferenceCode", _externalReferenceCode); + "classExternalReferenceCode", _classExternalReferenceCode); _columnOriginalValues.put("referrerClassNameId", _referrerClassNameId); _columnOriginalValues.put("parentSystemEventId", _parentSystemEventId); _columnOriginalValues.put("systemEventSetKey", _systemEventSetKey); @@ -1150,7 +1155,7 @@ public static long getColumnBitmask(String columnName) { columnBitmasks.put("classUuid", 1024L); - columnBitmasks.put("externalReferenceCode", 2048L); + columnBitmasks.put("classExternalReferenceCode", 2048L); columnBitmasks.put("referrerClassNameId", 4096L); 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 b6a27f690f8491..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 @@ -19,30 +19,23 @@ import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.dao.orm.Session; import com.liferay.portal.kernel.exception.NoSuchSystemEventException; -import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.model.SystemEvent; import com.liferay.portal.kernel.model.SystemEventTable; -import com.liferay.portal.kernel.sanitizer.Sanitizer; -import com.liferay.portal.kernel.sanitizer.SanitizerException; -import com.liferay.portal.kernel.sanitizer.SanitizerUtil; import com.liferay.portal.kernel.security.auth.CompanyThreadLocal; -import com.liferay.portal.kernel.security.auth.PrincipalThreadLocal; import com.liferay.portal.kernel.service.ServiceContext; import com.liferay.portal.kernel.service.ServiceContextThreadLocal; import com.liferay.portal.kernel.service.persistence.SystemEventPersistence; import com.liferay.portal.kernel.service.persistence.SystemEventUtil; import com.liferay.portal.kernel.service.persistence.change.tracking.helper.CTPersistenceHelperUtil; import com.liferay.portal.kernel.service.persistence.impl.BasePersistenceImpl; -import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.OrderByComparator; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.kernel.util.SetUtil; -import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.impl.SystemEventImpl; import com.liferay.portal.model.impl.SystemEventModelImpl; @@ -59,7 +52,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; /** @@ -2600,45 +2592,6 @@ public SystemEvent updateImpl(SystemEvent systemEvent) { SystemEventModelImpl systemEventModelImpl = (SystemEventModelImpl)systemEvent; - if (Validator.isNull(systemEvent.getExternalReferenceCode())) { - systemEvent.setExternalReferenceCode( - String.valueOf(systemEvent.getPrimaryKey())); - } - else { - if (!Objects.equals( - systemEventModelImpl.getColumnOriginalValue( - "externalReferenceCode"), - systemEvent.getExternalReferenceCode())) { - - long userId = GetterUtil.getLong( - PrincipalThreadLocal.getName()); - - if (userId > 0) { - long companyId = systemEvent.getCompanyId(); - - long groupId = systemEvent.getGroupId(); - - long classPK = 0; - - if (!isNew) { - classPK = systemEvent.getPrimaryKey(); - } - - try { - systemEvent.setExternalReferenceCode( - SanitizerUtil.sanitize( - companyId, groupId, userId, - SystemEvent.class.getName(), classPK, - ContentTypes.TEXT_HTML, Sanitizer.MODE_ALL, - systemEvent.getExternalReferenceCode(), null)); - } - catch (SanitizerException sanitizerException) { - throw new SystemException(sanitizerException); - } - } - } - } - if (isNew && (systemEvent.getCreateDate() == null)) { ServiceContext serviceContext = ServiceContextThreadLocal.getServiceContext(); @@ -3171,7 +3124,7 @@ public List getUniqueIndexColumnNames() { ctStrictColumnNames.add("classNameId"); ctStrictColumnNames.add("classPK"); ctMergeColumnNames.add("classUuid"); - ctMergeColumnNames.add("externalReferenceCode"); + ctMergeColumnNames.add("classExternalReferenceCode"); ctMergeColumnNames.add("referrerClassNameId"); ctMergeColumnNames.add("parentSystemEventId"); ctMergeColumnNames.add("systemEventSetKey"); 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 01f1228db8532b..fc3a08eee5bbeb 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java +++ b/portal-kernel/src/com/liferay/portal/kernel/model/SystemEventModel.java @@ -26,7 +26,7 @@ @ProviderType public interface SystemEventModel extends AttachedModel, BaseModel, CTModel, - ExternalReferenceCodeModel, MVCCModel, ShardedModel { + MVCCModel, ShardedModel { /* * NOTE FOR DEVELOPERS: @@ -241,21 +241,20 @@ public interface SystemEventModel public void setClassUuid(String classUuid); /** - * Returns the external reference code of this system event. + * Returns the class external reference code of this system event. * - * @return the external reference code of this system event + * @return the class external reference code of this system event */ @AutoEscape - @Override - public String getExternalReferenceCode(); + public String getClassExternalReferenceCode(); /** - * Sets the external reference code of this system event. + * Sets the class external reference code of this system event. * - * @param externalReferenceCode the external reference code of this system event + * @param classExternalReferenceCode the class external reference code of this system event */ - @Override - public void setExternalReferenceCode(String externalReferenceCode); + 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 ebd6b834d6c092..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,9 +46,9 @@ 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 externalReferenceCode = + public final Column classExternalReferenceCode = createColumn( - "externalReferenceCode", String.class, Types.VARCHAR, + "classExternalReferenceCode", String.class, Types.VARCHAR, Column.FLAG_DEFAULT); public final Column referrerClassNameId = createColumn( 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 255e871126ae2f..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,7 +45,8 @@ public Map getModelAttributes() { attributes.put("classNameId", getClassNameId()); attributes.put("classPK", getClassPK()); attributes.put("classUuid", getClassUuid()); - attributes.put("externalReferenceCode", getExternalReferenceCode()); + attributes.put( + "classExternalReferenceCode", getClassExternalReferenceCode()); attributes.put("referrerClassNameId", getReferrerClassNameId()); attributes.put("parentSystemEventId", getParentSystemEventId()); attributes.put("systemEventSetKey", getSystemEventSetKey()); @@ -123,11 +124,11 @@ public void setModelAttributes(Map attributes) { setClassUuid(classUuid); } - String externalReferenceCode = (String)attributes.get( - "externalReferenceCode"); + String classExternalReferenceCode = (String)attributes.get( + "classExternalReferenceCode"); - if (externalReferenceCode != null) { - setExternalReferenceCode(externalReferenceCode); + if (classExternalReferenceCode != null) { + setClassExternalReferenceCode(classExternalReferenceCode); } Long referrerClassNameId = (Long)attributes.get("referrerClassNameId"); @@ -166,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. * @@ -236,16 +247,6 @@ public long getCtCollectionId() { return model.getCtCollectionId(); } - /** - * Returns the external reference code of this system event. - * - * @return the external reference code of this system event - */ - @Override - public String getExternalReferenceCode() { - return model.getExternalReferenceCode(); - } - /** * Returns the extra data of this system event. * @@ -376,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); @@ -441,16 +454,6 @@ public void setCtCollectionId(long ctCollectionId) { model.setCtCollectionId(ctCollectionId); } - /** - * Sets the external reference code of this system event. - * - * @param externalReferenceCode the external reference code of this system event - */ - @Override - public void setExternalReferenceCode(String externalReferenceCode) { - model.setExternalReferenceCode(externalReferenceCode); - } - /** * Sets the extra data of this system event. * diff --git a/sql/portal-tables.sql b/sql/portal-tables.sql index 269e0c03f5baf9..33269df1a1506a 100644 --- a/sql/portal-tables.sql +++ b/sql/portal-tables.sql @@ -1401,7 +1401,7 @@ create table SystemEvent ( classNameId LONG, classPK LONG, classUuid VARCHAR(75) null, - externalReferenceCode VARCHAR(75) null, + classExternalReferenceCode VARCHAR(75) null, referrerClassNameId LONG, parentSystemEventId LONG, systemEventSetKey LONG, From b197aeaddde03cb98f91f2959354fcd6d45a30df Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 13:31:00 +0100 Subject: [PATCH 13/25] LPD-45734 rename externalReferenceCode param to classExternalReferenceCode --- .../service/impl/SystemEventLocalServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 094c2fee11ab4d..bd78ae57235867 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java @@ -40,7 +40,7 @@ public class SystemEventLocalServiceImpl @Override public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String externalReferenceCode, + String classUuid, String classExternalReferenceCode, String referrerClassName, int type, String extraData) throws PortalException { @@ -65,20 +65,20 @@ else if (groupId > 0) { return addSystemEvent( userId, companyId, groupId, className, classPK, classUuid, - externalReferenceCode, referrerClassName, type, extraData, + classExternalReferenceCode, referrerClassName, type, extraData, userName); } @Override public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String externalReferenceCode, String referrerClassName, int type, + String classExternalReferenceCode, String referrerClassName, int type, String extraData) throws PortalException { return addSystemEvent( 0, companyId, 0, className, classPK, classUuid, - externalReferenceCode, referrerClassName, type, extraData, + classExternalReferenceCode, referrerClassName, type, extraData, StringPool.BLANK); } @@ -163,7 +163,7 @@ public boolean validateGroup(long groupId) throws PortalException { protected SystemEvent addSystemEvent( long userId, long companyId, long groupId, String className, - long classPK, String classUuid, String externalReferenceCode, + long classPK, String classUuid, String classExternalReferenceCode, String referrerClassName, int type, String extraData, String userName) throws PortalException { @@ -224,7 +224,7 @@ protected SystemEvent addSystemEvent( systemEvent.setClassName(className); systemEvent.setClassPK(classPK); systemEvent.setClassUuid(classUuid); - systemEvent.setExternalReferenceCode(externalReferenceCode); + systemEvent.setClassExternalReferenceCode(classExternalReferenceCode); systemEvent.setReferrerClassName(referrerClassName); long parentSystemEventId = 0; From 9abbb8d45a0e2b0f9c1efe9d433304c38baef10b Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 13:34:02 +0100 Subject: [PATCH 14/25] LPD-45734 serviceBuilder --- .../kernel/service/SystemEventLocalService.java | 6 +++--- .../kernel/service/SystemEventLocalServiceUtil.java | 12 ++++++------ .../service/SystemEventLocalServiceWrapper.java | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) 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 48ca0aa7c1ab22..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,14 +62,14 @@ public interface SystemEventLocalService */ public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String externalReferenceCode, + String classUuid, String classExternalReferenceCode, String referrerClassName, int type, String extraData) throws PortalException; public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String externalReferenceCode, 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 934e010b85383a..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,24 +37,24 @@ public class SystemEventLocalServiceUtil { */ public static SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String externalReferenceCode, + String classUuid, String classExternalReferenceCode, String referrerClassName, int type, String extraData) throws PortalException { return getService().addSystemEvent( userId, groupId, className, classPK, classUuid, - externalReferenceCode, referrerClassName, type, extraData); + classExternalReferenceCode, referrerClassName, type, extraData); } public static SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String externalReferenceCode, String referrerClassName, int type, - String extraData) + String classExternalReferenceCode, String referrerClassName, + int type, String extraData) throws PortalException { return getService().addSystemEvent( - companyId, className, classPK, classUuid, externalReferenceCode, - 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 ffaa2a2e969bc0..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,25 +34,25 @@ public SystemEventLocalServiceWrapper( @Override public SystemEvent addSystemEvent( long userId, long groupId, String className, long classPK, - String classUuid, String externalReferenceCode, + 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, - externalReferenceCode, referrerClassName, type, extraData); + classExternalReferenceCode, referrerClassName, type, extraData); } @Override public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String externalReferenceCode, 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, externalReferenceCode, - referrerClassName, type, extraData); + companyId, className, classPK, classUuid, + classExternalReferenceCode, referrerClassName, type, extraData); } /** From 1d5c6dc0ae1e43813aaf7ae80e530a76e5305b6b Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 13:43:39 +0100 Subject: [PATCH 15/25] LPD-45734 override getStagedModelType method --- .../com/liferay/object/model/impl/ObjectEntryImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 = From 395facdfa9108d3146e8ed4cac593630a696a82b Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 15:12:36 +0100 Subject: [PATCH 16/25] LPD-45734 rename + first use ExternalReferenceCodeModel to retrieve ERC --- .../portal/systemevent/SystemEventAdvice.java | 94 ++++++++++--------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java index 328892b9f2db32..e4ec7964d214b0 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; @@ -25,11 +26,12 @@ import com.liferay.portal.kernel.systemevent.SystemEvent; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntry; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntryThreadLocal; -import com.liferay.portal.kernel.util.StringUtil; +import com.liferay.portal.kernel.util.Validator; import java.io.Serializable; import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Collections; @@ -117,7 +119,8 @@ protected void afterReturning( long classPK = getClassPK(classedModel); - String externalReferenceCode = getExternalReferenceCode(classedModel); + String classExternalReferenceCode = getClassExternalReferenceCode( + classedModel); SystemEventHierarchyEntry systemEventHierarchyEntry = SystemEventHierarchyEntryThreadLocal.peek(); @@ -129,7 +132,7 @@ protected void afterReturning( SystemEventLocalServiceUtil.addSystemEvent( 0, groupId, systemEventHierarchyEntry.getClassName(), classPK, systemEventHierarchyEntry.getUuid(), - externalReferenceCode, referrerClassName, + classExternalReferenceCode, referrerClassName, systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } @@ -137,22 +140,23 @@ protected void afterReturning( SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), systemEventHierarchyEntry.getClassName(), classPK, - systemEventHierarchyEntry.getUuid(), externalReferenceCode, - referrerClassName, systemEvent.type(), + systemEventHierarchyEntry.getUuid(), + classExternalReferenceCode, referrerClassName, + systemEvent.type(), systemEventHierarchyEntry.getExtraData()); } } else if (group != null) { SystemEventLocalServiceUtil.addSystemEvent( 0, groupId, className, classPK, getUuid(classedModel), - externalReferenceCode, referrerClassName, systemEvent.type(), - StringPool.BLANK); + classExternalReferenceCode, referrerClassName, + systemEvent.type(), StringPool.BLANK); } else { SystemEventLocalServiceUtil.addSystemEvent( getCompanyId(classedModel), className, classPK, - getUuid(classedModel), externalReferenceCode, referrerClassName, - systemEvent.type(), StringPool.BLANK); + getUuid(classedModel), classExternalReferenceCode, + referrerClassName, systemEvent.type(), StringPool.BLANK); } } @@ -184,13 +188,48 @@ protected void duringFinally( getClassName(classedModel), classPK); } + protected String getClassExternalReferenceCode(ClassedModel classedModel) + throws IllegalAccessException, InvocationTargetException { + + String externalReferenceCode = null; + + if (classedModel instanceof ExternalReferenceCodeModel) { + ExternalReferenceCodeModel externalReferenceCodeModel = + (ExternalReferenceCodeModel)classedModel; + + externalReferenceCode = + externalReferenceCodeModel.getExternalReferenceCode(); + } + + if (Validator.isNull(externalReferenceCode)) { + Class modelClass = classedModel.getClass(); + + Method getExternalReferenceCodeMethod = null; + + try { + getExternalReferenceCodeMethod = modelClass.getMethod( + "getExternalReferenceCode"); + } + catch (Exception exception) { + if (_log.isDebugEnabled()) { + _log.debug(exception); + } + + return StringPool.BLANK; + } + + externalReferenceCode = + (String)getExternalReferenceCodeMethod.invoke( + classedModel, new Object[0]); + } + + return externalReferenceCode; + } + protected String getClassName(ClassedModel classedModel) { String className = classedModel.getModelClassName(); - if ((classedModel instanceof StagedModel) && - !StringUtil.startsWith( - className, _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION)) { - + if (classedModel instanceof StagedModel) { StagedModel stagedModel = (StagedModel)classedModel; StagedModelType stagedModelType = stagedModel.getStagedModelType(); @@ -233,32 +272,6 @@ protected long getCompanyId(ClassedModel classedModel) { return 0; } - protected String getExternalReferenceCode(ClassedModel classedModel) - throws Exception { - - Class modelClass = classedModel.getClass(); - - String className = modelClass.getName(); - - Method getUuidMethod = null; - - try { - getUuidMethod = modelClass.getMethod( - "getExternalReferenceCode", new Class[0]); - } - catch (Exception exception) { - if (_log.isDebugEnabled()) { - _log.debug(exception); - } - - _noUUIDClassNames.add(className); - - return StringPool.BLANK; - } - - return (String)getUuidMethod.invoke(classedModel, new Object[0]); - } - protected long getGroupId(ClassedModel classedModel) { if (!(classedModel instanceof GroupedModel)) { return 0; @@ -369,9 +382,6 @@ protected boolean isValid( return true; } - private static final String _CLASS_NAME_PREFIX_CUSTOM_OBJECT_DEFINITION = - "com.liferay.object.model.ObjectDefinition#"; - private static final int _PHASE_AFTER_RETURNING = 1; private static final int _PHASE_BEFORE = 0; From 44f53f3643063d8e2b89d19be77c4fdb9b33711f Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 15:13:09 +0100 Subject: [PATCH 17/25] LPD-45734 SF --- .../portal/service/impl/SystemEventLocalServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bd78ae57235867..c09667cdde4c3e 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/SystemEventLocalServiceImpl.java @@ -72,8 +72,8 @@ else if (groupId > 0) { @Override public SystemEvent addSystemEvent( long companyId, String className, long classPK, String classUuid, - String classExternalReferenceCode, String referrerClassName, int type, - String extraData) + String classExternalReferenceCode, String referrerClassName, + int type, String extraData) throws PortalException { return addSystemEvent( From bf7a5e819f5fbd9eb7004a59b08fe055b7baf802 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Fri, 24 Jan 2025 15:24:08 +0100 Subject: [PATCH 18/25] LPD-45734 first param should be the expected one + avoid using stream --- .../test/ObjectEntryLocalServiceTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 bfe02540a5dee5..839e3ef2baf82c 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 @@ -4010,23 +4010,23 @@ public void testSystemEventOnObjectEntryDeletion() throws Exception { _objectEntryLocalService.deleteObjectEntry( objectEntry.getObjectEntryId()); - SystemEvent deletionSystemEvent = + SystemEvent deletionSystemEvent = null; + List systemEvents = _systemEventLocalService.getSystemEvents( 0, _portal.getClassNameId(objectEntry.getModelClassName()), - objectEntry.getPrimaryKey() - ).stream( - ).findFirst( - ).orElse( - null - ); + objectEntry.getPrimaryKey()); + + if (!systemEvents.isEmpty()) { + deletionSystemEvent = systemEvents.get(0); + } Assert.assertNotNull(deletionSystemEvent); Assert.assertEquals(1, deletionSystemEvent.getType()); Assert.assertEquals( - deletionSystemEvent.getExternalReferenceCode(), - objectEntry.getExternalReferenceCode()); + objectEntry.getExternalReferenceCode(), + deletionSystemEvent.getClassExternalReferenceCode()); } @Test From 03e355480f6e26149ca06d381638d089cc6fbab8 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Mon, 27 Jan 2025 14:22:05 +0100 Subject: [PATCH 19/25] LPD-45734 baseline --- portal-kernel/src/com/liferay/portal/kernel/model/packageinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f3d68a26e4c1e66f69c6396800b759bfdc6ba1eb Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Mon, 27 Jan 2025 14:26:37 +0100 Subject: [PATCH 20/25] LPD-45734 upgradeDB --- .../upgrade/v7_4_x/PortalUpgradeProcessRegistryImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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 From f70d11c768f86965d79d3130f350db512de3b1b9 Mon Sep 17 00:00:00 2001 From: Carlos Correa Date: Mon, 27 Jan 2025 16:05:40 +0100 Subject: [PATCH 21/25] LPD-45734 Simplify. If a NullPointerException is thrown, the test will fail anyway --- .../service/test/ObjectEntryLocalServiceTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 839e3ef2baf82c..09f24e9ba0fbc3 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 @@ -113,6 +113,7 @@ 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; @@ -4010,23 +4011,19 @@ public void testSystemEventOnObjectEntryDeletion() throws Exception { _objectEntryLocalService.deleteObjectEntry( objectEntry.getObjectEntryId()); - SystemEvent deletionSystemEvent = null; List systemEvents = _systemEventLocalService.getSystemEvents( 0, _portal.getClassNameId(objectEntry.getModelClassName()), objectEntry.getPrimaryKey()); - if (!systemEvents.isEmpty()) { - deletionSystemEvent = systemEvents.get(0); - } - - Assert.assertNotNull(deletionSystemEvent); + SystemEvent systemEvent = systemEvents.get(0); - Assert.assertEquals(1, deletionSystemEvent.getType()); + Assert.assertEquals( + SystemEventConstants.TYPE_DELETE, systemEvent.getType()); Assert.assertEquals( objectEntry.getExternalReferenceCode(), - deletionSystemEvent.getClassExternalReferenceCode()); + systemEvent.getClassExternalReferenceCode()); } @Test From f5c9e4d08ccebe4adf622beb7d1763c4ee21cc15 Mon Sep 17 00:00:00 2001 From: Carlos Correa Date: Mon, 27 Jan 2025 16:24:02 +0100 Subject: [PATCH 22/25] LPD-45734 Sort --- .../object/service/test/ObjectEntryLocalServiceTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 09f24e9ba0fbc3..7cca55e42e1786 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 @@ -4018,12 +4018,11 @@ public void testSystemEventOnObjectEntryDeletion() throws Exception { SystemEvent systemEvent = systemEvents.get(0); - Assert.assertEquals( - SystemEventConstants.TYPE_DELETE, systemEvent.getType()); - Assert.assertEquals( objectEntry.getExternalReferenceCode(), systemEvent.getClassExternalReferenceCode()); + Assert.assertEquals( + SystemEventConstants.TYPE_DELETE, systemEvent.getType()); } @Test From 1dabb55527994d2b024b69c2403c7374ce682eaa Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Mon, 27 Jan 2025 18:28:49 +0100 Subject: [PATCH 23/25] LPD-45734 include assertion inside testDeleteObjectEntry --- .../test/ObjectEntryLocalServiceTest.java | 41 ++++++------------- 1 file changed, 13 insertions(+), 28 deletions(-) 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 7cca55e42e1786..42a2af94487f0b 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 @@ -3132,6 +3132,19 @@ public void testDeleteObjectEntry() throws Exception { _objectEntryLocalService.deleteObjectEntry(objectEntry1); + 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 " + @@ -3997,34 +4010,6 @@ public void testSearchObjectEntries() throws Exception { Assert.assertEquals(0, baseModelSearchResult.getLength()); } - @Test - public void testSystemEventOnObjectEntryDeletion() throws Exception { - ObjectEntry objectEntry = _addObjectEntry( - HashMapBuilder.put( - "emailAddressRequired", "peter@liferay.com" - ).put( - "firstName", "Peter" - ).put( - "listTypeEntryKeyRequired", "listTypeEntryKey1" - ).build()); - - _objectEntryLocalService.deleteObjectEntry( - objectEntry.getObjectEntryId()); - - List systemEvents = - _systemEventLocalService.getSystemEvents( - 0, _portal.getClassNameId(objectEntry.getModelClassName()), - objectEntry.getPrimaryKey()); - - SystemEvent systemEvent = systemEvents.get(0); - - Assert.assertEquals( - objectEntry.getExternalReferenceCode(), - systemEvent.getClassExternalReferenceCode()); - Assert.assertEquals( - SystemEventConstants.TYPE_DELETE, systemEvent.getType()); - } - @Test public void testUpdateAsset() throws Exception { ObjectField objectField = _objectFieldLocalService.getObjectField( From c1b00be8359cd0f282ffe7ce1d7077611db3cf2e Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Tue, 4 Feb 2025 10:29:46 +0100 Subject: [PATCH 24/25] LPD-45734 remove reflection --- .../portal/systemevent/SystemEventAdvice.java | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java index e4ec7964d214b0..7900ce0edb49e5 100644 --- a/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java +++ b/portal-impl/src/com/liferay/portal/systemevent/SystemEventAdvice.java @@ -26,12 +26,10 @@ import com.liferay.portal.kernel.systemevent.SystemEvent; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntry; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntryThreadLocal; -import com.liferay.portal.kernel.util.Validator; import java.io.Serializable; import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Collections; @@ -188,9 +186,7 @@ protected void duringFinally( getClassName(classedModel), classPK); } - protected String getClassExternalReferenceCode(ClassedModel classedModel) - throws IllegalAccessException, InvocationTargetException { - + protected String getClassExternalReferenceCode(ClassedModel classedModel) { String externalReferenceCode = null; if (classedModel instanceof ExternalReferenceCodeModel) { @@ -201,28 +197,6 @@ protected String getClassExternalReferenceCode(ClassedModel classedModel) externalReferenceCodeModel.getExternalReferenceCode(); } - if (Validator.isNull(externalReferenceCode)) { - Class modelClass = classedModel.getClass(); - - Method getExternalReferenceCodeMethod = null; - - try { - getExternalReferenceCodeMethod = modelClass.getMethod( - "getExternalReferenceCode"); - } - catch (Exception exception) { - if (_log.isDebugEnabled()) { - _log.debug(exception); - } - - return StringPool.BLANK; - } - - externalReferenceCode = - (String)getExternalReferenceCodeMethod.invoke( - classedModel, new Object[0]); - } - return externalReferenceCode; } From 16ac1b663af8817dc980368923b727ba08c2acc7 Mon Sep 17 00:00:00 2001 From: Daniel Szimko Date: Thu, 6 Feb 2025 10:24:37 +0100 Subject: [PATCH 25/25] LPD-45734 sort --- .../test/ObjectEntryLocalServiceTest.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 42a2af94487f0b..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 @@ -3123,15 +3123,6 @@ public void testDeleteObjectEntry() throws Exception { _objectEntryLocalService.deleteObjectEntry( objectEntry1.getObjectEntryId()); - AssertUtils.assertFailure( - NoSuchObjectEntryException.class, - "No ObjectEntry exists with the primary key " + - objectEntry1.getObjectEntryId(), - () -> _objectEntryLocalService.deleteObjectEntry( - objectEntry1.getObjectEntryId())); - - _objectEntryLocalService.deleteObjectEntry(objectEntry1); - List systemEvents = _systemEventLocalService.getSystemEvents( 0, _portal.getClassNameId(objectEntry1.getModelClassName()), @@ -3145,6 +3136,13 @@ public void testDeleteObjectEntry() throws Exception { Assert.assertEquals( SystemEventConstants.TYPE_DELETE, systemEvent.getType()); + AssertUtils.assertFailure( + NoSuchObjectEntryException.class, + "No ObjectEntry exists with the primary key " + + objectEntry1.getObjectEntryId(), + () -> _objectEntryLocalService.deleteObjectEntry( + objectEntry1.getObjectEntryId())); + AssertUtils.assertFailure( NoSuchObjectEntryException.class, "No ObjectEntry exists with the primary key " +