LPS-113971 Autogenerated

liferay · Jun 11, 2020 · 6418084 · 6418084
1 parent 79b7c9c
commit 6418084
Show file tree

Hide file tree

Showing 19 changed files with 549 additions and 33 deletions.
diff --git a/...eray/portlet/documentlibrary/service/persistence/test/DLFileEntryTypePersistenceTest.java b/...eray/portlet/documentlibrary/service/persistence/test/DLFileEntryTypePersistenceTest.java
@@ -141,6 +141,8 @@ public void testUpdateExisting() throws Exception {
 
 		newDLFileEntryType.setModifiedDate(RandomTestUtil.nextDate());
 
+		newDLFileEntryType.setDataDefinitionId(RandomTestUtil.nextLong());
+
 		newDLFileEntryType.setFileEntryTypeKey(RandomTestUtil.randomString());
 
 		newDLFileEntryType.setName(RandomTestUtil.randomString());
@@ -183,6 +185,9 @@ public void testUpdateExisting() throws Exception {
 		Assert.assertEquals(
 			Time.getShortTimestamp(existingDLFileEntryType.getModifiedDate()),
 			Time.getShortTimestamp(newDLFileEntryType.getModifiedDate()));
+		Assert.assertEquals(
+			existingDLFileEntryType.getDataDefinitionId(),
+			newDLFileEntryType.getDataDefinitionId());
 		Assert.assertEquals(
 			existingDLFileEntryType.getFileEntryTypeKey(),
 			newDLFileEntryType.getFileEntryTypeKey());
@@ -279,8 +284,8 @@ protected OrderByComparator<DLFileEntryType> getOrderByComparator() {
 			"DLFileEntryType", "mvccVersion", true, "ctCollectionId", true,
 			"uuid", true, "fileEntryTypeId", true, "groupId", true, "companyId",
 			true, "userId", true, "userName", true, "createDate", true,
-			"modifiedDate", true, "fileEntryTypeKey", true, "name", true,
-			"description", true, "lastPublishDate", true);
+			"modifiedDate", true, "dataDefinitionId", true, "fileEntryTypeKey",
+			true, "name", true, "description", true, "lastPublishDate", true);
 	}
 
 	@Test
