Peer-at-Code/peer-at-code-backend
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Util -> Find | 2 method, one more optimized, one more easealy to use

Browse source
This commit is contained in:
jeffcheasey88 2023-06-01 19:28:49 +02:00
parent 8c90fc60b9
commit 0afdb0b76e
11 changed files with 107 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/be/jeffcheasey88/peeratcode/parser/java/Class.java
View file

@ -3,7 +3,7 @@ package be.jeffcheasey88.peeratcode.parser.java;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.function.BiFunction;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -110,7 +110,7 @@ public class Class extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
trace.add(this); trace.add(this);
if(!deep.apply(trace)) return null; if(!deep.apply(trace)) return null;
@ -120,4 +120,15 @@ public class Class extends JavaElement{
} }
return null; return null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
for(JavaElement element : this.childs){
JavaElement result = element.find(search, trace);
if(result != null) return result;
}
return null;
}
} }

6
src/be/jeffcheasey88/peeratcode/parser/java/JavaElement.java
View file

@ -1,13 +1,15 @@
package be.jeffcheasey88.peeratcode.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.util.Set; import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
public abstract class JavaElement { public abstract class JavaElement {
public abstract int parse(String content, CleanerPool global, CleanerPool local) throws Exception; public abstract int parse(String content, CleanerPool global, CleanerPool local) throws Exception;
public abstract JavaElement find(Function<JavaElement, Boolean> search, Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace); public abstract JavaElement find(Function<JavaElement, Boolean> search, Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace);
public abstract JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace);
//Only for development //Only for development
public abstract void show(int tab); public abstract void show(int tab);

11
src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
View file

@ -7,9 +7,8 @@ import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import be.jeffcheasey88.peeratcode.parser.java.CleanerPool.Cleaner; import be.jeffcheasey88.peeratcode.parser.java.CleanerPool.Cleaner;
@ -112,8 +111,12 @@ public class JavaParser{
content = content.substring(index); content = content.substring(index);
} }
public JavaElement find(Function<JavaElement, Boolean> search, Function<Set<JavaElement>, Boolean> deep){ public JavaElement find(Function<JavaElement, Boolean> search, Function<List<JavaElement>, Boolean> deep){
return this.clazz.find(search, deep, new HashSet<>()); return this.clazz.find(search, deep, new ArrayList<>());
}
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search){
return this.clazz.find(search, new ArrayList<>());
} }
public Package getPackage(){ public Package getPackage(){

12
src/be/jeffcheasey88/peeratcode/parser/java/Variable.java
View file

@ -4,7 +4,7 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.function.BiFunction;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -133,7 +133,7 @@ public class Variable extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
trace.add(this); trace.add(this);
if(!deep.apply(trace)) return null; if(!deep.apply(trace)) return null;
@ -141,6 +141,14 @@ public class Variable extends JavaElement{
return null; return null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
//value
return null;
}
public static class Value extends Variable{ public static class Value extends Variable{
private String value; private String value;

13
src/be/jeffcheasey88/peeratcode/parser/java/operations/AssigmentOperation.java
View file

@ -1,6 +1,7 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set; import java.util.List;
import java.util.function.BiFunction;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -35,11 +36,19 @@ public class AssigmentOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
trace.add(this); trace.add(this);
if(!deep.apply(trace)) return null; if(!deep.apply(trace)) return null;
//value //value
return null; return null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
//value
return null;
}
} }

1
src/be/jeffcheasey88/peeratcode/parser/java/operations/ElseOperation.java
View file

@ -5,7 +5,6 @@ import java.util.regex.Pattern;
import be.jeffcheasey88.peeratcode.parser.java.CleanerPool; import be.jeffcheasey88.peeratcode.parser.java.CleanerPool;
import be.jeffcheasey88.peeratcode.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import be.jeffcheasey88.peeratcode.parser.java.CleanerPool.Cleaner;
public class ElseOperation extends OperationContainer{ public class ElseOperation extends OperationContainer{

11
src/be/jeffcheasey88/peeratcode/parser/java/operations/LoopAffectOperation.java
View file

@ -1,6 +1,7 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set; import java.util.List;
import java.util.function.BiFunction;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -31,10 +32,16 @@ public class LoopAffectOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
return search.apply(this) ? this : null; return search.apply(this) ? this : null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
return search.apply(this, trace) ? this : null;
}
public static class ContinueOperation extends LoopAffectOperation{ public static class ContinueOperation extends LoopAffectOperation{
private static Pattern PATTERN = Pattern.compile("^(\\s*continue\\s*;).*$"); private static Pattern PATTERN = Pattern.compile("^(\\s*continue\\s*;).*$");

11
src/be/jeffcheasey88/peeratcode/parser/java/operations/MethodCallOperation.java
View file

@ -1,6 +1,7 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set; import java.util.List;
import java.util.function.BiFunction;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -39,7 +40,13 @@ public class MethodCallOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
return search.apply(this) ? this : null; return search.apply(this) ? this : null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
return search.apply(this, trace) ? this : null;
}
} }

15
src/be/jeffcheasey88/peeratcode/parser/java/operations/OperationContainer.java
View file

@ -2,7 +2,7 @@ package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.function.BiFunction;
import be.jeffcheasey88.peeratcode.parser.java.CleanerPool; import be.jeffcheasey88.peeratcode.parser.java.CleanerPool;
import be.jeffcheasey88.peeratcode.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
@ -68,7 +68,7 @@ public abstract class OperationContainer extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
trace.add(this); trace.add(this);
if(!deep.apply(trace)) return null; if(!deep.apply(trace)) return null;
@ -78,4 +78,15 @@ public abstract class OperationContainer extends JavaElement{
} }
return null; return null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
for(JavaElement element : this.childs){
JavaElement result = element.find(search, trace);
if(result != null) return result;
}
return null;
}
} }

