-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature] Support langCodeAliases (#141)
`langCodeAliases` lets you specify the language identifier for your supported languages. > For example, the default language identifier for English is `en`, such that a URL for your page in English language may look like `http://site.com/en/page`. > With `langCodeAliases`, you can change the language identifier to `us`, for example. The resulting URL would look like `http://site.com/us/page` instead. See README for more details. ### Comments This feature is relevant for path, query, and subdomain url patterns. As a result, the methods `getLang`, `convertToDefaultLanguage`, and `convertToTargetLanguage` has changed quite a bit for these pattern handlers. `langCodeAliases` is a two-in-one feature from an implementation perspective. Allowing alias for a target language is a simple change, we only need to replace the default language code for identifying the language. When an alias is set for default language, it changes the rules for interpreting requests. Request URLs without an explicit language identifier will now be ignored. `getLang` has been changed to return `null` _only for input URLs that cannot be intercepted_. For any URL that WovnServletFilter should process, `getLang` will either return default language or a target language. (The last pattern handler, `CustomDomainUrlLanguagePatternHandler` already conforms to this behavior.) With the new behavior of `getLang` , there is no longer need for the method `canInterceptUrl`. It has been removed.
- Loading branch information
Showing
24 changed files
with
791 additions
and
260 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/main/java/com/github/wovnio/wovnjava/LanguageAliasSerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package com.github.wovnio.wovnjava; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Map; | ||
| import java.util.LinkedHashMap; | ||
|
|
||
| class LanguageAliasSerializer { | ||
| private LanguageAliasSerializer() {} | ||
|
|
||
| public static Map<Lang, String> deserializeFilterConfig(String rawLangCodeAliases) throws ConfigurationError { | ||
| Map<Lang, String> langCodeAliases = new LinkedHashMap<Lang, String>(); | ||
|
|
||
| if (rawLangCodeAliases == null || rawLangCodeAliases.isEmpty()) { | ||
| return langCodeAliases; | ||
| } | ||
|
|
||
| for (String rawPair : rawLangCodeAliases.split(",")) { | ||
| if (rawPair == null || rawPair.isEmpty()) { | ||
| continue; | ||
| } | ||
| String[] splitPair = rawPair.split(":"); | ||
| if (splitPair.length != 2) { | ||
| throw new ConfigurationError("Invalid configuration format for \"langCodeAliases\": " + rawLangCodeAliases); | ||
| } | ||
|
|
||
| Lang lang = Lang.get(splitPair[0].trim()); | ||
| if (lang == null) { | ||
| throw new ConfigurationError("Invalid source language for \"langCodeAliases\", each left-hand value must match a supported language code."); | ||
| } | ||
|
|
||
| String alias = splitPair[1].trim(); | ||
| langCodeAliases.put(lang, alias); | ||
| } | ||
|
|
||
| return langCodeAliases; | ||
| } | ||
|
|
||
| public static String serializeToJson(Map<Lang, String> langCodeAliases) { | ||
| if (langCodeAliases == null || langCodeAliases.size() < 1) return "{}"; | ||
|
|
||
| ArrayList<String> items = new ArrayList<String>(); | ||
| for (Map.Entry<Lang, String> langCodeAlias : langCodeAliases.entrySet()) { | ||
| Lang lang = langCodeAlias.getKey(); | ||
| String alias = langCodeAlias.getValue(); | ||
| items.add(lang.code + "\":\"" + alias); | ||
| } | ||
| return "{\"" + String.join("\",\"", items) + "\"}"; | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
src/main/java/com/github/wovnio/wovnjava/LanguageAliases.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.github.wovnio.wovnjava; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Map; | ||
| import java.util.HashMap; | ||
| import java.net.URL; | ||
|
|
||
| class LanguageAliases { | ||
| public final boolean hasAliasForDefaultLang; | ||
|
|
||
| private final Map<Lang, String> langMap; | ||
|
|
||
| public LanguageAliases(ArrayList<Lang> supportedLangs, Map<Lang, String> langCodeAliases, Lang defaultLang) { | ||
| this.hasAliasForDefaultLang = langCodeAliases.get(defaultLang) != null; | ||
|
|
||
| HashMap<Lang, String> langMap = new HashMap<Lang, String>(); | ||
| for (Lang lang : supportedLangs) { | ||
| String alias = langCodeAliases.get(lang); | ||
| langMap.put(lang, (alias != null) ? alias : lang.code); | ||
| } | ||
| this.langMap = langMap; | ||
| } | ||
|
|
||
| public String getAliasFromLanguage(Lang lang) { | ||
| return this.langMap.get(lang); | ||
| } | ||
|
|
||
| public Lang getLanguageFromAlias(String alias) { | ||
| for (Map.Entry<Lang, String> entry : this.langMap.entrySet()) { | ||
| if (entry.getValue().equals(alias)) { | ||
| return entry.getKey(); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.