Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2014-01-21 01:55:09 +01:00
parent e0f9a85955
commit 11ef4308b8
4 changed files with 79 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.web.servlet.view.document;
import java.io.OutputStream;
import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,9 +33,9 @@ import org.springframework.web.servlet.view.AbstractView;
/**
* Convenient superclass for Excel document views.
*
* <p>This class uses the <i>JExcelAPI</i> instead of <i>POI</i>. More
* information on <i>JExcelAPI</i> can be found on their <a
* href="http://www.andykhan.com/jexcelapi/" target="_blank">website</a>.
* <p>This class uses the <i>JExcelAPI</i> instead of <i>POI</i>.
* More information on <i>JExcelAPI</i> can be found on their
* <a href="http://www.andykhan.com/jexcelapi/" target="_blank">website</a>.
*
* <p>Properties:
* <ul>
@@ -58,11 +57,11 @@ import org.springframework.web.servlet.view.AbstractView;
*
* <pre class="code">
* protected void buildExcelDocument(
* Map&lt;String, Object&gt; model, WritableWorkbook workbook,
* HttpServletRequest request, HttpServletResponse response) {
* Map&lt;String, Object&gt; model, WritableWorkbook workbook,
* HttpServletRequest request, HttpServletResponse response) {
*
* if (workbook.getNumberOfSheets() == 0) {
* workbook.createSheet(&quot;Spring&quot;, 0);
* workbook.createSheet(&quot;Spring&quot;, 0);
* }
*
* WritableSheet sheet = workbook.getSheet(&quot;Spring&quot;);
@@ -70,7 +69,7 @@ import org.springframework.web.servlet.view.AbstractView;
* sheet.addCell(label);
* }</pre>
*
* The use of this view is close to the AbstractExcelView class,
* The use of this view is close to the {@link AbstractExcelView} class,
* just using the JExcel API instead of the Apache POI API.
*
* @author Bram Smeets

85
spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -69,12 +68,9 @@ public class ExcelViewTests extends TestCase {
public void testExcel() throws Exception {
AbstractExcelView excelView = new AbstractExcelView() {
@Override
protected void buildExcelDocument(Map model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
HSSFSheet sheet = wb.createSheet();
wb.setSheetName(0, "Test Sheet");
protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
HSSFSheet sheet = wb.createSheet("Test Sheet");
// test all possible permutation of row or column not existing
HSSFCell cell = getCell(sheet, 2, 4);
cell.setCellValue("Test Value");
@@ -87,7 +83,7 @@ public class ExcelViewTests extends TestCase {
}
};
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -104,11 +100,9 @@ public class ExcelViewTests extends TestCase {
AbstractExcelView excelView = new AbstractExcelView() {
@Override
protected void buildExcelDocument(Map model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
HSSFSheet sheet = wb.getSheet("Sheet1");
// test all possible permutation of row or column not existing
HSSFCell cell = getCell(sheet, 2, 4);
cell.setCellValue("Test Value");
@@ -123,7 +117,7 @@ public class ExcelViewTests extends TestCase {
excelView.setApplicationContext(webAppCtx);
excelView.setUrl("template");
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -139,11 +133,9 @@ public class ExcelViewTests extends TestCase {
AbstractExcelView excelView = new AbstractExcelView() {
@Override
protected void buildExcelDocument(Map model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
HSSFSheet sheet = wb.getSheet("Sheet1");
// test all possible permutation of row or column not existing
HSSFCell cell = getCell(sheet, 2, 4);
cell.setCellValue("Test Value");
@@ -158,7 +150,7 @@ public class ExcelViewTests extends TestCase {
excelView.setApplicationContext(webAppCtx);
excelView.setUrl("template");
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -174,11 +166,9 @@ public class ExcelViewTests extends TestCase {
AbstractExcelView excelView = new AbstractExcelView() {
@Override
protected void buildExcelDocument(Map model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
HSSFSheet sheet = wb.getSheet("Sheet1");
// test all possible permutation of row or column not existing
HSSFCell cell = getCell(sheet, 2, 4);
cell.setCellValue("Test Value");
@@ -193,7 +183,7 @@ public class ExcelViewTests extends TestCase {
excelView.setApplicationContext(webAppCtx);
excelView.setUrl("template");
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -206,13 +196,9 @@ public class ExcelViewTests extends TestCase {
public void testJExcel() throws Exception {
AbstractJExcelView excelView = new AbstractJExcelView() {
@Override
protected void buildExcelDocument(Map model,
WritableWorkbook wb,
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
WritableSheet sheet = wb.createSheet("Test Sheet", 0);
// test all possible permutation of row or column not existing
sheet.addCell(new Label(2, 4, "Test Value"));
sheet.addCell(new Label(2, 3, "Test Value"));
@@ -221,7 +207,7 @@ public class ExcelViewTests extends TestCase {
}
};
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
assertEquals("Test Sheet", wb.getSheet(0).getName());
@@ -236,13 +222,9 @@ public class ExcelViewTests extends TestCase {
AbstractJExcelView excelView = new AbstractJExcelView() {
@Override
protected void buildExcelDocument(Map model,
WritableWorkbook wb,
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
WritableSheet sheet = wb.getSheet("Sheet1");
// test all possible permutation of row or column not existing
sheet.addCell(new Label(2, 4, "Test Value"));
sheet.addCell(new Label(2, 3, "Test Value"));
@@ -253,7 +235,7 @@ public class ExcelViewTests extends TestCase {
excelView.setApplicationContext(webAppCtx);
excelView.setUrl("template");
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
Sheet sheet = wb.getSheet("Sheet1");
@@ -267,13 +249,9 @@ public class ExcelViewTests extends TestCase {
AbstractJExcelView excelView = new AbstractJExcelView() {
@Override
protected void buildExcelDocument(Map model,
WritableWorkbook wb,
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
WritableSheet sheet = wb.getSheet("Sheet1");
// test all possible permutation of row or column not existing
sheet.addCell(new Label(2, 4, "Test Value"));
sheet.addCell(new Label(2, 3, "Test Value"));
@@ -284,7 +262,7 @@ public class ExcelViewTests extends TestCase {
excelView.setApplicationContext(webAppCtx);
excelView.setUrl("template");
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
Sheet sheet = wb.getSheet("Sheet1");
@@ -298,13 +276,9 @@ public class ExcelViewTests extends TestCase {
AbstractJExcelView excelView = new AbstractJExcelView() {
@Override
protected void buildExcelDocument(Map model,
WritableWorkbook wb,
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
HttpServletRequest request, HttpServletResponse response) throws Exception {
WritableSheet sheet = wb.getSheet("Sheet1");
// test all possible permutation of row or column not existing
sheet.addCell(new Label(2, 4, "Test Value"));
sheet.addCell(new Label(2, 3, "Test Value"));
@@ -315,7 +289,7 @@ public class ExcelViewTests extends TestCase {
excelView.setApplicationContext(webAppCtx);
excelView.setUrl("template");
excelView.render(new HashMap(), request, response);
excelView.render(new HashMap<String, Object>(), request, response);
Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
Sheet sheet = wb.getSheet("Sheet1");
@@ -329,12 +303,9 @@ public class ExcelViewTests extends TestCase {
public Locale resolveLocale(HttpServletRequest request) {
return new Locale(lang, country);
}
@Override
public void setLocale(HttpServletRequest request,
HttpServletResponse response, Locale locale) {
// not supported!
public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
// not supported
}
};
}