pmd fixes

Author: rbri

src/main/java/org/htmlunit/csp/Policy.java

@@ -186,16 +186,16 @@ private Directive add(final String name, final List<String> values,
 
             case "block-all-mixed-content":
                 // https://www.w3.org/TR/mixed-content/#strict-opt-in
-                if (!blockAllMixedContent_) {
+                if (blockAllMixedContent_) {
+                    wasDupe = true;
+                }
+                else {
                     if (!values.isEmpty()) {
                         directiveErrorConsumer.add(Severity.Error,
                                         "The block-all-mixed-content directive does not support values", 0);
                     }
                     blockAllMixedContent_ = true;
                 }
-                else {
-                    wasDupe = true;
-                }
                 newDirective = new Directive(values);
                 break;
 
@@ -322,16 +322,16 @@ else if (values.size() == 1) {
 
             case "upgrade-insecure-requests":
                 // https://www.w3.org/TR/upgrade-insecure-requests/#delivery
-                if (!upgradeInsecureRequests_) {
+                if (upgradeInsecureRequests_) {
+                    wasDupe = true;
+                }
+                else {
                     if (!values.isEmpty()) {
                         directiveErrorConsumer.add(Severity.Error,
                                 "The upgrade-insecure-requests directive does not support values", 0);
                     }
                     upgradeInsecureRequests_ = true;
                 }
-                else {
-                    wasDupe = true;
-                }
                 newDirective = new Directive(values);
                 break;
 
@@ -383,8 +383,7 @@ public String toString() {
             first = false;
             out.append(directive.name_);
             for (final String value : directive.directive_.getValues()) {
-                out.append(' ');
-                out.append(value);
+                out.append(' ').append(value);
             }
         }
         return out.toString();

src/main/java/org/htmlunit/csp/directive/HostSourceDirective.java

@@ -71,19 +71,19 @@ void addHostOrSchemeDuringConstruction(final String token,
         }
         else if ("*".equals(lowcaseToken)) {
             // Technically this is just a specific kind of host-source, but it's worth handling explicitly
-            if (!star_) {
-                star_ = true;
+            if (star_) {
+                errors.add(Policy.Severity.Warning, "Duplicate " + kind + " *", index);
             }
             else {
-                errors.add(Policy.Severity.Warning, "Duplicate " + kind + " *", index);
+                star_ = true;
             }
         }
         else if (lowcaseToken.equals(SELF_SRC)) {
-            if (!self_) {
-                self_ = true;
+            if (self_) {
+                errors.add(Policy.Severity.Warning, "Duplicate " + kind + " 'self'", index);
             }
             else {
-                errors.add(Policy.Severity.Warning, "Duplicate " + kind + " 'self'", index);
+                self_ = true;
             }
         }
         else {