Skip to content

Bdd naming #3893

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
sbiscigl merged 1 commit into from
Aug 13, 2026
+12 −5
Merged

Bdd naming #3893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions ...src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/ServiceNameUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import software.amazon.smithy.aws.traits.ServiceTrait;

import java.util.Map;
import java.util.Optional;

public final class ServiceNameUtil {

Expand Down Expand Up @@ -170,12 +171,18 @@ public static String getExportMacro(ServiceShape service, Map<String, String> se
* Follows C2J convention: AWS_{UPPERCASED_SERVICE_NAME}_LOCAL
*
* @param service The service shape to generate the macro for
* @param serviceMap Service ID mappings for namespace overrides (reserved for future consistency with getSmithyServiceName)
* @param serviceMap Service ID mappings, used to resolve the key into namespaceMap
* @param namespaceMap Namespace overrides, keyed by smithy service name; the macro must follow the
* override because the C2J-generated {@code <Prefix>_EXPORTS.h} defines it off
* {@code metadata.classNamePrefix}
* @return The local macro in format AWS_{SERVICE_NAME}_LOCAL
*/
public static String getLocalMacro(ServiceShape service, Map<String, String> serviceMap) {
String serviceName = getServiceName(service);
return "AWS_" + serviceName.toUpperCase() + "_LOCAL";
public static String getLocalMacro(ServiceShape service, Map<String, String> serviceMap,
Map<String, String> namespaceMap) {
return Optional.ofNullable(namespaceMap.get(getSmithyServiceName(service, serviceMap)))
.orElseGet(() -> getServiceName(service))
.toUpperCase()
.transform(name -> "AWS_" + name + "_LOCAL");
}

public static boolean isS3CrtProjection(ServiceShape service) {
Expand Down
2 changes: 1 addition & 1 deletion ...ws/util/awsclientsmithygenerator/generators/endpointrules/EndpointRulesCodegenPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private void generateEndpointRules(ServiceShape service, Map<String, String> ser
Map<String, String> namespaceMap, String pythonExecutable,
String bddBytecoderPath, CppWriterDelegator writerDelegator) {
String smithyServiceName = ServiceNameUtil.getSmithyServiceName(service, serviceMap);
String localMacro = ServiceNameUtil.getLocalMacro(service, serviceMap);
String localMacro = ServiceNameUtil.getLocalMacro(service, serviceMap, namespaceMap);
String namespace = namespaceMap.getOrDefault(smithyServiceName, ServiceNameUtil.getServiceName(service));
String classPrefix = Optional.ofNullable(namespaceMap.get(smithyServiceName))
.map(ServiceNameUtil::capitalize)
Expand Down
Loading