Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate Guava Predicates and Functions to Java implementations #6047

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open

Migrate Guava Predicates and Functions to Java implementations #6047

wants to merge 81 commits into from

Commits on Sep 2, 2024

  1. Guava migration - Preliminary

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    b46c1de View commit details
    Browse the repository at this point in the history

  2. Guava migration - Create migration scaffold

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    bb520b1 View commit details
    Browse the repository at this point in the history

  3. Guava migration - Remove Functions dependency

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    fb16a46 View commit details
    Browse the repository at this point in the history

  4. Guava migration - Migrate static libraries

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    4d62928 View commit details
    Browse the repository at this point in the history

  5. Guava migration - Migrate Predicates

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    9765279 View commit details
    Browse the repository at this point in the history

  6. Guava migration - Migrate Functions

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    8702e29 View commit details
    Browse the repository at this point in the history

  7. Guava migration - Migrate Optionals

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    ecf25a8 View commit details
    Browse the repository at this point in the history

  8. Guava migration - Migrate Suppliers

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    6a87768 View commit details
    Browse the repository at this point in the history

  9. Guava migration - Migrate Lists.transform

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    67f22c6 View commit details
    Browse the repository at this point in the history

  10. Guava migration - Remove forwarding overloads

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    a070fee View commit details
    Browse the repository at this point in the history

  11. Guava migration - Inline Predicate varargs methods

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    055dff7 View commit details
    Browse the repository at this point in the history

  12. Guava migration - Fix lingering build errors

    Jetz authored and Jetz committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    16c0fa1 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Guava migration - Inline Predicates.alwaysTrue

    Jetz authored and Jetz committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    77ba9f1 View commit details
    Browse the repository at this point in the history

  2. Guava migration - Inline Predicates.instanceOf

    Jetz authored and Jetz committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ef011d3 View commit details
    Browse the repository at this point in the history

  3. Guava migration - Inline Predicates.in

    Jetz authored and Jetz committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    4eb8fdd View commit details
    Browse the repository at this point in the history

  4. Guava migration - Inline Predicates.equalTo

    Jetz authored and Jetz committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    6b96bca View commit details
    Browse the repository at this point in the history

  5. Guava migration - Swap in Predicate.isEqual

    Jetz authored and Jetz committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    22e7465 View commit details
    Browse the repository at this point in the history

  6. Guava migration - Inline Predicates.not

    Jetz authored and Jetz committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    78bc9fd View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Guava migration - Inline Predicates.and

    Jetz authored and Jetz committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    b37f872 View commit details
    Browse the repository at this point in the history

  2. Guava migration - Inline Predicates.or

    Jetz authored and Jetz committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    2d233f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Guava migration - Add common helper predicates

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    0bf04c2 View commit details
    Browse the repository at this point in the history

  2. Guava migration - Explode Predicate "Presets" subclasses

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    85f80bb View commit details
    Browse the repository at this point in the history

  3. Guava migration - Helper method for composing CardRules into PaperCards

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    734bcec View commit details
    Browse the repository at this point in the history

  4. Guava migration - Remove unused imports

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    6e3726e View commit details
    Browse the repository at this point in the history

  5. Guava migration - Inline Predicates.compose

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4c8a94b View commit details
    Browse the repository at this point in the history

  6. Guava migration - Inline Iterables.isEmpty (Collection overload)

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    efe55ef View commit details
    Browse the repository at this point in the history

  7. Guava migration - Inline Iterables.removeAll (Collection overload)

    Jetz authored and Jetz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c1de0de View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Guava migration - Inline Iterables.addAll (Collection overload)

    Jetz authored and Jetz committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    d9c54aa View commit details
    Browse the repository at this point in the history

  2. Guava migration - Cleanup imports

    Jetz authored and Jetz committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    79a640c View commit details
    Browse the repository at this point in the history

  3. Guava migration - Inline Iterables.contains (Collection overload)

    Jetz authored and Jetz committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    8489866 View commit details
    Browse the repository at this point in the history

  4. Guava migration - Inline Iterables.removeIf (Collection overload)

    Jetz authored and Jetz committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    36cff7e View commit details
    Browse the repository at this point in the history

  5. Guava migration - Inline Iterables.find (Collection overload)

    Jetz authored and Jetz committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    dfac93a View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Guava migration - Add helper methods for FCollectionView anyMatch a… 

    …nd `allMatch`
    Jetz authored and Jetz committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    4716415 View commit details
    Browse the repository at this point in the history

  2. Guava migration - Inline Iterables.any and Iterables.all (FCollec… 

    …tionView overloads)
    Jetz authored and Jetz committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    b4015af View commit details
    Browse the repository at this point in the history

  3. Guava migration - Inline Iterables.any (Collection overload)

    Jetz authored and Jetz committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    7e3bb81 View commit details
    Browse the repository at this point in the history

  4. Guava migration - Inline Iterables.all (Collection overload)

    Jetz authored and Jetz committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    cf68a75 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Guava migration - Replace select usages of Iterables.filter

    Jetz authored and Jetz committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    76aa196 View commit details
    Browse the repository at this point in the history

  2. Guava migration - Replace select usages of Iterables.transform

    Jetz authored and Jetz committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    1644e74 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
#	forge-core/src/main/java/forge/item/IPaperCard.java
#	forge-game/src/main/java/forge/game/ForgeScript.java
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
#	forge-game/src/main/java/forge/game/card/CardState.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-game/src/main/java/forge/game/trigger/Trigger.java
    Jetz authored and Jetz committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    8189f13 View commit details
    Browse the repository at this point in the history

  4. Guava migration - Cleanup

    Jetz authored and Jetz committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    ae25137 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Guava migration - ItemPool collector

    Jetz authored and Jetz committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    7ab333a View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Guava migration - Refactor edition type checks

    Jetz authored and Jetz committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    c913340 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Guava migration - Stream support for FCollectionView

    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    c2f72bb View commit details
    Browse the repository at this point in the history

  2. Guava migration - Add StreamUtils.random collectors

    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    05d58c2 View commit details
    Browse the repository at this point in the history

  3. Guava migration - Slim down quest reward logic

    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    e739dad View commit details
    Browse the repository at this point in the history

  4. Guava migration - Replace select usages of Aggregates methods

    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    cbcfa8f View commit details
    Browse the repository at this point in the history

  5. Fixed some predicate logic issues.

    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    d173c22 View commit details
    Browse the repository at this point in the history

  6. Guava migration - Added PaperCard predicates for commonly forwarded C… 

    …ardRules predicates
    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    cb4c64c View commit details
    Browse the repository at this point in the history

  7. Guava migration - Remove CollectionSuppliers

    Jetz authored and Jetz committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    1af22ff View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Guava migration - Remove single use Predicate implementations 

    Remove unused parameters of other predicates
    Jetz authored and Jetz committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    a57bab1 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Guava migration - Slight cleanup

    Jetz authored and Jetz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    52112e6 View commit details
    Browse the repository at this point in the history

  2. Guava migration - Remove unused imports

    Jetz authored and Jetz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    d01c4e0 View commit details
    Browse the repository at this point in the history

  3. Guava migration - Fix build error

    Jetz authored and Jetz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    1395baa View commit details
    Browse the repository at this point in the history

  4. Guava migration - Rename StreamUtils -> StreamUtil for consistency

    Jetz authored and Jetz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    f636910 View commit details
    Browse the repository at this point in the history

  5. Guava migration - Create IterableUtil to house iterable helper meth… 

    …ods dependent on Java predicates
    Jetz authored and Jetz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    0278f58 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Guava migration - Remove migration scaffold

    Jetz authored and Jetz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6a04fcd View commit details
    Browse the repository at this point in the history

  2. Guava migration - Optimize imports

    Jetz authored and Jetz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    871947a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
    Jetz authored and Jetz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b359812 View commit details
    Browse the repository at this point in the history

  4. Fix ConcurrentModificationException

    Jetz authored and Jetz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    474be7b View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Bug fix in RandomReservoir accumulator

    Jetz authored and Jetz committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    2e769ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-game/src/main/java/forge/game/ForgeScript.java
    Jetz authored and Jetz committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c43015f View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-game/src/main/java/forge/game/phase/PhaseHandler.java
    Jetz authored and Jetz committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    31547c6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-ai/src/main/java/forge/ai/ComputerUtil.java
#	forge-core/src/main/java/forge/card/DeckHints.java
#	forge-game/src/main/java/forge/game/ability/AbilityFactory.java
#	forge-game/src/main/java/forge/game/cost/CostUntapType.java
#	forge-gui/src/main/java/forge/player/HumanCostDecision.java
    Jetz authored and Jetz committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6b93e62 View commit details
    Browse the repository at this point in the history

  3. Swap out lingering use of Iterables.any

    Jetz authored and Jetz committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2d6952f View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge branch 'master' into code-cleanup

    Jetz authored and Jetz committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    9be2c3d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
    Jetz authored and Jetz committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    67cedad View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Add some helper methods to StreamUtil; 

    Rewrite `generateParticipants`
    Jetz authored and Jetz committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    64609b0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into code-cleanup 

    # Conflicts:
#	forge-game/src/main/java/forge/game/GameEntityCounterTable.java
#	forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
    Jetz authored and Jetz committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    c5be6f1 View commit details
    Browse the repository at this point in the history

  3. Remove unused imports

    Jetz authored and Jetz committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    e52a7b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'master' into code-cleanup

    @Hanmac
    Hanmac authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    7a34369 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Merge remote-tracking branch 'origin/master' into code-cleanup 

    # Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java
#	forge-ai/src/main/java/forge/ai/ability/ScryAi.java
#	forge-core/src/main/java/forge/card/DeckHints.java
#	forge-core/src/main/java/forge/util/TextUtil.java
#	forge-gui-mobile/src/forge/itemmanager/ItemManager.java
#	forge-gui/src/main/java/forge/download/AutoUpdater.java
#	forge-gui/src/main/java/forge/player/HumanCostDecision.java
    Jetz authored and Jetz committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    d6c8e9a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/code-cleanup' into code-cleanup

    Jetz authored and Jetz committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    903d636 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. Guava migration - Replace .negate() with Predicate.not(...) in co… 

    …mpound predicates.
    Jetz authored and Jetz committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    c9ba926 View commit details
    Browse the repository at this point in the history

  2. Remove unused imports

    Jetz authored and Jetz committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    7bb8ccd View commit details
    Browse the repository at this point in the history

  3. Guava migration - Use .toList()

    Jetz authored and Jetz committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    4bbc165 View commit details
    Browse the repository at this point in the history

  4. Guava migration - Use Arrays.stream()

    Jetz authored and Jetz committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    6b7ac1e View commit details
    Browse the repository at this point in the history

  5. Guava migration - Swap in StreamUtil.stream

    Jetz authored and Jetz committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    c6ad122 View commit details
    Browse the repository at this point in the history

  6. Remove unused imports

    Jetz authored and Jetz committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    2b5fc37 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Revert .toList() for Android compatibility

    Jetz authored and Jetz committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    d81c5a4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into code-cleanup

    Jetz authored and Jetz committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    e879abc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into code-cleanup 

    # Conflicts:
#	forge-core/src/main/java/forge/StaticData.java
    Jetz authored and Jetz committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    c347ff5 View commit details
    Browse the repository at this point in the history