Skip to content

Revert change that breaks spark compatability #1

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

Open
davidtime wants to merge 1 commit into
base: release-2.17.0
Choose a base branch
from
Open

Revert change that breaks spark compatability #1

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
9 changes: 3 additions & 6 deletions ...va/io/amazon-web-services/src/main/java/org/apache/beam/sdk/io/aws/options/AwsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.core.type.WritableTypeId;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
Expand Down Expand Up @@ -158,9 +156,8 @@ public void serializeWithType(
SerializerProvider serializers,
TypeSerializer typeSerializer)
throws IOException {
WritableTypeId typeId =
typeSerializer.writeTypePrefix(
jsonGenerator, typeSerializer.typeId(credentialsProvider, JsonToken.START_OBJECT));
typeSerializer.writeTypePrefixForObject(credentialsProvider, jsonGenerator);

if (credentialsProvider.getClass().equals(AWSStaticCredentialsProvider.class)) {
jsonGenerator.writeStringField(
AWS_ACCESS_KEY_ID, credentialsProvider.getCredentials().getAWSAccessKeyId());
Expand Down Expand Up @@ -200,7 +197,7 @@ public void serializeWithType(
throw new IllegalArgumentException(
"Unsupported AWS credentials provider type " + credentialsProvider.getClass());
}
typeSerializer.writeTypeSuffix(jsonGenerator, typeId);
typeSerializer.writeTypeSuffixForObject(credentialsProvider, jsonGenerator);
}
}

Expand Down
8 changes: 2 additions & 6 deletions .../io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/options/AwsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.core.type.WritableTypeId;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
Expand Down Expand Up @@ -141,9 +139,7 @@ public void serializeWithType(
SerializerProvider serializer,
TypeSerializer typeSerializer)
throws IOException {
WritableTypeId typeId =
typeSerializer.writeTypePrefix(
jsonGenerator, typeSerializer.typeId(credentialsProvider, JsonToken.START_OBJECT));
typeSerializer.writeTypePrefixForObject(credentialsProvider, jsonGenerator);
if (credentialsProvider.getClass().equals(StaticCredentialsProvider.class)) {
jsonGenerator.writeStringField(
ACCESS_KEY_ID, credentialsProvider.resolveCredentials().accessKeyId());
Expand All @@ -153,7 +149,7 @@ public void serializeWithType(
throw new IllegalArgumentException(
"Unsupported AWS credentials provider type " + credentialsProvider.getClass());
}
typeSerializer.writeTypeSuffix(jsonGenerator, typeId);
typeSerializer.writeTypeSuffixForObject(credentialsProvider, jsonGenerator);
}
}

Expand Down