Changeset 1230 for trunk

Timestamp:

02/04/19 13:44:13 (5 years ago)

Author:

bln4

Message:

org.expeditee.auth.AuthenticationTag ->

Optionally choose not to use defaults (equiv to default being null)

File:

• trunk/src/org/expeditee/auth/AuthenticationTag.java (modified) (2 diffs)

trunk/src/org/expeditee/auth/AuthenticationTag.java

@@ -26 +26 @@
         }
         
-        public static Optional<Map<AuthenticationTag, String>> fetchUserData(final Collection<Text> from, final AuthenticationTag... tags) {
+        public static Optional<Map<AuthenticationTag, String>> fetchUserData(Collection<Text> from, boolean useDefaults, AuthenticationTag... tags) {
                 final Map<AuthenticationTag, String> fetchedData = new HashMap<AuthenticationTag, String>();
                 
-                for (final AuthenticationTag tag: tags) {
-                        for (final Text canditate: from) {
+                for (AuthenticationTag tag: tags) {
+                        for (Text canditate: from) {
                                 // use the canditate if it exists
                                 if (canditate.hasData(tag.val)) {
@@ -37 +37 @@
                                 }
                                 // otherwise try use the default
-                                final String property = tag.def;
+                                String property = tag.def;
                                 if (property != null && !property.isEmpty()) { 
-                                        fetchedData.put(tag, property); 
+                                        fetchedData.put(tag, useDefaults ? property : null); 
                                 }
                         }