[guava-libraries] 01/05: Merge tag 'upstream/18.0'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri May 22 10:29:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository guava-libraries.

commit 1ae2703ad91d4717e7b65c33bc59985e954105b5
Merge: 0e6bf0a 0fa9364
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 21 19:13:40 2015 +0200

    Merge tag 'upstream/18.0'
    
    Upstream version 18.0

 AUTHORS                                            |   1 +
 README                                             |  10 +-
 guava-gwt/pom.xml                                  |   9 +-
 .../super/com/google/common/base/Charsets.java     |   3 +
 .../base/super/com/google/common/base/Enums.java   |  56 +--
 .../com/google/common/cache/CacheBuilder.java      |  18 +-
 .../com/google/common/collect/FluentIterable.java  |  51 +-
 .../google/common/collect/ImmutableCollection.java |   7 +-
 .../common/collect/ImmutableSetMultimap.java       |   4 +-
 .../super/com/google/common/collect/Iterators.java |   5 +
 .../super/com/google/common/collect/Lists.java     | 111 ++--
 .../super/com/google/common/collect/Maps.java      |   4 +-
 .../com/google/common/collect/TreeMultiset.java    |   6 +-
 .../com/google/common/math/BigIntegerMath.java     |   4 +-
 .../super/com/google/common/math/DoubleMath.java   |   2 +-
 .../super/com/google/common/math/LongMath.java     |  11 +-
 .../super/com/google/common/primitives/Chars.java  |   4 +-
 .../com/google/common/primitives/Doubles.java      |   2 +-
 .../super/com/google/common/primitives/Floats.java |   2 +-
 .../super/com/google/common/primitives/Ints.java   |  97 +++-
 .../super/com/google/common/primitives/Shorts.java |   4 +-
 .../super/com/google/common/base/EnumsTest.java    |  28 --
 .../super/com/google/common/base/OptionalTest.java |  14 +-
 .../super/com/google/common/base/SplitterTest.java | 146 +++---
 .../common/collect/AbstractImmutableSetTest.java   |  14 +-
 .../collect/AbstractSequentialIteratorTest.java    |   6 +-
 .../common/collect/AbstractTableReadTest.java      |   4 +-
 .../common/collect/ArrayListMultimapTest.java      |  10 +-
 .../com/google/common/collect/ArrayTableTest.java  |   6 +-
 .../google/common/collect/Collections2Test.java    |   4 +-
 .../google/common/collect/ContiguousSetTest.java   |  72 +--
 .../com/google/common/collect/EnumBiMapTest.java   |  26 +-
 .../google/common/collect/ImmutableBiMapTest.java  |   6 +-
 .../common/collect/ImmutableEnumMapTest.java       |   4 +-
 .../common/collect/ImmutableListMultimapTest.java  |  34 +-
 .../common/collect/ImmutableMultisetTest.java      |   9 +-
 .../common/collect/ImmutableSetMultimapTest.java   |  34 +-
 .../google/common/collect/ImmutableSetTest.java    |   4 +-
 .../common/collect/ImmutableSortedMapTest.java     |  18 +-
 .../common/collect/ImmutableSortedSetTest.java     |  92 ++--
 .../google/common/collect/ImmutableTableTest.java  |  50 +-
 .../com/google/common/collect/IterablesTest.java   |  18 +-
 .../com/google/common/collect/IteratorsTest.java   |  16 +-
 .../common/collect/LinkedHashMultimapTest.java     |  32 +-
 .../common/collect/LinkedHashMultisetTest.java     |  10 +-
 .../common/collect/LinkedListMultimapTest.java     |  14 +-
 .../super/com/google/common/collect/ListsTest.java |  16 +-
 .../google/common/collect/MapConstraintsTest.java  |  18 +-
 .../super/com/google/common/collect/MapsTest.java  |  87 ++--
 .../google/common/collect/MultimapBuilderTest.java |  19 -
 .../com/google/common/collect/MultimapsTest.java   |  18 +-
 .../com/google/common/collect/MultisetsTest.java   |  70 ++-
 .../google/common/collect/ObjectArraysTest.java    |  14 +-
 .../com/google/common/collect/OrderingTest.java    |   4 +-
 .../super/com/google/common/collect/SetsTest.java  |  32 +-
 .../collect/SingletonImmutableTableTest.java       |   4 +-
 .../google/common/collect/TreeBasedTableTest.java  |  10 +-
 .../common/collect/TreeMultimapExplicitTest.java   |  28 +-
 .../common/collect/TreeMultimapNaturalTest.java    |  20 +-
 .../google/common/collect/TreeMultisetTest.java    |  48 +-
 .../google/common/collect/TreeTraverserTest.java   |  16 +-
 .../testing/google/MultisetRemoveTester.java       |   4 +-
 .../google/common/collect/testing/Platform.java    |   4 -
 .../google/common/net/InternetDomainNameTest.java  |   4 +-
 .../com/google/common/primitives/DoublesTest.java  |   4 +-
 .../com/google/common/primitives/FloatsTest.java   |   4 +-
 .../com/google/common/primitives/IntsTest.java     |  35 +-
 .../com/google/common/primitives/LongsTest.java    |  25 +
 .../test/com/google/common/base/AsciiTest_gwt.java |   5 -
 .../test/com/google/common/base/EnumsTest_gwt.java |  20 -
 .../test/com/google/common/base/testModule.gwt.xml |   2 +-
 .../com/google/common/cache/testModule.gwt.xml     |   2 +-
 .../common/collect/MultimapBuilderTest_gwt.java    |   5 -
 .../google/common/collect/MultisetsTest_gwt.java   |  27 +-
 .../com/google/common/collect/testModule.gwt.xml   |   2 +-
 .../google/common/collect/testing/Testing.gwt.xml  |   2 +-
 .../common/collect/testing/google/Google.gwt.xml   |   2 +-
 .../com/google/common/escape/testModule.gwt.xml    |   1 -
 .../test/com/google/common/html/testModule.gwt.xml |   1 +
 .../test/com/google/common/math/testModule.gwt.xml |   4 +-
 .../test/com/google/common/net/testModule.gwt.xml  |   2 +-
 .../com/google/common/primitives/IntsTest_gwt.java |   5 +
 .../google/common/primitives/LongsTest_gwt.java    |   5 +
 .../google/common/primitives/testModule.gwt.xml    |   2 +-
 .../com/google/common/testing/testModule.gwt.xml   |   2 +-
 guava-testlib/pom.xml                              |   4 +-
 .../testing/FeatureSpecificTestSuiteBuilder.java   |   3 +-
 .../collect/testing/MapTestSuiteBuilder.java       |  14 +-
 .../google/common/collect/testing/Platform.java    |   4 -
 .../collect/testing/features/FeatureUtil.java      |   2 +-
 .../testing/google/AbstractListMultimapTester.java |   8 +-
 .../testing/google/AbstractMultimapTester.java     |  10 +-
 .../testing/google/ListMultimapRemoveTester.java   |   4 +-
 .../testing/google/MultimapAsMapGetTester.java     |  14 +-
 .../testing/google/MultimapAsMapTester.java        |  18 +-
 .../testing/google/MultimapClearTester.java        |  20 +-
 .../testing/google/MultimapEntriesTester.java      |   8 +-
 .../collect/testing/google/MultimapGetTester.java  |  14 +-
 .../collect/testing/google/MultimapKeysTester.java |  10 +-
 .../google/MultimapPutAllMultimapTester.java       |   4 +-
 .../testing/google/MultimapPutIterableTester.java  |   4 +-
 .../collect/testing/google/MultimapPutTester.java  |  16 +-
 .../testing/google/MultimapRemoveAllTester.java    |  14 +-
 .../testing/google/MultimapRemoveEntryTester.java  |   8 +-
 .../google/MultimapReplaceValuesTester.java        |   4 +-
 .../testing/google/MultimapValuesTester.java       |   6 +-
 .../testing/google/MultisetElementSetTester.java   |   6 +-
 .../testing/google/MultisetRemoveTester.java       |   4 +-
 .../google/SortedMultisetTestSuiteBuilder.java     |   2 +-
 .../testing/testers/CollectionAddAllTester.java    |  24 +
 .../testing/testers/CollectionAddTester.java       |  12 +
 .../testing/testers/ListRetainAllTester.java       |   4 +-
 .../collect/testing/testers/MapGetTester.java      |   7 +-
 .../testing/testers/SortedMapNavigationTester.java |   8 +-
 .../google/common/testing/ArbitraryInstances.java  |  33 +-
 .../common/testing/ForwardingWrapperTester.java    |   7 +
 .../concurrent/testing/MockFutureListener.java     |   5 +-
 .../SameThreadScheduledExecutorService.java        |   6 +-
 .../util/concurrent/testing/TestingExecutors.java  |   2 +-
 .../common/collect/testing/OpenJdk6MapTests.java   |  36 +-
 .../collect/testing/features/FeatureUtilTest.java  |  16 +-
 .../testing/AbstractPackageSanityTestsTest.java    |  32 +-
 .../common/testing/ArbitraryInstancesTest.java     |  13 +-
 .../common/testing/ClassSanityTesterTest.java      |  10 +-
 .../common/testing/EquivalenceTesterTest.java      |  12 +-
 .../common/testing/NullPointerTesterTest.java      |   4 +-
 .../ForwardingWrapperTesterTest.java               |   4 +-
 .../com/google/common/math/IntMathBenchmark.java   |   4 +-
 .../com/google/common/math/LongMathBenchmark.java  |   4 +-
 .../util/concurrent/ExecutionListBenchmark.java    |  16 +-
 .../util/concurrent/FuturesCombineBenchmark.java   | 147 ++++++
 .../MoreExecutorsDirectExecutorBenchmark.java      | 117 +++++
 guava-tests/pom.xml                                |   4 +-
 .../test/com/google/common/base/AsciiTest.java     |   2 +
 .../test/com/google/common/base/EnumsTest.java     |  34 --
 .../test/com/google/common/base/JoinerTest.java    |   6 +-
 .../test/com/google/common/base/OptionalTest.java  |  14 +-
 .../test/com/google/common/base/SplitterTest.java  | 182 +++----
 .../com/google/common/cache/AbstractCacheTest.java |  31 +-
 .../google/common/cache/CacheBuilderFactory.java   |   3 +-
 .../com/google/common/cache/CacheEvictionTest.java |  63 ++-
 .../google/common/cache/CacheExpirationTest.java   |  46 +-
 .../com/google/common/cache/CacheLoadingTest.java  |   6 +-
 .../google/common/cache/CacheReferencesTest.java   |   6 +-
 .../google/common/cache/LocalLoadingCacheTest.java |  12 +-
 .../com/google/common/cache/LongAdderTest.java     |  24 +
 .../google/common/cache/PopulatedCachesTest.java   |  21 +-
 .../common/collect/AbstractImmutableSetTest.java   |  14 +-
 .../collect/AbstractSequentialIteratorTest.java    |   6 +-
 .../common/collect/AbstractTableReadTest.java      |   4 +-
 .../common/collect/ArrayListMultimapTest.java      |  10 +-
 .../com/google/common/collect/ArrayTableTest.java  |  12 +-
 .../google/common/collect/Collections2Test.java    |   4 +-
 .../com/google/common/collect/ConstraintsTest.java |  42 +-
 .../google/common/collect/ContiguousSetTest.java   |  72 +--
 .../com/google/common/collect/EnumBiMapTest.java   |  26 +-
 .../common/collect/FilteredCollectionsTest.java    |  10 +-
 .../google/common/collect/FluentIterableTest.java  |  68 ++-
 .../google/common/collect/ForwardingTestCase.java  |  22 +
 .../google/common/collect/ImmutableBiMapTest.java  |   6 +-
 .../common/collect/ImmutableEnumMapTest.java       |   4 +-
 .../common/collect/ImmutableListMultimapTest.java  |  34 +-
 .../common/collect/ImmutableMultisetTest.java      |  12 +-
 .../common/collect/ImmutableRangeSetTest.java      |  20 +-
 .../common/collect/ImmutableSetMultimapTest.java   |  38 +-
 .../google/common/collect/ImmutableSetTest.java    |   4 +-
 .../common/collect/ImmutableSortedMapTest.java     |  18 +-
 .../collect/ImmutableSortedMultisetTest.java       |  12 +-
 .../common/collect/ImmutableSortedSetTest.java     |  92 ++--
 .../google/common/collect/ImmutableTableTest.java  |  50 +-
 .../com/google/common/collect/IterablesTest.java   |  20 +-
 .../com/google/common/collect/IteratorsTest.java   |  16 +-
 .../common/collect/LinkedHashMultimapTest.java     |  36 +-
 .../common/collect/LinkedHashMultisetTest.java     |  10 +-
 .../common/collect/LinkedListMultimapTest.java     |  14 +-
 .../test/com/google/common/collect/ListsTest.java  |  18 +-
 .../google/common/collect/MapConstraintsTest.java  |  18 +-
 .../test/com/google/common/collect/MapsTest.java   | 115 ++---
 .../common/collect/MinMaxPriorityQueueTest.java    |  16 +-
 .../google/common/collect/MultimapBuilderTest.java |  27 +-
 .../com/google/common/collect/MultimapsTest.java   |  26 +-
 .../com/google/common/collect/MultisetsTest.java   |  70 ++-
 .../google/common/collect/NewCustomTableTest.java  |   6 +-
 .../google/common/collect/ObjectArraysTest.java    |  20 +-
 .../com/google/common/collect/OrderingTest.java    |   4 +-
 .../common/collect/RegularImmutableTableTest.java  |   4 +-
 .../test/com/google/common/collect/SetsTest.java   |  36 +-
 .../collect/SingletonImmutableTableTest.java       |   4 +-
 .../common/collect/SynchronizedMultimapTest.java   |  14 +-
 .../google/common/collect/TreeBasedTableTest.java  |  10 +-
 .../common/collect/TreeMultimapExplicitTest.java   |  32 +-
 .../common/collect/TreeMultimapNaturalTest.java    |  32 +-
 .../google/common/collect/TreeMultisetTest.java    |  48 +-
 .../google/common/collect/TreeRangeSetTest.java    | 102 ++--
 .../google/common/collect/TreeTraverserTest.java   |  16 +-
 .../com/google/common/eventbus/EventBusTest.java   |  37 +-
 .../outside/AnnotatedSubscriberFinderTests.java    |  52 +-
 .../com/google/common/hash/BloomFilterTest.java    |  95 +++-
 .../google/common/hash/Crc32cHashFunctionTest.java | 124 +++++
 .../test/com/google/common/hash/HashingTest.java   |   3 +
 .../test/com/google/common/io/ByteSourceTest.java  |   4 +-
 .../test/com/google/common/io/CloserTest.java      |   3 +-
 .../test/com/google/common/io/FilesTest.java       |  42 +-
 .../test/com/google/common/io/ResourcesTest.java   |   4 +-
 .../test/com/google/common/math/IntMathTest.java   |   2 +-
 .../com/google/common/math/MathBenchmarking.java   |  58 ++-
 .../test/com/google/common/math/MathTesting.java   |   1 +
 .../com/google/common/net/HttpHeadersTest.java     |   2 +-
 .../com/google/common/net/InetAddressesTest.java   |  47 ++
 .../google/common/net/InternetDomainNameTest.java  |   4 +-
 .../com/google/common/primitives/DoublesTest.java  |   4 +-
 .../com/google/common/primitives/FloatsTest.java   |   4 +-
 .../com/google/common/primitives/IntsTest.java     |   8 +-
 .../com/google/common/primitives/LongsTest.java    |   9 +-
 .../com/google/common/reflect/ClassPathTest.java   |  66 +--
 .../reflect/ImmutableTypeToInstanceMapTest.java    |   4 +-
 .../reflect/MutableTypeToInstanceMapTest.java      |   6 +-
 .../common/reflect/TypeTokenResolutionTest.java    |   4 +-
 .../com/google/common/reflect/TypeTokenTest.java   | 107 ++--
 .../test/com/google/common/reflect/TypesTest.java  |  17 +-
 .../common/util/concurrent/AbstractFutureTest.java |   6 +-
 .../util/concurrent/AbstractIdleServiceTest.java   |  17 +-
 .../concurrent/AbstractScheduledServiceTest.java   |  68 +--
 .../util/concurrent/AbstractServiceTest.java       |  11 +-
 .../common/util/concurrent/ExecutionListTest.java  |  13 +-
 .../common/util/concurrent/FutureCallbackTest.java | 256 ++++++++++
 .../google/common/util/concurrent/FuturesTest.java |  68 ++-
 ...ityTests.java => InterruptibleMonitorTest.java} |  16 +-
 .../util/concurrent/JdkFutureAdaptersTest.java     |  12 +-
 .../util/concurrent/ListenableFutureTaskTest.java  |   4 +-
 .../util/concurrent/ListenerCallQueueTest.java     |   6 +-
 .../common/util/concurrent/MonitorTestCase.java    | 243 +++++++++
 .../common/util/concurrent/MoreExecutorsTest.java  |  46 +-
 .../common/util/concurrent/PackageSanityTests.java |  14 +
 .../common/util/concurrent/RateLimiterTest.java    | 298 ++++++++---
 .../common/util/concurrent/ServiceManagerTest.java |  49 +-
 .../google/common/util/concurrent/TestThread.java  | 296 +++++++++++
 .../util/concurrent/ThreadFactoryBuilderTest.java  |   4 +-
 ...yTests.java => UninterruptibleMonitorTest.java} |  16 +-
 .../concurrent/WrappingExecutorServiceTest.java    |  17 +-
 .../com/google/common/xml/XmlEscapersTest.java     |  23 +-
 guava/pom.xml                                      |   4 +-
 guava/src/com/google/common/base/Charsets.java     |  18 +
 guava/src/com/google/common/base/Converter.java    |  11 +-
 guava/src/com/google/common/base/Defaults.java     |   3 +
 guava/src/com/google/common/base/Enums.java        |  55 --
 guava/src/com/google/common/base/Equivalence.java  |   2 +-
 .../common/base/FinalizableReferenceQueue.java     |   3 +
 .../common/base/{Objects.java => MoreObjects.java} | 158 +++---
 guava/src/com/google/common/base/Objects.java      |  51 +-
 .../src/com/google/common/base/Preconditions.java  |   5 +-
 .../google/common/base/StandardSystemProperty.java |   3 +
 guava/src/com/google/common/base/Strings.java      |   3 +-
 guava/src/com/google/common/base/Verify.java       |   2 +-
 .../src/com/google/common/cache/AbstractCache.java |   5 +-
 .../src/com/google/common/cache/CacheBuilder.java  |  18 +-
 .../com/google/common/cache/CacheBuilderSpec.java  |   3 +-
 guava/src/com/google/common/cache/CacheStats.java  |   3 +-
 guava/src/com/google/common/cache/LocalCache.java  | 117 ++---
 guava/src/com/google/common/cache/LongAdder.java   |  27 +-
 guava/src/com/google/common/cache/Striped64.java   |  47 +-
 .../google/common/collect/AbstractMultiset.java    |   5 +-
 .../common/collect/ConcurrentHashMultiset.java     |  10 +-
 .../common/collect/FilteredEntryMultimap.java      |   4 +-
 .../com/google/common/collect/FluentIterable.java  |  51 +-
 .../com/google/common/collect/GenericMapMaker.java |   6 +-
 .../google/common/collect/ImmutableCollection.java |   2 +-
 .../com/google/common/collect/ImmutableList.java   |   2 +-
 .../com/google/common/collect/ImmutableSet.java    |   2 +-
 .../common/collect/ImmutableSetMultimap.java       |   4 +-
 .../com/google/common/collect/ImmutableTable.java  |   8 +-
 guava/src/com/google/common/collect/Iterators.java |   5 +
 guava/src/com/google/common/collect/Lists.java     | 111 ++--
 guava/src/com/google/common/collect/MapMaker.java  |  15 +-
 .../google/common/collect/MapMakerInternalMap.java |  68 +--
 guava/src/com/google/common/collect/Maps.java      |  11 +-
 guava/src/com/google/common/collect/Multimap.java  |  14 +-
 guava/src/com/google/common/collect/Multisets.java |  27 +-
 guava/src/com/google/common/collect/Ordering.java  |   2 +
 guava/src/com/google/common/collect/Queues.java    |   2 -
 guava/src/com/google/common/collect/Range.java     |   6 +-
 .../com/google/common/collect/TreeMultiset.java    |   6 +-
 .../com/google/common/collect/TreeRangeMap.java    |   7 +-
 .../com/google/common/collect/TreeRangeSet.java    |   6 +-
 .../common/eventbus/AnnotatedSubscriberFinder.java |  13 +-
 guava/src/com/google/common/hash/BloomFilter.java  | 114 ++++-
 .../com/google/common/hash/Crc32cHashFunction.java | 124 +++++
 guava/src/com/google/common/hash/HashCode.java     |  24 +-
 guava/src/com/google/common/hash/Hashing.java      |  14 +
 guava/src/com/google/common/html/HtmlEscapers.java |   2 +-
 guava/src/com/google/common/io/ByteSink.java       |  17 +-
 guava/src/com/google/common/io/ByteSource.java     |  17 +-
 guava/src/com/google/common/io/ByteStreams.java    | 330 ------------
 guava/src/com/google/common/io/CharSink.java       |  17 +-
 guava/src/com/google/common/io/CharSource.java     |  17 +-
 guava/src/com/google/common/io/CharStreams.java    | 318 ------------
 guava/src/com/google/common/io/Files.java          | 181 +------
 guava/src/com/google/common/io/InputSupplier.java  |   2 +-
 guava/src/com/google/common/io/OutputSupplier.java |   2 +-
 guava/src/com/google/common/io/Resources.java      |  38 +-
 .../src/com/google/common/math/BigIntegerMath.java |   4 +-
 guava/src/com/google/common/math/DoubleMath.java   |   2 +-
 guava/src/com/google/common/math/IntMath.java      |   4 +-
 guava/src/com/google/common/math/LongMath.java     |  20 +-
 guava/src/com/google/common/net/HostAndPort.java   |   1 -
 guava/src/com/google/common/net/InetAddresses.java |  31 +-
 guava/src/com/google/common/net/MediaType.java     |  15 +-
 .../src/com/google/common/net/PercentEscaper.java  |   2 +-
 guava/src/com/google/common/net/UrlEscapers.java   |   6 +-
 .../src/com/google/common/primitives/Booleans.java |   4 +-
 guava/src/com/google/common/primitives/Chars.java  |   4 +-
 .../src/com/google/common/primitives/Doubles.java  |   2 +-
 guava/src/com/google/common/primitives/Floats.java |   2 +-
 guava/src/com/google/common/primitives/Ints.java   |   8 +-
 guava/src/com/google/common/primitives/Longs.java  |   4 +-
 guava/src/com/google/common/primitives/Shorts.java |   4 +-
 guava/src/com/google/common/reflect/Parameter.java |  37 ++
 guava/src/com/google/common/reflect/Types.java     |  54 +-
 .../util/concurrent/AbstractScheduledService.java  |   5 +-
 .../util/concurrent/CycleDetectingLockFactory.java |   4 +-
 .../common/util/concurrent/ExecutionList.java      |  10 +-
 .../com/google/common/util/concurrent/Futures.java | 227 ++++++---
 .../common/util/concurrent/ListenableFuture.java   |   8 +-
 .../common/util/concurrent/MoreExecutors.java      |  79 ++-
 .../google/common/util/concurrent/RateLimiter.java | 556 +++++----------------
 .../com/google/common/util/concurrent/Service.java |   2 +-
 .../common/util/concurrent/ServiceManager.java     | 256 +++++-----
 .../{RateLimiter.java => SmoothRateLimiter.java}   | 550 ++++----------------
 .../com/google/common/util/concurrent/Striped.java |   5 +-
 .../common/util/concurrent/Uninterruptibles.java   |  42 ++
 guava/src/com/google/common/xml/XmlEscapers.java   |  47 +-
 .../publicsuffix/PublicSuffixPatterns.java         |   6 +-
 pom.xml                                            |  11 +-
 333 files changed, 5677 insertions(+), 4794 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guava-libraries.git



More information about the pkg-java-commits mailing list