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

Util -> Find -> Generic type

Browse source
This commit is contained in:
jeffcheasey88 2023-06-01 20:26:28 +02:00
parent 0afdb0b76e
commit da87230afc
10 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,23 +110,23 @@ public class Class extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return (E)this;
trace.add(this);
if(!deep.apply(trace)) return null;
for(JavaElement element : this.childs){
JavaElement result = element.find(search, deep, trace);
E result = element.find(search, deep, trace);
if(result != null) return result;
}
return null;
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
if(search.apply(this, trace)) return (E)this;
for(JavaElement element : this.childs){
JavaElement result = element.find(search, trace);
E result = element.find(search, trace);
if(result != null) return result;
}
return null;

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

@ -8,8 +8,8 @@ public abstract class JavaElement {
public abstract int parse(String content, CleanerPool global, CleanerPool local) throws Exception;
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);
public abstract <E extends JavaElement> E find(Function<JavaElement, Boolean> search, Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace);
public abstract <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace);
//Only for development
public abstract void show(int tab);

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

@ -111,12 +111,12 @@ public class JavaParser{
content = content.substring(index);
}
public JavaElement find(Function<JavaElement, Boolean> search, Function<List<JavaElement>, Boolean> deep){
return this.clazz.find(search, deep, new ArrayList<>());
public <E extends JavaElement> E find(Function<JavaElement, Boolean> search, Function<List<JavaElement>, Boolean> deep){
return (E)this.clazz.find(search, deep, new ArrayList<>());
}
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search){
return this.clazz.find(search, new ArrayList<>());
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search){
return (E) this.clazz.find(search, new ArrayList<>());
}
public Package getPackage(){

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

@ -133,8 +133,8 @@ public class Variable extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return (E)this;
trace.add(this);
if(!deep.apply(trace)) return null;
//Value of the variable
@ -142,9 +142,9 @@ public class Variable extends JavaElement{
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
if(search.apply(this, trace)) return (E)this;
//value
return null;
}

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

@ -36,8 +36,8 @@ public class AssigmentOperation extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return (E)this;
trace.add(this);
if(!deep.apply(trace)) return null;
//value
@ -45,9 +45,9 @@ public class AssigmentOperation extends JavaElement{
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
if(search.apply(this, trace)) return (E)this;
//value
return null;
}

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

@ -32,14 +32,14 @@ public class LoopAffectOperation extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
return search.apply(this) ? (E)this : null;
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
return search.apply(this, trace) ? this : null;
return search.apply(this, trace) ? (E)this : null;
}
public static class ContinueOperation extends LoopAffectOperation{

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

@ -40,13 +40,13 @@ public class MethodCallOperation extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
return search.apply(this) ? (E)this : null;
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
return search.apply(this, trace) ? this : null;
return search.apply(this, trace) ? (E)this : null;
}
}

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

@ -68,23 +68,23 @@ public abstract class OperationContainer extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return (E)this;
trace.add(this);
if(!deep.apply(trace)) return null;
for(JavaElement element : this.childs){
JavaElement result = element.find(search, deep, trace);
E result = element.find(search, deep, trace);
if(result != null) return result;
}
return null;
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
trace.add(this);
if(search.apply(this, trace)) return this;
if(search.apply(this, trace)) return (E)this;
for(JavaElement element : this.childs){
JavaElement result = element.find(search, trace);
E result = element.find(search, trace);
if(result != null) return result;
}
return null;

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

@ -50,20 +50,20 @@ public class ReturnOperation extends JavaElement{
}
@Override
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;
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<List<JavaElement>, Boolean> deep, List<JavaElement> trace){
if(search.apply(this)) return (E)this;
trace.add(this);
if(!deep.apply(trace)) return null;
JavaElement result = value.find(search, deep, trace);
E result = value.find(search, deep, trace);
if(result != null) return result;
return null;
}
@Override
public JavaElement find(BiFunction<JavaElement, List<JavaElement>, Boolean> search, List<JavaElement> trace){
public <E extends JavaElement> E 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(search.apply(this, trace)) return (E)this;
E result = value.find(search, trace);
if(result != null) return result;
return null;
}

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

@ -72,13 +72,13 @@ class SearchTest{
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(
MethodCallOperation element = parser.find(
(e, trace) -> {
return (e instanceof MethodCallOperation) && (trace.get(trace.size()-2) instanceof IfOperation);
});
assertNotNull(element);
assertEquals("this.none()", ((MethodCallOperation)element).getValue());
assertEquals("this.none()", element.getValue());
} catch (Exception e) {
e.printStackTrace();
}