Skip to content

Commit

Permalink
Merge pull request #55 from zeoflow/feature/long-cast
Browse files Browse the repository at this point in the history 
Fixed problem with casting int to long
  • Loading branch information
@teogor
teogor authored Jan 13, 2022
2 parents ca93c74 + ab03ab2 commit d967de1
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 74 deletions.
130 changes: 57 additions & 73 deletions memo-compiler/src/main/java/com/zeoflow/memo/processor/PreferenceFieldMethodGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package com.zeoflow.memo.processor;

import static com.zeoflow.memo.processor.PreferenceChangeListenerGenerator.getChangeListenerFieldName;
import static javax.lang.model.element.Modifier.PUBLIC;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

Expand All @@ -28,12 +31,8 @@
import java.util.ArrayList;
import java.util.List;

import static com.zeoflow.memo.processor.PreferenceChangeListenerGenerator.getChangeListenerFieldName;
import static javax.lang.model.element.Modifier.PUBLIC;

@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection"})
public class PreferenceFieldMethodGenerator
{
public class PreferenceFieldMethodGenerator {

private static final String SETTER_PREFIX = "put";
private static final String GETTER_PREFIX = "get";
Expand All @@ -46,20 +45,17 @@ public class PreferenceFieldMethodGenerator

public PreferenceFieldMethodGenerator(
PreferenceKeyField keyField,
PreferenceEntityAnnotatedClass annotatedClass)
{
PreferenceEntityAnnotatedClass annotatedClass) {
this.keyField = keyField;
this.annotatedEntityClazz = annotatedClass;
}

public List<MethodSpec> getFieldMethods()
{
public List<MethodSpec> getFieldMethods() {
List<MethodSpec> methodSpecs = new ArrayList<>();

methodSpecs.add(generateGetter());
methodSpecs.add(generateSetter());
if (keyField.isObservable)
{
if (keyField.isObservable) {
methodSpecs.add(generateObserver());
}
methodSpecs.add(generateObjectKeyNameSpec());
Expand All @@ -68,11 +64,9 @@ public List<MethodSpec> getFieldMethods()
return methodSpecs;
}

private MethodSpec generateObserver()
{
private MethodSpec generateObserver() {
TypeName typeName = ParameterSpec.builder(keyField.typeName, keyField.keyName.toLowerCase()).build().type;
switch (keyField.typeStringName)
{
switch (keyField.typeStringName) {
case "Boolean":
typeName = TypeName.get(Boolean.class);
break;
Expand All @@ -98,18 +92,34 @@ private MethodSpec generateObserver()
return builder.build();
}

private MethodSpec generateGetter()
{
MethodSpec.Builder builder =
MethodSpec.methodBuilder(getGetterPrefixName())
.addModifiers(PUBLIC);
private MethodSpec generateGetter() {
MethodSpec.Builder builder = MethodSpec
.methodBuilder(getGetterPrefixName())
.addModifiers(PUBLIC);
if (keyField.value != null) {
builder.addAnnotation(NonNull.class);
if (keyField.value instanceof Long) {
builder.addStatement(
"return " + getGetterStatement(),
"Memo",
keyField.keyName,
keyField.value + "L"
);
} else {
builder.addStatement(
"return " + getGetterStatement(),
"Memo",
keyField.keyName,
keyField.value
);
}
} else if (keyField.isFinal) {
builder.addAnnotation(NonNull.class);
builder.addStatement(
"return " + getGetterStatement(),
"Memo",
keyField.keyName,
keyField.value
keyField.variableName
);
} else {
builder.addAnnotation(Nullable.class);
Expand All @@ -124,8 +134,7 @@ private MethodSpec generateGetter()
return builder.build();
}

private MethodSpec generateSetter()
{
private MethodSpec generateSetter() {
MethodSpec.Builder builder =
MethodSpec.methodBuilder(getSetterPrefixName())
.addModifiers(PUBLIC)
Expand All @@ -135,24 +144,20 @@ private MethodSpec generateSetter()
keyField.keyName,
keyField.keyName.toLowerCase()
);
if (keyField.isObservable)
{
if (keyField.isObservable) {
builder.addStatement(getOnLiveDataStatement());
}
if (keyField.isListener)
{
if (keyField.isListener) {
builder.addStatement(getOnChangedStatement());
}
return builder.build();
}

private String getOnLiveDataStatement()
{
private String getOnLiveDataStatement() {
return keyField.keyName + "Observable.setValue(" + keyField.keyName.toLowerCase() + ")";
}

private MethodSpec generateObjectKeyNameSpec()
{
private MethodSpec generateObjectKeyNameSpec() {
return MethodSpec.methodBuilder(getKeyNamePostfixName())
.addModifiers(PUBLIC)
.addAnnotation(NonNull.class)
Expand All @@ -161,8 +166,7 @@ private MethodSpec generateObjectKeyNameSpec()
.build();
}

private MethodSpec generateContainsSpec()
{
private MethodSpec generateContainsSpec() {
return MethodSpec.methodBuilder(getContainsPrefixName())
.addModifiers(PUBLIC)
.addAnnotation(NonNull.class)
Expand All @@ -171,88 +175,69 @@ private MethodSpec generateContainsSpec()
.build();
}

private MethodSpec generateRemoveSpec()
{
private MethodSpec generateRemoveSpec() {
return MethodSpec.methodBuilder(getRemovePrefixName())
.addModifiers(PUBLIC)
.addStatement(
"$N.delete($S)", preference, keyField.keyName)
.build();
}

private String getGetterPrefixName()
{
private String getGetterPrefixName() {
return GETTER_PREFIX + StringUtils.toUpperCamel(this.keyField.keyName);
}

private String getSetterPrefixName()
{
private String getSetterPrefixName() {
return SETTER_PREFIX + StringUtils.toUpperCamel(this.keyField.keyName);
}

private String getKeyNamePostfixName()
{
private String getKeyNamePostfixName() {
return this.keyField.keyName + KEYNAME_POSTFIX;
}

private String getContainsPrefixName()
{
private String getContainsPrefixName() {
return HAS_PREFIX + StringUtils.toUpperCamel(this.keyField.keyName);
}

private String getRemovePrefixName()
{
private String getRemovePrefixName() {
return REMOVE_PREFIX + StringUtils.toUpperCamel(this.keyField.keyName);
}

private String getGetterStatement()
{
if (annotatedEntityClazz.getterFunctionsList.containsKey(keyField.keyName))
{
private String getGetterStatement() {
if (annotatedEntityClazz.getterFunctionsList.containsKey(keyField.keyName)) {
String superMethodName =
annotatedEntityClazz.getterFunctionsList.get(keyField.keyName).getSimpleName().toString();
if (keyField.value instanceof String)
{
if (keyField.value instanceof String) {
return String.format("super.%s($N.get($S, $S))", superMethodName);
} else if (keyField.value instanceof Float)
{
} else if (keyField.value instanceof Float) {
return String.format(
"super.%s($N.get($S, $Lf))", superMethodName);
} else
{
} else {
return String.format(
"super.%s($N.get($S, $L))", superMethodName);
}
} else
{
if (keyField.value instanceof String)
{
} else {
if (keyField.value instanceof String) {
return "$N.get($S, $S)";
} else if (keyField.value instanceof Float)
{
} else if (keyField.value instanceof Float) {
return "$N.get($S, $Lf)";
} else
{
} else {
return "$N.get($S, $L)";
}
}
}

private String getSetterStatement()
{
if (annotatedEntityClazz.setterFunctionsList.containsKey(keyField.keyName))
{
private String getSetterStatement() {
if (annotatedEntityClazz.setterFunctionsList.containsKey(keyField.keyName)) {
return String.format(
"Memo.put($S, super.%s($N))",
annotatedEntityClazz.setterFunctionsList.get(keyField.keyName).getSimpleName());
} else
{
} else {
return "Memo.put($S, $N)";
}
}

private String getOnChangedStatement()
{
private String getOnChangedStatement() {
String onChangeListener = getChangeListenerFieldName(keyField.keyName);
PreferenceChangeListenerGenerator generator = new PreferenceChangeListenerGenerator(keyField);
return "if ("
Expand All @@ -271,8 +256,7 @@ private String getOnChangedStatement()
+ ")";
}

private String getObserverName()
{
private String getObserverName() {
return this.keyField.keyName + "Observer";
}

Expand Down
6 changes: 5 additions & 1 deletion memo-compiler/src/main/java/com/zeoflow/memo/processor/PreferenceKeyField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ public class PreferenceKeyField
public final TypeName typeName;
public final String clazzName;
public String typeStringName;
public String variableName;
public String keyName;
public Object value;
public boolean isFinal;

public boolean isObjectField = false;
public boolean isObservable = false;
Expand All @@ -57,6 +59,8 @@ public PreferenceKeyField(
this.typeName = TypeName.get(variableElement.asType());
this.clazzName = variableElement.getSimpleName().toString();
this.value = variableElement.getConstantValue();
this.variableName = variableElement.getSimpleName().toString();
this.isFinal = variableElement.getModifiers().contains(Modifier.FINAL);
setTypeStringName();

if (annotation_keyName != null)
Expand Down Expand Up @@ -108,7 +112,7 @@ private void setTypeStringName()
this.typeStringName = "String";
} else
{
this.typeStringName = "String";
this.typeStringName = "Object";
this.isObjectField = true;
}
}
Expand Down

0 comments on commit d967de1

Please sign in to comment.