Author: reschke Date: Wed Oct 9 16:10:40 2019 New Revision: 1868196 URL: http://svn.apache.org/viewvc?rev=1868196&view=rev Log: OAK-8687: deprecate Guava based APIs in ManagementOperation
Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java?rev=1868196&r1=1868195&r2=1868196&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperation.java Wed Oct 9 16:10:40 2019 @@ -41,6 +41,7 @@ import java.util.concurrent.ExecutionExc import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; @@ -51,9 +52,8 @@ import javax.management.openmbean.Tabula import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; -import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; import org.apache.jackrabbit.oak.commons.TimeDurationFormatter; +import org.apache.jackrabbit.oak.spi.GuavaDeprecation; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,7 +88,7 @@ public class ManagementOperation<R> exte public static <R> ManagementOperation<R> newManagementOperation( @NotNull String name, @NotNull Callable<R> task) { - return new ManagementOperation<R>(name, Suppliers.ofInstance(""), task); + return new ManagementOperation<R>(name, () -> "", task); } /** @@ -108,6 +108,17 @@ public class ManagementOperation<R> exte } /** + * @deprecated use {@link #newManagementOperation(String, Supplier, Callable)} instead + */ + @Deprecated public static <R> ManagementOperation<R> newManagementOperation( + @NotNull String name, + @NotNull com.google.common.base.Supplier<String> statusMessage, + @NotNull Callable<R> task) { + GuavaDeprecation.handleCall("OAK-8687"); + return new ManagementOperation<R>(name, () -> statusMessage.get(), task); + } + + /** * An operation that is already done with the given {@code value}. * * @param name name of the operation @@ -116,7 +127,7 @@ public class ManagementOperation<R> exte */ @NotNull public static <R> ManagementOperation<R> done(String name, final R result) { - return new ManagementOperation<R>("done", Suppliers.ofInstance(""), + return new ManagementOperation<R>("done", () -> "", new Callable<R>() { @Override public R call() throws Exception { Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java?rev=1868196&r1=1868195&r2=1868196&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java (original) +++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java Wed Oct 9 16:10:40 2019 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("1.0.1") +@Version("1.1.0") package org.apache.jackrabbit.oak.commons.jmx; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java?rev=1868196&r1=1868195&r2=1868196&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java Wed Oct 9 16:10:40 2019 @@ -67,6 +67,7 @@ import java.util.concurrent.atomic.Atomi import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.function.Supplier; import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; @@ -75,7 +76,6 @@ import javax.management.NotCompliantMBea import javax.management.ObjectName; import com.google.common.base.Predicate; -import com.google.common.base.Supplier; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableScheduledFuture; @@ -280,12 +280,7 @@ public class SegmentCompactionIT { fileStore.cancelGC(); } }; - Supplier<String> status = new Supplier<String>() { - @Override - public String get() { - return fileStoreGCMonitor.getStatus(); - } - }; + Supplier<String> status = () -> fileStoreGCMonitor.getStatus(); List<Registration> registrations = newArrayList(); registrations.add(registerMBean(segmentCompactionMBean, Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1868196&r1=1868195&r2=1868196&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java (original) +++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java Wed Oct 9 16:10:40 2019 @@ -44,13 +44,13 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; import javax.sql.DataSource; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Strings; -import com.google.common.base.Supplier; import com.google.common.io.Closer; import com.google.common.util.concurrent.UncheckedExecutionException; import com.mongodb.MongoClientURI; Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java?rev=1868196&r1=1868195&r2=1868196&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java Wed Oct 9 16:10:40 2019 @@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.plugin import java.io.File; import java.lang.reflect.Field; import java.util.Map; +import java.util.function.Supplier; -import com.google.common.base.Supplier; import com.google.common.collect.Maps; import com.mongodb.MongoClient; @@ -184,7 +184,7 @@ public class DocumentNodeStoreServiceTes } assertNotNull(rgcJob); assertTrue(rgcJob instanceof Supplier); - assertNotNull(((Supplier) rgcJob).get()); + assertNotNull(((Supplier<String>) rgcJob).get()); } @Test Modified: jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java?rev=1868196&r1=1868195&r2=1868196&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java (original) +++ jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java Wed Oct 9 16:10:40 2019 @@ -27,11 +27,10 @@ import static org.apache.jackrabbit.oak. import java.util.concurrent.Callable; import java.util.concurrent.Executor; +import java.util.function.Supplier; import javax.management.openmbean.CompositeData; -import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; @@ -87,7 +86,7 @@ public class RevisionGC implements Revis @NotNull Runnable runGC, @NotNull Runnable cancelGC, @NotNull Executor executor) { - this(runGC, cancelGC, Suppliers.ofInstance(""), executor); + this(runGC, cancelGC, () -> "", executor); } @NotNull