Refactored to avoid using null as it is a project definition.

yegor256 · May 22, 2015 · a569d1d · a569d1d
1 parent b119492
commit a569d1d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/src/main/java/org/takes/facets/auth/PsByFlag.java b/src/main/java/org/takes/facets/auth/PsByFlag.java
@@ -100,7 +100,7 @@ public PsByFlag(final String flg, final Map<Pattern, Pass> map) {
     public Opt<Identity> enter(final Request req) throws IOException {
         final Iterator<String> flg = new RqHref.Base(req).href()
             .param(this.flag).iterator();
-        Opt<Identity> user = null;
+        Opt<Identity> user = new Opt.Empty<Identity>();
         if (flg.hasNext()) {
             final String value = flg.next();
             for (final Map.Entry<Pattern, Pass> ent : this.passes.entrySet()) {
@@ -109,9 +109,6 @@ public Opt<Identity> enter(final Request req) throws IOException {
                 }
             }
         }
-        if (user == null) {
-            user = new Opt.Empty<Identity>();
-        }
         return user;
     }
 

diff --git a/src/main/java/org/takes/facets/auth/PsChain.java b/src/main/java/org/takes/facets/auth/PsChain.java
@@ -65,16 +65,13 @@ public PsChain(final Iterable<Pass> list) {
 
     @Override
     public Opt<Identity> enter(final Request req) throws IOException {
-        Opt<Identity> user = null;
+        Opt<Identity> user = new Opt.Empty<Identity>();
         for (final Pass pass : this.passes) {
             user = pass.enter(req);
             if (user.has()) {
                 break;
             }
         }
-        if (user == null) {
-            user = new Opt.Empty<Identity>();
-        }
         return user;
     }
 

diff --git a/src/main/java/org/takes/facets/auth/PsCookie.java b/src/main/java/org/takes/facets/auth/PsCookie.java
@@ -98,15 +98,12 @@ public PsCookie(final Codec cdc, final String name, final long sec) {
     public Opt<Identity> enter(final Request req) throws IOException {
         final Iterator<String> cookies = new RqCookies.Base(req)
             .cookie(this.cookie).iterator();
-        Opt<Identity> user = null;
+        Opt<Identity> user = new Opt.Empty<Identity>();
         if (cookies.hasNext()) {
             user = new Opt.Single<Identity>(
                 this.codec.decode(cookies.next().getBytes())
             );
         }
-        if (user == null) {
-            user = new Opt.Empty<Identity>();
-        }
         return user;
     }