Skip to content

Don't add property info if getter/setter signature is null #1543

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
Nov 26, 2019
Merged

Don't add property info if getter/setter signature is null #1543

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
27 changes: 16 additions & 11 deletions test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

import com.telerik.metadata.TreeNode.FieldInfo;
import com.telerik.metadata.TreeNode.MethodInfo;
import com.telerik.metadata.parsing.classes.bytecode.JarFile;
import com.telerik.metadata.parsing.ClassParser;
import com.telerik.metadata.parsing.classes.MetadataInfoAnnotationDescriptor;
import com.telerik.metadata.parsing.classes.NativeClassDescriptor;
import com.telerik.metadata.parsing.classes.NativeFieldDescriptor;
import com.telerik.metadata.parsing.classes.MetadataInfoAnnotationDescriptor;
import com.telerik.metadata.parsing.classes.NativeMethodDescriptor;
import com.telerik.metadata.parsing.classes.kotlin.extensions.KotlinExtensionFunctionDescriptor;
import com.telerik.metadata.parsing.classes.kotlin.properties.KotlinPropertyDescriptor;
import com.telerik.metadata.parsing.classes.NativeTypeDescriptor;
import com.telerik.metadata.parsing.classes.kotlin.metadata.ClassMetadataParser;
import com.telerik.metadata.parsing.classes.kotlin.metadata.bytecode.BytecodeClassMetadataParser;
import com.telerik.metadata.parsing.classes.bytecode.JarFile;
import com.telerik.metadata.parsing.classes.kotlin.extensions.ClassNameAndFunctionPair;
import com.telerik.metadata.parsing.classes.kotlin.extensions.ExtensionFunctionsCollector;
import com.telerik.metadata.storage.functions.FunctionsStorage;
import com.telerik.metadata.parsing.classes.kotlin.extensions.KotlinExtensionFunctionDescriptor;
import com.telerik.metadata.parsing.classes.kotlin.extensions.bytecode.BytecodeExtensionFunctionsCollector;
import com.telerik.metadata.parsing.classes.kotlin.metadata.ClassMetadataParser;
import com.telerik.metadata.parsing.classes.kotlin.metadata.bytecode.BytecodeClassMetadataParser;
import com.telerik.metadata.parsing.classes.kotlin.properties.KotlinPropertyDescriptor;
import com.telerik.metadata.storage.functions.FunctionsStorage;
import com.telerik.metadata.storage.functions.extensions.ExtensionFunctionsStorage;
import com.telerik.metadata.parsing.ClassParser;

import java.io.File;
import java.lang.reflect.Array;
Expand Down Expand Up @@ -90,7 +90,7 @@ static TreeNode build(List<String> paths) throws Exception {
if (clazz == null) {
throw new ClassNotFoundException("Class " + className + " not found in the input android libraries.");
} else {
if(clazz.getClassName().contains("SomePublicClass")){
if (clazz.getClassName().contains("SomePublicClass")) {
System.out.println("asd");
}
generate(clazz, root);
Expand Down Expand Up @@ -258,12 +258,14 @@ private static void setPropertiesInfo(TreeNode root, TreeNode node, KotlinProper

NativeMethodDescriptor getterMethod = propertyDescriptor.getGetterMethod();
NativeMethodDescriptor setterMethod = propertyDescriptor.getSetterMethod();
boolean shouldAddProperty = true;

MethodInfo getterMethodInfo = null;
if (getterMethod != null) {
getterMethodInfo = new MethodInfo(getterMethod);
getterMethodInfo.isResolved = true;
getterMethodInfo.signature = getMethodSignature(root, getterMethod.getReturnType(), getterMethod.getArgumentTypes());
shouldAddProperty = getterMethodInfo.signature != null;
}


Expand All @@ -272,10 +274,13 @@ private static void setPropertiesInfo(TreeNode root, TreeNode node, KotlinProper
setterMethodInfo = new MethodInfo(setterMethod);
setterMethodInfo.isResolved = true;
setterMethodInfo.signature = getMethodSignature(root, setterMethod.getReturnType(), setterMethod.getArgumentTypes());
shouldAddProperty = setterMethodInfo.signature != null;
}

TreeNode.PropertyInfo propertyInfo = new TreeNode.PropertyInfo(propertyName, getterMethodInfo, setterMethodInfo);
node.addProperty(propertyInfo);
if (shouldAddProperty) {
TreeNode.PropertyInfo propertyInfo = new TreeNode.PropertyInfo(propertyName, getterMethodInfo, setterMethodInfo);
node.addProperty(propertyInfo);
}
}

}
Expand Down