Some bugfixes

ccm-docs
Jens Pelzetter 2020-12-03 20:27:16 +01:00
parent bd0ccd0ae6
commit c363b8cd43
2 changed files with 60 additions and 39 deletions

View File

@ -254,16 +254,12 @@ final class EntityImExporterTreeManager {
//Check if the nodes list has an entry for the required module. //Check if the nodes list has an entry for the required module.
if (!nodes.containsKey(requiredClass.getName())) { if (!nodes.containsKey(requiredClass.getName())) {
LOGGER.fatal("Required EntityImExporter for \"{}\" no found.", LOGGER.fatal("Required EntityImExporter for \"{}\" no found.",
requiredClass.getName()); requiredClass.getName());
throw new DependencyException(String.format( throw new DependencyException(String.format(
"EntityImExporter for type \"%s\" depends on type \"%s\" " "EntityImExporter for type \"%s\" depends on type \"%s\" "
+ "but no EntityImExporter for type \"%s\" is available.", + "but no EntityImExporter for type \"%s\" is available.",
node node.getEntityImExporter().getEntityClass(),
.getEntityImExporter()
.getClass()
.getAnnotation(Processes.class).value().getName(),
requiredClass.getName(), requiredClass.getName(),
requiredClass.getName())); requiredClass.getName()));
} }

View File

@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* A node in the dependency tree managed by {@link EntityImExporterTreeManager}. * A node in the dependency tree managed by {@link EntityImExporterTreeManager}.
@ -106,8 +107,9 @@ final class EntityImExporterTreeNode {
public int hashCode() { public int hashCode() {
int hash = 7; int hash = 7;
hash = 47 hash = 47
* hash * hash
+ Objects.hashCode(this.entityImExporter.getClass().getName()); + Objects
.hashCode(this.entityImExporter.getClass().getName());
return hash; return hash;
} }
@ -128,6 +130,29 @@ final class EntityImExporterTreeNode {
other.getEntityImExporter().getClass().getName()); other.getEntityImExporter().getClass().getName());
} }
@Override
public String toString() {
return String.format(
"%s{ "
+ "entityImExporter: %s, "
+ "dependentImExporters: [%s], "
+ "dependsOn: [%s]"
+ " }",
super.toString(),
entityImExporter.getEntityClass().toString(),
dependentImExporters
.stream()
.map(EntityImExporterTreeNode::getEntityImExporter)
.map(AbstractEntityImExporter::getEntityClass)
.map(Class::getName)
.collect(Collectors.joining(", ")),
dependsOn
.stream()
.map(EntityImExporterTreeNode::getEntityImExporter)
.map(AbstractEntityImExporter::getEntityClass)
.map(Class::getName)
.collect(Collectors.joining(", "))
);
}
} }