LPD-35542 Undo badly generated code that was made using an older Serv…

…ice Builder
ealonso · Nov 12, 2024 · 50cb2bb · 50cb2bb
1 parent 4b1884d
commit 50cb2bb
Show file tree

Hide file tree

Showing 29 changed files with 295 additions and 237 deletions.
diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/AddressPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/AddressPersistenceImpl.java
@@ -7641,6 +7641,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -7654,27 +7655,28 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctIgnoreColumnNames.add("modifiedDate");
 		ctStrictColumnNames.add("classNameId");
 		ctStrictColumnNames.add("classPK");
-		ctStrictColumnNames.add("countryId");
-		ctStrictColumnNames.add("listTypeId");
-		ctStrictColumnNames.add("regionId");
-		ctStrictColumnNames.add("city");
-		ctStrictColumnNames.add("description");
-		ctStrictColumnNames.add("latitude");
-		ctStrictColumnNames.add("longitude");
-		ctStrictColumnNames.add("mailing");
-		ctStrictColumnNames.add("name");
-		ctStrictColumnNames.add("primary_");
-		ctStrictColumnNames.add("street1");
-		ctStrictColumnNames.add("street2");
-		ctStrictColumnNames.add("street3");
-		ctStrictColumnNames.add("validationDate");
-		ctStrictColumnNames.add("validationStatus");
-		ctStrictColumnNames.add("zip");
+		ctMergeColumnNames.add("countryId");
+		ctMergeColumnNames.add("listTypeId");
+		ctMergeColumnNames.add("regionId");
+		ctMergeColumnNames.add("city");
+		ctMergeColumnNames.add("description");
+		ctMergeColumnNames.add("latitude");
+		ctMergeColumnNames.add("longitude");
+		ctMergeColumnNames.add("mailing");
+		ctMergeColumnNames.add("name");
+		ctMergeColumnNames.add("primary_");
+		ctMergeColumnNames.add("street1");
+		ctMergeColumnNames.add("street2");
+		ctMergeColumnNames.add("street3");
+		ctMergeColumnNames.add("validationDate");
+		ctMergeColumnNames.add("validationStatus");
+		ctMergeColumnNames.add("zip");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK, Collections.singleton("addressId"));
 		_ctColumnNamesMap.put(

diff --git a/...l/src/com/liferay/portal/service/persistence/impl/CountryLocalizationPersistenceImpl.java b/...l/src/com/liferay/portal/service/persistence/impl/CountryLocalizationPersistenceImpl.java
@@ -1596,17 +1596,19 @@ public List<String[]> getUniqueIndexColumnNames() {
 
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
 		ctControlColumnNames.add("ctCollectionId");
 		ctStrictColumnNames.add("companyId");
-		ctStrictColumnNames.add("countryId");
-		ctStrictColumnNames.add("languageId");
-		ctStrictColumnNames.add("title");
+		ctMergeColumnNames.add("countryId");
+		ctMergeColumnNames.add("languageId");
+		ctMergeColumnNames.add("title");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK,
 			Collections.singleton("countryLocalizationId"));

diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/CountryPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/CountryPersistenceImpl.java
@@ -5599,6 +5599,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -5610,24 +5611,25 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctStrictColumnNames.add("userName");
 		ctStrictColumnNames.add("createDate");
 		ctIgnoreColumnNames.add("modifiedDate");
-		ctStrictColumnNames.add("a2");
-		ctStrictColumnNames.add("a3");
-		ctStrictColumnNames.add("active_");
-		ctStrictColumnNames.add("billingAllowed");
-		ctStrictColumnNames.add("groupFilterEnabled");
-		ctStrictColumnNames.add("idd_");
-		ctStrictColumnNames.add("name");
-		ctStrictColumnNames.add("number_");
-		ctStrictColumnNames.add("position");
-		ctStrictColumnNames.add("shippingAllowed");
-		ctStrictColumnNames.add("subjectToVAT");
-		ctStrictColumnNames.add("zipRequired");
-		ctStrictColumnNames.add("lastPublishDate");
+		ctMergeColumnNames.add("a2");
+		ctMergeColumnNames.add("a3");
+		ctMergeColumnNames.add("active_");
+		ctMergeColumnNames.add("billingAllowed");
+		ctMergeColumnNames.add("groupFilterEnabled");
+		ctMergeColumnNames.add("idd_");
+		ctMergeColumnNames.add("name");
+		ctMergeColumnNames.add("number_");
+		ctMergeColumnNames.add("position");
+		ctMergeColumnNames.add("shippingAllowed");
+		ctMergeColumnNames.add("subjectToVAT");
+		ctMergeColumnNames.add("zipRequired");
+		ctMergeColumnNames.add("lastPublishDate");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK, Collections.singleton("countryId"));
 		_ctColumnNamesMap.put(

diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/EmailAddressPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/EmailAddressPersistenceImpl.java
@@ -5086,6 +5086,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -5099,14 +5100,15 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctIgnoreColumnNames.add("modifiedDate");
 		ctStrictColumnNames.add("classNameId");
 		ctStrictColumnNames.add("classPK");
-		ctStrictColumnNames.add("address");
-		ctStrictColumnNames.add("listTypeId");
-		ctStrictColumnNames.add("primary_");
+		ctMergeColumnNames.add("address");
+		ctMergeColumnNames.add("listTypeId");
+		ctMergeColumnNames.add("primary_");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK, Collections.singleton("emailAddressId"));
 		_ctColumnNamesMap.put(

diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/GroupPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/GroupPersistenceImpl.java
@@ -15507,6 +15507,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -15518,30 +15519,31 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctIgnoreColumnNames.add("modifiedDate");
 		ctStrictColumnNames.add("classNameId");
 		ctStrictColumnNames.add("classPK");
-		ctStrictColumnNames.add("parentGroupId");
-		ctStrictColumnNames.add("liveGroupId");
-		ctStrictColumnNames.add("treePath");
-		ctStrictColumnNames.add("groupKey");
-		ctStrictColumnNames.add("name");
-		ctStrictColumnNames.add("description");
-		ctStrictColumnNames.add("type_");
-		ctStrictColumnNames.add("typeSettings");
-		ctStrictColumnNames.add("manualMembership");
-		ctStrictColumnNames.add("membershipRestriction");
-		ctStrictColumnNames.add("friendlyURL");
-		ctStrictColumnNames.add("site");
-		ctStrictColumnNames.add("remoteStagingGroupCount");
-		ctStrictColumnNames.add("inheritContent");
-		ctStrictColumnNames.add("active_");
-		ctStrictColumnNames.add("orgs");
-		ctStrictColumnNames.add("roles");
-		ctStrictColumnNames.add("userGroups");
-		ctStrictColumnNames.add("users");
+		ctMergeColumnNames.add("parentGroupId");
+		ctMergeColumnNames.add("liveGroupId");
+		ctMergeColumnNames.add("treePath");
+		ctMergeColumnNames.add("groupKey");
+		ctMergeColumnNames.add("name");
+		ctMergeColumnNames.add("description");
+		ctMergeColumnNames.add("type_");
+		ctMergeColumnNames.add("typeSettings");
+		ctMergeColumnNames.add("manualMembership");
+		ctMergeColumnNames.add("membershipRestriction");
+		ctMergeColumnNames.add("friendlyURL");
+		ctMergeColumnNames.add("site");
+		ctMergeColumnNames.add("remoteStagingGroupCount");
+		ctMergeColumnNames.add("inheritContent");
+		ctMergeColumnNames.add("active_");
+		ctMergeColumnNames.add("orgs");
+		ctMergeColumnNames.add("roles");
+		ctMergeColumnNames.add("userGroups");
+		ctMergeColumnNames.add("users");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK, Collections.singleton("groupId"));
 		_ctColumnNamesMap.put(

diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/ImagePersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/ImagePersistenceImpl.java
@@ -1304,21 +1304,23 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
 		ctControlColumnNames.add("ctCollectionId");
 		ctStrictColumnNames.add("companyId");
 		ctIgnoreColumnNames.add("modifiedDate");
-		ctStrictColumnNames.add("type_");
-		ctStrictColumnNames.add("height");
-		ctStrictColumnNames.add("width");
-		ctStrictColumnNames.add("size_");
+		ctMergeColumnNames.add("type_");
+		ctMergeColumnNames.add("height");
+		ctMergeColumnNames.add("width");
+		ctMergeColumnNames.add("size_");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK, Collections.singleton("imageId"));
 		_ctColumnNamesMap.put(

diff --git a/...mpl/src/com/liferay/portal/service/persistence/impl/LayoutFriendlyURLPersistenceImpl.java b/...mpl/src/com/liferay/portal/service/persistence/impl/LayoutFriendlyURLPersistenceImpl.java
@@ -6581,6 +6581,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -6592,16 +6593,17 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctStrictColumnNames.add("userName");
 		ctStrictColumnNames.add("createDate");
 		ctIgnoreColumnNames.add("modifiedDate");
-		ctStrictColumnNames.add("plid");
-		ctStrictColumnNames.add("privateLayout");
-		ctStrictColumnNames.add("friendlyURL");
-		ctStrictColumnNames.add("languageId");
-		ctStrictColumnNames.add("lastPublishDate");
+		ctMergeColumnNames.add("plid");
+		ctMergeColumnNames.add("privateLayout");
+		ctMergeColumnNames.add("friendlyURL");
+		ctMergeColumnNames.add("languageId");
+		ctMergeColumnNames.add("lastPublishDate");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK,
 			Collections.singleton("layoutFriendlyURLId"));

diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutPersistenceImpl.java
@@ -19977,6 +19977,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -19989,44 +19990,45 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctStrictColumnNames.add("userName");
 		ctStrictColumnNames.add("createDate");
 		ctIgnoreColumnNames.add("modifiedDate");
-		ctStrictColumnNames.add("parentPlid");
-		ctStrictColumnNames.add("privateLayout");
-		ctStrictColumnNames.add("layoutId");
-		ctStrictColumnNames.add("parentLayoutId");
+		ctMergeColumnNames.add("parentPlid");
+		ctMergeColumnNames.add("privateLayout");
+		ctMergeColumnNames.add("layoutId");
+		ctMergeColumnNames.add("parentLayoutId");
 		ctStrictColumnNames.add("classNameId");
 		ctStrictColumnNames.add("classPK");
-		ctStrictColumnNames.add("name");
-		ctStrictColumnNames.add("title");
-		ctStrictColumnNames.add("description");
-		ctStrictColumnNames.add("keywords");
-		ctStrictColumnNames.add("robots");
-		ctStrictColumnNames.add("type_");
-		ctStrictColumnNames.add("typeSettings");
-		ctStrictColumnNames.add("hidden_");
-		ctStrictColumnNames.add("system_");
-		ctStrictColumnNames.add("friendlyURL");
-		ctStrictColumnNames.add("iconImageId");
-		ctStrictColumnNames.add("themeId");
-		ctStrictColumnNames.add("colorSchemeId");
-		ctStrictColumnNames.add("styleBookEntryId");
-		ctStrictColumnNames.add("css");
-		ctStrictColumnNames.add("priority");
-		ctStrictColumnNames.add("faviconFileEntryId");
-		ctStrictColumnNames.add("masterLayoutPlid");
-		ctStrictColumnNames.add("layoutPrototypeUuid");
-		ctStrictColumnNames.add("layoutPrototypeLinkEnabled");
-		ctStrictColumnNames.add("sourcePrototypeLayoutUuid");
-		ctStrictColumnNames.add("publishDate");
-		ctStrictColumnNames.add("lastPublishDate");
-		ctStrictColumnNames.add("status");
-		ctStrictColumnNames.add("statusByUserId");
-		ctStrictColumnNames.add("statusByUserName");
-		ctStrictColumnNames.add("statusDate");
+		ctMergeColumnNames.add("name");
+		ctMergeColumnNames.add("title");
+		ctMergeColumnNames.add("description");
+		ctMergeColumnNames.add("keywords");
+		ctMergeColumnNames.add("robots");
+		ctMergeColumnNames.add("type_");
+		ctMergeColumnNames.add("typeSettings");
+		ctMergeColumnNames.add("hidden_");
+		ctMergeColumnNames.add("system_");
+		ctMergeColumnNames.add("friendlyURL");
+		ctMergeColumnNames.add("iconImageId");
+		ctMergeColumnNames.add("themeId");
+		ctMergeColumnNames.add("colorSchemeId");
+		ctMergeColumnNames.add("styleBookEntryId");
+		ctMergeColumnNames.add("css");
+		ctMergeColumnNames.add("priority");
+		ctMergeColumnNames.add("faviconFileEntryId");
+		ctMergeColumnNames.add("masterLayoutPlid");
+		ctMergeColumnNames.add("layoutPrototypeUuid");
+		ctMergeColumnNames.add("layoutPrototypeLinkEnabled");
+		ctMergeColumnNames.add("sourcePrototypeLayoutUuid");
+		ctMergeColumnNames.add("publishDate");
+		ctMergeColumnNames.add("lastPublishDate");
+		ctMergeColumnNames.add("status");
+		ctMergeColumnNames.add("statusByUserId");
+		ctMergeColumnNames.add("statusByUserName");
+		ctMergeColumnNames.add("statusDate");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK, Collections.singleton("plid"));
 		_ctColumnNamesMap.put(

diff --git a/...-impl/src/com/liferay/portal/service/persistence/impl/LayoutPrototypePersistenceImpl.java b/...-impl/src/com/liferay/portal/service/persistence/impl/LayoutPrototypePersistenceImpl.java
@@ -4741,6 +4741,7 @@ public List<String[]> getUniqueIndexColumnNames() {
 	static {
 		Set<String> ctControlColumnNames = new HashSet<String>();
 		Set<String> ctIgnoreColumnNames = new HashSet<String>();
+		Set<String> ctMergeColumnNames = new HashSet<String>();
 		Set<String> ctStrictColumnNames = new HashSet<String>();
 
 		ctControlColumnNames.add("mvccVersion");
@@ -4751,15 +4752,16 @@ public List<String[]> getUniqueIndexColumnNames() {
 		ctStrictColumnNames.add("userName");
 		ctStrictColumnNames.add("createDate");
 		ctIgnoreColumnNames.add("modifiedDate");
-		ctStrictColumnNames.add("name");
-		ctStrictColumnNames.add("description");
-		ctStrictColumnNames.add("settings_");
-		ctStrictColumnNames.add("active_");
+		ctMergeColumnNames.add("name");
+		ctMergeColumnNames.add("description");
+		ctMergeColumnNames.add("settings_");
+		ctMergeColumnNames.add("active_");
 
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.CONTROL, ctControlColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.IGNORE, ctIgnoreColumnNames);
+		_ctColumnNamesMap.put(CTColumnResolutionType.MERGE, ctMergeColumnNames);
 		_ctColumnNamesMap.put(
 			CTColumnResolutionType.PK,
 			Collections.singleton("layoutPrototypeId"));