From 46b3de5baf37b8c1ceb089f164dba1724f768caa Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 13 Oct 2016 16:26:17 -0400 Subject: [PATCH] PluginContentScanner: Use java.util.Optional Change-Id: I5df1e0b21b727f19ee034e3df54d14d4b54516e1 --- .../httpd/plugins/HttpPluginServlet.java | 4 ++-- .../gerrit/server/plugins/JarScanner.java | 20 ++++++++++--------- .../server/plugins/PluginContentScanner.java | 8 +++----- .../gerrit/server/plugins/PluginEntry.java | 6 +++--- plugins/cookbook-plugin | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java index cd70143de8..77c8bb4be4 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java @@ -21,7 +21,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.stream.Collectors.toList; import com.google.common.base.CharMatcher; -import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.cache.Cache; @@ -72,6 +71,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentMap; import java.util.function.Predicate; import java.util.jar.Attributes; @@ -556,7 +556,7 @@ class HttpPluginServlet extends HttpServlet int d = file.lastIndexOf('.'); return scanner.getEntry(file.substring(0, d) + ".md"); } - return Optional.absent(); + return Optional.empty(); } private void sendMarkdownAsHtml(PluginContentScanner scanner, PluginEntry entry, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java index 73d7b1e1d2..354ccf981f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java @@ -17,12 +17,9 @@ package com.google.gerrit.server.plugins; import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.Iterables.transform; -import com.google.common.base.Optional; -import com.google.common.base.Predicates; import com.google.common.base.Strings; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -49,6 +46,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.jar.Attributes; import java.util.jar.JarEntry; @@ -192,9 +190,9 @@ public class JarScanner implements PluginContentScanner { String annotationName; String annotationValue; String[] interfaces; - Iterable exports; + Collection exports; - private ClassData(Iterable exports) { + private ClassData(Collection exports) { super(Opcodes.ASM5); this.exports = exports; } @@ -214,9 +212,12 @@ public class JarScanner implements PluginContentScanner { @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + if (!visible) { + return null; + } Optional found = - Iterables.tryFind(exports, Predicates.equalTo(desc)); - if (visible && found.isPresent()) { + exports.stream().filter(x -> x.equals(desc)).findAny(); + if (found.isPresent()) { annotationName = desc; return new AbstractAnnotationVisitor() { @Override @@ -287,10 +288,11 @@ public class JarScanner implements PluginContentScanner { } @Override - public Optional getEntry(String resourcePath) throws IOException { + public Optional getEntry(String resourcePath) + throws IOException { JarEntry jarEntry = jarFile.getJarEntry(resourcePath); if (jarEntry == null || jarEntry.getSize() == 0) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(resourceOf(jarEntry)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java index 15bb92f645..c3336382b7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java @@ -14,8 +14,6 @@ package com.google.gerrit.server.plugins; -import com.google.common.base.Optional; - import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; @@ -23,6 +21,7 @@ import java.nio.file.NoSuchFileException; import java.util.Collections; import java.util.Enumeration; import java.util.Map; +import java.util.Optional; import java.util.jar.Manifest; /** @@ -51,9 +50,8 @@ public interface PluginContentScanner { } @Override - public Optional getEntry(String resourcePath) - throws IOException { - return Optional.absent(); + public Optional getEntry(String resourcePath) { + return Optional.empty(); } @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginEntry.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginEntry.java index 74ded733a7..c6077f4763 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginEntry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginEntry.java @@ -11,13 +11,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.plugins; -import com.google.common.base.Optional; +package com.google.gerrit.server.plugins; import java.util.Collections; import java.util.Comparator; import java.util.Map; +import java.util.Optional; /** * Plugin static resource entry @@ -38,7 +38,7 @@ public class PluginEntry { }; private static final Map EMPTY_ATTRS = Collections.emptyMap(); - private static final Optional NO_SIZE = Optional.absent(); + private static final Optional NO_SIZE = Optional.empty(); private final String name; private final long time; diff --git a/plugins/cookbook-plugin b/plugins/cookbook-plugin index 09981c0638..6cb2fcdb54 160000 --- a/plugins/cookbook-plugin +++ b/plugins/cookbook-plugin @@ -1 +1 @@ -Subproject commit 09981c0638f7241a4f435baaa96bd6112a1edaa9 +Subproject commit 6cb2fcdb54d73abf572a5fbb45db644c56f657ce