diff --git a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portlet/documentlibrary/service/persistence/test/DLFileEntryTypePersistenceTest.java b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portlet/documentlibrary/service/persistence/test/DLFileEntryTypePersistenceTest.java index c22c1e6cdd2081..be524cdd070551 100644 --- a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portlet/documentlibrary/service/persistence/test/DLFileEntryTypePersistenceTest.java +++ b/modules/test/persistence-test/src/testIntegration/java/com/liferay/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 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 index 7ac428a54e1df8..7e6051edfd2f98 100644 --- a/portal-impl/src/META-INF/portal-hbm.xml +++ b/portal-impl/src/META-INF/portal-hbm.xml @@ -1322,6 +1322,7 @@ + diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml index 334a16450c89d1..18d4bfd0519610 100644 --- a/portal-impl/src/META-INF/portal-model-hints.xml +++ b/portal-impl/src/META-INF/portal-model-hints.xml @@ -284,6 +284,7 @@ + 4000 diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeCacheModel.java b/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeCacheModel.java index b3cd7f049357c2..69a037398bf6e6 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/model/impl/DLFileEntryTypeCacheModel.java +++ b/portal-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 index 65d62924393686..95b0b8ea44d475 100644 --- 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 TABLE_COLUMNS_MAP = @@ -104,6 +105,7 @@ 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); @@ -111,7 +113,7 @@ public class DLFileEntryTypeModelImpl } 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 attributes) { "modifiedDate", (BiConsumer) DLFileEntryType::setModifiedDate); + attributeGetterFunctions.put( + "dataDefinitionId", DLFileEntryType::getDataDefinitionId); + attributeSetterBiConsumers.put( + "dataDefinitionId", + (BiConsumer) + 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 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; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceHttp.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceHttp.java index 8ef77ba77e0b2d..f55451891b3249 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceHttp.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceHttp.java @@ -51,6 +51,53 @@ */ public class DLFileEntryTypeServiceHttp { + public static com.liferay.document.library.kernel.model.DLFileEntryType + addFileEntryType( + HttpPrincipal httpPrincipal, long groupId, + long dataDefinitionId, String fileEntryTypeKey, + java.util.Map nameMap, + java.util.Map descriptionMap, + com.liferay.portal.kernel.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException { + + try { + MethodKey methodKey = new MethodKey( + DLFileEntryTypeServiceUtil.class, "addFileEntryType", + _addFileEntryTypeParameterTypes0); + + MethodHandler methodHandler = new MethodHandler( + methodKey, groupId, dataDefinitionId, fileEntryTypeKey, nameMap, + descriptionMap, serviceContext); + + Object returnObj = null; + + try { + returnObj = TunnelUtil.invoke(httpPrincipal, methodHandler); + } + catch (Exception exception) { + if (exception instanceof + com.liferay.portal.kernel.exception.PortalException) { + + throw (com.liferay.portal.kernel.exception.PortalException) + exception; + } + + throw new com.liferay.portal.kernel.exception.SystemException( + exception); + } + + return (com.liferay.document.library.kernel.model.DLFileEntryType) + returnObj; + } + catch (com.liferay.portal.kernel.exception.SystemException + systemException) { + + _log.error(systemException, systemException); + + throw systemException; + } + } + public static com.liferay.document.library.kernel.model.DLFileEntryType addFileEntryType( HttpPrincipal httpPrincipal, long groupId, @@ -64,7 +111,7 @@ public class DLFileEntryTypeServiceHttp { try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "addFileEntryType", - _addFileEntryTypeParameterTypes0); + _addFileEntryTypeParameterTypes1); MethodHandler methodHandler = new MethodHandler( methodKey, groupId, fileEntryTypeKey, nameMap, descriptionMap, @@ -109,7 +156,7 @@ public class DLFileEntryTypeServiceHttp { try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "addFileEntryType", - _addFileEntryTypeParameterTypes1); + _addFileEntryTypeParameterTypes2); MethodHandler methodHandler = new MethodHandler( methodKey, groupId, name, description, ddmStructureIds, @@ -151,7 +198,7 @@ public static void deleteFileEntryType( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "deleteFileEntryType", - _deleteFileEntryTypeParameterTypes2); + _deleteFileEntryTypeParameterTypes3); MethodHandler methodHandler = new MethodHandler( methodKey, fileEntryTypeId); @@ -187,7 +234,7 @@ public static void deleteFileEntryType( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "getFileEntryType", - _getFileEntryTypeParameterTypes3); + _getFileEntryTypeParameterTypes4); MethodHandler methodHandler = new MethodHandler( methodKey, fileEntryTypeId); @@ -228,7 +275,7 @@ public static void deleteFileEntryType( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "getFileEntryTypes", - _getFileEntryTypesParameterTypes4); + _getFileEntryTypesParameterTypes5); MethodHandler methodHandler = new MethodHandler( methodKey, groupIds); @@ -265,7 +312,7 @@ public static void deleteFileEntryType( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "getFileEntryTypes", - _getFileEntryTypesParameterTypes5); + _getFileEntryTypesParameterTypes6); MethodHandler methodHandler = new MethodHandler( methodKey, groupIds, start, end); @@ -299,7 +346,7 @@ public static int getFileEntryTypesCount( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "getFileEntryTypesCount", - _getFileEntryTypesCountParameterTypes6); + _getFileEntryTypesCountParameterTypes7); MethodHandler methodHandler = new MethodHandler( methodKey, groupIds); @@ -335,7 +382,7 @@ public static int getFileEntryTypesCount( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "getFolderFileEntryTypes", - _getFolderFileEntryTypesParameterTypes7); + _getFolderFileEntryTypesParameterTypes8); MethodHandler methodHandler = new MethodHandler( methodKey, groupIds, folderId, inherited); @@ -381,7 +428,7 @@ search( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "search", - _searchParameterTypes8); + _searchParameterTypes9); MethodHandler methodHandler = new MethodHandler( methodKey, companyId, folderId, groupIds, keywords, @@ -429,7 +476,7 @@ search( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "search", - _searchParameterTypes9); + _searchParameterTypes10); MethodHandler methodHandler = new MethodHandler( methodKey, companyId, groupIds, keywords, @@ -466,7 +513,7 @@ public static int searchCount( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "searchCount", - _searchCountParameterTypes10); + _searchCountParameterTypes11); MethodHandler methodHandler = new MethodHandler( methodKey, companyId, folderId, groupIds, keywords, @@ -500,7 +547,7 @@ public static int searchCount( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "searchCount", - _searchCountParameterTypes11); + _searchCountParameterTypes12); MethodHandler methodHandler = new MethodHandler( methodKey, companyId, groupIds, keywords, @@ -527,6 +574,50 @@ public static int searchCount( } } + public static com.liferay.document.library.kernel.model.DLFileEntryType + updateFileEntryType( + HttpPrincipal httpPrincipal, long fileEntryTypeId, + java.util.Map nameMap, + java.util.Map descriptionMap) + throws com.liferay.portal.kernel.exception.PortalException { + + try { + MethodKey methodKey = new MethodKey( + DLFileEntryTypeServiceUtil.class, "updateFileEntryType", + _updateFileEntryTypeParameterTypes13); + + MethodHandler methodHandler = new MethodHandler( + methodKey, fileEntryTypeId, nameMap, descriptionMap); + + Object returnObj = null; + + try { + returnObj = TunnelUtil.invoke(httpPrincipal, methodHandler); + } + catch (Exception exception) { + if (exception instanceof + com.liferay.portal.kernel.exception.PortalException) { + + throw (com.liferay.portal.kernel.exception.PortalException) + exception; + } + + throw new com.liferay.portal.kernel.exception.SystemException( + exception); + } + + return (com.liferay.document.library.kernel.model.DLFileEntryType) + returnObj; + } + catch (com.liferay.portal.kernel.exception.SystemException + systemException) { + + _log.error(systemException, systemException); + + throw systemException; + } + } + public static void updateFileEntryType( HttpPrincipal httpPrincipal, long fileEntryTypeId, java.util.Map nameMap, @@ -538,7 +629,7 @@ public static void updateFileEntryType( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "updateFileEntryType", - _updateFileEntryTypeParameterTypes12); + _updateFileEntryTypeParameterTypes14); MethodHandler methodHandler = new MethodHandler( methodKey, fileEntryTypeId, nameMap, descriptionMap, @@ -577,7 +668,7 @@ public static void updateFileEntryType( try { MethodKey methodKey = new MethodKey( DLFileEntryTypeServiceUtil.class, "updateFileEntryType", - _updateFileEntryTypeParameterTypes13); + _updateFileEntryTypeParameterTypes15); MethodHandler methodHandler = new MethodHandler( methodKey, fileEntryTypeId, name, description, ddmStructureIds, @@ -611,48 +702,56 @@ public static void updateFileEntryType( DLFileEntryTypeServiceHttp.class); private static final Class[] _addFileEntryTypeParameterTypes0 = + new Class[] { + long.class, long.class, String.class, java.util.Map.class, + java.util.Map.class, + com.liferay.portal.kernel.service.ServiceContext.class + }; + private static final Class[] _addFileEntryTypeParameterTypes1 = new Class[] { long.class, String.class, java.util.Map.class, java.util.Map.class, long[].class, com.liferay.portal.kernel.service.ServiceContext.class }; - private static final Class[] _addFileEntryTypeParameterTypes1 = + private static final Class[] _addFileEntryTypeParameterTypes2 = new Class[] { long.class, String.class, String.class, long[].class, com.liferay.portal.kernel.service.ServiceContext.class }; - private static final Class[] _deleteFileEntryTypeParameterTypes2 = + private static final Class[] _deleteFileEntryTypeParameterTypes3 = new Class[] {long.class}; - private static final Class[] _getFileEntryTypeParameterTypes3 = + private static final Class[] _getFileEntryTypeParameterTypes4 = new Class[] {long.class}; - private static final Class[] _getFileEntryTypesParameterTypes4 = - new Class[] {long[].class}; private static final Class[] _getFileEntryTypesParameterTypes5 = + new Class[] {long[].class}; + private static final Class[] _getFileEntryTypesParameterTypes6 = new Class[] {long[].class, int.class, int.class}; - private static final Class[] _getFileEntryTypesCountParameterTypes6 = + private static final Class[] _getFileEntryTypesCountParameterTypes7 = new Class[] {long[].class}; - private static final Class[] _getFolderFileEntryTypesParameterTypes7 = + private static final Class[] _getFolderFileEntryTypesParameterTypes8 = new Class[] {long[].class, long.class, boolean.class}; - private static final Class[] _searchParameterTypes8 = new Class[] { + private static final Class[] _searchParameterTypes9 = new Class[] { long.class, long.class, long[].class, String.class, boolean.class, boolean.class, int.class, int.class }; - private static final Class[] _searchParameterTypes9 = new Class[] { + private static final Class[] _searchParameterTypes10 = new Class[] { long.class, long[].class, String.class, boolean.class, int.class, int.class, com.liferay.portal.kernel.util.OrderByComparator.class }; - private static final Class[] _searchCountParameterTypes10 = new Class[] { + private static final Class[] _searchCountParameterTypes11 = new Class[] { long.class, long.class, long[].class, String.class, boolean.class, boolean.class }; - private static final Class[] _searchCountParameterTypes11 = new Class[] { + private static final Class[] _searchCountParameterTypes12 = new Class[] { long.class, long[].class, String.class, boolean.class }; - private static final Class[] _updateFileEntryTypeParameterTypes12 = + private static final Class[] _updateFileEntryTypeParameterTypes13 = + new Class[] {long.class, java.util.Map.class, java.util.Map.class}; + private static final Class[] _updateFileEntryTypeParameterTypes14 = new Class[] { long.class, java.util.Map.class, java.util.Map.class, long[].class, com.liferay.portal.kernel.service.ServiceContext.class }; - private static final Class[] _updateFileEntryTypeParameterTypes13 = + private static final Class[] _updateFileEntryTypeParameterTypes15 = new Class[] { long.class, String.class, String.class, long[].class, com.liferay.portal.kernel.service.ServiceContext.class diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceSoap.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceSoap.java index f9bbbea419b0f6..e836c93cab942e 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceSoap.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/http/DLFileEntryTypeServiceSoap.java @@ -65,6 +65,42 @@ */ public class DLFileEntryTypeServiceSoap { + public static com.liferay.document.library.kernel.model.DLFileEntryTypeSoap + addFileEntryType( + long groupId, long dataDefinitionId, String fileEntryTypeKey, + String[] nameMapLanguageIds, String[] nameMapValues, + String[] descriptionMapLanguageIds, + String[] descriptionMapValues, + com.liferay.portal.kernel.service.ServiceContext serviceContext) + throws RemoteException { + + try { + Map nameMap = LocalizationUtil.getLocalizationMap( + nameMapLanguageIds, nameMapValues); + Map descriptionMap = + LocalizationUtil.getLocalizationMap( + descriptionMapLanguageIds, descriptionMapValues); + + com.liferay.document.library.kernel.model.DLFileEntryType + returnValue = DLFileEntryTypeServiceUtil.addFileEntryType( + groupId, dataDefinitionId, fileEntryTypeKey, nameMap, + descriptionMap, serviceContext); + + return com.liferay.document.library.kernel.model. + DLFileEntryTypeSoap.toSoapModel(returnValue); + } + catch (Exception exception) { + _log.error(exception, exception); + + throw new RemoteException(exception.getMessage()); + } + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public static com.liferay.document.library.kernel.model.DLFileEntryTypeSoap addFileEntryType( long groupId, String fileEntryTypeKey, @@ -96,6 +132,11 @@ public class DLFileEntryTypeServiceSoap { } } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public static com.liferay.document.library.kernel.model.DLFileEntryTypeSoap addFileEntryType( long groupId, String name, String description, @@ -320,6 +361,39 @@ public static int searchCount( } } + public static com.liferay.document.library.kernel.model.DLFileEntryTypeSoap + updateFileEntryType( + long fileEntryTypeId, String[] nameMapLanguageIds, + String[] nameMapValues, String[] descriptionMapLanguageIds, + String[] descriptionMapValues) + throws RemoteException { + + try { + Map nameMap = LocalizationUtil.getLocalizationMap( + nameMapLanguageIds, nameMapValues); + Map descriptionMap = + LocalizationUtil.getLocalizationMap( + descriptionMapLanguageIds, descriptionMapValues); + + com.liferay.document.library.kernel.model.DLFileEntryType + returnValue = DLFileEntryTypeServiceUtil.updateFileEntryType( + fileEntryTypeId, nameMap, descriptionMap); + + return com.liferay.document.library.kernel.model. + DLFileEntryTypeSoap.toSoapModel(returnValue); + } + catch (Exception exception) { + _log.error(exception, exception); + + throw new RemoteException(exception.getMessage()); + } + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public static void updateFileEntryType( long fileEntryTypeId, String[] nameMapLanguageIds, String[] nameMapValues, String[] descriptionMapLanguageIds, @@ -345,6 +419,11 @@ public static void updateFileEntryType( } } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public static void updateFileEntryType( long fileEntryTypeId, String name, String description, long[] ddmStructureIds, diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypePersistenceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypePersistenceImpl.java index 8b14a1a88bd101..0259f022453cd1 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypePersistenceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/persistence/impl/DLFileEntryTypePersistenceImpl.java @@ -4482,6 +4482,7 @@ public List getUniqueIndexColumnNames() { ctStrictColumnNames.add("userName"); ctStrictColumnNames.add("createDate"); ctIgnoreColumnNames.add("modifiedDate"); + ctStrictColumnNames.add("dataDefinitionId"); ctStrictColumnNames.add("fileEntryTypeKey"); ctStrictColumnNames.add("name"); ctStrictColumnNames.add("description"); diff --git a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeModel.java b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeModel.java index 2beaea12325f80..bdf84d08c98647 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeModel.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeModel.java @@ -243,6 +243,20 @@ public interface DLFileEntryTypeModel @Override public void setModifiedDate(Date modifiedDate); + /** + * Returns the data definition ID of this document library file entry type. + * + * @return the data definition ID of this document library file entry type + */ + public long getDataDefinitionId(); + + /** + * Sets the data definition ID of this document library file entry type. + * + * @param dataDefinitionId the data definition ID of this document library file entry type + */ + public void setDataDefinitionId(long dataDefinitionId); + /** * Returns the file entry type key of this document library file entry type. * diff --git a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeSoap.java b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeSoap.java index f808273356b602..973a822b1fd84b 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeSoap.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeSoap.java @@ -41,6 +41,7 @@ public static DLFileEntryTypeSoap toSoapModel(DLFileEntryType model) { soapModel.setUserName(model.getUserName()); soapModel.setCreateDate(model.getCreateDate()); soapModel.setModifiedDate(model.getModifiedDate()); + soapModel.setDataDefinitionId(model.getDataDefinitionId()); soapModel.setFileEntryTypeKey(model.getFileEntryTypeKey()); soapModel.setName(model.getName()); soapModel.setDescription(model.getDescription()); @@ -184,6 +185,14 @@ public void setModifiedDate(Date modifiedDate) { _modifiedDate = modifiedDate; } + public long getDataDefinitionId() { + return _dataDefinitionId; + } + + public void setDataDefinitionId(long dataDefinitionId) { + _dataDefinitionId = dataDefinitionId; + } + public String getFileEntryTypeKey() { return _fileEntryTypeKey; } @@ -226,6 +235,7 @@ public void setLastPublishDate(Date lastPublishDate) { private String _userName; private Date _createDate; private Date _modifiedDate; + private long _dataDefinitionId; private String _fileEntryTypeKey; private String _name; private String _description; diff --git a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeTable.java b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeTable.java index a6ebf660ec254f..834e72b08db432 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeTable.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeTable.java @@ -55,6 +55,9 @@ public class DLFileEntryTypeTable extends BaseTable { "createDate", Date.class, Types.TIMESTAMP, Column.FLAG_DEFAULT); public final Column modifiedDate = createColumn( "modifiedDate", Date.class, Types.TIMESTAMP, Column.FLAG_DEFAULT); + public final Column dataDefinitionId = + createColumn( + "dataDefinitionId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT); public final Column fileEntryTypeKey = createColumn( "fileEntryTypeKey", String.class, Types.VARCHAR, diff --git a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeWrapper.java b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeWrapper.java index df9a386c23dd12..642bdea4addf99 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeWrapper.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/model/DLFileEntryTypeWrapper.java @@ -55,6 +55,7 @@ public Map getModelAttributes() { attributes.put("userName", getUserName()); attributes.put("createDate", getCreateDate()); attributes.put("modifiedDate", getModifiedDate()); + attributes.put("dataDefinitionId", getDataDefinitionId()); attributes.put("fileEntryTypeKey", getFileEntryTypeKey()); attributes.put("name", getName()); attributes.put("description", getDescription()); @@ -125,6 +126,12 @@ public void setModelAttributes(Map attributes) { setModifiedDate(modifiedDate); } + Long dataDefinitionId = (Long)attributes.get("dataDefinitionId"); + + if (dataDefinitionId != null) { + setDataDefinitionId(dataDefinitionId); + } + String fileEntryTypeKey = (String)attributes.get("fileEntryTypeKey"); if (fileEntryTypeKey != null) { @@ -185,6 +192,16 @@ public long getCtCollectionId() { return model.getCtCollectionId(); } + /** + * Returns the data definition ID of this document library file entry type. + * + * @return the data definition ID of this document library file entry type + */ + @Override + public long getDataDefinitionId() { + return model.getDataDefinitionId(); + } + @Override public java.util.List getDDMStructures() { @@ -523,6 +540,16 @@ public void setCtCollectionId(long ctCollectionId) { model.setCtCollectionId(ctCollectionId); } + /** + * Sets the data definition ID of this document library file entry type. + * + * @param dataDefinitionId the data definition ID of this document library file entry type + */ + @Override + public void setDataDefinitionId(long dataDefinitionId) { + model.setDataDefinitionId(dataDefinitionId); + } + /** * Sets the description of this document library file entry type. * diff --git a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalService.java b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalService.java index 5f7e3c98d49ee8..97049048b0c42d 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalService.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalService.java @@ -99,12 +99,28 @@ public void addDLFolderDLFileEntryTypes( public void addDLFolderDLFileEntryTypes( long folderId, long[] fileEntryTypeIds); + public DLFileEntryType addFileEntryType( + long userId, long groupId, long dataDefinitionId, + String fileEntryTypeKey, Map nameMap, + Map descriptionMap, ServiceContext serviceContext) + throws PortalException; + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public DLFileEntryType addFileEntryType( long userId, long groupId, String fileEntryTypeKey, Map nameMap, Map descriptionMap, long[] ddmStructureIds, ServiceContext serviceContext) throws PortalException; + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public DLFileEntryType addFileEntryType( long userId, long groupId, String name, String description, long[] ddmStructureIds, ServiceContext serviceContext) @@ -464,17 +480,32 @@ public DLFileEntry updateFileEntryFileEntryType( DLFileEntry dlFileEntry, ServiceContext serviceContext) throws PortalException; + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public void updateFileEntryType( long userId, long fileEntryTypeId, Map nameMap, Map descriptionMap, long[] ddmStructureIds, ServiceContext serviceContext) throws PortalException; + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public void updateFileEntryType( long userId, long fileEntryTypeId, String name, String description, long[] ddmStructureIds, ServiceContext serviceContext) throws PortalException; + public DLFileEntryType updateFileEntryType( + long fileEntryTypeId, Map nameMap, + Map descriptionMap) + throws PortalException; + public void updateFolderFileEntryTypes( DLFolder dlFolder, List fileEntryTypeIds, long defaultFileEntryTypeId, ServiceContext serviceContext); diff --git a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceUtil.java b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceUtil.java index 2d3bfc773df408..e06ab81f751230 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceUtil.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceUtil.java @@ -84,6 +84,25 @@ public static void addDLFolderDLFileEntryTypes( getService().addDLFolderDLFileEntryTypes(folderId, fileEntryTypeIds); } + public static com.liferay.document.library.kernel.model.DLFileEntryType + addFileEntryType( + long userId, long groupId, long dataDefinitionId, + String fileEntryTypeKey, + java.util.Map nameMap, + java.util.Map descriptionMap, + com.liferay.portal.kernel.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException { + + return getService().addFileEntryType( + userId, groupId, dataDefinitionId, fileEntryTypeKey, nameMap, + descriptionMap, serviceContext); + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public static com.liferay.document.library.kernel.model.DLFileEntryType addFileEntryType( long userId, long groupId, String fileEntryTypeKey, @@ -98,6 +117,11 @@ public static void addDLFolderDLFileEntryTypes( ddmStructureIds, serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public static com.liferay.document.library.kernel.model.DLFileEntryType addFileEntryType( long userId, long groupId, String name, String description, @@ -660,6 +684,11 @@ public static void updateDDMStructureLinks( dlFileEntry, serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public static void updateFileEntryType( long userId, long fileEntryTypeId, java.util.Map nameMap, @@ -673,6 +702,11 @@ public static void updateFileEntryType( serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public static void updateFileEntryType( long userId, long fileEntryTypeId, String name, String description, long[] ddmStructureIds, @@ -684,6 +718,17 @@ public static void updateFileEntryType( serviceContext); } + public static com.liferay.document.library.kernel.model.DLFileEntryType + updateFileEntryType( + long fileEntryTypeId, + java.util.Map nameMap, + java.util.Map descriptionMap) + throws com.liferay.portal.kernel.exception.PortalException { + + return getService().updateFileEntryType( + fileEntryTypeId, nameMap, descriptionMap); + } + public static void updateFolderFileEntryTypes( com.liferay.document.library.kernel.model.DLFolder dlFolder, java.util.List fileEntryTypeIds, long defaultFileEntryTypeId, diff --git a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceWrapper.java b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceWrapper.java index eb1c59950e738c..62413dc9243369 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceWrapper.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeLocalServiceWrapper.java @@ -87,6 +87,25 @@ public void addDLFolderDLFileEntryTypes( folderId, fileEntryTypeIds); } + @Override + public DLFileEntryType addFileEntryType( + long userId, long groupId, long dataDefinitionId, + String fileEntryTypeKey, + java.util.Map nameMap, + java.util.Map descriptionMap, + com.liferay.portal.kernel.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException { + + return _dlFileEntryTypeLocalService.addFileEntryType( + userId, groupId, dataDefinitionId, fileEntryTypeKey, nameMap, + descriptionMap, serviceContext); + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated @Override public DLFileEntryType addFileEntryType( long userId, long groupId, String fileEntryTypeKey, @@ -101,6 +120,11 @@ public DLFileEntryType addFileEntryType( ddmStructureIds, serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated @Override public DLFileEntryType addFileEntryType( long userId, long groupId, String name, String description, @@ -702,6 +726,11 @@ public DLFileEntryType updateDLFileEntryType( dlFileEntry, serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated @Override public void updateFileEntryType( long userId, long fileEntryTypeId, @@ -716,6 +745,11 @@ public void updateFileEntryType( serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated @Override public void updateFileEntryType( long userId, long fileEntryTypeId, String name, String description, @@ -728,6 +762,17 @@ public void updateFileEntryType( serviceContext); } + @Override + public DLFileEntryType updateFileEntryType( + long fileEntryTypeId, + java.util.Map nameMap, + java.util.Map descriptionMap) + throws com.liferay.portal.kernel.exception.PortalException { + + return _dlFileEntryTypeLocalService.updateFileEntryType( + fileEntryTypeId, nameMap, descriptionMap); + } + @Override public void updateFolderFileEntryTypes( com.liferay.document.library.kernel.model.DLFolder dlFolder, diff --git a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeService.java b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeService.java index 479a7171724034..a314706544f850 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeService.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeService.java @@ -55,12 +55,28 @@ public interface DLFileEntryTypeService extends BaseService { * * Never modify or reference this interface directly. Always use {@link DLFileEntryTypeServiceUtil} to access the document library file entry type remote service. Add custom service methods to com.liferay.portlet.documentlibrary.service.impl.DLFileEntryTypeServiceImpl and rerun ServiceBuilder to automatically copy the method declarations to this interface. */ + public DLFileEntryType addFileEntryType( + long groupId, long dataDefinitionId, String fileEntryTypeKey, + Map nameMap, Map descriptionMap, + ServiceContext serviceContext) + throws PortalException; + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public DLFileEntryType addFileEntryType( long groupId, String fileEntryTypeKey, Map nameMap, Map descriptionMap, long[] ddmStructureIds, ServiceContext serviceContext) throws PortalException; + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public DLFileEntryType addFileEntryType( long groupId, String name, String description, long[] ddmStructureIds, ServiceContext serviceContext) @@ -118,12 +134,27 @@ public int searchCount( long companyId, long[] groupIds, String keywords, boolean includeBasicFileEntryType); + public DLFileEntryType updateFileEntryType( + long fileEntryTypeId, Map nameMap, + Map descriptionMap) + throws PortalException; + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public void updateFileEntryType( long fileEntryTypeId, Map nameMap, Map descriptionMap, long[] ddmStructureIds, ServiceContext serviceContext) throws PortalException; + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public void updateFileEntryType( long fileEntryTypeId, String name, String description, long[] ddmStructureIds, ServiceContext serviceContext) diff --git a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceUtil.java b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceUtil.java index c3aa5fbf6de37a..dc5cfaa6dd9488 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceUtil.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceUtil.java @@ -35,6 +35,24 @@ public class DLFileEntryTypeServiceUtil { * * Never modify this class directly. Add custom service methods to com.liferay.portlet.documentlibrary.service.impl.DLFileEntryTypeServiceImpl and rerun ServiceBuilder to regenerate this class. */ + public static com.liferay.document.library.kernel.model.DLFileEntryType + addFileEntryType( + long groupId, long dataDefinitionId, String fileEntryTypeKey, + java.util.Map nameMap, + java.util.Map descriptionMap, + com.liferay.portal.kernel.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException { + + return getService().addFileEntryType( + groupId, dataDefinitionId, fileEntryTypeKey, nameMap, + descriptionMap, serviceContext); + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public static com.liferay.document.library.kernel.model.DLFileEntryType addFileEntryType( long groupId, String fileEntryTypeKey, @@ -49,6 +67,11 @@ public class DLFileEntryTypeServiceUtil { serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated public static com.liferay.document.library.kernel.model.DLFileEntryType addFileEntryType( long groupId, String name, String description, @@ -152,6 +175,22 @@ public static int searchCount( companyId, groupIds, keywords, includeBasicFileEntryType); } + public static com.liferay.document.library.kernel.model.DLFileEntryType + updateFileEntryType( + long fileEntryTypeId, + java.util.Map nameMap, + java.util.Map descriptionMap) + throws com.liferay.portal.kernel.exception.PortalException { + + return getService().updateFileEntryType( + fileEntryTypeId, nameMap, descriptionMap); + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public static void updateFileEntryType( long fileEntryTypeId, java.util.Map nameMap, @@ -165,6 +204,11 @@ public static void updateFileEntryType( serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated public static void updateFileEntryType( long fileEntryTypeId, String name, String description, long[] ddmStructureIds, diff --git a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceWrapper.java b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceWrapper.java index 535286705cf7d8..e2d637ca43e35a 100644 --- a/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceWrapper.java +++ b/portal-kernel/src/com/liferay/document/library/kernel/service/DLFileEntryTypeServiceWrapper.java @@ -33,6 +33,24 @@ public DLFileEntryTypeServiceWrapper( _dlFileEntryTypeService = dlFileEntryTypeService; } + @Override + public DLFileEntryType addFileEntryType( + long groupId, long dataDefinitionId, String fileEntryTypeKey, + java.util.Map nameMap, + java.util.Map descriptionMap, + com.liferay.portal.kernel.service.ServiceContext serviceContext) + throws com.liferay.portal.kernel.exception.PortalException { + + return _dlFileEntryTypeService.addFileEntryType( + groupId, dataDefinitionId, fileEntryTypeKey, nameMap, + descriptionMap, serviceContext); + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated @Override public DLFileEntryType addFileEntryType( long groupId, String fileEntryTypeKey, @@ -47,6 +65,11 @@ public DLFileEntryType addFileEntryType( serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #addFileEntryType(long, String, Map, Map, long, ServiceContext)} + */ + @Deprecated @Override public DLFileEntryType addFileEntryType( long groupId, String name, String description, @@ -151,6 +174,22 @@ public int searchCount( companyId, groupIds, keywords, includeBasicFileEntryType); } + @Override + public DLFileEntryType updateFileEntryType( + long fileEntryTypeId, + java.util.Map nameMap, + java.util.Map descriptionMap) + throws com.liferay.portal.kernel.exception.PortalException { + + return _dlFileEntryTypeService.updateFileEntryType( + fileEntryTypeId, nameMap, descriptionMap); + } + + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated @Override public void updateFileEntryType( long fileEntryTypeId, @@ -165,6 +204,11 @@ public void updateFileEntryType( serviceContext); } + /** + * @deprecated As of Athanasius (7.3.x), replaced by {@link + #updateFileEntryType(long, Map, Map)} + */ + @Deprecated @Override public void updateFileEntryType( long fileEntryTypeId, String name, String description, diff --git a/sql/portal-tables.sql b/sql/portal-tables.sql index 6707f7c73a9002..d9cc6b3c4e04a9 100644 --- a/sql/portal-tables.sql +++ b/sql/portal-tables.sql @@ -349,6 +349,7 @@ create table DLFileEntryType ( userName VARCHAR(75) null, createDate DATE null, modifiedDate DATE null, + dataDefinitionId LONG, fileEntryTypeKey VARCHAR(75) null, name STRING null, description STRING null,