Skip to content

Fix sourceSets configuration for packages using type-codegen #633

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.

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
merged 3 commits into from
Apr 4, 2025

Conversation

haydenbaker
Copy link
Contributor

@haydenbaker haydenbaker commented Apr 4, 2025

Description of changes:

  • Because the generated code is flat (no src/main/java and src/main/resources), the same source directory was being set
    • This was also explicitly called out in the TODO removed in this PR
    • Some zip implementations will fail to unzip when there are duplicate entries
  • Adds a fail duplicate strategy to our module-conventions plugin so this doesn't happen in the future

Before

META-INF/
META-INF/LICENSE
META-INF/MANIFEST.MF
META-INF/NOTICE
META-INF/services/
META-INF/services/software.amazon.smithy.model.traits.TraitService
META-INF/smithy-java/
META-INF/smithy-java/type-mappings.properties
META-INF/smithy-java/type-mappings.properties
META-INF/smithy/
META-INF/smithy/errors.smithy
META-INF/smithy/manifest
META-INF/smithy/trait.smithy
errors.smithy
software/
software/amazon/
software/amazon/smithy/
software/amazon/smithy/framework/
software/amazon/smithy/framework/knowledge/
software/amazon/smithy/framework/knowledge/ImplicitErrorIndex.java
software/amazon/smithy/framework/traits/
software/amazon/smithy/framework/traits/ImplicitErrorsTrait.java
software/amazon/smithy/framework/transform/
software/amazon/smithy/framework/transform/AddFrameworkErrorsTransform.java
software/amazon/smithy/java/
software/amazon/smithy/java/framework/
software/amazon/smithy/java/framework/model/
software/amazon/smithy/java/framework/model/AccessDeniedException.java
software/amazon/smithy/java/framework/model/AccessDeniedException.java
software/amazon/smithy/java/framework/model/InternalFailureException.java
software/amazon/smithy/java/framework/model/InternalFailureException.java
software/amazon/smithy/java/framework/model/MalformedRequestException.java
software/amazon/smithy/java/framework/model/MalformedRequestException.java
software/amazon/smithy/java/framework/model/NotAuthorizedException.java
software/amazon/smithy/java/framework/model/NotAuthorizedException.java
software/amazon/smithy/java/framework/model/Schemas.java
software/amazon/smithy/java/framework/model/Schemas.java
software/amazon/smithy/java/framework/model/SharedSerde.java
software/amazon/smithy/java/framework/model/SharedSerde.java
software/amazon/smithy/java/framework/model/ThrottlingException.java
software/amazon/smithy/java/framework/model/ThrottlingException.java
software/amazon/smithy/java/framework/model/UnknownOperationException.java
software/amazon/smithy/java/framework/model/UnknownOperationException.java
software/amazon/smithy/java/framework/model/ValidationException.java
software/amazon/smithy/java/framework/model/ValidationException.java
software/amazon/smithy/java/framework/model/ValidationExceptionField.java
software/amazon/smithy/java/framework/model/ValidationExceptionField.java
trait.smithy

After

META-INF/
META-INF/LICENSE
META-INF/MANIFEST.MF
META-INF/NOTICE
META-INF/services/
META-INF/services/software.amazon.smithy.model.traits.TraitService
META-INF/smithy-java/
META-INF/smithy-java/type-mappings.properties
META-INF/smithy/
META-INF/smithy/errors.smithy
META-INF/smithy/manifest
META-INF/smithy/trait.smithy
software/
software/amazon/
software/amazon/smithy/
software/amazon/smithy/framework/
software/amazon/smithy/framework/knowledge/
software/amazon/smithy/framework/knowledge/ImplicitErrorIndex.java
software/amazon/smithy/framework/traits/
software/amazon/smithy/framework/traits/ImplicitErrorsTrait.java
software/amazon/smithy/framework/transform/
software/amazon/smithy/framework/transform/AddFrameworkErrorsTransform.java
software/amazon/smithy/java/
software/amazon/smithy/java/framework/
software/amazon/smithy/java/framework/model/
software/amazon/smithy/java/framework/model/AccessDeniedException.java
software/amazon/smithy/java/framework/model/InternalFailureException.java
software/amazon/smithy/java/framework/model/MalformedRequestException.java
software/amazon/smithy/java/framework/model/NotAuthorizedException.java
software/amazon/smithy/java/framework/model/Schemas.java
software/amazon/smithy/java/framework/model/SharedSerde.java
software/amazon/smithy/java/framework/model/ThrottlingException.java
software/amazon/smithy/java/framework/model/UnknownOperationException.java
software/amazon/smithy/java/framework/model/ValidationException.java
software/amazon/smithy/java/framework/model/ValidationExceptionField.java

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@haydenbaker haydenbaker merged commit ace4cf5 into main Apr 4, 2025
3 checks passed
@haydenbaker haydenbaker deleted the haydenbaker/misc-fixes branch April 4, 2025 23:17
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.

2 participants