This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2d633aa96aff4935691647e6ef4daed9d854110a Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Tue Dec 10 10:38:38 2019 +0700 [Refactoring] Remove TikaContainerSingletonRule As we wrote a new Tika extension with a new singleton instance of a Tika container, and moved all test classes using the singleton rule to the new extension with JUnit 5, we don't need the old singleton rule anymore. --- .../mailbox/tika/TikaContainerSingletonRule.java | 56 ---------------------- 1 file changed, 56 deletions(-) diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainerSingletonRule.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainerSingletonRule.java deleted file mode 100644 index 1fefb78..0000000 --- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainerSingletonRule.java +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, 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 org.apache.james.mailbox.tika; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -public class TikaContainerSingletonRule implements TestRule { - - public static final TikaContainerSingletonRule rule = new TikaContainerSingletonRule(new TikaContainer()); - - private final TikaContainer tikaContainer; - - private TikaContainerSingletonRule(TikaContainer tikaContainer) { - this.tikaContainer = tikaContainer; - this.tikaContainer.start(); - } - - @Override - public Statement apply(Statement statement, Description description) { - return statement; - } - - public String getIp() { - return tikaContainer.getIp(); - } - - public int getPort() { - return tikaContainer.getPort(); - } - - public int getTimeoutInMillis() { - return tikaContainer.getTimeoutInMillis(); - } - - // Cleanup will be performed by test container resource reaper - -} --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org