Add languagePrecedence option to splash page (#81)

Author: ahmad-shahid

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## v4.0.5
 
 - [CDTS](https://github.com/wet-boew/cdts-sgdc/) v5.0.5 & [wet-boew](https://github.com/wet-boew/wet-boew) v4.0.89
+- Adding an optional languagePrecedence property for Splash page allowing users to decide the order of official languages
 - Updated static fallback files
 
 ## v4.0.4

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/SplashPageInfo.java

@@ -11,6 +11,7 @@ public class SplashPageInfo implements Serializable {
     private String frenchTermsUrl;
     private String englishName;
     private String frenchName;
+    private String languagePrecedence;
 
     public SplashPageInfo() {
         //everything null by default is fine
@@ -19,12 +20,20 @@ public SplashPageInfo() {
     public SplashPageInfo(String englishHomeUrl, String frenchHomeUrl,
                            String englishTermsUrl, String frenchTermsUrl,
                            String englishName, String frenchName) {
+        this(englishHomeUrl, frenchHomeUrl, englishTermsUrl,
+                frenchTermsUrl, englishName, frenchName, null);
+	}
+
+    public SplashPageInfo(String englishHomeUrl, String frenchHomeUrl,
+                           String englishTermsUrl, String frenchTermsUrl,
+                           String englishName, String frenchName, String languagePrecedence) {
         this.englishHomeUrl = englishHomeUrl;
         this.frenchHomeUrl = frenchHomeUrl;
         this.englishTermsUrl = englishTermsUrl;
         this.frenchTermsUrl = frenchTermsUrl;
         this.englishName = englishName;
         this.frenchName = frenchName;
+        this.languagePrecedence = languagePrecedence;
     }
 
     public String getEnglishHomeUrl() {
@@ -74,4 +83,12 @@ public String getFrenchName() {
     public void setFrenchName(String frenchName) {
         this.frenchName = frenchName;
     }
+
+    public String getLanguagePrecedence() {
+        return languagePrecedence;
+    }
+
+    public void setLanguagePrecedence(String languagePrecedence) {
+        this.languagePrecedence = languagePrecedence;
+    }
 }

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java

@@ -2259,7 +2259,8 @@ public String getRenderSplashSetup() {
                     JsonValueUtils.getNonEmptyString(spi.getEnglishTermsUrl()),
                     JsonValueUtils.getNonEmptyString(spi.getFrenchTermsUrl()),
                     spi.getEnglishName(),
-                    spi.getFrenchName()
+                    spi.getFrenchName(),
+                    spi.getLanguagePrecedence()
                 ),
                 this.buildHtmlBodyElements()));
     }

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/jsonentities/Splash.java

@@ -17,21 +17,24 @@ public class Splash implements Serializable {
     private String  termsFra;
     private String  nameEng;
     private String  nameFra;
+    private String  languagePrecedence;
 
     public Splash() {    
     }
 
     public Splash(String cdnEnv, 
                     String indexEng, String indexFra, 
                     String termsEng, String termsFra, 
-                    String nameEng,  String nameFra) {
+                    String nameEng,  String nameFra,
+                    String languagePrecedence) {
         this.cdnEnv = cdnEnv;
         this.indexEng = indexEng;
         this.indexFra = indexFra;
         this.termsEng = termsEng;
         this.termsFra = termsFra;
         this.nameEng = nameEng;
         this.nameFra = nameFra;
+        this.languagePrecedence = languagePrecedence;
     }
 
     public String getCdnEnv() {
@@ -89,4 +92,12 @@ public String getNameFra() {
     public void setNameFra(String nameFra) {
         this.nameFra = nameFra;
     }
+
+    public String getLanguagePrecedence() {
+        return languagePrecedence;
+    }
+
+    public void setLanguagePrecedence(String languagePrecedence) {
+        this.languagePrecedence = languagePrecedence;
+    }
 }

gocwebtemplate-core/gocwebtemplate-core-base/src/test/java/goc/webtemplate/component/abstractcorebeantest/RenderSplashTest.java

@@ -0,0 +1,29 @@
+package goc.webtemplate.component.abstractcorebeantest;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import goc.webtemplate.SplashPageInfo;
+
+public class RenderSplashTest {
+
+	@Test
+	public void testSplash() {
+		AbstractCoreBeanImpl sut = new AbstractCoreBeanImpl();
+
+		SplashPageInfo splash = new SplashPageInfo(
+                "index",
+                "index",
+                "http://www.canada.ca/en/transparency/terms.html",
+                "http://www.canada.ca/fr/transparence/avis.html",
+                "[My web asset]",
+                "[Mon actif web]",
+                "French"
+        );
+		sut.setSplashPageInfo(splash);
+
+		assertTrue(sut.getRenderSplashSetup().contains("\"splash\":{\"indexEng\":\"index\",\"indexFra\":\"index\",\"termsEng\":\"http://www.canada.ca/en/transparency/terms.html\",\"termsFra\":\"http://www.canada.ca/fr/transparence/avis.html\",\"nameEng\":\"[My web asset]\",\"nameFra\":\"[Mon actif web]\",\"languagePrecedence\":\"French\"}"),
+                "\"RenderSplash: Splash not rendered as expected.\"");
+	}
+}