safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-579: Clean up comments, implement convenience method for tokens without a prefix, and remove unneeded classes.

Browse Source
This commit is contained in:
Virtually Nick
2019-06-20 20:41:41 -04:00
parent 8ab9e51009
commit d8db630dbd
10 changed files with 62 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
guacamole-ext/src/main/java/org/apache/guacamole/token/TokenName.java
View File

@@ -65,7 +65,8 @@ public abstract class TokenName {
* automatically be transformed from "CamelCase", "headlessCamelCase",
* "lowercase_with_underscores", and "mixes_ofBoth_Styles" to consistent
* "UPPERCASE_WITH_UNDERSCORES". Each returned attribute will be prefixed
* with "LDAP_".
* with value provided in the prefix. The value provided in prefix will
* be prepended to the attribute name, but will itself not be transformed.
*
* @param name
* The name of the attribute to use to generate the token name.
@@ -99,5 +100,21 @@ public abstract class TokenName {
return builder.toString();
}
/**
* Generate the name of a parameter from the value of the given attribute,
* and with a blank prefix such that the token name will simply be the
* transformed version of the attribute name.
*
* @param name
* The name of the attribute to use to generate the token name.
*
* @return
* The name of the parameter token that should be populated with the
* value of the attribute having the given name.
*/
public static String fromAttribute(final String name) {
return fromAttribute(name, "");
}
}

31
guacamole-ext/src/test/java/org/apache/guacamole/token/TokenNameTest.java
View File

@@ -34,20 +34,23 @@ public class TokenNameTest {
*/
@Test
public void testFromAttribute() {
assertEquals("A", TokenName.fromAttribute("a", ""));
assertEquals("B", TokenName.fromAttribute("b", ""));
assertEquals("1", TokenName.fromAttribute("1", ""));
assertEquals("SOME_URL", TokenName.fromAttribute("someURL", ""));
assertEquals("LOWERCASE_WITH_DASHES", TokenName.fromAttribute("lowercase-with-dashes", ""));
assertEquals("HEADLESS_CAMEL_CASE", TokenName.fromAttribute("headlessCamelCase", ""));
assertEquals("CAMEL_CASE", TokenName.fromAttribute("CamelCase", ""));
assertEquals("CAMEL_CASE", TokenName.fromAttribute("CamelCase", ""));
assertEquals("LOWERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("lowercase_with_underscores", ""));
assertEquals("UPPERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("UPPERCASE_WITH_UNDERSCORES", ""));
assertEquals("A_VERY_INCONSISTENT_MIX_OF_ALL_STYLES", TokenName.fromAttribute("aVery-INCONSISTENTMix_ofAllStyles", ""));
assertEquals("ABC_123_DEF_456", TokenName.fromAttribute("abc123def456", ""));
assertEquals("ABC_123_DEF_456", TokenName.fromAttribute("ABC123DEF456", ""));
assertEquals("WORD_A_WORD_AB_WORD_ABC_WORD", TokenName.fromAttribute("WordAWordABWordABCWord", ""));
assertEquals("A", TokenName.fromAttribute("a"));
assertEquals("B", TokenName.fromAttribute("b"));
assertEquals("1", TokenName.fromAttribute("1"));
assertEquals("SOME_URL", TokenName.fromAttribute("someURL"));
assertEquals("LOWERCASE_WITH_DASHES", TokenName.fromAttribute("lowercase-with-dashes"));
assertEquals("HEADLESS_CAMEL_CASE", TokenName.fromAttribute("headlessCamelCase"));
assertEquals("CAMEL_CASE", TokenName.fromAttribute("CamelCase"));
assertEquals("CAMEL_CASE", TokenName.fromAttribute("CamelCase"));
assertEquals("LOWERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("lowercase_with_underscores"));
assertEquals("UPPERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("UPPERCASE_WITH_UNDERSCORES"));
assertEquals("A_VERY_INCONSISTENT_MIX_OF_ALL_STYLES", TokenName.fromAttribute("aVery-INCONSISTENTMix_ofAllStyles"));
assertEquals("ABC_123_DEF_456", TokenName.fromAttribute("abc123def456"));
assertEquals("ABC_123_DEF_456", TokenName.fromAttribute("ABC123DEF456"));
assertEquals("WORD_A_WORD_AB_WORD_ABC_WORD", TokenName.fromAttribute("WordAWordABWordABCWord"));
assertEquals("AUTH_ATTRIBUTE", TokenName.fromAttribute("Attribute", "AUTH_"));
assertEquals("auth_SOMETHING", TokenName.fromAttribute("Something", "auth_"));
}
}