@@ -554,6 +559,8 @@ protected DLFileEntryType addDLFileEntryType() throws Exception {
 
 		dlFileEntryType.setModifiedDate(RandomTestUtil.nextDate());
 
+		dlFileEntryType.setDataDefinitionId(RandomTestUtil.nextLong());
+
 		dlFileEntryType.setFileEntryTypeKey(RandomTestUtil.randomString());
 
 		dlFileEntryType.setName(RandomTestUtil.randomString());

diff --git a/portal-impl/src/META-INF/portal-hbm.xml b/portal-impl/src/META-INF/portal-hbm.xml
@@ -1322,6 +1322,7 @@
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="userName" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="createDate" type="org.hibernate.type.TimestampType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="modifiedDate" type="org.hibernate.type.TimestampType" />
+		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="dataDefinitionId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="fileEntryTypeKey" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="name" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="description" type="com.liferay.portal.dao.orm.hibernate.StringType" />

diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml
@@ -284,6 +284,7 @@
 		<field name="userName" type="String" />
 		<field name="createDate" type="Date" />
 		<field name="modifiedDate" type="Date" />
+		<field name="dataDefinitionId" type="long" />
 		<field name="fileEntryTypeKey" type="String" />
 		<field localized="true" name="name" type="String">
 			<hint name="max-length">4000</hint>

diff --git a/...al-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeCacheModel.java b/...al-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeCacheModel.java
@@ -77,7 +77,7 @@ public void setMvccVersion(long mvccVersion) {
 
 	@Override
 	public String toString() {
-		StringBundler sb = new StringBundler(29);
+		StringBundler sb = new StringBundler(31);
 
 		sb.append("{mvccVersion=");
 		sb.append(mvccVersion);
@@ -99,6 +99,8 @@ public String toString() {
 		sb.append(createDate);
 		sb.append(", modifiedDate=");
 		sb.append(modifiedDate);
+		sb.append(", dataDefinitionId=");
+		sb.append(dataDefinitionId);
 		sb.append(", fileEntryTypeKey=");
 		sb.append(fileEntryTypeKey);
 		sb.append(", name=");
@@ -152,6 +154,8 @@ public DLFileEntryType toEntityModel() {
 			dlFileEntryTypeImpl.setModifiedDate(new Date(modifiedDate));
 		}
 
+		dlFileEntryTypeImpl.setDataDefinitionId(dataDefinitionId);
+
 		if (fileEntryTypeKey == null) {
 			dlFileEntryTypeImpl.setFileEntryTypeKey("");
 		}
@@ -202,6 +206,8 @@ public void readExternal(ObjectInput objectInput) throws IOException {
 		userName = objectInput.readUTF();
 		createDate = objectInput.readLong();
 		modifiedDate = objectInput.readLong();
+
+		dataDefinitionId = objectInput.readLong();
 		fileEntryTypeKey = objectInput.readUTF();
 		name = objectInput.readUTF();
 		description = objectInput.readUTF();
@@ -239,6 +245,8 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 		objectOutput.writeLong(createDate);
 		objectOutput.writeLong(modifiedDate);
 
+		objectOutput.writeLong(dataDefinitionId);
+
 		if (fileEntryTypeKey == null) {
 			objectOutput.writeUTF("");
 		}
@@ -273,6 +281,7 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 	public String userName;
 	public long createDate;
 	public long modifiedDate;
+	public long dataDefinitionId;
 	public String fileEntryTypeKey;
 	public String name;
 	public String description;

diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeModelImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeModelImpl.java
@@ -86,8 +86,9 @@ public class DLFileEntryTypeModelImpl
 		{"groupId", Types.BIGINT}, {"companyId", Types.BIGINT},
 		{"userId", Types.BIGINT}, {"userName", Types.VARCHAR},
 		{"createDate", Types.TIMESTAMP}, {"modifiedDate", Types.TIMESTAMP},
-		{"fileEntryTypeKey", Types.VARCHAR}, {"name", Types.VARCHAR},
-		{"description", Types.VARCHAR}, {"lastPublishDate", Types.TIMESTAMP}
+		{"dataDefinitionId", Types.BIGINT}, {"fileEntryTypeKey", Types.VARCHAR},
+		{"name", Types.VARCHAR}, {"description", Types.VARCHAR},
+		{"lastPublishDate", Types.TIMESTAMP}
 	};
 
 	public static final Map<String, Integer> TABLE_COLUMNS_MAP =
@@ -104,14 +105,15 @@ public class DLFileEntryTypeModelImpl
 		TABLE_COLUMNS_MAP.put("userName", Types.VARCHAR);
 		TABLE_COLUMNS_MAP.put("createDate", Types.TIMESTAMP);
 		TABLE_COLUMNS_MAP.put("modifiedDate", Types.TIMESTAMP);
+		TABLE_COLUMNS_MAP.put("dataDefinitionId", Types.BIGINT);
 		TABLE_COLUMNS_MAP.put("fileEntryTypeKey", Types.VARCHAR);
 		TABLE_COLUMNS_MAP.put("name", Types.VARCHAR);
 		TABLE_COLUMNS_MAP.put("description", Types.VARCHAR);
 		TABLE_COLUMNS_MAP.put("lastPublishDate", Types.TIMESTAMP);
 	}
 
 	public static final String TABLE_SQL_CREATE =
-		"create table DLFileEntryType (mvccVersion LONG default 0 not null,ctCollectionId LONG default 0 not null,uuid_ VARCHAR(75) null,fileEntryTypeId LONG not null,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,fileEntryTypeKey VARCHAR(75) null,name STRING null,description STRING null,lastPublishDate DATE null,primary key (fileEntryTypeId, ctCollectionId))";
+		"create table DLFileEntryType (mvccVersion LONG default 0 not null,ctCollectionId LONG default 0 not null,uuid_ VARCHAR(75) null,fileEntryTypeId LONG not null,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,dataDefinitionId LONG,fileEntryTypeKey VARCHAR(75) null,name STRING null,description STRING null,lastPublishDate DATE null,primary key (fileEntryTypeId, ctCollectionId))";
 
 	public static final String TABLE_SQL_DROP = "drop table DLFileEntryType";
 
@@ -175,6 +177,7 @@ public static DLFileEntryType toModel(DLFileEntryTypeSoap soapModel) {
 		model.setUserName(soapModel.getUserName());
 		model.setCreateDate(soapModel.getCreateDate());
 		model.setModifiedDate(soapModel.getModifiedDate());
+		model.setDataDefinitionId(soapModel.getDataDefinitionId());
 		model.setFileEntryTypeKey(soapModel.getFileEntryTypeKey());
 		model.setName(soapModel.getName());
 		model.setDescription(soapModel.getDescription());
@@ -406,6 +409,12 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			"modifiedDate",
 			(BiConsumer<DLFileEntryType, Date>)
 				DLFileEntryType::setModifiedDate);
+		attributeGetterFunctions.put(
+			"dataDefinitionId", DLFileEntryType::getDataDefinitionId);
+		attributeSetterBiConsumers.put(
+			"dataDefinitionId",
+			(BiConsumer<DLFileEntryType, Long>)
+				DLFileEntryType::setDataDefinitionId);
 		attributeGetterFunctions.put(
 			"fileEntryTypeKey", DLFileEntryType::getFileEntryTypeKey);
 		attributeSetterBiConsumers.put(
@@ -611,6 +620,17 @@ public void setModifiedDate(Date modifiedDate) {
 		_modifiedDate = modifiedDate;
 	}
 
+	@JSON
+	@Override
+	public long getDataDefinitionId() {
+		return _dataDefinitionId;
+	}
+
+	@Override
+	public void setDataDefinitionId(long dataDefinitionId) {
+		_dataDefinitionId = dataDefinitionId;
+	}
+
 	@JSON
 	@Override
 	public String getFileEntryTypeKey() {
@@ -999,6 +1019,7 @@ public Object clone() {
 		dlFileEntryTypeImpl.setUserName(getUserName());
 		dlFileEntryTypeImpl.setCreateDate(getCreateDate());
 		dlFileEntryTypeImpl.setModifiedDate(getModifiedDate());
+		dlFileEntryTypeImpl.setDataDefinitionId(getDataDefinitionId());
 		dlFileEntryTypeImpl.setFileEntryTypeKey(getFileEntryTypeKey());
 		dlFileEntryTypeImpl.setName(getName());
 		dlFileEntryTypeImpl.setDescription(getDescription());
@@ -1136,6 +1157,8 @@ public CacheModel<DLFileEntryType> toCacheModel() {
 			dlFileEntryTypeCacheModel.modifiedDate = Long.MIN_VALUE;
 		}
 
+		dlFileEntryTypeCacheModel.dataDefinitionId = getDataDefinitionId();
+
 		dlFileEntryTypeCacheModel.fileEntryTypeKey = getFileEntryTypeKey();
 
 		String fileEntryTypeKey = dlFileEntryTypeCacheModel.fileEntryTypeKey;
@@ -1259,6 +1282,7 @@ private static class EscapedModelProxyProviderFunctionHolder {
 	private Date _createDate;
 	private Date _modifiedDate;
 	private boolean _setModifiedDate;
+	private long _dataDefinitionId;
 	private String _fileEntryTypeKey;
 	private String _originalFileEntryTypeKey;
 	private String _name;