Commit Graph

2983 Commits

Author SHA1 Message Date
Claude Warren 750b8797bf added missing license 2022-06-29 12:44:30 +01:00
Claude Warren 788120b249 put IndexFilter in separate file.
put BitMapTracker and ArrayTracker back as enclosed classes in
IndexFilter
2022-06-29 12:41:52 +01:00
Claude Warren 8bad223f22 Added new lines at end of files 2022-06-29 10:07:12 +01:00
Claude Warren d83704ab30 moved ArrayTracker and BitMapTracker to their own files. 2022-06-29 09:54:17 +01:00
Claude Warren a79ea005b1
Move counting long predicate (#314)
* Moved CounitngLongPredicate

* Moved CounitngLongPredicate

* fixed checkstyle issues

* made instance vars private
2022-06-25 11:25:44 -04:00
Claude Warren 87647d0812
Simplify bloom filters (#258)
* Fixed some unit tests

* First set with complete test cases.

* Cleaned up hasher collecton processing

* cleaned up code

* added license headers

* Refactored and cleaned up

Moved to dependency on BitMapProducer, IndexProducer and
BitCountProducer to retrieve internal representations of the data.

* Added license header.

* Updated documentation

* Fixed bug and added tests

* Added "@since 4.5" where necessary

* Added BitMapProducer constructor to SimpleBloomFilter

* added BitMapProducer.fromLongArray() and Hasher.isEmpty()

* Changes to speed up Simple filter processing

* Null hasher used when a hasher is required but no values are available.

* Added Hasher.Filter and Hasher.FilteredIntConsumer

* Updated documentation + formatted.

* Added license

* fixed checkstyle issues

* fixed javadoc issues

* fixed test issue

* fixed javadoc issues

* Reduced the acceptable delta for p tests

* Updated docs and test cases

* Updated docs and test cases

* fixed issue with Shape javadoc

* Added more test coverage.

* fixed formatting issues

* Updated tests to use assertThrows.

* fixed indents

* Added constructor with IndexProducer

* Fixed issue with compare and different length bitMap arrays

* fixed formatting issues

* Efficiency changes

cleaned up asIndexArray

BitMapProducer to IndexProducer conversion

* changed XProviers to use XPredicates

* Removed NoMatchException

* Removed unneeded BitMap funcs

Moves isSparse() to Shape.

* fixed checkstyle issues

* Fixed javadoc errors

* simplified parameter in BitMapProducer.fromIndexProducer

* fixed tests

* added BitMapping verification

* Added more tests

* Added more tests

* Fixed typos

* Changes requested  by aherbert

* fixed "bit map" in documentation

* Renamed tests

* Removed blank lines

* changed new X<foo> to new X<>

* updated documentation

* Added BloomFilter.copy()

* changed ArrayCountingBloomFilter to use copy() method

* cleaned up numberOfBitsMaps()

* added asBitMapArray() and makePredicate() to BitMapProducer

* Moved asIndexArray() to IndexProducer

* harmonized Simple and Sparse Bloom filter constructors

* Implemented AbstractCountingBloomFilter.asindexArray()

* updated documentation

* fixed up NullHasher

* implemented hasher filter

* Fixed style issues

* added default SimpleHasher increment.

* Added modulus calculation to SimpleHasher

* fixed Hashing issues

* moved hasher/filter/* to /hasher

* moved bloomfilter/hasher to bloomfilter

* fixed up checkstyle issues

* Made Filter -> IndexFilter -w- factory

* moved IndexFilter into Hasher

* updated hashing tests & fixed checksyle

* removed SingleItemhasherCollection as associated methods

* Fixed some unit tests

* First set with complete test cases.

* Cleaned up hasher collecton processing

* cleaned up code

* added license headers

* Refactored and cleaned up

Moved to dependency on BitMapProducer, IndexProducer and
BitCountProducer to retrieve internal representations of the data.

* Added license header.

* Updated documentation

* Fixed bug and added tests

* Added "@since 4.5" where necessary

* Added BitMapProducer constructor to SimpleBloomFilter

* added BitMapProducer.fromLongArray() and Hasher.isEmpty()

* Changes to speed up Simple filter processing

* Null hasher used when a hasher is required but no values are available.

* Added Hasher.Filter and Hasher.FilteredIntConsumer

* Updated documentation + formatted.

* Added license

* fixed checkstyle issues

* fixed javadoc issues

* fixed test issue

* fixed javadoc issues

* Reduced the acceptable delta for p tests

* Updated docs and test cases

* Updated docs and test cases

* fixed issue with Shape javadoc

* Added more test coverage.

* fixed formatting issues

* Updated tests to use assertThrows.

* fixed indents

* Added constructor with IndexProducer

* Fixed issue with compare and different length bitMap arrays

* fixed formatting issues

* Efficiency changes

cleaned up asIndexArray

BitMapProducer to IndexProducer conversion

* changed XProviers to use XPredicates

* Removed NoMatchException

* Removed unneeded BitMap funcs

Moves isSparse() to Shape.

* fixed checkstyle issues

* Fixed javadoc errors

* simplified parameter in BitMapProducer.fromIndexProducer

* fixed tests

* added BitMapping verification

* Added more tests

* Added more tests

* Fixed typos

* Changes requested  by aherbert

* fixed "bit map" in documentation

* Renamed tests

* Removed blank lines

* changed new X<foo> to new X<>

* updated documentation

* Added BloomFilter.copy()

* changed ArrayCountingBloomFilter to use copy() method

* cleaned up numberOfBitsMaps()

* added asBitMapArray() and makePredicate() to BitMapProducer

* Moved asIndexArray() to IndexProducer

* harmonized Simple and Sparse Bloom filter constructors

* Implemented AbstractCountingBloomFilter.asindexArray()

* updated documentation

* fixed up NullHasher

* implemented hasher filter

* Fixed style issues

* added default SimpleHasher increment.

* Added modulus calculation to SimpleHasher

* fixed Hashing issues

* moved hasher/filter/* to /hasher

* moved bloomfilter/hasher to bloomfilter

* fixed up checkstyle issues

* Made Filter -> IndexFilter -w- factory

* moved IndexFilter into Hasher

* updated hashing tests & fixed checksyle

* removed SingleItemhasherCollection as associated methods

* fixed javadoc issues

* fixed javadoc issues

* added checks for BitMapProducer limits and index limits

* updated tests

* added tests

* fixed checkstyle issues

* fixed formatting and test coverage

* fixed javadoc issue

* put back checkstyle.xml

* switched to forEachBitMapPair

* updated BitMap and Index array production

* fixed merge with BitMapProducer

* Cleaned up formatting

* fixed checkstyle issues

* fixed coding issues

* updated documentation

* simplified test

* removed unwanted merge files

* removed duplicate entry

* put back test that incorrectly removed

* fixed asIndexArray error

* fixed checkstyle errors

* Changes for last review
2022-06-15 13:24:22 -04:00
Gary Gregory 1e6ccae884 Fix and update site build (except jdepend/site broken compatibility) 2022-06-13 08:58:58 -04:00
dependabot[bot] e0f75108f2 Bump maven-pmd-plugin from 3.16.0 to 3.17.0
Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.16.0 to 3.17.0.
- [Release notes](https://github.com/apache/maven-pmd-plugin/releases)
- [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.16.0...maven-pmd-plugin-3.17.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-pmd-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-11 10:47:57 +12:00
Gary Gregory 45b7ba3825 Bump actions/cache from 3.0.3 to 3.0.4 2022-06-07 13:52:42 -04:00
Bruno P. Kinoshita 06f7b6fbb4
[COLLECTIONS-811] Integrate Guava Testlib tests for Apache Commons Collections (#301)
* [COLLECTIONS-811] Integrate Guava Testlib tests for Apache Commons Collections

* [COLLECTIONS-811] Add tests for Lists too, thanks to @ben-manes
2022-06-06 17:14:43 -04:00
Gary Gregory 528699431c Replace JUnit 3/4 @Ignore with JUnit 5 @Disabled 2022-06-06 10:37:39 -04:00
Gary Gregory 5e9b391ce2 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-collections.git 2022-06-06 10:22:43 -04:00
Gary Gregory b279e28dd6 Remove unused test code 2022-06-06 10:22:34 -04:00
Gary Gregory c94947493c
Use java.lang.Objects#equals; eliminate a couple of nulls #307 2022-06-06 10:09:53 -04:00
Steve Bosman e85e26e7bb
When possible use java.lang.Objects#equals; eliminated a couple of nulls (#307) 2022-06-06 10:06:12 -04:00
Gary Gregory 4ae79d210f Bump actions/cache from 3.0.2 to 3.0.3 2022-05-31 16:29:03 -04:00
Gary Gregory 1e0646ee8d Remove noisy inline comments. 2022-05-31 15:56:42 -04:00
Bruno P. Kinoshita 1677daceab [COLLECTIONS-812] Open both streams with try-with-resources, and assert that only the text is the same, not the time 2022-05-01 12:07:10 +12:00
Bruno P. Kinoshita 51813d040c [COLLECTIONS-807] add @samabcde contribution to the issue changelog 2022-04-30 10:31:38 +12:00
samabcde 369ae6b7d0 [COLLECTIONS-807] fix one place not updated 2022-04-30 00:00:05 +08:00
Gary Gregory 3d88221be0
Bump maven-antrun-plugin from 3.0.0 to 3.1.0 #303 2022-04-29 10:28:21 -04:00
Gary Gregory 5c86028948
Bump github/codeql-action from 1 to 2 #302 2022-04-29 10:26:44 -04:00
Bruno P. Kinoshita a1f7a125ea [COLLECTION-802] Add changelog 2022-04-28 22:38:17 +12:00
samabcde 43e23dd658 [COLLECTIONS-802] Fix remove failed by removing set null to currentKey and currentValue. 2022-04-25 00:23:02 +08:00
Gary Gregory 9df6f64b7e Bump japicmp from 0.15.4 to 0.15.7 2022-04-21 17:16:06 -04:00
Gary Gregory 56f7d9f6b0 Bump Jacoco from 0.8.7 to 0.8.8 2022-04-21 17:14:13 -04:00
Gary Gregory 81e41da39d [COLLECTIONS-807] Upgraded org.junit.Test to
org.junit.jupiter.api.Test #295.
2022-04-21 17:08:02 -04:00
Pradeesh Kumar 3aad6efa37
COLLECTIONS-807: Upgraded org.junit.Test to org.junit.jupiter.api.Test (#295)
* COLLECTIONS-807 - Upgraded org.junit.Test to org.junit.jupiter.api.Test

* COLLECTIONS-807 - Upgraded org.junit.Test to org.junit.jupiter.api.Test: EmptyPropertiesTest.testSave test fail bug fix

Co-authored-by: Pradeesh Kumar <pradeesh.kumar@deliveryhero.com>
2022-04-21 17:06:19 -04:00
dependabot[bot] fd3bcf3b30 Bump commons-parent from 52 to 53
Bumps commons-parent from 52 to 53.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-parent
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-16 13:09:50 +12:00
dependabot[bot] 5827d6a427 Bump actions/setup-java from 2 to 3
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-16 12:57:15 +12:00
Gary Gregory af2f6ddd98 Bump actions/setup-java from 2 to 3 2022-04-15 06:55:07 -04:00
Gary Gregory d8e5038876 Bump actions/cache from 3 to 3.0.2 2022-04-12 08:05:35 -04:00
dependabot[bot] 1b30597c2d Bump codecov/codecov-action from 2 to 3
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-09 09:50:42 +12:00
Sebb 72eaf4db22 git-wip-us => gitbox 2022-04-05 11:36:38 +01:00
Gary Gregory 4a473e6120
Bump actions/cache from 2.1.7 to 3 #294 2022-03-25 07:56:16 -07:00
John Patrick b4edfcc866
[COLLECTIONS-810] Change JUnit v3 to JUnitv4 Annotations (#292) 2022-03-18 08:55:20 -04:00
John Patrick f55268b092
[COLLECTIONS-809] JUnit v5 assertThrows (#291)
Refactor PredicatedMapTest

Refactor UnmodifiableSortedSetTest

Refactor PredicatedSortedSetTest

Refactor PredicatedSetTest

Refactor PredicatedNavigableSetTest

Refactor ListOrderedSetTest

Refactor PredicatedSortedMapTest

Refactor ReferenceIdentityMapTest

Refactor ReferenceMapTest

Refactor TransformedSortedMapTest

Refactor PredicatedMapTest

Refactor UnmodifiableSortedSetTest

Refactor PredicatedSortedSetTest

Refactor PredicatedSetTest

Refactor PredicatedNavigableSetTest

Refactor ListOrderedSetTest

Refactor PredicatedSortedMapTest

Refactor ReferenceIdentityMapTest

Refactor ReferenceMapTest

Refactor TransformedSortedMapTest

Refactor UnmodifiableMultiValuedMapTest

Refactor PredicatedMultiSetTest

Refactor UnmodifiableMultiSetTest

Refactor CircularFifoQueueTest

Refactor UnmodifiableQueueTest

Refactor CompositeSetTest

Refactor AbstractQueueTest

Refactor AbstractMultiSetTest

Refactor AbstractMultiValuedMapTest

Refactor AbstractBidiMapTest

Refactor AbstractBloomFilterTest

Refactor AbstractIteratorTest

Refactor AbstractLinkedListTest

Refactor AbstractListTest

Refactor AbstractSortedMapTest

Refactor AbstractOrderedMapTest

Refactor AbstractIterableMapTest

Refactor AbstractMapTest

Refactor AbstractMapIteratorTest

Refactor AbstractListIteratorTest

Refactor AbstractCollectionTest
2022-03-16 15:19:09 -04:00
Gary Gregory eab0aa0b09 [COLLECTIONS-777] Fully migrate to JUnit 5. 2022-03-06 17:24:13 -05:00
Gary Gregory 7fe2f39a10 Add missing Javadeoc tags. 2022-03-06 17:19:13 -05:00
Gary Gregory 99bb546524 Remove extra whitespace. 2022-03-06 17:17:39 -05:00
John Patrick 93510caf35
COLLECTIONS-777 JUnit v5 (#287)
* COLLECTIONS-777 JUnit v5

JUnit v5 assertThrows BagUtilsTest

JUnit v5 assertThrows ClosureUtilsTest

JUnit v5 assertThrows FluentIterableTest

JUnit v5 assertThrows IterableUtilsTest

JUnit v5 assertThrows ListUtilsTest

JUnit v5 assertThrows MapUtilsTest

JUnit v5 assertThrows SetUtilsTest

JUnit v5 assertThrows GrowthListTest

JUnit v5 assertThrows BoundedIteratorTest

JUnit v5 assertThrows CollectionUtilsTest

JUnit v5 assertThrows IteratorUtilsTest

JUnit v5 assertThrows AbstractLinkedListTest

JUnit v5 assertThrows SplitMapUtilsTest

JUnit v5 assertThrows ShapeTest

JUnit v5 assertThrows StaticHasherTest

JUnit v5 assertThrows ArrayIterator2Test

JUnit v5 assertThrows IteratorChainTest

JUnit v5 assertThrows LazyIteratorChainTest

JUnit v5 assertThrows ListIteratorWrapperTest

JUnit v5 assertThrows LoopingIteratorTest

JUnit v5 assertThrows LoopingListIteratorTest

JUnit v5 assertThrows ReverseListIteratorTest

JUnit v5 assertThrows SkippingIteratorTest

JUnit v5 assertThrows CursorableLinkedListTest

JUnit v5 assertThrows FixedSizeListTest

JUnit v5 assertThrows PredicatedListTest

JUnit v5 assertThrows ObjectGraphIteratorTest

JUnit v5 assertThrows UnmodifiableListTest

JUnit v5 assertThrows DefaultedMapTest

JUnit v5 assertThrows LazySortedMapTest

JUnit v5 assertThrows ListOrderedMapTest

JUnit v5 assertThrows LRUMapTest

JUnit v5 assertThrows MultiKeyMapTest

JUnit v5 assertThrows PassiveExpiringMapTest

* EmptyPropertiesTest Debug

(cherry picked from commit 3bb1225e762ff5befd17d53dc99b7371d71b1ff0)
2022-03-06 17:13:38 -05:00
Gary Gregory f93c7d5976 [COLLECTIONS-788] Use Java 8 and method reference. #274. 2022-03-04 09:08:29 -05:00
Arturo Bernal 35a6778db8
COLLECTIONS-788 - java8 improvements: (#228)
* Replace Collections.sort() with List.sort()
* Replace lambda with method reference
* Replace Loop with Collection.removeIf()
* Use lambda

Co-authored-by: Gary Gregory <garydgregory@users.noreply.github.com>
2022-03-04 09:07:07 -05:00
Gary Gregory dd69e59fcd Use Java 8 and method reference. #274 2022-03-04 09:04:56 -05:00
Arturo Bernal e30b4d3700
Use java 8 and method reference. (#274) 2022-03-04 08:58:30 -05:00
Gary Gregory 2431972cc0 Simple syntax for array creation. 2022-03-04 08:58:14 -05:00
Gary Gregory 5588a9bdee Clean up tests.
- Simple syntax for array creation.
- Use better Collection APIs.
- Make test fixture a static class.
- Use number cache when possible.
2022-03-04 08:56:42 -05:00
Gary Gregory 505722c303 Use final. 2022-03-04 08:49:14 -05:00
John Patrick 2a2a534c02
COLLECTIONS-777 JUnit v5 (#284)
JUnit v5 assertThrows TransformerUtilsTest

JUnit v5 assertThrows DynamicHasherBuilderTest

JUnit v5 assertThrows DynamicHasherTest

JUnit v5 assertThrows IndexFilterTest

JUnit v5 assertThrows BooleanComparatorTest

JUnit v5 assertThrows FixedOrderComparatorTest

JUnit v5 assertThrows ComparatorUtilsTest

JUnit v5 assertThrows FactoryUtilsTest

JUnit v5 assertThrows MultiSetUtilsTest

JUnit v5 assertThrows QueueUtilsTest
2022-03-04 08:44:25 -05:00
John Patrick 4d06b47d55
COLLECTIONS-777 JUnit v5 (#283)
JUnit v5 assertThrows PredicatedBagTest

JUnit v5 assertThrows PredicatedSortedBagTest

JUnit v5 assertThrows TreeBagTest

JUnit v5 assertThrows AbstractBagTest

JUnit v5 assertThrows AbstractBidiMapTest

JUnit v5 assertThrows AbstractOrderedBidiMapTest

JUnit v5 assertThrows PredicateUtilsTest

JUnit v5 assertThrows MultiMapUtilsTest

JUnit v5 assertThrows EnumerationUtilsTest

JUnit v5 assertThrows ArrayStackTest
2022-03-04 08:42:38 -05:00