Skip to content

Conversation

@labkey-jeckels
Copy link

Rationale

Improve generics handling to eliminate IntelliJ warnings about raw type usage

Related Pull Requests

Changes

  • Minor code cleanup

@labkey-jeckels labkey-jeckels merged commit 8abc286 into release24.11-SNAPSHOT Mar 20, 2025
6 checks passed
@labkey-jeckels labkey-jeckels deleted the 24.11_fb_ssrsSessionId branch March 20, 2025 20:12
@bbimber
Copy link
Collaborator

bbimber commented Mar 20, 2025

hi @labkey-jeckels, just curious, why is this going into a prior release? i'm all for cleanup but doesnt this normally go into develop? I think this is breaking the discvr build, due to something being out of sync between discvr-24.11 and EHR.

I'll update my branch, but it's not often this happens, so i thought i'd ask.

2025-03-20T21:02:49.8688860Z   location: class LabworkTypeTable.LabworkDataIteratorBuilder
2025-03-20T21:02:49.8690381Z /github/home/labkey_build/24.11/server/server/modules/ehrModules/ehr/src/org/labkey/ehr/query/LabworkTypeTable.java:188: error: cannot find symbol
2025-03-20T21:02:49.8691734Z                 ColumnInfo aliasColInfo = getRealTable().getColumn(aliasColName);
2025-03-20T21:02:49.8692323Z                                           ^

@labkey-jeckels
Copy link
Author

labkey-jeckels commented Mar 20, 2025

hi @labkey-jeckels, just curious, why is this going into a prior release? i'm all for cleanup but doesnt this normally go into develop? I think this is breaking the discvr build, due to something being out of sync between discvr-24.11 and EHR.

I'll update my branch, but it's not often this happens, so i thought i'd ask.

2025-03-20T21:02:49.8688860Z   location: class LabworkTypeTable.LabworkDataIteratorBuilder
2025-03-20T21:02:49.8690381Z /github/home/labkey_build/24.11/server/server/modules/ehrModules/ehr/src/org/labkey/ehr/query/LabworkTypeTable.java:188: error: cannot find symbol
2025-03-20T21:02:49.8691734Z                 ColumnInfo aliasColInfo = getRealTable().getColumn(aliasColName);
2025-03-20T21:02:49.8692323Z                                           ^

@bbimber
You're right - we're not typically doing refactors or cleanup work in release branches. I ended up touching this as part of the work to improve SSRS integration that Brent asked us to do in 24.11. This particular change wasn't strictly required, but it was adjacent to the minor tweaks/cleanups I made to the ehr_lookups.veterinarians table change that you saw in ehrModules to add some automated test coverage for the SSRS printable reports. I thought it was innocuous enough to include in the 24.11 PRs but didn't consider a potential build break for the discvr branches. Sorry to prompt an unexpected/unscheduled merge. I'm not planning any other 24.11 updates at this point.

@bbimber
Copy link
Collaborator

bbimber commented Mar 20, 2025

@labkey-jeckels, not really a big deal, just didnt expect it. in general, i do not merge/rebase incoming changes from the release-XX-SNAPSHOT branch onto the corresponding discvr-XX branches. it probably wouldnt be especially hard to make a github actions task to do this, but has never been necessary before. I think a feature branch I was making today just happened to hit unfortunately timing with respect to your commit as well.

bbimber pushed a commit that referenced this pull request Mar 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants