Couple minor changes

ahmad-shahid · ahmad-shahid · commit ef2879153fe6 · 2023-02-02T14:53:04.000-05:00
diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/BannerLink.java b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/BannerLink.java
@@ -1,8 +1,8 @@
 package goc.webtemplate;
 
-public class BannerLink {
-    private String href;
-    private String text;
+public class BannerLink extends Link{
+    private static final long serialVersionUID = 1L;
+
     private boolean newWindow;
     
     public BannerLink() {}
@@ -19,27 +19,10 @@ public BannerLink(String href, String text)
 
     public BannerLink(String href, String text, boolean newWindow)
     {   
-        this.href = href;
-        this.text = text;
+        super(href, text);
         this.newWindow = newWindow;
     }
 
-    public String getHref() {
-        return href;
-    }
-
-    public void setHref(String href) {
-        this.href = href;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
     public boolean isNewWindow() {
         return newWindow;
     }
diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/test/java/goc/webtemplate/component/abstractcorebeantest/RenderAppTopTest.java b/gocwebtemplate-core/gocwebtemplate-core-base/src/test/java/goc/webtemplate/component/abstractcorebeantest/RenderAppTopTest.java
@@ -36,7 +36,7 @@ public void testInfoBanner() {
         InfoBanner banner = new InfoBanner("Main Text", new BannerLink("google", "Link"), new BannerLink("yahoo", "Button"));
         sut.setInfoBanner(banner);
 
-        assertTrue(sut.getRenderAppTop().contains("\"infoBanner\":{\"mainHTML\":\"Main Text\",\"link\":{\"href\":\"google\",\"text\":\"Link\",\"newWindow\":false},\"button\":{\"href\":\"yahoo\",\"text\":\"Button\",\"newWindow\":false}"),
+        assertTrue(sut.getRenderAppTop().contains("\"infoBanner\":{\"mainHTML\":\"Main Text\",\"link\":{\"newWindow\":false,\"href\":\"google\",\"text\":\"Link\"},\"button\":{\"newWindow\":false,\"href\":\"yahoo\",\"text\":\"Button\"}"),
         		"\"RenderTop: InfoBanner not rendered as expected.\"");
     }
 
diff --git a/gocwebtemplate-sample-jsp/src/main/webapp/samplecontents/footerlinkssamplecontent.jsp b/gocwebtemplate-sample-jsp/src/main/webapp/samplecontents/footerlinkssamplecontent.jsp
@@ -1,5 +1,5 @@
 <h1>GoC Web Template Samples - Footer</h1>
-<p>Canada.ca is moving to a new global site footer as seen <a href="https://design.canada.ca/common-design-patterns/site-footer.html">here.</a></p>
+<p>Canada.ca provides a global site footer as seen <a href="https://design.canada.ca/common-design-patterns/site-footer.html">here.</a></p>
 <p>For more information, please visit the WET footer documentation <a href="https://wet-boew.github.io/GCWeb/sites/footers/footers-en.html">here.</a></p>
 <h2>Pre-requisite</h2>
 <p>To override the Default GoC Web Template look &amp; feel, you will have to create a custom bean class that extends the <code class="wb-prettify">goc.webtemplate.component.jsp.BaseCoreBean</code> class, and then override the various methods made available to alter the look &amp; feel of the web page.</p>
diff --git a/gocwebtemplate-sample-spring/src/main/resources/samples/FooterLinksSample.html b/gocwebtemplate-sample-spring/src/main/resources/samples/FooterLinksSample.html
@@ -5,7 +5,7 @@
 <body>
     <section layout:fragment="content"> 
         <h1>GoC Web Template Samples - Footer</h1>
-        <p>Canada.ca is moving to a new global site footer as seen <a href="https://design.canada.ca/common-design-patterns/site-footer.html">here.</a></p>
+        <p>Canada.ca provides a global site footer as seen <a href="https://design.canada.ca/common-design-patterns/site-footer.html">here.</a></p>
         <p>For more information, please visit the WET footer documentation <a href="https://wet-boew.github.io/GCWeb/sites/footers/footers-en.html">here.</a></p>
         <h2>Pre-requisite</h2>
         <p>To override the Default GoC Web Template look &amp; feel, you will have to create a custom bean class that extends the <code class="wb-prettify">goc.webtemplate.component.spring.BaseCoreBean</code> class, and then override the various methods made available to alter the look &amp; feel of the web page.</p>

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void testInfoBanner() {`
`36`	`36`	`InfoBanner banner = new InfoBanner("Main Text", new BannerLink("google", "Link"), new BannerLink("yahoo", "Button"));`
`37`	`37`	`sut.setInfoBanner(banner);`
`38`	`38`
`39`		`- assertTrue(sut.getRenderAppTop().contains("\"infoBanner\":{\"mainHTML\":\"Main Text\",\"link\":{\"href\":\"google\",\"text\":\"Link\",\"newWindow\":false},\"button\":{\"href\":\"yahoo\",\"text\":\"Button\",\"newWindow\":false}"),`
	`39`	`+ assertTrue(sut.getRenderAppTop().contains("\"infoBanner\":{\"mainHTML\":\"Main Text\",\"link\":{\"newWindow\":false,\"href\":\"google\",\"text\":\"Link\"},\"button\":{\"newWindow\":false,\"href\":\"yahoo\",\"text\":\"Button\"}"),`
`40`	`40`	`"\"RenderTop: InfoBanner not rendered as expected.\"");`
`41`	`41`	`}`
`42`	`42`