LPD-49933 1.) Label usually maps to a language key. 2.) And it's only used in one TaxonomyVocabularyResourceImpl.

Author: brianchandotcom

modules/apps/headless/headless-admin-taxonomy/headless-admin-taxonomy-impl/src/main/java/com/liferay/headless/admin/taxonomy/internal/resource/v1_0/TaxonomyVocabularyResourceImpl.java

@@ -10,7 +10,6 @@
 import com.liferay.asset.kernel.model.AssetCategoryConstants;
 import com.liferay.asset.kernel.model.AssetRendererFactory;
 import com.liferay.asset.kernel.model.AssetVocabulary;
-import com.liferay.asset.kernel.model.AssetVocabularyConstants;
 import com.liferay.asset.kernel.model.AssetVocabularyGroupRel;
 import com.liferay.asset.kernel.model.ClassType;
 import com.liferay.asset.kernel.model.ClassTypeReader;
@@ -514,6 +513,10 @@ private AssetVocabulary _addAssetVocabulary(
 			true, LocaleUtil.getSiteDefault(), "Taxonomy vocabulary", titleMap,
 			new HashSet<>(descriptionMap.keySet()));
 
+		boolean internalVisibilityType =
+			TaxonomyVocabulary.VisibilityType.INTERNAL.equals(
+				taxonomyVocabulary.getVisibilityType());
+
 		return _assetVocabularyService.addVocabulary(
 			externalReferenceCode, siteId,
 			titleMap.get(LocaleUtil.getSiteDefault()), null, titleMap,
@@ -522,8 +525,7 @@ private AssetVocabulary _addAssetVocabulary(
 				taxonomyVocabulary.getAssetTypes(), siteId,
 				GetterUtil.getBoolean(
 					taxonomyVocabulary.getMultiValued(), true)),
-			AssetVocabularyConstants.getLabelVisibilityType(
-				taxonomyVocabulary.getVisibilityTypeAsString()),
+			internalVisibilityType ? 1 : 0,
 			ServiceContextBuilder.create(
 				siteId, contextHttpServletRequest,
 				taxonomyVocabulary.getViewableByAsString()
@@ -912,9 +914,9 @@ private TaxonomyVocabulary _toTaxonomyVocabulary(
 						return GroupUtil.getSiteId(group);
 					});
 				setVisibilityType(
-					() -> TaxonomyVocabulary.VisibilityType.create(
-						AssetVocabularyConstants.getVisibilityTypeLabel(
-							assetVocabulary.getVisibilityType())));
+					() -> (assetVocabulary.getVisibilityType() == 1) ?
+						TaxonomyVocabulary.VisibilityType.INTERNAL :
+							TaxonomyVocabulary.VisibilityType.PUBLIC);
 			}
 		};
 	}

modules/apps/headless/headless-admin-taxonomy/headless-admin-taxonomy-test/src/testIntegration/java/com/liferay/headless/admin/taxonomy/resource/v1_0/test/TaxonomyVocabularyResourceTest.java

@@ -457,6 +457,7 @@ public void testPostTaxonomyVocabulary() throws Exception {
 				randomTaxonomyVocabulary);
 
 		assertEquals(randomTaxonomyVocabulary, postTaxonomyVocabulary);
+
 		Assert.assertTrue(
 			Objects.deepEquals(
 				assetLibraries, postTaxonomyVocabulary.getAssetLibraries()));
@@ -596,7 +597,6 @@ private TaxonomyVocabulary _randomTaxonomyVocabularyWithAssetLibraries(
 		TaxonomyVocabulary taxonomyVocabulary = randomTaxonomyVocabulary();
 
 		taxonomyVocabulary.setAssetLibraries(assetLibraries);
-
 		taxonomyVocabulary.setSiteId(GroupConstants.DEFAULT_LIVE_GROUP_ID);
 
 		return taxonomyVocabulary;

portal-kernel/src/com/liferay/asset/kernel/model/AssetVocabularyConstants.java

@@ -5,41 +5,17 @@
 
 package com.liferay.asset.kernel.model;
 
-import com.liferay.portal.kernel.util.StringUtil;
-
 /**
  * @author Rubén Pulido
  */
 public class AssetVocabularyConstants {
 
 	public static final int VISIBILITY_TYPE_INTERNAL = 1;
 
-	public static final String VISIBILITY_TYPE_INTERNAL_LABEL = "INTERNAL";
-
 	public static final int VISIBILITY_TYPE_PUBLIC = 0;
 
-	public static final String VISIBILITY_TYPE_PUBLIC_LABEL = "PUBLIC";
-
 	public static final int[] VISIBILITY_TYPES = {
 		VISIBILITY_TYPE_INTERNAL, VISIBILITY_TYPE_PUBLIC
 	};
 
-	public static int getLabelVisibilityType(String label) {
-		if (StringUtil.equalsIgnoreCase(
-				VISIBILITY_TYPE_INTERNAL_LABEL, label)) {
-
-			return VISIBILITY_TYPE_INTERNAL;
-		}
-
-		return VISIBILITY_TYPE_PUBLIC;
-	}
-
-	public static String getVisibilityTypeLabel(int visibilityType) {
-		if (visibilityType == VISIBILITY_TYPE_INTERNAL) {
-			return VISIBILITY_TYPE_INTERNAL_LABEL;
-		}
-
-		return VISIBILITY_TYPE_PUBLIC_LABEL;
-	}
-
 }

portal-kernel/src/com/liferay/asset/kernel/model/packageinfo

@@ -1 +1 @@
-version 11.7.0
+version 11.6.0