This commit is contained in:
Andrea Cavalli 2023-01-21 23:48:21 +01:00
parent ae89ce5a30
commit bdf037da06

View File

@ -41,9 +41,10 @@ public class GenDataSuperX extends ClassGenerator {
classBuilder.addSuperinterface(iTypeClass);
});
dataModel.getExtendsInterfaces(typeSuper).distinct().forEach(superType -> {
classBuilder.addSuperinterface(superType.getJTypeName(basePackageName));
});
Stream
.concat(dataModel.getSuperTypesOf(typeSuper, true), dataModel.getExtendsInterfaces(typeSuper))
.distinct()
.forEach(superType -> classBuilder.addSuperinterface(superType.getJTypeName(basePackageName)));
Stream
.concat(dataModel.getCommonInterfaceData(typeSuper), dataModel.getCommonInterfaceGetters(typeSuper))
@ -71,10 +72,6 @@ public class GenDataSuperX extends ClassGenerator {
classBuilder.addMethod(setter.build());
});
dataModel.getSuperTypesOf(typeSuper, true).forEach(superType -> {
classBuilder.addSuperinterface(superType.getJTypeName(basePackageName));
});
classBuilder.addMethod(MethodSpec
.methodBuilder("getMetaId$" + typeSuper.getName())
.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)