From bdf037da06aecaad845c1db02f91f00782a7aeed Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 21 Jan 2023 23:48:21 +0100 Subject: [PATCH] Update --- .../data/generator/plugin/classgen/GenDataSuperX.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java index a03f3b4..20ba68b 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java +++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java @@ -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)