Commit Graph

3901 Commits

Author SHA1 Message Date
aherbert 7bf71f59b8 Use private inner class 2022-08-24 13:23:19 +01:00
aherbert 33489b9114 Use diamond operator 2022-08-24 13:23:19 +01:00
Gary Gregory d7f2a7a377 Bump maven-checkstyle-plugin 3.1.0 to 3.2.0. 2022-08-24 08:11:07 -04:00
Gary Gregory bf0970a71f Bump maven-pmd-plugin from 3.17.0 to 3.18.0 2022-08-24 08:08:18 -04:00
Gary Gregory f1e2c878b8 [COLLECTIONS-833] Intermittent failure in EmptyPropertiesTest
Ignore second line of properties files since contain a timestamp, which
is a problem when the time ticks to the next second within some tests
2022-08-24 08:01:43 -04:00
aherbert 6ba199c691 Removed obsolete file 2022-08-23 11:31:25 +01:00
aherbert bf836c8df0 Test code cleanup
Use static

Remove incorrect javadoc tags

Add javadoc to return tag
2022-08-23 11:30:17 +01:00
Claude Warren, Jr 5a31023eae COLLECTIONS-831: Add BloomFilter clear() method 2022-08-23 11:27:24 +01:00
Gary Gregory fe783da49f Bump actions/cache from 3.0.7 to 3.0.8 2022-08-22 15:19:48 -04:00
Claude Warren 9999261d27
Collections-818: convert to characteristics flag (#329) 2022-08-16 09:54:33 +01:00
Gary Gregory 032e0eade0 Bump actions/cache from 3.0.6 to 3.0.7 2022-08-12 07:12:03 -04:00
Claude Warren 2af77aaa6b
Collections 827: Add tests using or, and and xor with different length filters. (#328)
* added missing tests
* simplified test framework
2022-08-10 10:27:24 +01:00
Claude Warren df091173cd
Collections-824: Optimize SimpleHasher.forEachIndex and SimpleHasher name change (#320)
* Renamed simple hasher as EnhancedDoubleHasher

* Added test for number of bits < number of hash functions

* Added IncrementingHasher for testing and updated tests

* Added test for number of bits < number of hash functions

* Fixed uniqueIndices implementation

Added default implementation.
Added test for unique filter working.
2022-08-08 08:44:37 +01:00
dependabot[bot] a43e0245ba Bump commons.pmd-impl.version from 6.47.0 to 6.48.0
Bumps `commons.pmd-impl.version` from 6.47.0 to 6.48.0.

Updates `pmd-core` from 6.47.0 to 6.48.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/6.48.0)

Updates `pmd-java` from 6.47.0 to 6.48.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/6.48.0)

Updates `pmd-javascript` from 6.47.0 to 6.48.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/6.48.0)

Updates `pmd-jsp` from 6.47.0 to 6.48.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/6.48.0)

---
updated-dependencies:
- dependency-name: net.sourceforge.pmd:pmd-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.sourceforge.pmd:pmd-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.sourceforge.pmd:pmd-javascript
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.sourceforge.pmd:pmd-jsp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-06 10:06:09 +12:00
Gary Gregory 5b970c8c45 Bump actions/cache from 3.0.5 to 3.0.6 2022-08-05 08:31:06 -04:00
Gary Gregory b12db43052 Bump actions/cache from 3.0.5 to 3.0.6 2022-08-05 08:30:24 -04:00
Gary Gregory 1d02aa5572 Update GitHub builds to use Temurin 2022-07-29 08:37:27 -04:00
Gary Gregory 0987f105e9
Bump commons.junit.version from 5.8.2 to 5.9.0 #324 2022-07-29 08:20:45 -04:00
dependabot[bot] 1c8af3f622
Bump commons.junit.version from 5.8.2 to 5.9.0 (#324)
Bumps `commons.junit.version` from 5.8.2 to 5.9.0.

Updates `junit-jupiter-api` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

Updates `junit-jupiter-engine` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

Updates `junit-jupiter-params` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

Updates `junit-vintage-engine` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.junit.vintage:junit-vintage-engine
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-29 08:17:35 -04:00
Claude Warren ebc66db426
Merge pull request #315 from Claudenw/remove_merge_in_place
replaced merge with old mergeInPlace
2022-07-28 12:17:28 +01:00
Gary Gregory ef728ec96b Bump actions/cache 3.0.4 to 3.0.5 2022-07-15 08:32:27 -04:00
Gary Gregory 29d79003ea Use for-each loop 2022-07-09 10:09:02 -04:00
Claude Warren c811f541aa
Merge pull request #317 from Claudenw/fix_collections_821
moved IndexFilter to its own file.
2022-07-06 16:52:06 +01:00
Claude Warren 57b5be9cce removed unused imports 2022-07-06 11:34:46 +01:00
Claude Warren 711ea22488 Made IndexFilter.create() return an IntPredicate 2022-07-06 11:30:32 +01:00
Claude Warren fcbcb2e746
COLLECTIONS-823: Modified ArrayCountingBloomFilter.forEachBitMap to be more efficient (#316)
* Modified forEachBitMap
* made blocksm1 final and initialized with counts.length
2022-07-05 13:36:02 +01:00
Gary Gregory 20b0357048 Add missing namespace and XSD to SpotBugs filter file. 2022-07-04 14:17:40 -04:00
Gary Gregory 224e51d51f Add missing namespace and XSD to SpotBugs filter file. 2022-07-04 14:12:56 -04:00
dependabot[bot] ea539b2d05 Bump commons.pmd-impl.version from 6.46.0 to 6.47.0
Bumps `commons.pmd-impl.version` from 6.46.0 to 6.47.0.

Updates `pmd-core` from 6.46.0 to 6.47.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.46.0...pmd_releases/6.47.0)

Updates `pmd-java` from 6.46.0 to 6.47.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.46.0...pmd_releases/6.47.0)

Updates `pmd-javascript` from 6.46.0 to 6.47.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.46.0...pmd_releases/6.47.0)

Updates `pmd-jsp` from 6.46.0 to 6.47.0
- [Release notes](https://github.com/pmd/pmd/releases)
- [Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.46.0...pmd_releases/6.47.0)

---
updated-dependencies:
- dependency-name: net.sourceforge.pmd:pmd-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.sourceforge.pmd:pmd-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.sourceforge.pmd:pmd-javascript
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.sourceforge.pmd:pmd-jsp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-02 10:28:23 +12:00
Claude Warren a89f3ec293 removed bad import 2022-06-29 13:23:03 +01:00
Claude Warren 5390be21e5 fixed checkstyle issues 2022-06-29 12:48:19 +01:00
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 c104fd4924 removed files added in error 2022-06-28 08:55:54 +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 8246b4e6fa replaced merge with old mergeInPlace
removed mergeInPlace
2022-06-24 16:28:09 +01: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
Gary Gregory 6aba9f02fd Remove obsolete Maven profile 2022-06-13 07:56:57 -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