This is an automated email from the ASF dual-hosted git repository.
alexvanboxel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new c4d006c Refine access level for `sdks/java/extensions/protobuf`
new 4e35fb6 Merge pull request #10796 from Refine access level for
`sdks/java/extensions/protobuf`
c4d006c is described below
commit c4d006c290e23cb100e19f307f8a696c76b47ee3
Author: Ismaël Mejía <ieme...@gmail.com>
AuthorDate: Thu Feb 6 23:36:49 2020 +0100
Refine access level for `sdks/java/extensions/protobuf`
---
.../beam/sdk/extensions/protobuf/ProtoByteBuddyUtils.java | 2 +-
.../beam/sdk/extensions/protobuf/ProtoSchemaTranslator.java | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteBuddyUtils.java
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteBuddyUtils.java
index 2b0af35..3b670ba 100644
---
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteBuddyUtils.java
+++
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoByteBuddyUtils.java
@@ -111,7 +111,7 @@ import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Maps;
import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Multimap;
-public class ProtoByteBuddyUtils {
+class ProtoByteBuddyUtils {
private static final ByteBuddy BYTE_BUDDY = new ByteBuddy();
private static final TypeDescriptor<ByteString> BYTE_STRING_TYPE_DESCRIPTOR =
TypeDescriptor.of(ByteString.class);
diff --git
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoSchemaTranslator.java
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoSchemaTranslator.java
index bc7503f..2981090 100644
---
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoSchemaTranslator.java
+++
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoSchemaTranslator.java
@@ -27,8 +27,6 @@ import com.google.protobuf.Message;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.beam.sdk.annotations.Experimental;
-import org.apache.beam.sdk.annotations.Experimental.Kind;
import org.apache.beam.sdk.extensions.protobuf.ProtoSchemaLogicalTypes.Fixed32;
import org.apache.beam.sdk.extensions.protobuf.ProtoSchemaLogicalTypes.Fixed64;
import
org.apache.beam.sdk.extensions.protobuf.ProtoSchemaLogicalTypes.SFixed32;
@@ -127,8 +125,7 @@ import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Sets;
* label is specified.
* </ul>
*/
-@Experimental(Kind.SCHEMAS)
-public class ProtoSchemaTranslator {
+class ProtoSchemaTranslator {
/** This METADATA tag is used to store the field number of a proto tag. */
public static final String PROTO_NUMBER_METADATA_TAG = "PROTO_NUMBER";
@@ -140,12 +137,12 @@ public class ProtoSchemaTranslator {
"PROTO_MAP_VALUE_MESSAGE_NAME";
/** Attach a proto field number to a type. */
- public static FieldType withFieldNumber(FieldType fieldType, int index) {
+ static FieldType withFieldNumber(FieldType fieldType, int index) {
return fieldType.withMetadata(PROTO_NUMBER_METADATA_TAG,
Long.toString(index));
}
/** Return the proto field number for a type. */
- public static int getFieldNumber(FieldType fieldType) {
+ static int getFieldNumber(FieldType fieldType) {
return
Integer.parseInt(fieldType.getMetadataString(PROTO_NUMBER_METADATA_TAG));
}
@@ -180,7 +177,7 @@ public class ProtoSchemaTranslator {
}
/** Return a Beam scheam representing a proto class. */
- public static Schema getSchema(Class<? extends Message> clazz) {
+ static Schema getSchema(Class<? extends Message> clazz) {
return getSchema(ProtobufUtil.getDescriptorForClass(clazz));
}
