Skip to content

Aggregate FindJavaVersion to one row per repository - #1105

Merged
sambsnyd merged 3 commits into
mainfrom
find-java-version-per-project
May 20, 2026
Merged

Aggregate FindJavaVersion to one row per repository#1105
sambsnyd merged 3 commits into
mainfrom
find-java-version-per-project

Conversation

@timtebeek

@timtebeek timtebeek commented May 20, 2026

Copy link
Copy Markdown
Member

Summary

  • Convert FindJavaVersion to a ScanningRecipe keyed on GitProvenance.origin, so each git repository contributes exactly one row regardless of how many modules or compilation units it contains
  • When modules in a repository disagree on JDK, retain the row with the lowest target compatibility (tiebreak: lowest source) — the migration floor for the repository
  • No schema change: JavaVersionTable.Row keeps its two original columns, sourceVersion and targetVersion

Problem

The recipe originally kept a transient HashSet<JavaVersion> seen on the recipe instance. Two things conspired to drop rows:

  1. JavaVersion excludes its UUID from equals/hashCode.
  2. The Moderne CLI reuses one recipe instance across every repository in a working-set run (verified empirically — see below).

The combination silently dropped every repository's row except the first one processed. The previous attempt on this branch removed the dedup and emitted one row per compilation unit — correct counts, but thousands of identical rows per project and no aggregation at the repository level (the unit that actually matters for portfolio-wide JDK inventory).

Solution

  • ScanningRecipe<Map<String, Row>>. The scanner reads JavaVersion and GitProvenance markers from each JavaSourceFile and merges into the accumulator.
  • Key: origin:<GitProvenance.origin>project:<JavaProject.getId()>version:<JavaVersion.getId()> (in that fallback order). Prefixed string keys keep the three namespaces from colliding and make the accumulator readable at a glance.
  • Merge: lower targetVersion wins; tiebreak on lower sourceVersion.
  • generate flushes accumulated rows to the data table. No recipe-instance mutable state.

Validation

