Skip to content

[Java] Remove php_generic_services usage for protobuf 4.x compatibility #502

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
jvdadda wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −13
Open

[Java] Remove php_generic_services usage for protobuf 4.x compatibility #502

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
1 change: 0 additions & 1 deletion multilang-schema-registry/shared/test/protos/TestOrderingSyntax3Options.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ syntax = "proto3";

package com.amazonaws.services.schemaregistry.utils.apicurio.syntax3.options;

option php_generic_services = true;
option php_class_prefix = "Example";
option php_metadata_namespace = "ExampleOptionsSyntax3";
option php_namespace = "com.amazonaws.services.schemaregistry.utils.apicurio.syntax3.options.example";
Expand Down
11 changes: 0 additions & 11 deletions ...c/main/java/com/amazonaws/services/schemaregistry/utils/apicurio/FileDescriptorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public class FileDescriptorUtils {
private static final String OBJC_CLASS_PREFIX_OPTION = "objc_class_prefix";
private static final String OPTIMIZE_FOR_OPTION = "optimize_for";
private static final String PHP_CLASS_PREFIX_OPTION = "php_class_prefix";
private static final String PHP_GENERIC_SERVICES_OPTION = "php_generic_services";
private static final String PHP_METADATA_NAMESPACE_OPTION = "php_metadata_namespace";
private static final String PHP_NAMESPACE_OPTION = "php_namespace";
private static final String PY_GENERIC_SERVICES_OPTION = "py_generic_services";
Expand Down Expand Up @@ -274,12 +273,6 @@ private static FileDescriptorProto toFileDescriptorProto(String schemaDefinition
schema.mergeOptions(options);
}

Boolean phpGenericServices= findOptionBoolean(PHP_GENERIC_SERVICES_OPTION, element.getOptions());
if (phpGenericServices != null) {
FileOptions options = FileOptions.newBuilder().setPhpGenericServices(phpGenericServices).build();
schema.mergeOptions(options);
}

String phpClassPrefix = findOptionString(PHP_CLASS_PREFIX_OPTION, element.getOptions());
if (phpClassPrefix != null) {
FileOptions options = FileOptions.newBuilder().setPhpClassPrefix(phpClassPrefix).build();
Expand Down Expand Up @@ -766,10 +759,6 @@ public static ProtoFileElement fileDescriptorToProtoFile(FileDescriptorProto fil
OptionElement option = new OptionElement(PHP_CLASS_PREFIX_OPTION, stringKind, file.getOptions().getPhpClassPrefix(), false);
options.add(option);
}
if (file.getOptions().hasPhpGenericServices()) {
OptionElement option = new OptionElement(PHP_GENERIC_SERVICES_OPTION, booleanKind, file.getOptions().getPhpGenericServices(), false);
options.add(option);
}
if (file.getOptions().hasPhpMetadataNamespace()) {
OptionElement option = new OptionElement(PHP_METADATA_NAMESPACE_OPTION, stringKind, file.getOptions().getPhpMetadataNamespace(), false);
options.add(option);
Expand Down
1 change: 0 additions & 1 deletion serializer-deserializer/src/test/proto/TestOrderingSyntax3Options.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ syntax = "proto3";

package com.amazonaws.services.schemaregistry.utils.apicurio.syntax3.options;

option php_generic_services = true;
option php_class_prefix = "Example";
option php_metadata_namespace = "ExampleOptionsSyntax3";
option php_namespace = "com.amazonaws.services.schemaregistry.utils.apicurio.syntax3.options.example";
Expand Down
Loading