BaseCertificate Reset

src/main/java/scot/carricksoftware/grants/commands/certificates/BaseCertificateCommand.java

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grants.commands.certificates;
-
-import scot.carricksoftware.grants.domains.places.Place;
-
-import java.sql.Date;
-
-public interface BaseCertificateCommand {
-
-    String getCertificateNumber();
-
-    void setCertificateNumber(String certificateNumber);
-
-    Date getCertificateDate();
-
-    void setCertificateDate(Date certificateDate);
-
-    Place getCertificateIssuedAt();
-
-    void setCertificateIssuedAt(Place certificateIssuedAt);
-}

src/main/java/scot/carricksoftware/grants/commands/certificates/BaseCertificateCommandImpl.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grants.commands.certificates;
-
-
-import org.springframework.stereotype.Component;
-import scot.carricksoftware.grants.domains.places.Place;
-
-import java.sql.Date;
-
-@Component
-public class BaseCertificateCommandImpl implements BaseCertificateCommand {
-
-    private String certificateNumber;
-
-    private Place certificateIssuedAt;
-
-    private Date certificateDate;
-
-
-    @Override
-    public String getCertificateNumber() {
-        return certificateNumber;
-    }
-
-    @Override
-    public void setCertificateNumber(String certificateNumber) {
-        this.certificateNumber = certificateNumber;
-    }
-
-    @Override
-    public Date getCertificateDate() {
-        return certificateDate;
-    }
-
-    @Override
-    public void setCertificateDate(Date certificateDate) {
-        this.certificateDate = certificateDate;
-    }
-
-    @Override
-    public Place getCertificateIssuedAt() {
-        return certificateIssuedAt;
-    }
-
-    @Override
-    public void setCertificateIssuedAt(Place certificateIssuedAt) {
-        this.certificateIssuedAt = certificateIssuedAt;
-    }
-
-}

src/main/java/scot/carricksoftware/grants/commands/certificates/birthcertificates/BirthCertificateCommand.java

