Duplicate all eventstream event shapes + add new legacy event modes #6052
+2,264
−220
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.codegen.customization.processors; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor; | ||
| import software.amazon.awssdk.codegen.model.config.customization.LegacyEventGenerationMode; | ||
| import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel; | ||
| import software.amazon.awssdk.codegen.model.service.ServiceModel; | ||
| import software.amazon.awssdk.codegen.model.service.Shape; | ||
| import software.amazon.awssdk.codegen.naming.NamingStrategy; | ||
| import software.amazon.awssdk.utils.Logger; | ||
|
|
||
| /** | ||
| * Processor for eventstreams that ensures that all eventstream event shapes are unique - for each eventstream/event it creates a | ||
| * new shape with a unique name constructed from the EventStream and Event shape names: `[ShapeName][EventStreamName]`. Any legacy | ||
| * eventstream/events (configured with the useLegacyEventGenerationScheme customization) are skipped. When an event shape is | ||
| * shared between multiple eventstreams, it causes SDK generation/compilation failures. The top level shape POJO implements the | ||
| * event stream interface for each stream and the return type of the sdkEventType method conflicts. | ||
| */ | ||
| public final class EventStreamUniqueEventShapesProcessor implements CodegenCustomizationProcessor { | ||
| private static final Logger log = Logger.loggerFor(EventStreamUniqueEventShapesProcessor.class); | ||
|
|
||
| private final Map<String, Map<String, LegacyEventGenerationMode>> useLegacyEventGenerationScheme; | ||
| private final NamingStrategy namingStrategy; | ||
|
|
||
| public EventStreamUniqueEventShapesProcessor( | ||
| Map<String, Map<String, LegacyEventGenerationMode>> useLegacyEventGenerationScheme, | ||
| NamingStrategy namingStrategy) { | ||
| this.useLegacyEventGenerationScheme = useLegacyEventGenerationScheme; | ||
| this.namingStrategy = namingStrategy; | ||
| } | ||
|
|
||
| @Override | ||
| public void preprocess(ServiceModel serviceModel) { | ||
| Map<String, Shape> newEventShapes = new HashMap<>(); | ||
| serviceModel.getShapes().forEach((name, shape) -> { | ||
| if (!shape.isEventstream()) { | ||
| return; | ||
| } | ||
|
|
||
| preprocessEventStream(serviceModel, name, shape, newEventShapes); | ||
| }); | ||
| serviceModel.getShapes().putAll(newEventShapes); | ||
| } | ||
|
|
||
| private void preprocessEventStream(ServiceModel serviceModel, String eventStreamName, Shape eventStreamShape, Map<String, | ||
| Shape> newEventShapes) { | ||
| Map<String, LegacyEventGenerationMode> eventLegacyModes = useLegacyEventGenerationScheme | ||
| .getOrDefault(eventStreamName, Collections.emptyMap()); | ||
|
|
||
| eventStreamShape.getMembers().forEach((memberName, member) -> { | ||
| String eventShapeName = member.getShape(); | ||
| Shape memberTargetShape = serviceModel.getShape(eventShapeName); | ||
| LegacyEventGenerationMode legacyEventGenerationMode = eventLegacyModes | ||
| .getOrDefault(memberName, LegacyEventGenerationMode.DISABLED); | ||
|
|
||
| if (memberTargetShape.isEvent() && legacyEventGenerationMode == LegacyEventGenerationMode.DISABLED) { | ||
| String newShapeName = namingStrategy.getUniqueEventStreamEventShapeName(member, eventStreamName); | ||
| if (serviceModel.getShapes().containsKey(newShapeName)) { | ||
| log.warn(() -> String.format("Shape name conflict, unable to create a new unique event shape name for %s in" | ||
| + " eventstream %s because %s already exists in the model. Skipping.", | ||
| eventShapeName, eventStreamName, newShapeName)); | ||
| } else { | ||
| log.debug(() -> String.format("Creating new, unique, event shape for %s in eventstream %s: %s", | ||
| eventShapeName, eventStreamName, newShapeName)); | ||
| newEventShapes.put(newShapeName, memberTargetShape); | ||
| member.setShape(newShapeName); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void postprocess(IntermediateModel intermediateModel) { | ||
| // no-op | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.codegen.model.config.customization; | ||
|
|
||
| /** | ||
| * Legacy event generation modes. | ||
| */ | ||
| public enum LegacyEventGenerationMode { | ||
| DISABLED, | ||
| NO_EVENT_SUBCLASS, // old legacy - do not generate subclasses of events | ||
| NO_UNIQUE_EVENT_NAMES // new legacy - do not duplicate event shapes to ensure unique events | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "useLegacyEventGenerationScheme": { | ||
| "EventStream": {"EventOne": "NO_EVENT_SUBCLASS"} | ||
| }, | ||
| "underscoresInNameBehavior": "ALLOW" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| { | ||
| "useLegacyEventGenerationScheme": { | ||
| "EventStream": {"EventOne": "NO_EVENT_SUBCLASS", "secondEventOne": "NO_EVENT_SUBCLASS"} | ||
| }, | ||
| "underscoresInNameBehavior": "ALLOW" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.