From 1efe249e3b2647d2b89489aaa0f57fd4e55f4f60 Mon Sep 17 00:00:00 2001 From: Mars Lan Date: Sat, 8 Aug 2020 13:46:24 -0700 Subject: [PATCH] refactor: remove unused internal models (#1789) --- .../pegasus/com/linkedin/common/Locale.pdl | 22 ------------ .../com/linkedin/common/MultiLocaleString.pdl | 18 ---------- .../com/linkedin/common/MultiProductUrn.pdl | 22 ------------ .../builders/search/BuilderUtils.java | 21 ----------- .../builders/search/BuilderUtilsTest.java | 36 ------------------- 5 files changed, 119 deletions(-) delete mode 100644 li-utils/src/main/pegasus/com/linkedin/common/Locale.pdl delete mode 100644 li-utils/src/main/pegasus/com/linkedin/common/MultiLocaleString.pdl delete mode 100644 li-utils/src/main/pegasus/com/linkedin/common/MultiProductUrn.pdl diff --git a/li-utils/src/main/pegasus/com/linkedin/common/Locale.pdl b/li-utils/src/main/pegasus/com/linkedin/common/Locale.pdl deleted file mode 100644 index a23a202dd4395b..00000000000000 --- a/li-utils/src/main/pegasus/com/linkedin/common/Locale.pdl +++ /dev/null @@ -1,22 +0,0 @@ -namespace com.linkedin.common - -/** - * Motivated by java.util.Locale - */ -record Locale { - - /** - * A lowercase two-letter language code as defined by ISO-639. - */ - language: string - - /** - * An uppercase two-letter country code as defined by ISO-3166. - */ - country: optional string - - /** - * Vendor or browser-specific code. - */ - variant: optional string -} \ No newline at end of file diff --git a/li-utils/src/main/pegasus/com/linkedin/common/MultiLocaleString.pdl b/li-utils/src/main/pegasus/com/linkedin/common/MultiLocaleString.pdl deleted file mode 100644 index ef5138688d2599..00000000000000 --- a/li-utils/src/main/pegasus/com/linkedin/common/MultiLocaleString.pdl +++ /dev/null @@ -1,18 +0,0 @@ -namespace com.linkedin.common - -/** - * Represents a textual field with values for multiple locales. Most readers should use the 'localized' field entry keyed by preferredLocale. - */ -record MultiLocaleString { - - /** - * Maps a locale to a localized version of the string. Each key is a Locale record converted to string format, with the language, country and variant separated by underscores. Examples: 'en', 'de_DE', 'en_US_WIN', 'de__POSIX', 'fr__MAC'. - */ - localized: map[string, string] - - /** - * The preferred locale to use, based on standard rules - */ - @derived - preferredLocale: optional Locale -} \ No newline at end of file diff --git a/li-utils/src/main/pegasus/com/linkedin/common/MultiProductUrn.pdl b/li-utils/src/main/pegasus/com/linkedin/common/MultiProductUrn.pdl deleted file mode 100644 index 678ebf82b463b7..00000000000000 --- a/li-utils/src/main/pegasus/com/linkedin/common/MultiProductUrn.pdl +++ /dev/null @@ -1,22 +0,0 @@ -namespace com.linkedin.common - -/** - * A urn identifying an officially recognized LI multi-product. - */ -@java.class = "com.linkedin.common.urn.MultiProductUrn" -@validate.`com.linkedin.common.validator.TypedUrnValidator` = { - "owningTeam" : "urn:li:internalTeam:tools", - "entityType" : "multiProduct", - "namespace" : "li", - "name" : "MultiProduct", - "doc" : "A urn identifying an officially recognized LI multi-product.", - "owners" : [ "urn:li:corpuser:fbar", "urn:li:corpuser:bfoo" ], - "fields" : [ { - "name" : "productName", - "doc" : "The key found under products for this MP in curli https://tools.corp.linkedin.com/apps/tools/updog/api/v1/mpl/", - "type" : "string", - "maxLength" : 100 - } ], - "maxLength" : 120 -} -typeref MultiProductUrn = string \ No newline at end of file diff --git a/metadata-builders/src/main/java/com/linkedin/metadata/builders/search/BuilderUtils.java b/metadata-builders/src/main/java/com/linkedin/metadata/builders/search/BuilderUtils.java index 0450698db130e6..c6e6cb7430c027 100644 --- a/metadata-builders/src/main/java/com/linkedin/metadata/builders/search/BuilderUtils.java +++ b/metadata-builders/src/main/java/com/linkedin/metadata/builders/search/BuilderUtils.java @@ -3,16 +3,13 @@ import com.linkedin.common.CorpGroupUrnArray; import com.linkedin.common.CorpuserUrnArray; import com.linkedin.common.DatasetUrnArray; -import com.linkedin.common.MultiLocaleString; import com.linkedin.common.Owner; import com.linkedin.common.Ownership; import com.linkedin.common.urn.CorpuserUrn; import com.linkedin.common.urn.DatasetUrn; import com.linkedin.common.urn.Urn; -import com.linkedin.data.template.GetMode; import com.linkedin.data.template.StringArray; import java.net.URISyntaxException; -import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nonnull; import lombok.extern.slf4j.Slf4j; @@ -76,24 +73,6 @@ public static StringArray getCorpGroupnames(@Nonnull CorpGroupUrnArray corpgroup return corpgroupUrns.stream().map(urn -> urn.getGroupNameEntity()).collect(Collectors.toCollection(StringArray::new)); } - /** - * Convert a Multi locale String to users preferred language - * @param multiLocaleString - * @param locale {@link String} User's preferred language such as "en_US" - * @return Localized String - */ - @Nonnull - public static String convertMultiLocaleStringToString(@Nonnull MultiLocaleString multiLocaleString, @Nonnull String locale) { - String convertedString = multiLocaleString.getLocalized().get(locale); - if (convertedString == null) { - Set keySet = multiLocaleString.getLocalized(GetMode.STRICT).keySet(); - if (!keySet.isEmpty() && keySet.iterator().hasNext()) { - convertedString = multiLocaleString.getLocalized().get(keySet.iterator().next()); - } - } - return convertedString != null ? convertedString : ""; - } - /** * Get normalized browse field by replacing special browse hiearchy seperator's with a replacement * @param field browse field diff --git a/metadata-builders/src/test/java/com/linkedin/metadata/builders/search/BuilderUtilsTest.java b/metadata-builders/src/test/java/com/linkedin/metadata/builders/search/BuilderUtilsTest.java index ea8454b8e4f874..36701e6674d034 100644 --- a/metadata-builders/src/test/java/com/linkedin/metadata/builders/search/BuilderUtilsTest.java +++ b/metadata-builders/src/test/java/com/linkedin/metadata/builders/search/BuilderUtilsTest.java @@ -2,7 +2,6 @@ import com.linkedin.common.DatasetUrnArray; import com.linkedin.common.FabricType; -import com.linkedin.common.MultiLocaleString; import com.linkedin.common.Owner; import com.linkedin.common.OwnerArray; import com.linkedin.common.Ownership; @@ -10,7 +9,6 @@ import com.linkedin.common.urn.CorpuserUrn; import com.linkedin.common.urn.DataPlatformUrn; import com.linkedin.common.urn.DatasetUrn; -import com.linkedin.data.template.StringMap; import java.util.Arrays; import java.util.List; import org.testng.annotations.Test; @@ -39,38 +37,4 @@ public void testGetDatasetNames() { assertEquals(BuilderUtils.getDatasetNames(datasetUrns), Arrays.asList("testDataset1", "testDataset2")); } - @Test - public void testMultiLocale() { - - String enUSLocale = "en_US"; - String enINLocale = "en_IN"; - String deDELocale = "de_DE"; - - String enUSStr = "English USA"; - String enINStr = "English India"; - String deDEStr = "German String"; - - MultiLocaleString multiLocaleString = new MultiLocaleString(); - StringMap stringMap = new StringMap(); - multiLocaleString.setLocalized(stringMap); - assertEquals(BuilderUtils.convertMultiLocaleStringToString(multiLocaleString, enUSLocale), ""); - - stringMap.put(enUSLocale, enUSStr); - multiLocaleString.setLocalized(stringMap); - assertEquals(BuilderUtils.convertMultiLocaleStringToString(multiLocaleString, enUSLocale), enUSStr); - - MultiLocaleString multiLocaleString1 = new MultiLocaleString(); - StringMap stringMap1 = new StringMap(); - stringMap1.put(enINLocale, enINStr); - multiLocaleString1.setLocalized(stringMap1); - assertEquals(BuilderUtils.convertMultiLocaleStringToString(multiLocaleString1, enUSLocale), enINStr); - - MultiLocaleString multiLocaleString2 = new MultiLocaleString(); - StringMap stringMap2 = new StringMap(); - stringMap2.put(enINLocale, enINStr); - stringMap2.put(deDELocale, deDEStr); - stringMap2.put(enUSLocale, enUSStr); - multiLocaleString2.setLocalized(stringMap2); - assertEquals(BuilderUtils.convertMultiLocaleStringToString(multiLocaleString2, enUSLocale), enUSStr); - } }