SAK-50233: Try catch and I18n issues

Author: jumarub

assignment/api/src/resources/assignment_es.properties

@@ -1167,7 +1167,7 @@ settings.access.checkFailure=Comprobaci\u00f3n fallida, no hay respuesta del ser
 
 selected.group=Grupo seleccionado
 selected.groups=Grupo(s) seleccionado(s)
-selected.groups.without.gradebook = Has seleccionado grupos sin gradebook existente, por favor revisa la configuraci�n.
+selected.groups.without.gradebook = Has seleccionado grupos sin gradebook existente, por favor revisa la configuraci\u00f3n.
 
 submission.inline=Respuesta enviada
 grade.type.unknown=Tipo de nota desconocido

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java

@@ -239,12 +239,9 @@ else if (!this.businessService.isUserAbleToEditAssessments(siteId)) {
 
 		add(new CloseOnESCBehavior(bulkEditItemsWindow));
 
-
-
 		this.exportRubricWindow = new GbModalWindow("exportRubricWindow");
 		this.form.add(this.exportRubricWindow);
 
-
 		// first get any settings data from the session
 		final GradebookUiSettings settings = getUiSettings();
 

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ExportRubricPanel.java

@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
@@ -114,13 +115,14 @@ protected File load() {
 	private File buildFile() {
 		final String[] userIds = receivedParams.get("userIds").asText().split(",");
 
-		File tempFile;
+		File tempFile = null;
+		ZipOutputStream out = null;
 
 		try {
 			if (rubric != null) {
 				Long rubricId = rubric.getId();
 				tempFile = File.createTempFile("tempZip", ".zip");
-				ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tempFile));
+				out = new ZipOutputStream(new FileOutputStream(tempFile));
 				for (String userId : userIds) {
 					String evaluatedItemId = rubricsService.getRubricEvaluationObjectId(gradebookAssignmentId, userId, toolId, currentSiteId);
 					String name = userDirectoryService.getUser(userId).getEid();
@@ -135,14 +137,25 @@ private File buildFile() {
 					out.write(pdf);
 					out.closeEntry();
 				}
-
-				out.finish();
-				out.flush();
-				out.close();
-				return tempFile;
 			}
 		} catch (final Exception e) {
 			log.error(e.toString(), e);
+		} finally {
+			if (out != null) {
+				try {
+					out.finish();
+					out.flush();
+				} catch (IOException e) {
+					log.error("Error ocurred while finish ZipOutputStream: " + e.toString(), e);
+				}
+				try {
+					out.close();
+				} catch (IOException e) {
+					log.error("Error ocurred while closing ZipOutputStream: " + e.toString(), e);
+				}
+
+				return tempFile;
+			}
 		}
 		return null;
 	}

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/ExportRubrics.java

@@ -23,8 +23,10 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -64,18 +66,23 @@ public class ExportRubrics implements ActionListener {
   public void processAction(ActionEvent ae) throws AbortProcessingException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
+    QuestionScoresBean bean = (QuestionScoresBean) ContextUtil.lookupBean("questionScores");
+    TotalScoresBean tBean = (TotalScoresBean) ContextUtil.lookupBean("totalScores");
+    String templateFilename = rb.getString("question") + "_" + bean.getItemName();
+    String toolId = "sakai.samigo";
+
+    ZipOutputStream out = null;
+
     try {
-      ZipOutputStream out = new ZipOutputStream(baos);
+      out = new ZipOutputStream(baos);
 
-      QuestionScoresBean bean = (QuestionScoresBean) ContextUtil.lookupBean("questionScores");
-      TotalScoresBean tBean = (TotalScoresBean) ContextUtil.lookupBean("totalScores");
-      String templateFilename = rb.getString("question") + "_" + bean.getItemName();
-      String toolId = "sakai.samigo";
       List<AgentResults> agents = (List<AgentResults>) bean.getAgents();
+      List<User> users = userDirectoryService.getUsersByEids(agents.stream()
+          .map(AgentResults::getAgentEid)
+          .collect(Collectors.toList()));
 
-      for (AgentResults ar : agents) {
+      for (User user : users) {
         String itemId = "pub." + bean.getPublishedId() + "." + ContextUtil.lookupParam("itemId");
-        User user = userDirectoryService.getUserByEid(ar.getAgentEid());
 
         Optional<ToolItemRubricAssociation> optAssociation = associationRepository.findByToolIdAndItemId(toolId, itemId);
         long rubricId = optAssociation.isPresent()? optAssociation.get().getRubric().getId() : 0l;
@@ -88,23 +95,39 @@ public void processAction(ActionEvent ae) throws AbortProcessingException {
         out.write(pdf);
         out.closeEntry();
       }
-
-      out.finish();
-      out.close();
-
-      FacesContext faces = FacesContext.getCurrentInstance();
-      HttpServletResponse response = (HttpServletResponse)faces.getExternalContext().getResponse();
-      String fileName = tBean.getAssessmentName().replaceAll(" ", "_") + "_" + templateFilename;
-
-      response.reset();	// Eliminate the added-on stuff
-      response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "_" + rb.getString("rubrics") + ".zip\"");
-      response.setContentType("application/zip");
-      response.setContentLength(baos.size());
-
-      baos.writeTo(response.getOutputStream());
-      faces.responseComplete();
     } catch (Exception e) {
       log.error(e.toString(), e);
+    } finally {
+      if (out != null) {
+        try {
+            out.finish();
+            out.flush();
+        } catch (IOException e) {
+          log.error("Error ocurred while finish ZipOutputStream: " + e.toString(), e);
+        }
+        try {
+          out.close();
+        } catch (IOException e) {
+          log.error("Error ocurred while closing ZipOutputStream: " + e.toString(), e);
+        }
+
+        FacesContext faces = FacesContext.getCurrentInstance();
+        HttpServletResponse response = (HttpServletResponse)faces.getExternalContext().getResponse();
+        String fileName = tBean.getAssessmentName().replaceAll(" ", "_") + "_" + templateFilename;
+
+        response.reset();	// Eliminate the added-on stuff
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "_" + rb.getString("rubrics") + ".zip\"");
+        response.setContentType("application/zip");
+        response.setContentLength(baos.size());
+
+        try {
+          baos.writeTo(response.getOutputStream());
+        } catch (IOException e) {
+          log.error("Error ocurred while writing ByteArrayOutputStream: " + e.toString(), e);
+        }
+
+        faces.responseComplete();
+      }
     }
   }
 }