Skip to content

Commit 3a547fc

Browse files
LightSunLightSun
committed
fix lint and release lint 1.2
1 parent 51e339c commit 3a547fc

File tree

9 files changed

+151
-70
lines changed

9 files changed

+151
-70
lines changed

‎data-mediator-lint/dmlint-core/src/main/java/com/heaven7/java/data/mediator/lint/PropertyDetector.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
import org.jetbrains.uast.UElement;
1616
import org.jetbrains.uast.UMethod;
1717

18-
import java.util.Collection;
19-
import java.util.Collections;
20-
import java.util.List;
21-
import java.util.Set;
18+
import java.util.*;
2219

2320
import static com.heaven7.java.data.mediator.lint.PropertyUtils.getProp;
2421
import static com.heaven7.java.data.mediator.lint.PropertyUtils.getPropInfoWithSupers;
@@ -39,7 +36,7 @@ public class PropertyDetector extends Detector implements Detector.UastScanner {
3936

4037
@Override
4138
public List<Class<? extends UElement>> getApplicableUastTypes() {
42-
return Collections.singletonList(UClass.class);
39+
return Collections.<Class<? extends UElement>>singletonList(UClass.class);
4340
}
4441

4542
@Override
@@ -71,11 +68,15 @@ static boolean hasPropInfo(Collection<PropInfo> coll, String method){
7168

7269
@Override
7370
public void visitClass(UClass uClass) {
71+
//only check interface
72+
if(!uClass.isInterface()){
73+
return;
74+
}
7475
Set<PropInfo> infos = getPropInfoWithSupers(uClass);
7576
if(infos.isEmpty()){
7677
return;
7778
}
78-
79+
//check method is relative of any field
7980
for(UMethod method: uClass.getMethods()){
8081
PsiModifierList list = method.getModifierList();
8182
PsiAnnotation pa_keep = list.findAnnotation(NAME_KEEP);

‎data-mediator-lint/dmlint-core/src/main/java/com/heaven7/java/data/mediator/lint/PropertyUtils.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
package com.heaven7.java.data.mediator.lint;
22

3-
import com.intellij.psi.JavaPsiFacade;
4-
import com.intellij.psi.PsiAnnotation;
5-
import com.intellij.psi.PsiAnnotationMemberValue;
6-
import com.intellij.psi.PsiConstantEvaluationHelper;
7-
import com.intellij.psi.PsiElement;
8-
import com.intellij.psi.PsiExpression;
9-
import com.intellij.psi.PsiType;
3+
import com.intellij.psi.*;
104
import com.intellij.util.containers.ArrayListSet;
11-
12-
import org.jetbrains.uast.UAnnotation;
135
import org.jetbrains.uast.UClass;
146

157
import java.util.Set;
@@ -25,34 +17,42 @@
2517

2618
static Set<PropertyDetector.PropInfo> getPropInfoWithSupers(UClass uClass){
2719
Set<PropertyDetector.PropInfo> mSet = new ArrayListSet<>();
28-
do{
29-
getPropInfosForClass(uClass, mSet);
30-
uClass = uClass.getSuperClass();
31-
}while (uClass != null &&
32-
!uClass.getQualifiedName().startsWith("java.")
33-
&& !uClass.getQualifiedName().startsWith("android."));
20+
getPropInfoWithSupers(uClass.getPsi(), mSet);
3421
return mSet;
3522
}
23+
private static void getPropInfoWithSupers(PsiClass uClass, Set<PropertyDetector.PropInfo> out){
24+
if(uClass == null || uClass.getQualifiedName().startsWith("java.")
25+
|| uClass.getQualifiedName().startsWith("android.")){
26+
return;
27+
}
28+
getPropInfosForTarget(uClass, out);
29+
for(PsiClass clazz : uClass.getInterfaces()){
30+
getPropInfoWithSupers(clazz, out);
31+
}
32+
}
3633

37-
private static void getPropInfosForClass(UClass uClass, Set<PropertyDetector.PropInfo> mSet) {
38-
for(UAnnotation ua : uClass.getAnnotations()){
34+
private static void getPropInfosForTarget(PsiClass psiClass, Set<PropertyDetector.PropInfo> mSet) {
35+
final PsiModifierList list = psiClass.getModifierList();
36+
if(list == null){
37+
return;
38+
}
39+
for(PsiAnnotation ua : list.getAnnotations()){
3940
if(!getPropInfosOfFields(ua, mSet)){
4041
return;
4142
}
4243
}
4344
}
4445

4546
//true means success
46-
private static boolean getPropInfosOfFields(UAnnotation ua, Set<PropertyDetector.PropInfo> mSet) {
47-
String qualifiedName = ua.getQualifiedName();
47+
private static boolean getPropInfosOfFields(PsiAnnotation psa_fields, Set<PropertyDetector.PropInfo> mSet) {
48+
String qualifiedName = psa_fields.getQualifiedName();
4849
if(qualifiedName == null || !qualifiedName.equals(FOCUS_FIELDS)){
4950
return false;
5051
}
5152
// Set<PropertyDetector.PropInfo> mSet = new ArrayListSet<>();
52-
PsiConstantEvaluationHelper evaluation = JavaPsiFacade.getInstance(ua.getPsi().getProject())
53+
PsiConstantEvaluationHelper evaluation = JavaPsiFacade.getInstance(psa_fields.getProject())
5354
.getConstantEvaluationHelper();
5455

55-
PsiAnnotation psa_fields = (PsiAnnotation) ua.getPsi();
5656
PsiAnnotationMemberValue tempValues = psa_fields.findAttributeValue("value");
5757
if(tempValues == null){
5858
return false;

‎data-mediator-lint/dmlint/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
defaultConfig {
77
minSdkVersion 15
88
targetSdkVersion 26
9-
versionCode 1
10-
versionName "1.0"
9+
versionCode 12
10+
versionName "1.2"
1111
}
1212

1313
}

‎dmlint-core/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ dependencies {
3838
testCompile "com.android.tools.lint:lint:$lintVersion"
3939
testCompile "com.android.tools.lint:lint-tests:$lintVersion"
4040
testCompile "com.android.tools:testutils:$lintVersion"
41+
42+
testCompile 'com.heaven7.java.data.mediator.annotation:data-mediator-annotations:1.2.2'
43+
testCompile 'com.heaven7.java.data.mediator:data-mediator:1.4.4'
4144
}
4245

4346
jar {
@@ -52,7 +55,7 @@ publish {
5255
userOrg = 'lightsun' //bintray user name
5356
groupId = 'com.heaven7.java.data.mediator.lint'
5457
artifactId = 'dmlint-core'
55-
publishVersion = '1.0'
58+
publishVersion = '1.2'
5659
desc = 'this is a lint lib of data mediator. '
5760
website = 'https://github.com/LightSun/data-mediator'
58-
}
61+
}

‎dmlint-core/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 30 13:20:01 CST 2017
1+
#Fri Dec 01 21:08:57 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎dmlint-core/src/main/java/com/heaven7/java/data/mediator/lint/PropertyDetector.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,15 @@ static boolean hasPropInfo(Collection<PropInfo> coll, String method){
6868

6969
@Override
7070
public void visitClass(UClass uClass) {
71+
//only check interface
72+
if(!uClass.isInterface()){
73+
return;
74+
}
7175
Set<PropInfo> infos = getPropInfoWithSupers(uClass);
7276
if(infos.isEmpty()){
7377
return;
7478
}
75-
79+
//check method is relative of any field
7680
for(UMethod method: uClass.getMethods()){
7781
PsiModifierList list = method.getModifierList();
7882
PsiAnnotation pa_keep = list.findAnnotation(NAME_KEEP);

‎dmlint-core/src/main/java/com/heaven7/java/data/mediator/lint/PropertyUtils.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
package com.heaven7.java.data.mediator.lint;
22

3-
import com.intellij.psi.JavaPsiFacade;
4-
import com.intellij.psi.PsiAnnotation;
5-
import com.intellij.psi.PsiAnnotationMemberValue;
6-
import com.intellij.psi.PsiConstantEvaluationHelper;
7-
import com.intellij.psi.PsiElement;
8-
import com.intellij.psi.PsiExpression;
9-
import com.intellij.psi.PsiType;
3+
import com.intellij.psi.*;
104
import com.intellij.util.containers.ArrayListSet;
11-
12-
import org.jetbrains.uast.UAnnotation;
135
import org.jetbrains.uast.UClass;
146

157
import java.util.Set;
@@ -25,34 +17,42 @@
2517

2618
static Set<PropertyDetector.PropInfo> getPropInfoWithSupers(UClass uClass){
2719
Set<PropertyDetector.PropInfo> mSet = new ArrayListSet<>();
28-
do{
29-
getPropInfosForClass(uClass, mSet);
30-
uClass = uClass.getSuperClass();
31-
}while (uClass != null &&
32-
!uClass.getQualifiedName().startsWith("java.")
33-
&& !uClass.getQualifiedName().startsWith("android."));
20+
getPropInfoWithSupers(uClass.getPsi(), mSet);
3421
return mSet;
3522
}
23+
private static void getPropInfoWithSupers(PsiClass uClass, Set<PropertyDetector.PropInfo> out){
24+
if(uClass == null || uClass.getQualifiedName().startsWith("java.")
25+
|| uClass.getQualifiedName().startsWith("android.")){
26+
return;
27+
}
28+
getPropInfosForTarget(uClass, out);
29+
for(PsiClass clazz : uClass.getInterfaces()){
30+
getPropInfoWithSupers(clazz, out);
31+
}
32+
}
3633

37-
private static void getPropInfosForClass(UClass uClass, Set<PropertyDetector.PropInfo> mSet) {
38-
for(UAnnotation ua : uClass.getAnnotations()){
34+
private static void getPropInfosForTarget(PsiClass psiClass, Set<PropertyDetector.PropInfo> mSet) {
35+
final PsiModifierList list = psiClass.getModifierList();
36+
if(list == null){
37+
return;
38+
}
39+
for(PsiAnnotation ua : list.getAnnotations()){
3940
if(!getPropInfosOfFields(ua, mSet)){
4041
return;
4142
}
4243
}
4344
}
4445

4546
//true means success
46-
private static boolean getPropInfosOfFields(UAnnotation ua, Set<PropertyDetector.PropInfo> mSet) {
47-
String qualifiedName = ua.getQualifiedName();
47+
private static boolean getPropInfosOfFields(PsiAnnotation psa_fields, Set<PropertyDetector.PropInfo> mSet) {
48+
String qualifiedName = psa_fields.getQualifiedName();
4849
if(qualifiedName == null || !qualifiedName.equals(FOCUS_FIELDS)){
4950
return false;
5051
}
5152
// Set<PropertyDetector.PropInfo> mSet = new ArrayListSet<>();
52-
PsiConstantEvaluationHelper evaluation = JavaPsiFacade.getInstance(ua.getPsi().getProject())
53+
PsiConstantEvaluationHelper evaluation = JavaPsiFacade.getInstance(psa_fields.getProject())
5354
.getConstantEvaluationHelper();
5455

55-
PsiAnnotation psa_fields = (PsiAnnotation) ua.getPsi();
5656
PsiAnnotationMemberValue tempValues = psa_fields.findAttributeValue("value");
5757
if(tempValues == null){
5858
return false;

‎dmlint-core/src/test/java/com/heaven7/java/data/mediator/lint/Parent.java

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.heaven7.java.data.mediator.lint;
2+
3+
import com.heaven7.java.data.mediator.DataPools;
4+
import com.heaven7.java.data.mediator.Field;
5+
import com.heaven7.java.data.mediator.Fields;
6+
import com.heaven7.java.data.mediator.Property;
7+
import com.heaven7.java.data.mediator.internal.SharedProperties;
8+
9+
@Fields({
10+
@Field(propName = "text1")
11+
})
12+
public interface Parent extends DataPools.Poolable {
13+
14+
Property PROP_text1 = SharedProperties.get("java.lang.String", "text1", 0);
15+
16+
@Fields({
17+
@Field(propName = "text2")
18+
})
19+
interface Child extends Parent{
20+
21+
Property PROP_text2 = SharedProperties.get("java.lang.String", "text2", 0);
22+
23+
Child setText2(String text21);
24+
String getText2();
25+
26+
Child setText1(String text11);
27+
}
28+
@Fields({
29+
@Field(propName = "text3")
30+
})
31+
interface Child2 extends Child{
32+
Property PROP_text3 = SharedProperties.get("java.lang.String", "text3", 0);
33+
Child2 setText3(String text31);
34+
String getText3();
35+
36+
Child2 setText2(String text21);
37+
Child2 setText1(String text11);
38+
}
39+
40+
Parent setText1(String text11);
41+
String getText1();
42+
}

‎dmlint-core/src/test/java/com/heaven7/java/data/mediator/lint/PropertyDetectorTest.java

+46-15
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
public class PropertyDetectorTest extends LintDetectorTest {
1515

16-
public void testBasic0() throws Exception {
16+
public void testBasic1() throws Exception {
1717
String string = lintProject(
1818
java(getTestSource()),
1919
// TestFiles.copy("FlowItem.java", "src/test/dm/lint/test/FlowItem.java.java", this),
@@ -24,6 +24,16 @@ public void testBasic0() throws Exception {
2424
System.out.println(string);
2525
}
2626

27+
public void testBasic2() throws Exception {
28+
String string = lintProject(
29+
java(getTestSource2()),
30+
TestFiles.copy("Java-base-1.1.0.jar", "libs/Java-base.jar", this),
31+
TestFiles.copy("data-mediator-1.4.4.jar", "libs/data-mediator.jar", this),
32+
TestFiles.copy("data-mediator-annotations-1.2.2.jar", "libs/data-mediator-annotations.jar", this)
33+
);
34+
System.out.println(string);
35+
}
36+
2737
private String getTestSource(){
2838
return "" +
2939
"package dm.lint.test;\n" +
@@ -48,27 +58,48 @@ private String getTestSource(){
4858
"}";
4959
}
5060
private String getTestSource2(){
51-
return "" +
52-
"package dm.lint.test;\n" +
61+
return "package com.heaven7.java.data.mediator.lint;\n" +
62+
"\n" +
5363
"import com.heaven7.java.data.mediator.DataPools;\n" +
5464
"import com.heaven7.java.data.mediator.Field;\n" +
55-
"import com.heaven7.java.data.mediator.FieldFlags;\n" +
5665
"import com.heaven7.java.data.mediator.Fields;\n" +
57-
"import com.heaven7.java.data.mediator.ListPropertyEditor;\n" +
5866
"import com.heaven7.java.data.mediator.Property;\n" +
5967
"import com.heaven7.java.data.mediator.internal.SharedProperties;\n" +
6068
"\n" +
61-
"import java.util.List;\n" +
62-
"@Fields(value = {\n" +
63-
" @Field(propName = \"desc\" , complexType = FieldFlags.COMPLEX_LIST),\n" +
69+
"@Fields({\n" +
70+
" @Field(propName = \"text1\")\n" +
6471
"})\n" +
65-
"public interface FlowItem extends DataPools.Poolable {\n" +
66-
" Property PROP_desc = SharedProperties.get(String.class.getName(), \"desc\", 2);\n" +
67-
" FlowItem setDesc(List<String> desc1);\n" +
68-
" List<String> getDesc();\n" +
69-
" ListPropertyEditor<? extends FlowItem, String> beginDescEditor();\n" +
70-
" void getxxx();\n "+
71-
"}";
72+
"public interface Parent extends DataPools.Poolable {\n" +
73+
"\n" +
74+
" Property PROP_text1 = SharedProperties.get(\"java.lang.String\", \"text1\", 0);\n" +
75+
"\n" +
76+
" @Fields({\n" +
77+
" @Field(propName = \"text2\")\n" +
78+
" })\n" +
79+
" interface Child extends Parent{\n" +
80+
"\n" +
81+
" Property PROP_text2 = SharedProperties.get(\"java.lang.String\", \"text2\", 0);\n" +
82+
"\n" +
83+
" Child setText2(String text21);\n" +
84+
" String getText2();\n" +
85+
"\n" +
86+
" Child setText1(String text11);\n" +
87+
" }\n" +
88+
" @Fields({\n" +
89+
" @Field(propName = \"text3\")\n" +
90+
" })\n" +
91+
" interface Child2 extends Child{\n" +
92+
" Property PROP_text3 = SharedProperties.get(\"java.lang.String\", \"text3\", 0);\n" +
93+
" Child2 setText3(String text31);\n" +
94+
" String getText3();\n" +
95+
"\n" +
96+
" Child2 setText2(String text21);\n" +
97+
" Child2 setText1(String text11);\n" +
98+
" }\n" +
99+
"\n" +
100+
" Parent setText1(String text11);\n" +
101+
" String getText1();\n" +
102+
"}\n";
72103
}
73104

74105
@Override

0 commit comments

Comments
 (0)