Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
package io.polyapi.plugin.model.type.basic;

import io.polyapi.plugin.model.type.PolyType;
import io.polyapi.plugin.model.type.complex.MapObjectPolyType;
import io.polyapi.plugin.model.visitor.TypeVisitor;

public class AnyPolyType extends PolyType implements MapObjectPolyType {
public class AnyPolyType extends PolyType {

@Override
public void accept(TypeVisitor visitor) {
visitor.visit(MapObjectPolyType.class.cast(this));
}

@Override
public String getTypeName() {
return "any";
visitor.visit(this);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ default void visit(PrimitivePolyType type) {

default void visit(AnyPolyType type) {
log.trace("Visiting AnyPolyType.");
visit((MapObjectPolyType) type);
visit((PolyType) type);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import static com.fasterxml.jackson.databind.type.TypeFactory.defaultInstance;
import static java.lang.String.format;
import static java.nio.charset.Charset.defaultCharset;
import static java.util.function.Predicate.isEqual;
import static java.util.function.Predicate.not;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toSet;
Expand Down Expand Up @@ -122,7 +121,7 @@ public List<PolyFunction> deployFunctions(List<String> functionFilters, boolean
Arrays.stream(method.getParameters()).map(parameter -> {
log.debug("Processing parameter {}", parameter);
PolyFunctionArgument argument = new PolyFunctionArgument();
if (parameter.getType().equals(Map.class)) {
if (parameter.getType().equals(Object.class)) {
argument.setType("any");
} else {
argument.setType(parameter.getParameterizedType().getTypeName());
Expand All @@ -141,7 +140,7 @@ public List<PolyFunction> deployFunctions(List<String> functionFilters, boolean
"java.lang.Short", "java.lang.Byte" -> "number";
case "java.lang.Boolean" -> "boolean";
case "java.lang.String", "java.lang.Character" -> "string";
case "java.util.Map" -> "any";
case "java.util.Object" -> "any";
case "void" -> "void";
default -> "object";
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void visit(PlainPolyType type) {
result = Optional.ofNullable(type)
.map(PlainPolyType::getValue)
.filter(not(isEqual("void")))
.map(plainType -> new ParsedType(plainType.equals("any")? TypeUtils.parameterize(Map.class, String.class, Object.class) : Object.class))
.map(plainType -> new ParsedType(Object.class))
.orElse(new ParsedType(Void.class));
}

Expand Down