Skip to content

More predictable handling of trait/validator classes model loader #1709

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

Merged
Baccata merged 8 commits into from
May 15, 2025
Merged

More predictable handling of trait/validator classes model loader #1709

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd01c5a
More deterministic model loader
kubukoz May 1, 2025
7d72440
dunno
kubukoz May 1, 2025
5e44d2d
Merge branch 'series/0.18' into modelloader-more-determinism
kubukoz May 14, 2025
63ab0e3
Add test for transformations
kubukoz May 14, 2025
92a3dcf
set scala version just in case
kubukoz May 14, 2025
887e917
Add another test
kubukoz May 14, 2025
135cf20
Add headers
kubukoz May 14, 2025
260e0a6
Add changelog entry
kubukoz May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions modules/codegen/src/smithy4s/codegen/internals/ModelLoader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,14 @@ private[codegen] object ModelLoader {
}
}

val validatorClassLoader = locally {
val jarUrls = deps.map(_.toURI().toURL()).toArray
new URLClassLoader(jarUrls, currentClassLoader)
}

// Loading the upstream model
val upstreamModel = Model
.assembler()
.assembler(validatorClassLoader)
Copy link
Member Author

@kubukoz kubukoz May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should make the classes (validators, trait services) visible to the assembler - but notably not making the models visible.

Copy link
Member Author

@kubukoz kubukoz May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

notably this doesn't solve the problems that #1705 and #1707 are attempting to solve, but it's a step in the right direction and doesn't clash with them

// disabling cache to support snapshot-driven experimentation
.putProperty(ModelAssembler.DISABLE_JAR_CACHE, true)
.addClasspathModels(currentClassLoader, discoverModels)
Expand All @@ -95,11 +100,6 @@ private[codegen] object ModelLoader {
case _ => ()
}

val validatorClassLoader = locally {
val jarUrls = deps.map(_.toURI().toURL()).toArray
new URLClassLoader(jarUrls, currentClassLoader)
}

val preTransformationModel =
Model
.assembler(validatorClassLoader)
Expand Down