Unit tests

  • multiModuleRepositoryCollapsesToOneRow — modules sharing one GitProvenance produce a single row
  • heterogeneousVersionsInOneRepoPickLowestTarget — Java 8 + Java 17 modules in one repo produce a single row showing Java 8
  • identicalJavaVersionMarkersAcrossRepositoriesAreEachReported — three repos sharing one JavaVersion produce three rows (regression for moderneinc/customer-requests#2409)
  • withoutGitProvenanceFallsBackToPerProject — no GitProvenance → one row per JavaProject
  • ./gradlew test --tests '*FindJavaVersionTest*' passes

CLI reproduction on real repositories

Ran mod run working-set --recipe org.openrewrite.java.migrate.search.FindJavaVersion against the 8 repositories in the Spinnaker organization (clouddriver, echo, fiat, front50, halyard, kayenta, kork, spinnaker-gradle-project — 4448 source files in clouddriver alone, varied submodule structures).

To confirm the bug is real on the CLI (not just a theoretical concern) I swapped in the pre-fix code from commit 4beeb8a1 and reran identically:

Code version Rows in aggregated CSV Per-repo distribution
Pre-fix (transient seen HashSet) 1 Only clouddriver (processed first) wrote a JavaVersionTable.csv.gz. All 7 other repos: no data table file emitted at all.
This PR (ScanningRecipe) 8 One row per repo. 7 × Java 17, 1 × Java 11 (spinnaker-gradle-project).

This proves three things on real LSTs:

  1. The CLI does reuse the recipe instance across repositories in a working-set run. The buggy seen HashSet leaked across all 8 repos and silently dropped 7 of them.
  2. Multi-module aggregation works: clouddriver (4448 source files, ~30 submodules) collapses to a single row under the fix. Previously this would have been the only row, masking the much worse cross-repo bug.
  3. Cross-repo non-collapse works (regression for #2409): 7 repositories sharing Java 17 each appear as their own row instead of merging into one.

The "lowest version wins" branch (heterogeneous JDKs within one repo) isn't exercised by Spinnaker — every repo's submodules agree on a single JDK — but it's covered deterministically by the unit test.

Fixes moderneinc/customer-requests#2409

The recipe used a `transient Set<JavaVersion> seen` HashSet on the recipe
instance to deduplicate rows. Because `JavaVersion` excludes its UUID from
`equals`, two compilation units from different projects built with the same
JDK compare equal, and recipe instances are reused across repositories within
a single run, so identical Java versions in separate projects collapsed into
a single data-table row.

Drop the deduplication and add a `projectName` column derived from the
`JavaProject` marker so that each project contributes its own row.

Fixes moderneinc/customer-requests#2409
@github-project-automation github-project-automation Bot moved this to In Progress in OpenRewrite May 20, 2026
@timtebeek
timtebeek marked this pull request as draft May 20, 2026 18:00
@timtebeek timtebeek changed the title Record one row per project in FindJavaVersion Emit one row per project in FindJavaVersion via ScanningRecipe May 20, 2026
@timtebeek timtebeek changed the title Emit one row per project in FindJavaVersion via ScanningRecipe Emit one row per git repository in FindJavaVersion May 20, 2026
@timtebeek timtebeek changed the title Emit one row per git repository in FindJavaVersion Aggregate FindJavaVersion to one row per repository May 20, 2026
timtebeek added 2 commits May 20, 2026 20:26
Convert FindJavaVersion to a ScanningRecipe keyed on GitProvenance.origin,
so each git repository contributes exactly one row regardless of how many
modules or compilation units it contains. When modules in a repository
disagree on JDK, retain the row with the lowest target compatibility
(tiebreak: lowest source) — the migration floor for the repository.

Fallback key order: GitProvenance.origin -> JavaProject.getId() ->
JavaVersion.getId(), so disconnected sources never silently merge.

Revert the projectName column added in e5a310b; JavaVersionTable.Row
is back to its original two columns (sourceVersion, targetVersion).

Fixes moderneinc/customer-requests#2409
Address PR review feedback:
- Replace `Map<Object, Row>` with `Map<String, Row>`. The three key
  namespaces (git origin URL, JavaProject UUID, JavaVersion UUID) now get
  explicit `origin:` / `project:` / `version:` prefixes so they can never
  collide with each other.
- Collapse the if/else key-derivation into a single Optional chain.
@timtebeek
timtebeek marked this pull request as ready for review May 20, 2026 21:13
@timtebeek
timtebeek marked this pull request as draft May 20, 2026 21:18
@timtebeek
timtebeek marked this pull request as ready for review May 20, 2026 21:26
@timtebeek
timtebeek requested a review from sambsnyd May 20, 2026 21:26
@github-project-automation github-project-automation Bot moved this from In Progress to Ready to Review in OpenRewrite May 20, 2026
@sambsnyd
sambsnyd merged commit a08ce01 into main May 20, 2026
1 check passed
@sambsnyd
sambsnyd deleted the find-java-version-per-project branch May 20, 2026 21:27
@github-project-automation github-project-automation Bot moved this from Ready to Review to Done in OpenRewrite May 20, 2026
mergify Bot added a commit to robfrank/linklift that referenced this pull request Jun 4, 2026
…34.0 to 3.36.0 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-migrate-java](https://github.com/openrewrite/rewrite-migrate-java) from 3.34.0 to 3.36.0.
Release notes

*Sourced from [org.openrewrite.recipe:rewrite-migrate-java's releases](https://github.com/openrewrite/rewrite-migrate-java/releases).*

> 3.36.0
> ------
>
> What's Changed
> --------------
>
> * Move StringFormatted recipe from Java 17 upgrade to Java best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1106](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1106)
> * Skip `IfElseIfConstructToSwitch` when a trailing non-`== null` binary check is present by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1109](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1109)
> * Skip `UseTextBlocks` when literal value matches its source by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1111](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1111)
> * Skip `UseMapOf` for `HashMap` subclasses like `LinkedHashMap` and `TreeMap` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1113](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1113)
> * Skip `RenameUnderscoreIdentifier` on Kotlin and Groovy sources by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#1114](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1114)
> * Do not add `java.io.IO` import in `ReplaceSystemOutWithIOPrint` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1118](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1118)
> * fix: do not replace lambda params with underscore when used as assignment target by [`@​darrencilia`](https://github.com/darrencilia) in [openrewrite/rewrite-migrate-java#1117](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1117)
> * Route WSS4J message.token classes to their real 2.x packages by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1122](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1122)
> * Migrate `com.sun.xml.bind.marshaller.NamespacePrefixMapper` to `org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper` by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1121](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1121)
> * Fix `RefineSwitchCases` generating invalid guard on enum constant labels by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1124](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1124)
> * Skip unparseable Java versions in FindJavaVersion instead of reporting -1 by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1125](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1125)
>
> New Contributors
> ----------------
>
> * [`@​darrencilia`](https://github.com/darrencilia) made their first contribution in [openrewrite/rewrite-migrate-java#1117](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1117)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.35.0...v3.36.0>
>
> 3.35.0
> ------
>
> What's Changed
> --------------
>
> * Add `java.io.IO` import in `ReplaceSystemOutWithIOPrint` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1093](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1093)
> * Skip `UseMapOf` when `put()` argument is a null literal by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1094](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1094)
> * Migrate JAXB XJC binding files declaring version 2.0/2.1/2.2 by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-migrate-java#1098](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1098)
> * Preserve explicit type arguments in MigrateCollections\* recipes by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1099](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1099)
> * Route Maven through Moderne Artifactory cache to avoid HTTP 429 by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1096](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1096)
> * Load sun.internal.new[Class].jar directly to fix CI test failures by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1101](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1101)
> * Skip explicit type arguments containing wildcards in `UseVarForGenericMethodInvocations` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1102](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1102)
> * Skip `var` when target type inference widens a generic argument by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1103](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1103)
> * Skip `IfElseIfConstructToSwitch` when `instanceof` types are missing by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1095](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1095)
> * Revert inline Maven mirror (now in gh-automation#95) by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#1104](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1104)
> * Aggregate FindJavaVersion to one row per repository by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1105](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1105)
>
> **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.34.1...v3.35.0>
>
> v3.34.1
> -------
>
> What's Changed
> --------------
>
> * OpenRewrite [v8.81.6](https://github.com/openrewrite/rewrite/releases/tag/v8.81.6)
> * Refresh UpdateSdkManTest fixtures after SDKMAN CSV update by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-migrate-java#1073](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1073)
> * Add more static analysis recipes to java-best-practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1075](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1075)
> * OpenRewrite recipe best practices by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1074](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1074)
> * Add jspecify hyperlink by [`@​sullis`](https://github.com/sullis) in [openrewrite/rewrite-migrate-java#1076](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1076)
> * Skip `var` when reassignment relies on declared supertype by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1078](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1078)
> * Keep parentheses when renaming typed lambda parameter to underscore by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1082](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1082)
> * Document null-probing semantic differences in singleton migrations by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1081](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1081)
> * Skip main migration when referenced as static API by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1084](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1084)
> * Skip `Immutable*.copyOf` rewrite when argument is not a `Collection` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1089](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1089)
> * Keep block body when refined switch arm contains an if statement by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#1088](https://redirect.github.com/openrewrite/rewrite-migrate-java/pull/1088)

... (truncated)


Commits

* [`d4df178`](openrewrite/rewrite-migrate-java@d4df178) Skip unparseable Java versions in FindJavaVersion instead of reporting -1 ([#1](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1)...
* [`b8a298e`](openrewrite/rewrite-migrate-java@b8a298e) Fix `RefineSwitchCases` generating invalid guard on enum constant labels ([#1124](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1124))
* [`c7f400b`](openrewrite/rewrite-migrate-java@c7f400b) [Auto] SDKMAN! Java candidates as of 2026-06-01T1550
* [`fca7c7c`](openrewrite/rewrite-migrate-java@fca7c7c) Migrate `com.sun.xml.bind.marshaller.NamespacePrefixMapper` to `org.glassfish...
* [`74017b2`](openrewrite/rewrite-migrate-java@74017b2) Route WSS4J message.token classes to their real 2.x packages ([#1122](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1122))
* [`52b0808`](openrewrite/rewrite-migrate-java@52b0808) OpenRewrite recipe best practices
* [`23e5804`](openrewrite/rewrite-migrate-java@23e5804) Update Gradle wrapper 9.5.1
* [`21548bd`](openrewrite/rewrite-migrate-java@21548bd) fix: do not replace lambda params with underscore when used as assignment tar...
* [`61e7d90`](openrewrite/rewrite-migrate-java@61e7d90) Do not add `java.io.IO` import in `ReplaceSystemOutWithIOPrint` ([#1118](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1118))
* [`dec86d0`](openrewrite/rewrite-migrate-java@dec86d0) Skip `RenameUnderscoreIdentifier` on Kotlin and Groovy sources ([#1114](https://redirect.github.com/openrewrite/rewrite-migrate-java/issues/1114))
* Additional commits viewable in [compare view](openrewrite/rewrite-migrate-java@v3.34.0...v3.36.0)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-migrate-java&package-manager=maven&previous-version=3.34.0&new-version=3.36.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants