Changeset 89:247cbbb385de in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

Timestamp:

Feb 4, 2015, 6:37:02 PM (9 years ago)

Author:

casties

Branch:

default

Message:

improved logging.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (4 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -73 +73 @@
 public abstract class AnnotatorResourceImpl extends ServerResource {
 
-    protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.toString());
+        protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.getCanonicalName());
 
     private AnnotationStore store;
@@ -171 +171 @@
         if (authToken == null) {
             if (!((BaseRestlet) getApplication()).isAuthorizationMode()) {
+                // no token, no-auth mode -> anonymous
                 return Person.getAnonymous();
             }
+            // no token, auth mode -> null 
             return null;
         }
-        Person user = null;
                 try {
                         // decode token first to get consumer key
@@ -198 +199 @@
             // userId is mandatory
             String userId = payload.get("userId").getAsString();
-            user = new Person(userId);
+            Person user = new Person(userId);
             // displayName is optional
             if (payload.has("displayName")) {
@@ -212 +213 @@
                 user.groups = groups;
             }
+            logger.fine("auth OK! user=" + user);
+            return user;
         } catch (Exception e) {
             logger.warning("Error checking auth token: "+e.toString());
-            return null;
-        }
-        // must be ok then
-        logger.fine("auth OK! user=" + user);
-        return user;
+        }
+        return null;
     }