[story/VSPC-213] added exceptions. modified exhibition language config

vspace/src/main/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfig.java

@@ -20,6 +20,8 @@
 import org.springframework.stereotype.Component;
 
 import edu.asu.diging.vspace.core.model.impl.ExhibitionLanguage;
+import org.springframework.core.env.MutablePropertySources;
+
 
 @Component
 @PropertySource(value= "classpath:exhibitionLanguages.properties" , factory=JsonPropertySourceFactory.class)
@@ -37,16 +39,13 @@ public class ExhibitionLanguageConfig {
      */
     @PostConstruct
     public void init() {
-        for(Iterator it = ((AbstractEnvironment) environment).getPropertySources().iterator(); it.hasNext(); ) {
-            org.springframework.core.env.PropertySource propertySource = (org.springframework.core.env.PropertySource) it.next();
-            if (propertySource instanceof MapPropertySource) {
-                MapPropertySource mapSource = ((MapPropertySource) propertySource);
-                if(ConfigConstants.EXHIBITION_LANGUAGE_LIST_PROPERTY.equals(mapSource.getName())) {
-                    Map<String, Object> languageMap = mapSource.getSource();
-                    exhibitionLanguageList = (List<Map>) languageMap.get(ConfigConstants.LANGUAGES);
-                }
-            }
+
+        org.springframework.core.env.PropertySource<?> source =  ((AbstractEnvironment) environment).getPropertySources().get(ConfigConstants.EXHIBITION_LANGUAGE_LIST_PROPERTY);
+        if(source !=null ) {
+            Map<String, Object> languageMap = (Map<String, Object>) source.getSource();
+            exhibitionLanguageList = (List<Map>) languageMap.get(ConfigConstants.LANGUAGES);
         }
+
     }
 
     public List<Map> getExhibitionLanguageList() {

vspace/src/main/java/edu/asu/diging/vspace/core/exception/LanguageListConfigurationNotFound.java

@@ -0,0 +1,36 @@
+package edu.asu.diging.vspace.core.exception;
+
+public class LanguageListConfigurationNotFound  extends Exception {
+
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    public LanguageListConfigurationNotFound() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+    public LanguageListConfigurationNotFound(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
+        super(arg0, arg1, arg2, arg3);
+        // TODO Auto-generated constructor stub
+    }
+
+    public LanguageListConfigurationNotFound(String arg0, Throwable arg1) {
+        super(arg0, arg1);
+        // TODO Auto-generated constructor stub
+    }
+
+    public LanguageListConfigurationNotFound(String arg0) {
+        super(arg0);
+        // TODO Auto-generated constructor stub
+    }
+
+    public LanguageListConfigurationNotFound(Throwable arg0) {
+        super(arg0);
+        // TODO Auto-generated constructor stub
+    }
+
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExhibitionLanguage.java

@@ -38,23 +38,15 @@ public ExhibitionLanguage(String label, String code, Exhibition exhibition) {
         this.code=code;
         this.exhibition=exhibition;
     }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
+
     public String getLabel() {
         return label;
     }
 
     public void setLabel(String label) {
         this.label = label;
     }
-
+    
     public Exhibition getExhibition() {
         return exhibition;
     }
@@ -63,7 +55,22 @@ public void setExhibition(Exhibition exhibition) {
         this.exhibition = exhibition;
     }
 
+    public String getCode() {
+        return code;
+    }
 
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public boolean isDefault() {
+        return isDefault;
+    }
+
+    public void setDefault(boolean isDefault) {
+        this.isDefault = isDefault;
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(code, exhibition, label);
@@ -82,12 +89,4 @@ public boolean equals(Object obj) {
                && Objects.equals(label, other.label);
     }
 
-    public boolean isDefault() {
-        return isDefault;
-    }
-
-    public void setDefault(boolean isDefault) {
-        this.isDefault = isDefault;
-    }
-
 }

vspace/src/main/java/edu/asu/diging/vspace/core/services/IExhibitionManager.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import edu.asu.diging.vspace.core.exception.LanguageListConfigurationNotFound;
 import edu.asu.diging.vspace.core.model.IExhibition;
 import edu.asu.diging.vspace.core.model.impl.Exhibition;
 
@@ -34,6 +35,6 @@ public interface IExhibitionManager {
 
     IExhibition getStartExhibition();
 
-    void updateExhibitionLanguages(Exhibition exhibition, List<String> languages, String defaultLanguage);
+    void updateExhibitionLanguages(Exhibition exhibition, List<String> languages, String defaultLanguage) throws LanguageListConfigurationNotFound;
 
 }

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManager.java

@@ -16,6 +16,7 @@
 import edu.asu.diging.vspace.config.ConfigConstants;
 import edu.asu.diging.vspace.config.ExhibitionLanguageConfig;
 import edu.asu.diging.vspace.core.data.ExhibitionRepository;
+import edu.asu.diging.vspace.core.exception.LanguageListConfigurationNotFound;
 import edu.asu.diging.vspace.core.model.IExhibition;
 import edu.asu.diging.vspace.core.model.impl.Exhibition;
 import edu.asu.diging.vspace.core.model.impl.ExhibitionLanguage;
@@ -86,32 +87,47 @@ public IExhibition getStartExhibition() {
      * @param exhibition
      * @param defaultLanguage 
      * @param languages
+     * @throws LanguageListConfigurationNotFound 
      */
     @Override
-    public void updateExhibitionLanguages(Exhibition exhibition, List<String> codes, String defaultLanguage) {
+    public void updateExhibitionLanguages(Exhibition exhibition, List<String> codes, String defaultLanguage) throws LanguageListConfigurationNotFound {
         if(CollectionUtils.isNotEmpty(codes)) {
-            if(defaultLanguage!=null) {
+            if(defaultLanguage!=null && !codes.contains(defaultLanguage)) {
                 codes.add(defaultLanguage);
             }
             if(CollectionUtils.isNotEmpty(exhibitionLanguageConfig.getExhibitionLanguageList())) {
                 List<ExhibitionLanguage> exhibitionLanguages =   exhibitionLanguageConfig.getExhibitionLanguageList()
-                        .stream().filter(languageMap -> codes.contains(languageMap.get(ConfigConstants.CODE)))
-                        .map(map -> {
-                            ExhibitionLanguage exhibitionLanguage =   new ExhibitionLanguage((String) map.get(ConfigConstants.LABEL),
-                                    (String) map.get(ConfigConstants.CODE), exhibition);
+                        .stream().filter(languageConfig -> codes.contains(languageConfig.get(ConfigConstants.CODE)))
+                        .map(languageMap -> {
+                            ExhibitionLanguage exhibitionLanguage =   new ExhibitionLanguage((String) languageMap.get(ConfigConstants.LABEL),
+                                    (String) languageMap.get(ConfigConstants.CODE), exhibition);
 
                             if(exhibitionLanguage.getCode().equalsIgnoreCase(defaultLanguage)) {
                                 exhibitionLanguage.setDefault(true);
+                            } else {
+                                exhibitionLanguage.setDefault(false);
                             }
                             return exhibitionLanguage;
                         }).collect(Collectors.toList());
 
                 if(CollectionUtils.isNotEmpty(exhibitionLanguages)) {
-                    logger.info("Updating Exhibition with Languages" + codes);
+                    logger.trace("Updating Exhibition with Languages" + codes);
                     exhibition.getLanguages().addAll(exhibitionLanguages);
-                }
+
+//                   List<ExhibitionLanguage> defaultLanguages=  exhibition.getLanguages().stream()
+//                    .filter(language -> language.isDefault() && !language.getCode().equals(defaultLanguage) )
+//                    .map(languageMap -> {languageMap.setDefault(false);  return languageMap ; })
+//             
+//                    .collect(Collectors.toList());
+//                   
+//                   exhibition.getLanguages().removeAll(defaultLanguages);
+//                   exhibition.getLanguages().addAll(defaultLanguages);
+
+
+               }
+
             } else {
-                logger.error("Language list configuration not available");
+                throw new LanguageListConfigurationNotFound("Exhibition Language Configuration not found");
             }
         } 
 

vspace/src/main/java/edu/asu/diging/vspace/web/staff/ExhibitionConfigurationController.java

@@ -22,6 +22,7 @@
 
 import edu.asu.diging.vspace.config.ExhibitionLanguageConfig;
 import edu.asu.diging.vspace.core.data.SpaceRepository;
+import edu.asu.diging.vspace.core.exception.LanguageListConfigurationNotFound;
 import edu.asu.diging.vspace.core.factory.impl.ExhibitionFactory;
 import edu.asu.diging.vspace.core.model.ExhibitionModes;
 import edu.asu.diging.vspace.core.model.IExhibition;
@@ -59,6 +60,9 @@ public String showExhibitions(Model model) {
             if(exhibition.getLanguages() != null ) {
                 model.addAttribute("mappedLanguages", exhibition.getLanguages()
                         .stream().map(language -> language.getLabel()).collect(Collectors.toList()));
+                model.addAttribute("defaultLanguage",exhibition.getLanguages().stream()
+                        .filter(language -> language.isDefault()).findFirst().orElse(null) );
+
             }
         } else {
             model.addAttribute("exhibition", new Exhibition());
@@ -77,6 +81,7 @@ public String showExhibitions(Model model) {
      * @param spaceParam
      * @param attributes
      * @return
+     * @throws LanguageListConfigurationNotFound 
      */
     @RequestMapping(value = "/staff/exhibit/config", method = RequestMethod.POST)
     public RedirectView createOrUpdateExhibition(HttpServletRequest request,
@@ -86,7 +91,7 @@ public RedirectView createOrUpdateExhibition(HttpServletRequest request,
             @RequestParam(value = "customMessage", required = false, defaultValue = "") String customMessage,
             @RequestParam("exhibitLanguage") List<String> languages,
             @RequestParam("defaultExhibitLanguage") String defaultLanguage,
-            RedirectAttributes attributes) throws IOException {
+            RedirectAttributes attributes) throws IOException, LanguageListConfigurationNotFound {
 
         ISpace startSpace = spaceManager.getSpace(spaceID);
 
@@ -100,7 +105,7 @@ public RedirectView createOrUpdateExhibition(HttpServletRequest request,
         exhibition.setTitle(title);
         exhibition.setMode(exhibitMode);
         exhibitManager.updateExhibitionLanguages(exhibition,languages,defaultLanguage);
-        
+
         if(exhibitMode.equals(ExhibitionModes.OFFLINE) && !customMessage.equals(ExhibitionModes.OFFLINE.getValue())) {
             exhibition.setCustomMessage(customMessage);
         }

vspace/src/main/webapp/WEB-INF/views/staff/exhibit/config.html

@@ -59,7 +59,7 @@ <h2>Exhibition Configuration</h2>
 		        <div style="padding-top: 20px;">
 		            <label for="title">Default Exhibition Language:</label>
 		            <select class="form-control" name="defaultExhibitLanguage" >
-		                <option th:each="language: ${languageList}" th:id=${language.code} th:value=${language.code} th:selected="${mappedLanguages!=null && mappedLanguages.contains(language.label)}">[[${language.label}]]</option>
+		                <option th:each="language: ${languageList}" th:id=${language.code} th:value=${language.code} th:selected="${defaultLanguage!=null && #strings.equals(defaultLanguage.label, language.label)}">[[${language.label}]]</option>
 		            </select>
 		        </div>
 		        <div id="offlineMessage" style="padding-top: 20px;" th:style="${exhibition.mode != 'OFFLINE' ? 'display: none;' : '' }">