Skip to content
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

Jump to bottom

Fix parameter collisions #3

Closed
wants to merge 5 commits into from
Closed

Fix parameter collisions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ef2223
support binder arrays
Jan 10, 2019
0ab8c12
fix parameter name collisions by using own parameter names
Feb 11, 2019
a2b0757
Merge branch 'master' of github.com:josesamuel/remoter into fix_param…
Feb 11, 2019
30ccf73
fix missing arg and remove debug exception
Feb 11, 2019
d16ccaa
fix clrf
Feb 11, 2019
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
71 changes: 36 additions & 35 deletions remoter/src/main/java/remoter/compiler/builder/BinderParamBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package remoter.compiler.builder;

import com.squareup.javapoet.ArrayTypeName;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.TypeName;

import javax.annotation.processing.Messager;
import javax.lang.model.element.Element;
Expand All @@ -26,40 +29,38 @@ protected BinderParamBuilder(Messager messager, Element element) {


@Override
public void writeParamsToProxy(VariableElement param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY) {
TypeMirror type = ((ArrayType) param.asType()).getComponentType();
methodBuilder.beginControlFlow("if(" + param.getSimpleName() + " == null)")
public void writeParamsToProxy(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName) {
TypeName type = ((ArrayTypeName) param.type).componentType;
methodBuilder.beginControlFlow("if($L == null)", param.name)
.addStatement("data.writeInt(-1)")
.nextControlFlow("else")
.addStatement("data.writeInt(" + param.getSimpleName() + ".length)")
.beginControlFlow("for($T item : " + param.getSimpleName() + ")", type)
.addStatement("data.writeStrongBinder(item != null ? new $T(item) : null)",
getStubClassName(type))
.addStatement("data.writeInt($L.length)", param.name)
.beginControlFlow("for($T item : $L)", type, param.name)
.addStatement("data.writeStrongBinder(item != null ? new $T(item) : null)", getStubClassName(type))
.endControlFlow()
.endControlFlow();
} else {

String binderName = param.getSimpleName() +"_binder";
methodBuilder.addStatement("IBinder "+ binderName +" = null");
methodBuilder.beginControlFlow("if (" + param.getSimpleName() + " != null)");
String binderName = param.name +"_binder";
methodBuilder.addStatement("IBinder $L = null", binderName);
methodBuilder.beginControlFlow("if ($L != null)", param.name);
methodBuilder.beginControlFlow("synchronized (stubMap)");
methodBuilder.addStatement(binderName + " = stubMap.get(" + param.getSimpleName() +")");
methodBuilder.beginControlFlow("if (" + binderName + " == null)");
methodBuilder.addStatement(binderName + " = new $T("+ param.getSimpleName() +")", getStubClassName(param.asType()));
methodBuilder.addStatement("stubMap.put(" + param.getSimpleName() + ", " + binderName +")");
methodBuilder.addStatement("$L = stubMap.get($L)", binderName, param.name);
methodBuilder.beginControlFlow("if ($L == null)", binderName);
methodBuilder.addStatement("$L = new $T($L)", binderName, getStubClassName(param.type), param.name);
methodBuilder.addStatement("stubMap.put($L, $L)", param.name, binderName);
methodBuilder.endControlFlow();
methodBuilder.endControlFlow();
methodBuilder.endControlFlow();

methodBuilder.addStatement("data.writeStrongBinder(" + binderName + ")");
methodBuilder.addStatement("data.writeStrongBinder($L)", binderName);
}
}

@Override
public void readResultsFromStub(TypeMirror resultType, MethodSpec.Builder methodBuilder) {
if (resultType.getKind() == TypeKind.ARRAY) {
TypeMirror type = ((ArrayType) resultType).getComponentType();
public void readResultsFromStub(TypeName resultType, MethodSpec.Builder methodBuilder) {
if (resultType instanceof ArrayTypeName) {
TypeName type = ((ArrayTypeName) resultType).componentType;
methodBuilder.beginControlFlow("if(result == null)")
.addStatement("data.writeInt(-1)")
.nextControlFlow("else")
Expand All @@ -78,9 +79,9 @@ public void readResultsFromStub(TypeMirror resultType, MethodSpec.Builder method


@Override
public void readResultsFromProxy(TypeMirror resultType, MethodSpec.Builder methodBuilder) {
if (resultType.getKind() == TypeKind.ARRAY) {
TypeMirror type = ((ArrayType) resultType).getComponentType();
public void readResultsFromProxy(TypeName resultType, MethodSpec.Builder methodBuilder) {
if (resultType instanceof ArrayTypeName) {
TypeName type = ((ArrayTypeName) resultType).componentType;
methodBuilder.addStatement("int length = reply.readInt()")
.beginControlFlow("if(length == -1)")
.addStatement("result = null")
Expand All @@ -96,44 +97,44 @@ public void readResultsFromProxy(TypeMirror resultType, MethodSpec.Builder metho
}

@Override
public void readOutResultsFromStub(VariableElement param, ParamType paramType, String paramName, MethodSpec.Builder methodBuilder) {
public void readOutResultsFromStub(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
}

@Override
public void writeParamsToStub(VariableElement param, ParamType paramType, String paramName, MethodSpec.Builder methodBuilder) {
super.writeParamsToStub(param, paramType, paramName, methodBuilder);
if (param.asType().getKind() == TypeKind.ARRAY) {
TypeMirror type = ((ArrayType) param.asType()).getComponentType();
public void writeParamsToStub(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
super.writeParamsToStub(param, paramType, methodBuilder);
if (param.type instanceof ArrayTypeName) {
TypeName type = ((ArrayTypeName) param.type).componentType;
methodBuilder.addStatement("int length = data.readInt()")
.beginControlFlow("if(length == -1)")
.addStatement(paramName + " = null")
.addStatement("$L = null", param.name)
.nextControlFlow("else")
.addStatement(paramName + " = new $T[length]", type)
.addStatement("$L = new $T[length]", param.name, type)
.beginControlFlow("for(int i = 0; i < length; i++)")
.addStatement(paramName + "[i] = new $T(reply.readStrongBinder())", getProxyClassName(type))
.addStatement("$L[i] = new $T(reply.readStrongBinder())", param.name, getProxyClassName(type))
.endControlFlow()
.endControlFlow();
} else {
methodBuilder.addStatement(paramName + " = new $T(data.readStrongBinder())", getProxyClassName(param.asType()));
methodBuilder.addStatement("$L = new $T(data.readStrongBinder())", param.name, getProxyClassName(param.type));
}
}

@Override
public void readOutParamsFromProxy(VariableElement param, ParamType paramType, MethodSpec.Builder methodBuilder) {
public void readOutParamsFromProxy(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
}

/**
* Returns the {@link ClassName} for the Stub
*/
private ClassName getStubClassName(TypeMirror param) {
private ClassName getStubClassName(TypeName param) {
Element element = getBindingManager().getElement(param.toString());
return ClassName.get(getPackage(element).getQualifiedName().toString(), element.getSimpleName() + ClassBuilder.STUB_SUFFIX);
}

/**
* Returns the {@link ClassName} for the Proxy
*/
private ClassName getProxyClassName(TypeMirror param) {
private ClassName getProxyClassName(TypeName param) {
Element element = getBindingManager().getElement(param.toString());
return ClassName.get(getPackage(element).getQualifiedName().toString(), element.getSimpleName() + ClassBuilder.PROXY_SUFFIX);
}
Expand Down
43 changes: 23 additions & 20 deletions remoter/src/main/java/remoter/compiler/builder/BooleanParamBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package remoter.compiler.builder;

import com.squareup.javapoet.ArrayTypeName;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.TypeName;

import javax.annotation.processing.Messager;
import javax.lang.model.element.Element;
Expand All @@ -20,62 +23,62 @@ protected BooleanParamBuilder(Messager messager, Element element) {


@Override
public void writeParamsToProxy(VariableElement param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY) {
public void writeParamsToProxy(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName) {
if (paramType == ParamType.OUT) {
writeArrayOutParamsToProxy(param, methodBuilder);
} else {
methodBuilder.addStatement("data.writeBooleanArray(" + param.getSimpleName() + ")");
methodBuilder.addStatement("data.writeBooleanArray($L)", param.name);
}
} else {
methodBuilder.addStatement("data.writeInt(" + param.getSimpleName() + " ? 1 : 0 )");
methodBuilder.addStatement("data.writeInt($L ? 1 : 0 )", param.name);
}
}

@Override
public void readResultsFromProxy(TypeMirror resultType, MethodSpec.Builder methodBuilder) {
if (resultType.getKind() == TypeKind.ARRAY) {
public void readResultsFromProxy(TypeName resultType, MethodSpec.Builder methodBuilder) {
if (resultType instanceof ArrayTypeName) {
methodBuilder.addStatement("result = reply.createBooleanArray()");
} else {
methodBuilder.addStatement("result = reply.readInt() == 1");
}
}

@Override
public void readResultsFromStub(TypeMirror resultType, MethodSpec.Builder methodBuilder) {
if (resultType.getKind() == TypeKind.ARRAY) {
public void readResultsFromStub(TypeName resultType, MethodSpec.Builder methodBuilder) {
if (resultType instanceof ArrayTypeName) {
methodBuilder.addStatement("reply.writeBooleanArray(result)");
} else {
methodBuilder.addStatement("reply.writeInt(result ? 1 : 0 )");
}
}

@Override
public void readOutResultsFromStub(VariableElement param, ParamType paramType, String paramName, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY) {
methodBuilder.addStatement("reply.writeBooleanArray(" + paramName + ")");
public void readOutResultsFromStub(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName) {
methodBuilder.addStatement("reply.writeBooleanArray($L)", param.name);
}
}


@Override
public void writeParamsToStub(VariableElement param, ParamType paramType, String paramName, MethodSpec.Builder methodBuilder) {
super.writeParamsToStub(param, paramType, paramName, methodBuilder);
if (param.asType().getKind() == TypeKind.ARRAY) {
public void writeParamsToStub(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
super.writeParamsToStub(param, paramType, methodBuilder);
if (param.type instanceof ArrayTypeName) {
if (paramType == ParamType.OUT) {
writeOutParamsToStub(param, paramType, paramName, methodBuilder);
writeOutParamsToStub(param, paramType, methodBuilder);
} else {
methodBuilder.addStatement(paramName + " = data.createBooleanArray()");
methodBuilder.addStatement("$L = data.createBooleanArray()", param.name);
}
} else {
methodBuilder.addStatement(paramName + " = 0 != data.readInt()");
methodBuilder.addStatement("$L = 0 != data.readInt()", param.name);
}
}

@Override
public void readOutParamsFromProxy(VariableElement param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY && paramType != ParamType.IN) {
methodBuilder.addStatement("reply.readBooleanArray(" + param.getSimpleName() + ")");
public void readOutParamsFromProxy(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName && paramType != ParamType.IN) {
methodBuilder.addStatement("reply.readBooleanArray($L)", param.name);
}
}

Expand Down
43 changes: 23 additions & 20 deletions remoter/src/main/java/remoter/compiler/builder/ByteParamBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package remoter.compiler.builder;

import com.squareup.javapoet.ArrayTypeName;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.TypeName;

import javax.annotation.processing.Messager;
import javax.lang.model.element.Element;
Expand All @@ -19,21 +22,21 @@ protected ByteParamBuilder(Messager messager, Element element) {
}

@Override
public void writeParamsToProxy(VariableElement param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY) {
public void writeParamsToProxy(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName) {
if (paramType == ParamType.OUT) {
writeArrayOutParamsToProxy(param, methodBuilder);
} else {
methodBuilder.addStatement("data.writeByteArray(" + param.getSimpleName() + ")");
methodBuilder.addStatement("data.writeByteArray($L)", param.name);
}
} else {
methodBuilder.addStatement("data.writeByte(" + param.getSimpleName() + ")");
methodBuilder.addStatement("data.writeByte($L)", param.name);
}
}

@Override
public void readResultsFromStub(TypeMirror resultType, MethodSpec.Builder methodBuilder) {
if (resultType.getKind() == TypeKind.ARRAY) {
public void readResultsFromStub(TypeName resultType, MethodSpec.Builder methodBuilder) {
if (resultType instanceof ArrayTypeName) {
methodBuilder.addStatement("reply.writeByteArray(result)");
} else {
methodBuilder.addStatement("reply.writeByte(result)");
Expand All @@ -42,39 +45,39 @@ public void readResultsFromStub(TypeMirror resultType, MethodSpec.Builder method


@Override
public void readResultsFromProxy(TypeMirror resultType, MethodSpec.Builder methodBuilder) {
if (resultType.getKind() == TypeKind.ARRAY) {
public void readResultsFromProxy(TypeName resultType, MethodSpec.Builder methodBuilder) {
if (resultType instanceof ArrayTypeName) {
methodBuilder.addStatement("result = reply.createByteArray()");
} else {
methodBuilder.addStatement("result = reply.readByte()");
}
}

@Override
public void readOutParamsFromProxy(VariableElement param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY && paramType != ParamType.IN) {
methodBuilder.addStatement("reply.readByteArray(" + param.getSimpleName() + ")");
public void readOutParamsFromProxy(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName && paramType != ParamType.IN) {
methodBuilder.addStatement("reply.readByteArray($L)", param.name);
}
}

@Override
public void readOutResultsFromStub(VariableElement param, ParamType paramType, String paramName, MethodSpec.Builder methodBuilder) {
if (param.asType().getKind() == TypeKind.ARRAY) {
methodBuilder.addStatement("reply.writeByteArray(" + paramName + ")");
public void readOutResultsFromStub(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
if (param.type instanceof ArrayTypeName) {
methodBuilder.addStatement("reply.writeByteArray($L)", param.name);
}
}

@Override
public void writeParamsToStub(VariableElement param, ParamType paramType, String paramName, MethodSpec.Builder methodBuilder) {
super.writeParamsToStub(param, paramType, paramName, methodBuilder);
if (param.asType().getKind() == TypeKind.ARRAY) {
public void writeParamsToStub(ParameterSpec param, ParamType paramType, MethodSpec.Builder methodBuilder) {
super.writeParamsToStub(param, paramType, methodBuilder);
if (param.type instanceof ArrayTypeName) {
if (paramType == ParamType.OUT) {
writeOutParamsToStub(param, paramType, paramName, methodBuilder);
writeOutParamsToStub(param, paramType, methodBuilder);
} else {
methodBuilder.addStatement(paramName + " = data.createByteArray()");
methodBuilder.addStatement("$L = data.createByteArray()", param.name);
}
} else {
methodBuilder.addStatement(paramName + " = data.readByte()");
methodBuilder.addStatement("$L = data.readByte()", param.name);
}
}
}
Loading