Skip to content

Adding onClass attribute on ProtobufTypeBuilder #12799

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
merged 1 commit into from
Jul 29, 2023
Merged

Adding onClass attribute on ProtobufTypeBuilder #12799

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
20 changes: 5 additions & 15 deletions ...obuf/src/main/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.dubbo.metadata.definition.protobuf;

import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.lang.Prioritized;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
Expand All @@ -37,6 +38,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@Activate(onClass = "com.google.protobuf.GeneratedMessageV3")
public class ProtobufTypeBuilder implements TypeBuilder, Prioritized {
private final Logger logger = LoggerFactory.getLogger(getClass());
private static final Pattern MAP_PATTERN = Pattern.compile("^java\\.util\\.Map<(\\S+), (\\S+)>$");
Expand Down Expand Up @@ -258,11 +260,7 @@ private boolean isSimplePropertySettingMethod(Method method) {
// Enum property has two setting method.
// skip setXXXValue(int value)
// parse setXXX(SomeEnum value)
if (methodName.endsWith("Value") && types[0] == int.class) {
return false;
}

return true;
return !methodName.endsWith("Value") || types[0] != int.class;
}


Expand All @@ -289,11 +287,7 @@ boolean isListPropertyGettingMethod(Method method) {
}

// if field name end with List, should skip
if (!List.class.isAssignableFrom(type)) {
return false;
}

return true;
return List.class.isAssignableFrom(type);
}

/**
Expand All @@ -307,10 +301,6 @@ boolean isListPropertyGettingMethod(Method method) {
private boolean isMapPropertySettingMethod(Method methodTemp) {
String methodName = methodTemp.getName();
Class[] parameters = methodTemp.getParameterTypes();
if (methodName.startsWith("putAll") && parameters.length == 1 && Map.class.isAssignableFrom(parameters[0])) {
return true;
}

return false;
return methodName.startsWith("putAll") && parameters.length == 1 && Map.class.isAssignableFrom(parameters[0]);
}
}