Rework things

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/asyncapi/AsyncApiGenerator.java

@@ -422,7 +422,7 @@ private void fillTemplateFactory(
         schemaObjectIt.forEachRemaining(schemaObj -> writeSchemaObject(operationObject.isUseLombokModelAnnotation(), operationObject.getModelPackage(), null, schemaObj));
 
         if (Boolean.TRUE.equals(generateExceptionTemplate)) {
-          templateFactory.fillTemplateModelClassException(filePath, modelPackage);
+          templateFactory.fillTemplateModelClassException(operationObject.getApiPackage(), modelPackage);
         }
       }
     }

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/asyncapi/template/TemplateFactory.java

@@ -221,7 +221,7 @@ public final void fillTemplateWrapper(
                  "className", className,
                  "keyNamespace", keyClassFullName,
                  "keyClassName", keyClassName));
-    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_MESSAGE_WRAPPER, filePath.resolve("MessageWrapper.java").toAbsolutePath().toString());
+    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_MESSAGE_WRAPPER, filePath, "MessageWrapper");
     clearData();
   }
 

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/common/template/CommonTemplateFactory.java

@@ -193,11 +193,11 @@ private Set<String> fillTemplateSchema(final ClassTemplate classTemplate, final
     return propertiesSet;
   }
 
-  public final void fillTemplateModelClassException(final Path filePathToSave, final String modelPackage) throws IOException {
-    final Path pathToExceptionPackage = filePathToSave.resolve("exception");
+  public final void fillTemplateModelClassException(final String filePathToSave, final String modelPackage) throws IOException {
+    final Path pathToExceptionPackage = Paths.get(filePathToSave).resolve("exception");
     pathToExceptionPackage.toFile().mkdirs();
     addToRoot(EXCEPTION_PACKAGE, modelPackage);
-    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_MODEL_EXCEPTION, filePathToSave, "ModelClassException");
+    writeTemplateToFile(CommonTemplateIndexConstants.TEMPLATE_MODEL_EXCEPTION, filePathToSave, "ModelClassException");
   }
 
   private void fillTemplateCustom(

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/common/template/CommonTemplateIndexConstants.java

@@ -66,4 +66,6 @@ public abstract class CommonTemplateIndexConstants {
 
   public static final String TEMPLATE_UNIQUE_ITEMS_VALIDATOR_ANNOTATION = "templateUniqueItemsValidator.ftlh";
 
+  private CommonTemplateIndexConstants() {
+  }
 }

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/openapi/OpenApiGenerator.java

@@ -295,16 +295,16 @@ private Map<String, SchemaObject> writeSchemaObject(
       try {
         final Set<String> propertiesSet = new HashSet<>();
         templateFactory.fillTemplateSchema(fileModelToSave, specFile.isUseLombokModelAnnotation(), schemaObject, propertiesSet);
-        fillTemplates(fileModelToSave,  propertiesSet);
+        fillTempla(fileModelToSave, propertiesSet);
       } catch (IOException | TemplateException e) {
         throw new GeneratedSourcesException(schemaObject.getClassName(), e);
       }
     });
 
     if (Boolean.TRUE.equals(generateExceptionTemplate)) {
       try {
-        templateFactory.fillTemplateModelClassException(fileModelToSave, true, modelPackage);
-      } catch (IOException | TemplateException e) {
+        templateFactory.fillTemplateModelClassException(fileModelToSave, modelPackage);
+      } catch (IOException e) {
         throw new GeneratedSourcesException(fileModelToSave, e);
       }
     }

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/openapi/template/TemplateFactory.java

@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -44,7 +45,7 @@ public final void fillTemplateSchema(
                                             TemplateException {
     if (Objects.nonNull(schemaObject.getFieldObjectList()) && !schemaObject.getFieldObjectList().isEmpty()) {
       addToRoot("schema", schemaObject);
-      writeTemplateToFile(templateSelector(useLombok, schemaObject), filePathToSave, schemaObject.getClassName());
+      writeTemplateToFile(templateSelector(useLombok), filePathToSave, schemaObject.getClassName());
       for (SchemaFieldObject fieldObject : schemaObject.getFieldObjectList()) {
         propertiesSet.addAll(fieldObject.getRestrictions().getProperties());
         if (fieldObject.isRequired() && Boolean.FALSE.equals(useLombok)) {
@@ -58,7 +59,7 @@ public final void clearData() {
     cleanData();
   }
 
-  private static String templateSelector(final Boolean useLombok, final SchemaObject schemaObject) {
+  private static String templateSelector(final Boolean useLombok) {
     final var shouldUseLombok = Objects.requireNonNullElse(useLombok, false);
     final String template;
 
@@ -71,44 +72,18 @@ private static String templateSelector(final Boolean useLombok, final SchemaObje
     return template;
   }
 
-  public final void fillTemplateModelClassException(final String filePathToSave) throws IOException, TemplateException {
-    final File fileToSave = new File(filePathToSave);
-    final Path pathToExceptionPackage = fileToSave.toPath().resolve("exception");
-    pathToExceptionPackage.toFile().mkdirs();
-    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_MODEL_EXCEPTION, pathToExceptionPackage, "ModelClassException");
-
-  }
-
   public final void fillTemplateWebClient(final String filePathToSave) throws IOException, TemplateException {
-    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_WEB_CLIENT, pathToSaveMainClass, "ApiWebClient");
+    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_WEB_CLIENT, filePathToSave, "ApiWebClient");
   }
 
   public final void fillTemplateRestClient(final String filePathToSave) throws IOException, TemplateException {
-    final File fileToSave = new File(filePathToSave);
-
-    final String pathToSaveMainClass = fileToSave.toPath().resolve("ApiRestClient.java").toString();
-    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_REST_CLIENT, pathToSaveMainClass);
+    writeTemplateToFile(TemplateIndexConstants.TEMPLATE_REST_CLIENT, Paths.get(filePathToSave), "ApiRestClient");
 
   }
 
   public final void fillTemplateAuth(final String filePathToSave, final String authName) throws IOException {
-    final File fileToSave = new File(filePathToSave);
-    final var nameAuthClass = authName + JAVA_EXTENSION;
-    final String pathToSaveMainClass = fileToSave.toPath().resolve(nameAuthClass).toString();
-    writeTemplateToFile(createNameTemplate(authName), pathToSaveMainClass);
-
-  }
-
-  public final void fillTemplateCustom(
-      final String filePathToSave, final String annotationFileName, final String validatorFileName, final String annotationTemplate,
-      final String validatorTemplate) throws IOException {
-    final File fileToSave = new File(filePathToSave);
-    final Path pathToValidatorPackage = fileToSave.toPath().resolve("customvalidator");
-    pathToValidatorPackage.toFile().mkdirs();
-    final String pathToSaveMainClass = pathToValidatorPackage.resolve(annotationFileName).toString();
-    writeTemplateToFile(annotationTemplate, pathToSaveMainClass);
-    final String pathToSaveMainClassValidator = pathToValidatorPackage.resolve(validatorFileName).toString();
-    writeTemplateToFile(validatorTemplate, pathToSaveMainClassValidator);
+    writeTemplateToFile(createNameTemplate(authName), Paths.get(filePathToSave), authName);
+
   }
 
   public final void fillTemplate(