Add association tags and generate UML

Signed-off-by: Yuuta Liang <yuutaw@student.cs.ubc.ca>

3 files changed, 14 insertions, 0 deletions

diff --git a/src/main/model/pki/crl/CertificateList.java b/src/main/model/pki/crl/CertificateList.java
index 8729561..8f4b98b 100644
--- a/src/main/model/pki/crl/CertificateList.java
+++ b/src/main/model/pki/crl/CertificateList.java
@@ -1,5 +1,6 @@
 package model.pki.crl;
 
+import annotations.Assoc;
 import model.asn1.ASN1Object;
 import model.asn1.BitString;
 import model.asn1.Tag;
@@ -20,16 +21,19 @@ public class CertificateList extends ASN1Object {
      * All info of that CRL, excluding the signature.
      * It will be signed, and the signature is in <pre>signature</pre>.
      */
+    @Assoc(partOf = true)
     private final CertificateListContent crl;
 
     /**
      * The algorithm used for <pre>signature</pre>.
      */
+    @Assoc(partOf = true)
     private final AlgorithmIdentifier signatureAlgorithm;
 
     /**
      * The signature.
      */
+    @Assoc(partOf = true)
     private final BitString signature;
 
     /**
diff --git a/src/main/model/pki/crl/CertificateListContent.java b/src/main/model/pki/crl/CertificateListContent.java
index 4cc96fb..80d8fc1 100644
--- a/src/main/model/pki/crl/CertificateListContent.java
+++ b/src/main/model/pki/crl/CertificateListContent.java
@@ -1,5 +1,6 @@
 package model.pki.crl;
 
+import annotations.Assoc;
 import model.asn1.*;
 import model.pki.AlgorithmIdentifier;
 import model.x501.Name;
@@ -39,10 +40,15 @@ import java.util.stream.Stream;
  */
 public class CertificateListContent extends ASN1Object {
     private final Int version = new Int(Int.TAG, null, 1);
+    @Assoc(partOf = true)
     private final Name issuer;
+    @Assoc(partOf = true)
     private final AlgorithmIdentifier signature;
+    @Assoc(partOf = true)
     private final ASN1Time thisUpdate;
+    @Assoc(partOf = true)
     private final ASN1Time nextUpdate;
+    @Assoc(partOf = true, lowerBond = 0)
     private final RevokedCertificate[] revokedCertificates;
 
     /**
diff --git a/src/main/model/pki/crl/RevokedCertificate.java b/src/main/model/pki/crl/RevokedCertificate.java
index 1f0afc1..5acb2ed 100644
--- a/src/main/model/pki/crl/RevokedCertificate.java
+++ b/src/main/model/pki/crl/RevokedCertificate.java
@@ -1,5 +1,6 @@
 package model.pki.crl;
 
+import annotations.Assoc;
 import model.asn1.*;
 
 import java.util.Arrays;
@@ -17,8 +18,11 @@ import java.util.stream.Stream;
  * </pre>
  */
 public class RevokedCertificate extends ASN1Object {
+    @Assoc(partOf = true)
     private final Int serialNumber;
+    @Assoc(partOf = true)
     private final ASN1Time revocationDate;
+    @Assoc(partOf = true)
     private final Reason reason;
 
     /**