[SLING-5917] parseRawText flag in getRepoInitText() is ambiguous

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: Repoinit JCR 1.0.0
• Component/s: Repoinit
• Assignee: Oliver Lietz
• Reporter: Oliver Lietz
• Created: 28/Jul/16 21:39
• Updated: 22/Aug/16 16:17
• Resolved: 29/Jul/16 07:13

Description

current:

    private String getRepoInitText() {
        final boolean parseRawText = modelSectionName.trim().length() > 0;
        if(parseRawText) {
            log.info("Reading repoinit statements from {}", textURL);
        } else {
            log.info("Extracting repoinit statements from section {} of provisioning model {}", modelSectionName, textURL);
        }
        String result = getRawRepoInitText();
        log.debug("Raw text from {}: \n{}", textURL, result);
        log.info("Got {} characters from {}", result.length(), textURL);
        if(parseRawText) {
            final StringReader r = new StringReader(result);
            try {
                final Model m = ModelReader.read(r, textURL);
                final StringBuilder b = new StringBuilder();
                for(Feature f : m.getFeatures()) {
                    for(Section s : f.getAdditionalSections(modelSectionName)) {
                        b.append("# ").append(modelSectionName).append(" from ").append(f.getName()).append("\n");
                        b.append("# ").append(s.getComment()).append("\n");
                        b.append(s.getContents()).append("\n");
                    }
                }
                result = b.toString();
            } catch (IOException e) {
                result = "";
                log.warn("Error parsing provisioning model from " + textURL, e);
            }
        }
        return result;
    }

improved:

    private String getRepoInitText() {
        final String rawText = getRawRepoInitText();
        log.debug("Raw text from {}: \n{}", textURL, rawText);
        log.info("Got {} characters from {}", rawText.length(), textURL);
        final boolean parseRawText = modelSectionName.trim().length() == 0;
        if (parseRawText) {
            log.info("Parsing raw repoinit statements from {}", textURL);
            return rawText;
        } else {
            log.info("Extracting repoinit statements from section '{}' of provisioning model {}", modelSectionName, textURL);
            final StringReader reader = new StringReader(rawText);
            try {
                final Model model = ModelReader.read(reader, textURL);
                final StringBuilder sb = new StringBuilder();
                for (Feature feature : model.getFeatures()) {
                    for (Section section : feature.getAdditionalSections(modelSectionName)) {
                        sb.append("# ").append(modelSectionName).append(" from ").append(feature.getName()).append("\n");
                        sb.append("# ").append(section.getComment()).append("\n");
                        sb.append(section.getContents()).append("\n");
                    }
                }
                return sb.toString();
            } catch (IOException e) {
                log.warn("Error parsing provisioning model from " + textURL, e);
                return "";
            }
        }
    }

Issue Links

• relates to: SLING-5923 Support <RAW> marker in model.section.name config param of jcr.repoinit.RepositoryInitializer