FIX: Pre-requisite handling

odf-apps/src/main/java/org/openpreservation/odf/apps/BuildVersionProvider.java

@@ -6,7 +6,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
-import java.util.logging.Level;
 
 import picocli.CommandLine.IVersionProvider;
 

odf-core/src/main/java/org/openpreservation/odf/validation/ValidatingParserImpl.java

@@ -11,12 +11,10 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.validation.Schema;
 
-import org.openpreservation.format.xml.Namespace;
 import org.openpreservation.format.xml.ParseResult;
 import org.openpreservation.format.xml.ValidationResult;
 import org.openpreservation.format.xml.XmlValidator;
@@ -124,8 +122,9 @@ private final List<Message> validateOdfXmlDocument(final OdfPackage odfPackage,
         List<Message> messageList = new ArrayList<>();
         OdfNamespaces ns = OdfNamespaces.fromId(parseResult.getRootNamespace().getId());
         if (OdfXmlDocuments.odfXmlDocumentOf(parseResult).isExtended()) {
-            messageList.add(FACTORY.getError("DOC-8", Utils.collectNsPrefixes(OdfXmlDocuments.odfXmlDocumentOf(parseResult)
-                    .getForeignNamespaces())));
+            messageList
+                    .add(FACTORY.getError("DOC-8", Utils.collectNsPrefixes(OdfXmlDocuments.odfXmlDocumentOf(parseResult)
+                            .getForeignNamespaces())));
             return messageList;
         }
         Schema schema = (ns == null) ? null

odf-core/src/main/java/org/openpreservation/odf/validation/Validator.java

@@ -6,12 +6,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.validation.Schema;
 
-import org.openpreservation.format.xml.Namespace;
 import org.openpreservation.format.xml.ParseResult;
 import org.openpreservation.format.xml.XmlParser;
 import org.openpreservation.format.xml.XmlValidator;

odf-core/src/main/java/org/openpreservation/odf/validation/rules/EncryptionRule.java

@@ -14,7 +14,7 @@ final class EncryptionRule extends AbstractRule {
 
     static final EncryptionRule getInstance(final Severity severity) {
         return new EncryptionRule("POL_1", "Encryption",
-                "The package MUST NOT contain any encrypted entries.", severity, true);
+                "The package MUST NOT contain any encrypted entries.", severity, false);
     }
 
     private EncryptionRule(final String id, final String name, final String description, final Severity severity,

odf-core/src/main/java/org/openpreservation/odf/validation/rules/ProfileImpl.java

@@ -1,7 +1,12 @@
 package org.openpreservation.odf.validation.rules;
 
+import java.util.Collection;
 import java.util.Set;
+import java.util.Map;
+import java.util.List;
+import java.util.stream.Collectors;
 
+import org.openpreservation.messages.Message;
 import org.openpreservation.messages.MessageLog;
 import org.openpreservation.messages.Messages;
 import org.openpreservation.odf.pkg.OdfPackage;
@@ -11,38 +16,38 @@
 import org.openpreservation.odf.validation.ValidationReport;
 
 final class ProfileImpl extends AbstractProfile {
+    private ValidationReport report = null;
+
     static final ProfileImpl of(final String id, final String name, final String description, final Set<Rule> rules) {
         return new ProfileImpl(id, name, description, rules);
     }
 
     private ProfileImpl(final String id, final String name, final String description, final Set<Rule> rules) {
         super(id, name, description, rules);
     }
- 
+
     @Override
     public ProfileResult check(final OdfPackage odfPackage) throws ParseException {
-        ValidationReport report = null;
         final MessageLog messages = Messages.messageLogInstance();
-        for (final Rule rule : this.rules) {
-            if (!rule.isPrerequisite()) {
-                continue;
-            }
+        messages.add(getRulesetMessages(odfPackage,
+                this.rules.stream().filter(Rule::isPrerequisite).collect(Collectors.toList())));
+        if (!messages.hasErrors()) {
+            messages.add(getRulesetMessages(odfPackage,
+                    this.rules.stream().filter(rule -> !rule.isPrerequisite()).collect(Collectors.toList())));
+        }
+        return ProfileResultImpl.of(odfPackage.getName(), report, messages);
+    }
+
+    private final Map<String, List<Message>> getRulesetMessages(final OdfPackage odfPackage,
+            final Collection<Rule> rules) throws ParseException {
+        final MessageLog messages = Messages.messageLogInstance();
+        for (final Rule rule : rules) {
             final MessageLog ruleMessages = rule.check(odfPackage);
             if (rule instanceof ValidPackageRule) {
                 report = ((ValidPackageRule) rule).getValidationReport();
             }
-            if (ruleMessages.hasErrors()) {
-                return ProfileResultImpl.of(odfPackage.getName(), report, ruleMessages);
-            }
             messages.add(ruleMessages.getMessages());
         }
-        for (final Rule rule : this.rules) {
-            if (rule.isPrerequisite()) {
-                continue;
-            }
-            final MessageLog ruleMessages = rule.check(odfPackage);
-            messages.add(ruleMessages.getMessages());
-        }
-        return ProfileResultImpl.of(odfPackage.getName(), report, messages);
+        return messages.getMessages();
     }
 }

odf-core/src/main/java/org/openpreservation/odf/validation/rules/ValidPackageRule.java

@@ -27,7 +27,7 @@ static final ValidPackageRule getInstance(final Severity severity)
             throws ParserConfigurationException, SAXException {
         return new ValidPackageRule("POL_2", "Standard Compliance",
                 "The file MUST comply with the standard \"OASIS Open Document Format for Office Applications (OpenDocument) v1.3\".",
-                severity, true);
+                severity, false);
     }
 
     private final ValidatingParser validatingParser = Validators.getValidatingParser();

odf-core/src/test/java/org/openpreservation/odf/validation/rules/ProfileImplTest.java

@@ -1,6 +1,5 @@
 package org.openpreservation.odf.validation.rules;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;