Skip to content

Demo code for https://github.com/aws/aws-sdk-js-v3/pull/3852 #3853

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package software.amazon.smithy.aws.typescript.codegen;

public class AwsSdkErrorHeaderProvider implements ErrorHeaderProvider {
@Override
public String getErrorHeader() {
return "x-amzn-errortype";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package software.amazon.smithy.aws.typescript.codegen;

public interface ErrorHeaderProvider {
String getErrorHeader();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package software.amazon.smithy.aws.typescript.codegen;

import software.amazon.smithy.utils.IoUtils;

public class JsonErrorCodeStubGenerator {
public static String getStub(final Class<?> c) {
return String.format(IoUtils.readUtf8Resource(c, "load-json-error-code-stub.ts"), ResolvedErrorHeaderProvider.getSingletonInstance().getErrorHeader());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void generateSharedComponents(GenerationContext context) {

TypeScriptWriter writer = context.getWriter();
writer.addUseImports(getApplicationProtocol().getResponseType());
writer.write(IoUtils.readUtf8Resource(getClass(), "load-json-error-code-stub.ts"));
writer.write(JsonErrorCodeStubGenerator.getStub(getClass()));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package software.amazon.smithy.aws.typescript.codegen;

import java.util.ServiceLoader;

public class ResolvedErrorHeaderProvider implements ErrorHeaderProvider {
private static final ErrorHeaderProvider SINGLETON = new ResolvedErrorHeaderProvider();

final String errorHeader;
private ResolvedErrorHeaderProvider() {
final ServiceLoader<ErrorHeaderProvider> loader = ServiceLoader.load(ErrorHeaderProvider.class);
errorHeader = loader.findFirst().orElse(new AwsSdkErrorHeaderProvider());
}

@Override
public String getErrorHeader() {
return errorHeader;
}

public static ErrorHeaderProvider getSingletonInstance() {
return SINGLETON;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void generateSharedComponents(GenerationContext context) {

TypeScriptWriter writer = context.getWriter();
writer.addUseImports(getApplicationProtocol().getResponseType());
writer.write(IoUtils.readUtf8Resource(getClass(), "load-json-error-code-stub.ts"));
writer.write(JsonErrorCodeStubGenerator.getStub(getClass()));
}

@Override
Expand All @@ -93,7 +93,7 @@ protected void writeDefaultInputHeaders(GenerationContext context, OperationShap

@Override
protected void writeDefaultErrorHeaders(GenerationContext context, StructureShape error) {
context.getWriter().write("'x-amzn-errortype': $S,", error.getId().getName());
context.getWriter().write("'$L': $S,", ResolvedErrorHeaderProvider.getSingletonInstance().getErrorHeader(), error.getId().getName());
}

@Override
Expand Down