[JAVA-28185] (#15367)

* [JAVA-28185] Moved code for article(Introduction to HtmlUnit) to spring-mvc-java-2

* [JAVA-28185] Moved code for article(Upload and Display Excel Files with Spring MVC) to spring-mvc-java-2

* [JAVA-28185] Clean up

* [JAVA-28185]

spring-web-modules/spring-mvc-java/src/main/java/com/baeldung/excel/ExcelPOIHelper.java

@@ -1,185 +0,0 @@
-package com.baeldung.excel;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.DateUtil;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.IntStream;
-
-public class ExcelPOIHelper {
-
-    public Map<Integer, List<MyCell>> readExcel(String fileLocation) throws IOException {
-
-        Map<Integer, List<MyCell>> data = new HashMap<>();
-        FileInputStream fis = new FileInputStream(new File(fileLocation));
-
-        if (fileLocation.endsWith(".xls")) {
-            data = readHSSFWorkbook(fis);
-        } else if (fileLocation.endsWith(".xlsx")) {
-            data = readXSSFWorkbook(fis);
-        }
-
-        int maxNrCols = data.values().stream()
-          .mapToInt(List::size)
-          .max()
-          .orElse(0);
-
-        data.values().stream()
-          .filter(ls -> ls.size() < maxNrCols)
-          .forEach(ls -> {
-              IntStream.range(ls.size(), maxNrCols)
-                .forEach(i -> ls.add(new MyCell("")));
-          });
-
-        return data;
-    }
-
-    private String readCellContent(Cell cell) {
-        String content;
-        switch (cell.getCellTypeEnum()) {
-        case STRING:
-            content = cell.getStringCellValue();
-            break;
-        case NUMERIC:
-            if (DateUtil.isCellDateFormatted(cell)) {
-                content = cell.getDateCellValue() + "";
-            } else {
-                content = cell.getNumericCellValue() + "";
-            }
-            break;
-        case BOOLEAN:
-            content = cell.getBooleanCellValue() + "";
-            break;
-        case FORMULA:
-            content = cell.getCellFormula() + "";
-            break;
-        default:
-            content = "";
-        }
-        return content;
-    }
-
-    private Map<Integer, List<MyCell>> readHSSFWorkbook(FileInputStream fis) throws IOException {
-        Map<Integer, List<MyCell>> data = new HashMap<>();
-        HSSFWorkbook workbook = null;
-        try {
-            workbook = new HSSFWorkbook(fis);
-
-            HSSFSheet sheet = workbook.getSheetAt(0);
-            for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
-                HSSFRow row = sheet.getRow(i);
-                data.put(i, new ArrayList<>());
-                if (row != null) {
-                    for (int j = 0; j < row.getLastCellNum(); j++) {
-                        HSSFCell cell = row.getCell(j);
-                        if (cell != null) {
-                            HSSFCellStyle cellStyle = cell.getCellStyle();
-
-                            MyCell myCell = new MyCell();
-
-                            HSSFColor bgColor = cellStyle.getFillForegroundColorColor();
-                            if (bgColor != null) {
-                                short[] rgbColor = bgColor.getTriplet();
-                                myCell.setBgColor("rgb(" + rgbColor[0] + "," + rgbColor[1] + "," + rgbColor[2] + ")");
-                            }
-                            HSSFFont font = cell.getCellStyle()
-                                .getFont(workbook);
-                            myCell.setTextSize(font.getFontHeightInPoints() + "");
-                            if (font.getBold()) {
-                                myCell.setTextWeight("bold");
-                            }
-                            HSSFColor textColor = font.getHSSFColor(workbook);
-                            if (textColor != null) {
-                                short[] rgbColor = textColor.getTriplet();
-                                myCell.setTextColor("rgb(" + rgbColor[0] + "," + rgbColor[1] + "," + rgbColor[2] + ")");
-                            }
-                            myCell.setContent(readCellContent(cell));
-                            data.get(i)
-                                .add(myCell);
-                        } else {
-                            data.get(i)
-                                .add(new MyCell(""));
-                        }
-                    }
-                }
-            }
-        } finally {
-            if (workbook != null) {
-                workbook.close();
-            }
-        }
-        return data;
-    }
-
-    private Map<Integer, List<MyCell>> readXSSFWorkbook(FileInputStream fis) throws IOException {
-        XSSFWorkbook workbook = null;
-        Map<Integer, List<MyCell>> data = new HashMap<>();
-        try {
-
-            workbook = new XSSFWorkbook(fis);
-            XSSFSheet sheet = workbook.getSheetAt(0);
-
-            for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
-                XSSFRow row = sheet.getRow(i);
-                data.put(i, new ArrayList<>());
-                if (row != null) {
-                    for (int j = 0; j < row.getLastCellNum(); j++) {
-                        XSSFCell cell = row.getCell(j);
-                        if (cell != null) {
-                            XSSFCellStyle cellStyle = cell.getCellStyle();
-
-                            MyCell myCell = new MyCell();
-                            XSSFColor bgColor = cellStyle.getFillForegroundColorColor();
-                            if (bgColor != null) {
-                                byte[] rgbColor = bgColor.getRGB();
-                                myCell.setBgColor("rgb(" + (rgbColor[0] < 0 ? (rgbColor[0] + 0xff) : rgbColor[0]) + "," + (rgbColor[1] < 0 ? (rgbColor[1] + 0xff) : rgbColor[1]) + "," + (rgbColor[2] < 0 ? (rgbColor[2] + 0xff) : rgbColor[2]) + ")");
-                            }
-                            XSSFFont font = cellStyle.getFont();
-                            myCell.setTextSize(font.getFontHeightInPoints() + "");
-                            if (font.getBold()) {
-                                myCell.setTextWeight("bold");
-                            }
-                            XSSFColor textColor = font.getXSSFColor();
-                            if (textColor != null) {
-                                byte[] rgbColor = textColor.getRGB();
-                                myCell.setTextColor("rgb(" + (rgbColor[0] < 0 ? (rgbColor[0] + 0xff) : rgbColor[0]) + "," + (rgbColor[1] < 0 ? (rgbColor[1] + 0xff) : rgbColor[1]) + "," + (rgbColor[2] < 0 ? (rgbColor[2] + 0xff) : rgbColor[2]) + ")");
-                            }
-                            myCell.setContent(readCellContent(cell));
-                            data.get(i)
-                                .add(myCell);
-                        } else {
-                            data.get(i)
-                                .add(new MyCell(""));
-                        }
-                    }
-                }
-            }
-        } finally {
-            if (workbook != null) {
-                workbook.close();
-            }
-        }
-        return data;
-    }
-
-}

