Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • server/runner/src/main/webResources/doc/api/public/doc.js
    ... ... @@ -129,6 +129,32 @@ function loadXml(tag, file) {
    129 129 
         }
    130 130 
     }
    131 131
    132 
    +function loadJson(tag, file) {
    133 
    +    let target = document.getElementById(tag + "-json-source");
    134 
    +    if (target) {
    135 
    +        load(file + ".json", function onLoad(text) {
    136 
    +            try {
    137 
    +                let response = JSON.parse(text);
    138 
    +                const formatter = new JSONFormatter(response, 100, {
    139 
    +                    hoverPreviewEnabled: false,
    140 
    +                    hoverPreviewArrayCount: 100,
    141 
    +                    hoverPreviewFieldCount: 5,
    142 
    +                    animateOpen: true,
    143 
    +                    animateClose: true,
    144 
    +                    theme: null, // or 'dark'
    145 
    +                    useToJSON: true // use the toJSON method to render an object as a string as available
    146 
    +                });
    147 
    +                let responseFormatter = formatter.render();
    148 
    +                // console.log("Youhou1 "+file+" : "+text);
    149 
    +                // console.log("Youhou2 "+file+" : "+responseFormatter);
    150 
    +                target.appendChild(responseFormatter);
    151 
    +            } catch (e) {
    152 
    +                target.innerHTML = text
    153 
    +            }
    154 
    +        });
    155 
    +    }
    156 
    +}
    157 
    +
    132 158 
     function addValidationMessages( messages) {
    133 159 
         let result = '<td><ul>';
    134 160 
         if (!!messages) {

  • toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/server/html/model/DocType.java
    ... ... @@ -54,10 +54,10 @@ public class DocType extends DocElement implements WithValidation {
    54 54 
         private String definitionContent;
    55 55 
         private String createValidationContent;
    56 56 
         private String updateValidationContent;
    57 
    -    private String createErrorValidationXmlContent;
    58 
    -    private String createWarningValidationXmlContent;
    59 
    -    private String updateErrorValidationXmlContent;
    60 
    -    private String updateWarningValidationXmlContent;
    57 
    +    private String createErrorValidationContent;
    58 
    +    private String createWarningValidationContent;
    59 
    +    private String updateErrorValidationContent;
    60 
    +    private String updateWarningValidationContent;
    61 61 
         private String validationContent = "";
    62 62
    63 63 
         public DocType(DocPackage parent, String name) {
    ... ... @@ -128,46 +128,46 @@ public class DocType extends DocElement implements WithValidation {
    128 128 
             this.updateValidationContent = updateValidationContent;
    129 129 
         }
    130 130
    131 
    -    public String getUpdateWarningValidationXmlContent() {
    132 
    -        return updateWarningValidationXmlContent;
    131 
    +    public String getUpdateWarningValidationContent() {
    132 
    +        return updateWarningValidationContent;
    133 133 
         }
    134 134
    135 
    -    public void setUpdateWarningValidationXmlContent(String updateWarningValidationXmlContent) {
    136 
    -        this.updateWarningValidationXmlContent = updateWarningValidationXmlContent;
    135 
    +    public void setUpdateWarningValidationContent(String updateWarningValidationContent) {
    136 
    +        this.updateWarningValidationContent = updateWarningValidationContent;
    137 137 
         }
    138 138
    139 
    -    public String getUpdateErrorValidationXmlContent() {
    140 
    -        return updateErrorValidationXmlContent;
    139 
    +    public String getUpdateErrorValidationContent() {
    140 
    +        return updateErrorValidationContent;
    141 141 
         }
    142 142
    143 
    -    public void setUpdateErrorValidationXmlContent(String updateErrorValidationXmlContent) {
    144 
    -        this.updateErrorValidationXmlContent = updateErrorValidationXmlContent;
    143 
    +    public void setUpdateErrorValidationContent(String updateErrorValidationContent) {
    144 
    +        this.updateErrorValidationContent = updateErrorValidationContent;
    145 145 
         }
    146 146
    147 
    -    public String getCreateWarningValidationXmlContent() {
    148 
    -        return createWarningValidationXmlContent;
    147 
    +    public String getCreateWarningValidationContent() {
    148 
    +        return createWarningValidationContent;
    149 149 
         }
    150 150
    151 
    -    public void setCreateWarningValidationXmlContent(String createWarningValidationXmlContent) {
    152 
    -        this.createWarningValidationXmlContent = createWarningValidationXmlContent;
    151 
    +    public void setCreateWarningValidationContent(String createWarningValidationContent) {
    152 
    +        this.createWarningValidationContent = createWarningValidationContent;
    153 153 
         }
    154 154
    155 
    -    public String getCreateErrorValidationXmlContent() {
    156 
    -        return createErrorValidationXmlContent;
    155 
    +    public String getCreateErrorValidationContent() {
    156 
    +        return createErrorValidationContent;
    157 157 
         }
    158 158
    159 
    -    public void setCreateErrorValidationXmlContent(String createErrorValidationXmlContent) {
    160 
    -        this.createErrorValidationXmlContent = createErrorValidationXmlContent;
    159 
    +    public void setCreateErrorValidationContent(String createErrorValidationContent) {
    160 
    +        this.createErrorValidationContent = createErrorValidationContent;
    161 161 
         }
    162 162
    163 163 
         @Override
    164 164 
         public void storeValidation(Path requestPath) throws IOException {
    165 165 
             WithValidation.store(getCreateValidationContent(), requestPath.resolve("validation-create.json"));
    166 166 
             WithValidation.store(getUpdateValidationContent(), requestPath.resolve("validation-update.json"));
    167 
    -        WithValidation.store(getCreateErrorValidationXmlContent(), requestPath.resolve("validation-create-error.xml"));
    168 
    -        WithValidation.store(getCreateWarningValidationXmlContent(), requestPath.resolve("validation-create-warning.xml"));
    169 
    -        WithValidation.store(getUpdateErrorValidationXmlContent(), requestPath.resolve("validation-update-error.xml"));
    170 
    -        WithValidation.store(getUpdateWarningValidationXmlContent(), requestPath.resolve("validation-update-warning.xml"));
    167 
    +        WithValidation.store(getCreateErrorValidationContent(), requestPath.resolve("validation-create-error.json"));
    168 
    +        WithValidation.store(getCreateWarningValidationContent(), requestPath.resolve("validation-create-warning.json"));
    169 
    +        WithValidation.store(getUpdateErrorValidationContent(), requestPath.resolve("validation-update-error.json"));
    170 
    +        WithValidation.store(getUpdateWarningValidationContent(), requestPath.resolve("validation-update-warning.json"));
    171 171 
         }
    172 172
    173 173 
         public void addSimpleType(TemplateModelBuilder builder,
    ... ... @@ -208,18 +208,18 @@ public class DocType extends DocElement implements WithValidation {
    208 208
    209 209 
         private void addValidation(Class<? extends BusinessDto> dtoType, DtoEntityContext<?, ?, ?, ?> spi, String validationTypeContent) {
    210 210 
             Path directory = FileUtil.getFileFromFQN(Path.of("/").toFile(), dtoType.getName()).toPath().getParent();
    211 
    -        String createErrorFileXmlContent = getValidator(directory, dtoType, "create", "error");
    212 
    -        String updateErrorFileXmlContent = getValidator(directory, dtoType, "update", "error");
    213 
    -        String createWarningFileXmlContent = getValidator(directory, dtoType, "create", "warning");
    214 
    -        String updateWarningFileXmlContent = getValidator(directory, dtoType, "update", "warning");
    211 
    +        String createErrorFileContent = getValidator(directory, dtoType, "create", "error");
    212 
    +        String updateErrorFileContent = getValidator(directory, dtoType, "update", "error");
    213 
    +        String createWarningFileContent = getValidator(directory, dtoType, "create", "warning");
    214 
    +        String updateWarningFileContent = getValidator(directory, dtoType, "update", "warning");
    215 215 
             String createFileContent = spi.getValidationCreateContent();
    216 216 
             String updateFileContent = spi.getValidationUpdateContent();
    217 217 
             setCreateValidationContent(createFileContent);
    218 218 
             setUpdateValidationContent(updateFileContent);
    219 
    -        setCreateErrorValidationXmlContent(createErrorFileXmlContent);
    220 
    -        setCreateWarningValidationXmlContent(createWarningFileXmlContent);
    221 
    -        setUpdateErrorValidationXmlContent(updateErrorFileXmlContent);
    222 
    -        setUpdateWarningValidationXmlContent(updateWarningFileXmlContent);
    219 
    +        setCreateErrorValidationContent(createErrorFileContent);
    220 
    +        setCreateWarningValidationContent(createWarningFileContent);
    221 
    +        setUpdateErrorValidationContent(updateErrorFileContent);
    222 
    +        setUpdateWarningValidationContent(updateWarningFileContent);
    223 223
    224 224 
             if (createFileContent == null && updateFileContent == null) {
    225 225 
                 return;
    ... ... @@ -241,12 +241,12 @@ public class DocType extends DocElement implements WithValidation {
    241 241 
         }
    242 242
    243 243 
         private String getValidator(Path directory, Class<? extends BusinessDto> dtoType, String context, String scope) {
    244 
    -        Path path = directory.resolve(String.format("%s-%s-%s-validation.xml", dtoType.getSimpleName(), context, scope));
    244 
    +        Path path = directory.resolve(String.format("%s-%s-%s-validation.json", dtoType.getSimpleName(), context, scope));
    245 245 
             try {
    246 246 
                 String location = path.toString().substring(1);
    247 247 
                 return IOUtils.resourceToString(location, StandardCharsets.UTF_8, Thread.currentThread().getContextClassLoader());
    248 248 
             } catch (IOException e) {
    249 
    -            log.warn("Can't load description at: " + path);
    249 
    +            log.warn("Can't load description at: {}", path);
    250 250 
                 return null;
    251 251 
             }
    252 252 
         }

  • toolkit/plugin/src/main/resources/templates/fragment/validationTypeContent.mustache
    1 
    -<h4>Validation - xml files</h4>
    2 
    -<div id="validation-create-xml" class="widget">
    3 
    -    <div class="widget-list widget-list-validation-xml" id="validation-create-warning-xml">
    4 
    -        <div><textarea id="validation-create-warning-xml-source" readonly="readonly" rows="20" style="border:none;margin-top:14px;width: 99%;"></textarea></div>
    1 
    +<h4>Validation - json files</h4>
    2 
    +<div id="validation-create-json" class="widget">
    3 
    +    <div class="widget-list widget-list-json" id="validation-create-warning-json">
    4 
    +        <div><pre id="validation-create-warning-json-source"></pre></div>
    5 5 
         </div>
    6 
    -    <div class="widget-list widget-list-validation-xml" id="validation-create-error-xml">
    7 
    -        <div><textarea id="validation-create-error-xml-source" readonly="readonly" rows="20" style="border:none;margin-top:14px;width: 99%;"></textarea></div>
    6 
    +    <div class="widget-list widget-list-json" id="validation-create-error-json">
    7 
    +        <div><pre id="validation-create-error-json-source"></pre></div>
    8 8 
         </div>
    9 9 
         <ul class="widget-tabs">
    10 
    -        <li class="widget-tab"><a href="#validation-create-warning-xml" class="widget-tab-link">Create warning xml file</a>
    11 
    -        <li class="widget-tab"><a href="#validation-create-error-xml" class="widget-tab-link">Create error xml file</a>
    10 
    +        <li class="widget-tab"><a href="#validation-create-warning-json" class="widget-tab-link">Create warning file</a>
    11 
    +        <li class="widget-tab"><a href="#validation-create-error-json" class="widget-tab-link">Create error file</a>
    12 12 
         </ul>
    13 13 
     </div>
    14 
    -<script type="application/javascript">loadXml("validation-create-error", "validation-create-error");loadXml("validation-create-warning", "validation-create-warning");</script>
    15 
    -<div id="validation-update-xml" class="widget">
    16 
    -    <div class="widget-list widget-list-validation-xml" id="validation-update-warning-xml">
    17 
    -       <div> <textarea id="validation-update-warning-xml-source" readonly="readonly" rows="20" style="border:none;margin-top:14px;width: 99%;"></textarea></div>
    14 
    +<script type="application/javascript">loadJson("validation-create-error", "validation-create-error");loadJson("validation-create-warning", "validation-create-warning");</script>
    15 
    +<div id="validation-update-json" class="widget">
    16 
    +    <div class="widget-list widget-list-json" id="validation-update-warning-json">
    17 
    +       <div> <pre id="validation-update-warning-json-source"></pre></div>
    18 18 
         </div>
    19 
    -    <div class="widget-list widget-list-validation-xml" id="validation-update-error-xml">
    20 
    -        <div> <textarea id="validation-update-error-xml-source" readonly="readonly" rows="20" style="border:none;margin-top:14px;width: 99%;"></textarea></div>
    19 
    +    <div class="widget-list widget-list-json" id="validation-update-error-json">
    20 
    +        <div> < <pre id="validation-update-error-json-source"></pre></div>
    21 21 
         </div>
    22 22 
         <ul class="widget-tabs">
    23 
    -        <li class="widget-tab"><a href="#validation-update-warning-xml" class="widget-tab-link">Update warning xml file</a>
    24 
    -        <li class="widget-tab"><a href="#validation-update-error-xml" class="widget-tab-link">Update error xml file</a>
    23 
    +        <li class="widget-tab"><a href="#validation-update-warning-json" class="widget-tab-link">Update warning file</a>
    24 
    +        <li class="widget-tab"><a href="#validation-update-error-json" class="widget-tab-link">Update error file</a>
    25 25 
         </ul>
    26 26 
     </div>
    27 
    -<script type="application/javascript">loadXml("validation-update-error", "validation-update-error");loadXml("validation-update-warning", "validation-update-warning");</script>
    27 
    +<script type="application/javascript">loadJson("validation-update-error", "validation-update-error");loadJson("validation-update-warning", "validation-update-warning");</script>
    28 28 
     <p><a href="#top" class="top" title="Up to top"></a></p>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help