LPS-92884 apply

liferay · Mar 28, 2019 · 4576487 · 4576487
1 parent 03a34bf
commit 4576487
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 110 deletions.
diff --git a/...es/internal/search/spi/model/index/contributor/AssetCategoryModelDocumentContributor.java b/...es/internal/search/spi/model/index/contributor/AssetCategoryModelDocumentContributor.java
@@ -18,10 +18,10 @@
 import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.search.Document;
 import com.liferay.portal.kernel.search.Field;
 import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.LocalizationUtil;
 import com.liferay.portal.kernel.util.Portal;
 import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.kernel.util.Validator;
@@ -81,8 +81,11 @@ public void contribute(Document document, AssetCategory assetCategory) {
 			"leftCategoryId", assetCategory.getLeftCategoryId());
 		document.addLocalizedKeyword(
 			"localized_title",
-			_populateMap(assetCategory, assetCategory.getTitleMap()), true,
-			true);
+			LocalizationUtil.populateLocalizationMap(
+				assetCategory.getTitleMap(),
+				assetCategory.getDefaultLanguageId(),
+				assetCategory.getGroupId()),
+			true, true);
 	}
 
 	protected void addSearchAssetCategoryTitles(
@@ -151,25 +154,6 @@ protected Locale getSiteDefaultLocale(AssetCategory assetCategory) {
 	@Reference
 	protected Portal portal;
 
-	private Map<Locale, String> _populateMap(
-		AssetCategory assetCategory, Map<Locale, String> map) {
-
-		String defaultValue = map.get(
-			LocaleUtil.fromLanguageId(assetCategory.getDefaultLanguageId()));
-
-		for (Locale availableLocale :
-				LanguageUtil.getAvailableLocales(assetCategory.getGroupId())) {
-
-			if (!map.containsKey(availableLocale) ||
-				Validator.isNull(map.get(availableLocale))) {
-
-				map.put(availableLocale, defaultValue);
-			}
-		}
-
-		return map;
-	}
-
 	@Reference
 	private SearchLocalizationHelper _searchLocalizationHelper;
 

diff --git a/.../internal/search/spi/model/index/contributor/AssetVocabularyModelDocumentContributor.java b/.../internal/search/spi/model/index/contributor/AssetVocabularyModelDocumentContributor.java
@@ -17,17 +17,14 @@
 import com.liferay.asset.kernel.model.AssetVocabulary;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.search.Document;
 import com.liferay.portal.kernel.search.Field;
-import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.LocalizationUtil;
 import com.liferay.portal.kernel.util.Portal;
-import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.search.localization.SearchLocalizationHelper;
 import com.liferay.portal.search.spi.model.index.contributor.ModelDocumentContributor;
 
 import java.util.Locale;
-import java.util.Map;
 
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -64,8 +61,11 @@ public void contribute(Document document, AssetVocabulary assetVocabulary) {
 
 		document.addLocalizedKeyword(
 			"localized_title",
-			_populateMap(assetVocabulary, assetVocabulary.getTitleMap()), true,
-			true);
+			LocalizationUtil.populateLocalizationMap(
+				assetVocabulary.getTitleMap(),
+				assetVocabulary.getDefaultLanguageId(),
+				assetVocabulary.getGroupId()),
+			true, true);
 	}
 
 	private Locale _getSiteDefaultLocale(long groupId) {
@@ -77,26 +77,6 @@ private Locale _getSiteDefaultLocale(long groupId) {
 		}
 	}
 
-	private Map<Locale, String> _populateMap(
-		AssetVocabulary assetVocabulary, Map<Locale, String> map) {
-
-		String defaultValue = map.get(
-			LocaleUtil.fromLanguageId(assetVocabulary.getDefaultLanguageId()));
-
-		for (Locale availableLocale :
-				LanguageUtil.getAvailableLocales(
-					assetVocabulary.getGroupId())) {
-
-			if (!map.containsKey(availableLocale) ||
-				Validator.isNull(map.get(availableLocale))) {
-
-				map.put(availableLocale, defaultValue);
-			}
-		}
-
-		return map;
-	}
-
 	@Reference
 	private Portal _portal;
 

diff --git a/...ing/internal/search/spi/model/index/contributor/DDMStructureModelDocumentContributor.java b/...ing/internal/search/spi/model/index/contributor/DDMStructureModelDocumentContributor.java
@@ -18,18 +18,15 @@
 import com.liferay.dynamic.data.mapping.model.DDMStructureVersion;
 import com.liferay.dynamic.data.mapping.service.DDMStructureVersionLocalService;
 import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.search.Document;
 import com.liferay.portal.kernel.search.Field;
 import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.LocalizationUtil;
-import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.search.spi.model.index.contributor.ModelDocumentContributor;
 
 import java.util.Locale;
-import java.util.Map;
 
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -92,7 +89,10 @@ public void contribute(Document document, DDMStructure ddmStructure) {
 
 		document.addLocalizedKeyword(
 			"localized_name",
-			_populateMap(ddmStructure, ddmStructure.getNameMap()), true, true);
+			LocalizationUtil.populateLocalizationMap(
+				ddmStructure.getNameMap(), ddmStructure.getDefaultLanguageId(),
+				ddmStructure.getGroupId()),
+			true, true);
 	}
 
 	protected String[] getLanguageIds(
@@ -111,25 +111,6 @@ protected String[] getLanguageIds(
 	@Reference
 	protected DDMStructureVersionLocalService ddmStructureVersionLocalService;
 
-	private Map<Locale, String> _populateMap(
-		DDMStructure ddmStructure, Map<Locale, String> map) {
-
-		String defaultValue = map.get(
-			LocaleUtil.fromLanguageId(ddmStructure.getDefaultLanguageId()));
-
-		for (Locale availableLocale :
-				LanguageUtil.getAvailableLocales(ddmStructure.getGroupId())) {
-
-			if (!map.containsKey(availableLocale) ||
-				Validator.isNull(map.get(availableLocale))) {
-
-				map.put(availableLocale, defaultValue);
-			}
-		}
-
-		return map;
-	}
-
 	private static final Log _log = LogFactoryUtil.getLog(
 		DDMStructureModelDocumentContributor.class);
 

diff --git a/...om/liferay/portal/search/internal/contributor/document/AssetEntryDocumentContributor.java b/...om/liferay/portal/search/internal/contributor/document/AssetEntryDocumentContributor.java
@@ -18,18 +18,14 @@
 import com.liferay.asset.kernel.model.AssetEntry;
 import com.liferay.asset.kernel.model.AssetRendererFactory;
 import com.liferay.asset.kernel.service.AssetEntryLocalService;
-import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.model.BaseModel;
 import com.liferay.portal.kernel.search.Document;
 import com.liferay.portal.kernel.search.DocumentContributor;
 import com.liferay.portal.kernel.search.Field;
 import com.liferay.portal.kernel.util.GetterUtil;
-import com.liferay.portal.kernel.util.LocaleUtil;
-import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.util.LocalizationUtil;
 
 import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
 
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -90,31 +86,15 @@ public void contribute(Document document, BaseModel baseModel) {
 
 		document.addLocalizedKeyword(
 			"localized_title",
-			_populateMap(assetEntry, assetEntry.getTitleMap()), true, true);
+			LocalizationUtil.populateLocalizationMap(
+				assetEntry.getTitleMap(), assetEntry.getDefaultLanguageId(),
+				assetEntry.getGroupId()),
+			true, true);
 		document.addNumber("viewCount", assetEntry.getViewCount());
 		document.addKeyword("visible", assetEntry.isVisible());
 	}
 
 	@Reference
 	protected AssetEntryLocalService assetEntryLocalService;
 
-	private Map<Locale, String> _populateMap(
-		AssetEntry assetEntry, Map<Locale, String> map) {
-
-		String defaultValue = map.get(
-			LocaleUtil.fromLanguageId(assetEntry.getDefaultLanguageId()));
-
-		for (Locale availableLocale :
-				LanguageUtil.getAvailableLocales(assetEntry.getGroupId())) {
-
-			if (!map.containsKey(availableLocale) ||
-				Validator.isNull(map.get(availableLocale))) {
-
-				map.put(availableLocale, defaultValue);
-			}
-		}
-
-		return map;
-	}
-
 }
diff --git a/portal-kernel/src/com/liferay/portal/kernel/search/BaseIndexer.java b/portal-kernel/src/com/liferay/portal/kernel/search/BaseIndexer.java
@@ -1691,20 +1691,8 @@ protected void populateAddresses(
 	protected Map<Locale, String> populateMap(
 		AssetEntry assetEntry, Map<Locale, String> map) {
 
-		String defaultValue = map.get(
-			LocaleUtil.fromLanguageId(assetEntry.getDefaultLanguageId()));
-
-		for (Locale availableLocale :
-				LanguageUtil.getAvailableLocales(assetEntry.getGroupId())) {
-
-			if (!map.containsKey(availableLocale) ||
-				Validator.isNull(map.get(availableLocale))) {
-
-				map.put(availableLocale, defaultValue);
-			}
-		}
-
-		return map;
+		return LocalizationUtil.populateLocalizationMap(
+			map, assetEntry.getDefaultLanguageId(), assetEntry.getGroupId());
 	}
 
 	protected void postProcessFullQuery(