@@ -6,6 +6,9 @@
 package scot.carricksoftware.grants.commands.certificates.birthcertificates;
 
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Place;
+
+import java.sql.Date;
 
 public interface BirthCertificateCommand {
 
@@ -17,4 +20,22 @@ public interface BirthCertificateCommand {
     Person getNewBorn();
 
     void setNewBorn(Person newBorn);
+
+    @SuppressWarnings("unused")
+    String getCertificateNumber();
+
+    @SuppressWarnings("unused")
+    void setCertificateNumber(String certificateNumber);
+
+    @SuppressWarnings("unused")
+    Place getCertificateIssuedAt();
+
+    @SuppressWarnings("unused")
+    void setCertificateIssuedAt(Place certificateIssuedAt);
+
+    @SuppressWarnings("unused")
+    Date getCertificateDate();
+
+    @SuppressWarnings("unused")
+    void setCertificateDate(Date certificateDate);
 }

src/main/java/scot/carricksoftware/grants/commands/certificates/birthcertificates/BirthCertificateCommandImpl.java

@@ -6,6 +6,9 @@
 package scot.carricksoftware.grants.commands.certificates.birthcertificates;
 
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Place;
+
+import java.sql.Date;
 
 public class BirthCertificateCommandImpl implements BirthCertificateCommand {
 
@@ -13,6 +16,12 @@ public class BirthCertificateCommandImpl implements BirthCertificateCommand {
 
     Person newBorn;
 
+    private String certificateNumber;
+
+    private Place certificateIssuedAt;
+
+    private Date certificateDate;
+
     public Long getId() {
         return Id;
     }
@@ -30,4 +39,34 @@ public class BirthCertificateCommandImpl implements BirthCertificateCommand {
     public void setNewBorn(Person newBorn) {
         this.newBorn = newBorn;
     }
+
+    @Override
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+
+    @Override
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+
+    @Override
+    public Place getCertificateIssuedAt() {
+        return certificateIssuedAt;
+    }
+
+    @Override
+    public void setCertificateIssuedAt(Place certificateIssuedAt) {
+        this.certificateIssuedAt = certificateIssuedAt;
+    }
+
+    @Override
+    public Date getCertificateDate() {
+        return certificateDate;
+    }
+
+    @Override
+    public void setCertificateDate(Date certificateDate) {
+        this.certificateDate = certificateDate;
+    }
 }

src/test/java/scot/carricksoftware/grants/commands/certificates/BaseCertificateCommandTest.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grants.commands.certificates;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grants.domains.places.Place;
-
-import java.sql.Date;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grants.GenerateRandomDateValues.GetRandomDate;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
-
-class BaseCertificateCommandTest {
-
-    private BaseCertificateCommand command;
-
-    @BeforeEach
-    void setUp() {
-        command = new BaseCertificateCommandImpl();
-    }
-
-    @Test
-    void setCertificateNumberTest() {
-        String certificateNumber = GetRandomString();
-        command.setCertificateNumber(certificateNumber);
-        assertEquals(certificateNumber, command.getCertificateNumber());
-    }
-
-    @Test
-    void getCertificateNumberTest() {
-        assertNull(command.getCertificateNumber());
-    }
-
-    @Test
-    void getCertificateDateTest() {
-        assertNull(command.getCertificateDate());
-    }
-
-    @Test
-    void setCertificateDateTest() {
-        Date certificateDate = GetRandomDate();
-        command.setCertificateDate(certificateDate);
-        assertEquals(certificateDate, command.getCertificateDate());
-    }
-
-    @Test
-    void getCertificateIssuedAtTest() {
-        assertNull(command.getCertificateIssuedAt());
-    }
-
-    @Test
-    void setCertificateIssuedAtTest() {
-        Place issuedAt = GetRandomPlace();
-        command.setCertificateIssuedAt(issuedAt);
-        assertEquals(issuedAt, command.getCertificateIssuedAt());
-    }
-}

src/test/java/scot/carricksoftware/grants/domains/certificates/BaseCertificateTest.java

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grants.domains.certificates;
-
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grants.domains.places.Place;
-
-import java.sql.Date;
-import java.time.LocalDate;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
-
-class BaseCertificateTest {
-
-    private BaseCertificate certificate;
-
-    @BeforeEach
-    void setUp() {
-        certificate = new BaseCertificate();
-    }
-
-    @Test
-    void dummyTest(){
-        assertNotNull(certificate);
-    }
-
-    @Test
-    void getCertificateNumberTest() {
-        assertNull(certificate.getCertificateNumber());
-    }
-
-    @Test
-    void setCertificateNumberTest() {
-        String certificateNumber = GetRandomString();
-        certificate.setCertificateNumber(certificateNumber);
-        assertEquals(certificateNumber, certificate.getCertificateNumber());
-    }
-
-
-    @Test
-    void getCertificateDateTest() {
-        assertNull(certificate.getCertificateDate());
-    }
-
-    @Test
-    void setCertificateDateTest() {
-        Date certificateDate = Date.valueOf(LocalDate.now());
-        certificate.setCertificateDate(certificateDate);
-        assertEquals(certificateDate, certificate.getCertificateDate());
-    }
-
-    @Test
-    void getCertificateIssuedAtTest() {
-        Place place = GetRandomPlace();
-        certificate.setCertificateIssuedAt(place);
-        assertEquals(place, certificate.getCertificateIssuedAt());
-    }
-
-}

src/test/java/scot/carricksoftware/grants/domains/certificates/BirthCertificateTest.java

@@ -8,12 +8,17 @@ package scot.carricksoftware.grants.domains.certificates;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Place;
+
+import java.sql.Date;
+import java.time.LocalDate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
-
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 class BirthCertificateTest {
 
@@ -47,4 +52,35 @@ class BirthCertificateTest {
         certificate.setNewBorn(person);
         assertEquals(person, certificate.getNewBorn());
     }
+
+    @Test
+    void getCertificateNumberTest() {
+        assertNull(certificate.getCertificateNumber());
+    }
+
+    @Test
+    void setCertificateNumberTest() {
+        String certificateNumber = GetRandomString();
+        certificate.setCertificateNumber(certificateNumber);
+        assertEquals(certificateNumber, certificate.getCertificateNumber());
+    }
+
+    @Test
+    void getCertificateDateTest() {
+        assertNull(certificate.getCertificateDate());
+    }
+
+    @Test
+    void setCertificateDateTest() {
+        Date certificateDate = Date.valueOf(LocalDate.now());
+        certificate.setCertificateDate(certificateDate);
+        assertEquals(certificateDate, certificate.getCertificateDate());
+    }
+
+    @Test
+    void getCertificateIssuedAtTest() {
+        Place place = GetRandomPlace();
+        certificate.setCertificateIssuedAt(place);
+        assertEquals(place, certificate.getCertificateIssuedAt());
+    }
 }