spring-web-modules/spring-mvc-java/src/main/java/com/baeldung/excel/MyCell.java

@@ -1,57 +0,0 @@
-package com.baeldung.excel;
-
-public class MyCell {
-    private String content;
-    private String textColor;
-    private String bgColor;
-    private String textSize;
-    private String textWeight;
-
-    public MyCell() {
-    }
-
-    public MyCell(String content) {
-        this.content = content;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getTextColor() {
-        return textColor;
-    }
-
-    public void setTextColor(String textColor) {
-        this.textColor = textColor;
-    }
-
-    public String getBgColor() {
-        return bgColor;
-    }
-
-    public void setBgColor(String bgColor) {
-        this.bgColor = bgColor;
-    }
-
-    public String getTextSize() {
-        return textSize;
-    }
-
-    public void setTextSize(String textSize) {
-        this.textSize = textSize;
-    }
-
-    public String getTextWeight() {
-        return textWeight;
-    }
-
-    public void setTextWeight(String textWeight) {
-        this.textWeight = textWeight;
-    }
-
-}

spring-web-modules/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java

@@ -27,7 +27,6 @@ import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver;
 import org.thymeleaf.spring4.view.ThymeleafViewResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 
-import com.baeldung.excel.ExcelPOIHelper;
 
 @EnableWebMvc
 @Configuration
@@ -118,11 +117,6 @@ public class WebConfig implements WebMvcConfigurer {
         configurer.setUrlPathHelper(urlPathHelper);
     }
 
-    @Bean
-    public ExcelPOIHelper excelPOIHelper() {
-        return new ExcelPOIHelper();
-    }
-    
     @Bean(name = "multipartResolver")
     public CommonsMultipartResolver multipartResolver() {
         CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();

spring-web-modules/spring-mvc-java/src/main/java/com/baeldung/web/controller/ExcelController.java

@@ -1,63 +0,0 @@
-package com.baeldung.web.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import com.baeldung.excel.*;
-import java.util.Map;
-import java.util.List;
-import javax.annotation.Resource;
-
-@Controller
-public class ExcelController {
-
-    private String fileLocation;
-
-    @Resource(name = "excelPOIHelper")
-    private ExcelPOIHelper excelPOIHelper;
-
-    @RequestMapping(method = RequestMethod.GET, value = "/excelProcessing")
-    public String getExcelProcessingPage() {
-        return "excel";
-    }
-
-    @RequestMapping(method = RequestMethod.POST, value = "/uploadExcelFile")
-    public String uploadFile(Model model, MultipartFile file) throws IOException {
-        InputStream in = file.getInputStream();
-        File currDir = new File(".");
-        String path = currDir.getAbsolutePath();
-        fileLocation = path.substring(0, path.length() - 1) + file.getOriginalFilename();
-        FileOutputStream f = new FileOutputStream(fileLocation);
-        int ch = 0;
-        while ((ch = in.read()) != -1) {
-            f.write(ch);
-        }
-        f.flush();
-        f.close();
-        model.addAttribute("message", "File: " + file.getOriginalFilename() + " has been uploaded successfully!");
-        return "excel";
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = "/readPOI")
-    public String readPOI(Model model) throws IOException {
-
-        if (fileLocation != null) {
-            if (fileLocation.endsWith(".xlsx") || fileLocation.endsWith(".xls")) {
-                Map<Integer, List<MyCell>> data = excelPOIHelper.readExcel(fileLocation);
-                model.addAttribute("data", data);
-            } else {
-                model.addAttribute("message", "Not a valid excel file!");
-            }
-        } else {
-            model.addAttribute("message", "File missing! Please upload an excel file.");
-        }
-        return "excel";
-    }
-
-}

spring-web-modules/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndJUnitLiveTest.java

@@ -1,32 +0,0 @@
-package com.baeldung.htmlunit;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class HtmlUnitAndJUnitLiveTest {
-
-    private WebClient webClient;
-
-    @Before
-    public void init() throws Exception {
-        webClient = new WebClient();
-    }
-
-    @After
-    public void close() throws Exception {
-        webClient.close();
-    }
-
-    @Test
-    public void givenAClient_whenEnteringBaeldung_thenPageTitleIsOk() throws Exception {
-        webClient.getOptions().setThrowExceptionOnScriptError(false);
-        HtmlPage page = webClient.getPage("http://www.baeldung.com/");
-        Assert.assertEquals("Baeldung | Java, Spring and Web Development tutorials", page.getTitleText());
-    }
-
-}

spring-web-modules/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndSpringLiveTest.java

@@ -1,54 +0,0 @@
-package com.baeldung.htmlunit;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { TestConfig.class })
-public class HtmlUnitAndSpringLiveTest {
-
-    @Autowired
-    private WebApplicationContext wac;
-
-    private WebClient webClient;
-
-    @Before
-    public void setup() {
-        webClient = MockMvcWebClientBuilder.webAppContextSetup(wac).build();
-    }
-
-    @Test
-    public void givenAMessage_whenSent_thenItShows() throws Exception {
-        String text = "Hello world!";
-        HtmlPage page;
-
-        String url = "http://localhost/message/showForm";
-        page = webClient.getPage(url);
-
-        HtmlTextInput messageText = page.getHtmlElementById("message");
-        messageText.setValueAttribute(text);
-
-        HtmlForm form = page.getForms().get(0);
-        HtmlSubmitInput submit = form.getOneHtmlElementByAttribute("input", "type", "submit");
-        HtmlPage newPage = submit.click();
-
-        String receivedText = newPage.getHtmlElementById("received").getTextContent();
-
-        Assert.assertEquals(receivedText, text);
-    }
-}

spring-web-modules/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScrapingLiveTest.java

@@ -1,43 +0,0 @@
-package com.baeldung.htmlunit;
-
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class HtmlUnitWebScrapingLiveTest {
-
-    private WebClient webClient;
-
-    @Before
-    public void init() throws Exception {
-        webClient = new WebClient();
-    }
-
-    @After
-    public void close() throws Exception {
-        webClient.close();
-    }
-
-    @Test
-    public void givenBaeldungArchive_whenRetrievingArticle_thenHasH1() throws Exception {
-        webClient.getOptions().setCssEnabled(false);
-        webClient.getOptions().setJavaScriptEnabled(false);
-
-        final String url = "http://www.baeldung.com/full_archive";
-        final HtmlPage page = webClient.getPage(url);
-        final String xpath = "(//ul[@class='car-monthlisting']/li)[1]/a";
-        final HtmlAnchor latestPostLink = (HtmlAnchor) page.getByXPath(xpath).get(0);
-        final HtmlPage postPage = latestPostLink.click();
-
-        final List<Object> h1 = postPage.getByXPath("//h1");
-
-        Assert.assertTrue(h1.size() > 0);
-    }
-}

spring-web-modules/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java

@@ -1,47 +0,0 @@
-package com.baeldung.htmlunit;
-
-import javax.servlet.ServletContext;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.spring4.view.ThymeleafViewResolver;
-import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.web.controller.message" })
-public class TestConfig implements WebMvcConfigurer {
-
-    @Autowired
-    private ServletContext ctx;
-    
-    @Bean
-    public ViewResolver thymeleafViewResolver() {
-        final ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
-        viewResolver.setTemplateEngine(templateEngine());
-        viewResolver.setOrder(1);
-        return viewResolver;
-    }
-
-    @Bean
-    public ServletContextTemplateResolver templateResolver() {
-        final ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver(ctx);
-        templateResolver.setPrefix("/WEB-INF/templates/");
-        templateResolver.setSuffix(".html");
-        templateResolver.setTemplateMode("HTML5");
-        return templateResolver;
-    }
-
-    @Bean
-    public SpringTemplateEngine templateEngine() {
-        final SpringTemplateEngine templateEngine = new SpringTemplateEngine();
-        templateEngine.setTemplateResolver(templateResolver());
-        return templateEngine;
-    }
-}