Remove unnecessarily nested else clauses Change-Id: I0f632a1dc74e66c6583040e151d49594e41836fc

diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java
index 6a17543..fd2ce65 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java

@@ -228,9 +228,8 @@
       if (ifModifiedSince > 0 && ifModifiedSince == lastModified) {
         res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
         return;
-      } else {
-        res.setDateHeader("Last-Modified", lastModified);
       }
+      res.setDateHeader("Last-Modified", lastModified);
     }
     res.setContentType(contentType);
     res.setCharacterEncoding(UTF_8.name());

diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
index a777989..1de0838 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java

@@ -138,12 +138,10 @@
           throw new BadRequestException("incorrect mime type");
         }
         return new ImageInfo(storeImage(pc, content, fileName));
-      } else {
-        throw new MethodNotAllowedException("unsupported encoding");
       }
-    } else {
-      throw new BadRequestException("invalid image data");
+      throw new MethodNotAllowedException("unsupported encoding");
     }
+    throw new BadRequestException("invalid image data");
   }
 
   private String storeImage(ProjectControl pc, byte[] content, String fileName)
@@ -244,10 +242,9 @@
     long local = p.getMaxObjectSizeLimit();
     if (global > 0 && local > 0) {
       return Math.min(global, local);
-    } else {
-      // zero means "no limit", in this case the max is more limiting
-      return Math.max(global, local);
     }
+    // zero means "no limit", in this case the max is more limiting
+    return Math.max(global, local);
   }
 
   public static class ImageInfo {

diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
index 5d5116b..5fd4588 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java

@@ -105,9 +105,8 @@
     List<String> values = getParameters().get(name);
     if (values == null) {
       return null;
-    } else {
-      return values.get(values.size() - 1);
     }
+    return values.get(values.size() - 1);
   }
 
   private static Map<String, List<String>> getParameters() {