Changeset 9997 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-03-15T02:16:30+01:00 (10 years ago)

Author:

Don-vip

Message:

sonar - various fixes + javadoc

File:

• trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java

@@ -38 +38 @@
  *
  * The certificates are added in-memory at each start, nothing is written to disk.
+ * @since 9995
  */
-public class CertificateAmendment {
+public final class CertificateAmendment {
 
-    public static final String[] CERT_AMEND = { 
+    private static final String[] CERT_AMEND = {
         "resource://data/security/DST_Root_CA_X3.pem",
         "resource://data/security/StartCom_Certification_Authority.pem"
     };
-    public static final String[] SHA_HASHES = {
+
+    private static final String[] SHA_HASHES = {
         "139a5e4a4e0fa505378c72c5f700934ce8333f4e6b1b508886c4b0eb14f4be99",
         "916a8f9232328192968c81c8edb672fa539f726861dfe379ca722050e19962cd"
     };
+
+    private CertificateAmendment() {
+        // Hide default constructor for utility classes
+    }
 
     /**
@@ -81 +87 @@
         for (int i = 0; i < CERT_AMEND.length; i++) {
             CachedFile certCF = new CachedFile(CERT_AMEND[i]);
-            byte[] certBytes = certCF.getByteContent();
             MessageDigest md;
             try {
@@ -88 +93 @@
                 throw new RuntimeException(ex);
             }
+            byte[] certBytes = certCF.getByteContent();
             byte[] sha = md.digest(certBytes);
             if (!SHA_HASHES[i].equals(Utils.toHexString(sha)))
@@ -131 +137 @@
      */
     private static boolean certificateIsMissing(KeyStore keyStore, X509Certificate crt) {
-        String id = crt.getSubjectX500Principal().getName();
         PKIXParameters params;
         try {
@@ -140 +145 @@
             throw new RuntimeException(ex);
         }
+        String id = crt.getSubjectX500Principal().getName();
         for (TrustAnchor ta : params.getTrustAnchors()) {
             X509Certificate cert = ta.getTrustedCert();