14
src/be/jeffcheasey88/peeratcode/parser/java/operations/ReturnOperation.java
View file

@ -1,6 +1,7 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set; import java.util.List;
import java.util.function.BiFunction;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -49,7 +50,7 @@ public class ReturnOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
trace.add(this); trace.add(this);
if(!deep.apply(trace)) return null; if(!deep.apply(trace)) return null;
@ -58,4 +59,13 @@ public class ReturnOperation extends JavaElement{
return null; return null;
} }
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
JavaElement result = value.find(search, trace);
if(result != null) return result;
return null;
}
} }

28
test/be/jeffcheasey88/peeratcode/parser/java/SearchTest.java
View file

@ -7,21 +7,13 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import javax.lang.model.element.Element;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.TestInstance.Lifecycle;
import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.ForOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.IfOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.WhileOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.DoOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.LoopAffectOperation.BreakOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.LoopAffectOperation.ContinueOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.MethodCallOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.MethodCallOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.OperationContainer;
import be.jeffcheasey88.peeratcode.parser.java.operations.SynchronizedOperation;
@TestInstance(Lifecycle.PER_CLASS) @TestInstance(Lifecycle.PER_CLASS)
class SearchTest{ class SearchTest{
@ -75,4 +67,22 @@ class SearchTest{
} }
@Test
void siplifiedMethodCallInIfSearch(){
try {
JavaParser parser = parse("package be.jeffcheasey88.peeratcode.parser.java; class Test{ void function(){ int i = 0; if(i == 0){ this.none(); } valid(); } }");
JavaElement element = parser.find(
(e, trace) -> {
return (e instanceof MethodCallOperation) && (trace.get(trace.size()-2) instanceof IfOperation);
});
assertNotNull(element);
assertEquals("this.none()", ((MethodCallOperation)element).getValue());
} catch (Exception e) {
e.printStackTrace();
}
}
} }