From commits-return-1463-apmail-any23-commits-archive=any23.apache.org@any23.apache.org Wed Jul 11 20:57:27 2018 Return-Path: X-Original-To: apmail-any23-commits-archive@www.apache.org Delivered-To: apmail-any23-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 45E35185B2 for ; Wed, 11 Jul 2018 20:57:27 +0000 (UTC) Received: (qmail 25197 invoked by uid 500); 11 Jul 2018 20:57:27 -0000 Delivered-To: apmail-any23-commits-archive@any23.apache.org Received: (qmail 25154 invoked by uid 500); 11 Jul 2018 20:57:27 -0000 Mailing-List: contact commits-help@any23.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: any23-dev@any23.apache.org Delivered-To: mailing list commits@any23.apache.org Received: (qmail 25145 invoked by uid 99); 11 Jul 2018 20:57:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2018 20:57:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10C32E08DE; Wed, 11 Jul 2018 20:57:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hansbrende@apache.org To: commits@any23.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: any23 git commit: ANY23-365 resolved additional warnings Date: Wed, 11 Jul 2018 20:57:27 +0000 (UTC) Repository: any23 Updated Branches: refs/heads/master 5a2613b84 -> 3f87cf3a8 ANY23-365 resolved additional warnings Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/3f87cf3a Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/3f87cf3a Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/3f87cf3a Branch: refs/heads/master Commit: 3f87cf3a8ca51650376d7f111613fe0c1eda74d5 Parents: 5a2613b Author: Hans Authored: Wed Jul 11 15:53:05 2018 -0500 Committer: Hans Committed: Wed Jul 11 15:53:05 2018 -0500 ---------------------------------------------------------------------- api/src/main/java/org/apache/any23/plugin/Author.java | 4 ++++ cli/src/main/java/org/apache/any23/cli/PluginVerifier.java | 4 ++-- service/src/main/java/org/apache/any23/servlet/WebResponder.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/3f87cf3a/api/src/main/java/org/apache/any23/plugin/Author.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/plugin/Author.java b/api/src/main/java/org/apache/any23/plugin/Author.java index 86ae20a..a113a15 100644 --- a/api/src/main/java/org/apache/any23/plugin/Author.java +++ b/api/src/main/java/org/apache/any23/plugin/Author.java @@ -17,11 +17,15 @@ package org.apache.any23.plugin; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * Describes the author of the plugin. * * @author Michele Mostarda (mostarda@fbk.eu) */ +@Retention(RetentionPolicy.RUNTIME) public @interface Author { /** http://git-wip-us.apache.org/repos/asf/any23/blob/3f87cf3a/cli/src/main/java/org/apache/any23/cli/PluginVerifier.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/any23/cli/PluginVerifier.java b/cli/src/main/java/org/apache/any23/cli/PluginVerifier.java index f3f3234..a43065d 100644 --- a/cli/src/main/java/org/apache/any23/cli/PluginVerifier.java +++ b/cli/src/main/java/org/apache/any23/cli/PluginVerifier.java @@ -76,11 +76,11 @@ public class PluginVerifier implements Tool { return sb.toString(); } - private void printPluginData(ExtractorFactory extractorFactory, PrintStream ps) { + private void printPluginData(ExtractorFactory extractorFactory, PrintStream ps) { final Author authorAnnotation = extractorFactory.getClass().getAnnotation(Author.class); ps.printf("Plugin author : %s%n", authorAnnotation == null ? "" : authorAnnotation.name()); ps.printf("Plugin factory : %s%n", extractorFactory.getClass()); - ps.printf("Plugin mime-types: %s%n", getMimeTypesStr( extractorFactory.getSupportedMIMETypes() )); + ps.printf("Plugin mime-types: %s%n", getMimeTypesStr(extractorFactory.getSupportedMIMETypes())); } } http://git-wip-us.apache.org/repos/asf/any23/blob/3f87cf3a/service/src/main/java/org/apache/any23/servlet/WebResponder.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/any23/servlet/WebResponder.java b/service/src/main/java/org/apache/any23/servlet/WebResponder.java index b9641d2..024bf70 100644 --- a/service/src/main/java/org/apache/any23/servlet/WebResponder.java +++ b/service/src/main/java/org/apache/any23/servlet/WebResponder.java @@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.nio.charset.Charset; +import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -45,7 +46,6 @@ import org.apache.any23.writer.TripleHandler; import org.apache.any23.writer.TripleHandlerException; import org.apache.any23.writer.WriterFactory; import org.apache.any23.writer.WriterFactoryRegistry; -import sun.security.validator.ValidatorException; /** * This class is responsible for building the {@link Servlet} @@ -127,7 +127,7 @@ class WebResponder { } } catch (IOException ioe) { // IO Error. - if (ioe.getCause() != null && ValidatorException.class.equals(ioe.getCause().getClass())) { + if (ioe.getCause() instanceof CertificateException) { final String errMsg = "Could not fetch input, IO Error."; any23servlet.log(errMsg, ioe.getCause()); sendError(502, errMsg, ioe, null, report);