Skip to content

Commit

Permalink
#3128 - replace deprecated apache.poi methods not available anymore i…
Browse files Browse the repository at this point in the history 
…n new version of the dependencies
  • Loading branch information
@lollegp
lollegp committed Jul 7, 2023
1 parent 2fab221 commit 94846fe
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion bundle/src/main/java/com/adobe/acs/commons/mcp/impl/GenericReportExcelServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFFont;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xssf.usermodel.DefaultIndexedColorMap;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
Expand Down Expand Up @@ -135,7 +136,7 @@ private Workbook createSpreadsheet(AbstractReport report) {

CellStyle createHeaderStyle(Workbook wb){
XSSFCellStyle xstyle = (XSSFCellStyle)wb.createCellStyle();
XSSFColor header = new XSSFColor(new Color(79, 129, 189));
XSSFColor header = new XSSFColor(new Color(79, 129, 189), new DefaultIndexedColorMap());
xstyle.setFillForegroundColor(header);
xstyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
XSSFFont font = (XSSFFont)wb.createFont();
Expand Down
22 changes: 11 additions & 11 deletions bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/ImportRedirectMapServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Map<String, Resource> getRules(Resource resource) {

/**
* @param root root resource, e.g. /conf/global/settings/redirects
* @param xlsRules redirects read from an Excel spreadhseet
* @param xlsRules redirects read from an Excel spreadsheet
* @param jcrRedirects existing redirect nodes keyed by the source path.
* We assume that the source path is unique.
*/
Expand Down Expand Up @@ -204,7 +204,7 @@ Map<ExportColumn, Integer> mapColumns(Row row) {
// columns A, B and C are reserved for source, target and statusCode
continue;
}
if (cell.getCellTypeEnum() == CellType.STRING) {
if (cell.getCellType() == CellType.STRING) {
String title = cell.getStringCellValue();
for (ExportColumn col : ExportColumn.values()) {
if (col.getTitle().equalsIgnoreCase(title)) {
Expand All @@ -225,19 +225,19 @@ private Map<String, Object> readRedirect(Row row, Map<ExportColumn, Integer> col
Map<String, Object> props = new HashMap<>();
props.put(PROPERTY_RESOURCE_TYPE, REDIRECT_RULE_RESOURCE_TYPE);
Cell c0 = row.getCell(0);
if (c0 == null || c0.getCellTypeEnum() != CellType.STRING) {
if (c0 == null || c0.getCellType() != CellType.STRING) {
auditLog.warn(new CellReference(row.getRowNum(), 0).formatAsString(),
"Cells A is required and should contain redirect source");
return null;
}
Cell c1 = row.getCell(1);
if (c1 == null || c1.getCellTypeEnum() != CellType.STRING) {
if (c1 == null || c1.getCellType() != CellType.STRING) {
auditLog.warn(new CellReference(row.getRowNum(), 1).formatAsString(),
"Cells B is required and should contain redirect source");
return null;
}
Cell c2 = row.getCell(2);
if (c2 == null || c2.getCellTypeEnum() != CellType.NUMERIC) {
if (c2 == null || c2.getCellType() != CellType.NUMERIC) {
auditLog.warn(new CellReference(row.getRowNum(), 2).formatAsString(),
"Cells C is required and should contain redirect status code");
return null;
Expand Down Expand Up @@ -266,15 +266,15 @@ private Map<String, Object> readOptionalProperties(Row row, Map<ExportColumn, In
if (cols.containsKey(column)) {
int columnIndex = cols.get(column);
Cell cell = row.getCell(columnIndex);
if (cell != null && cell.getCellTypeEnum() != CellType.BLANK) {
if (cell != null && cell.getCellType() != CellType.BLANK) {
Object value = null;
if (column.getPropertyType() == String[].class && cell.getCellTypeEnum() == CellType.STRING) {
if (column.getPropertyType() == String[].class && cell.getCellType() == CellType.STRING) {
value = cell.getStringCellValue().split("\n");
} else if (column.getPropertyType() == String.class && cell.getCellTypeEnum() == CellType.STRING) {
} else if (column.getPropertyType() == String.class && cell.getCellType() == CellType.STRING) {
value = cell.getStringCellValue();
} else if (column.getPropertyType() == Boolean.class && cell.getCellTypeEnum() == CellType.BOOLEAN) {
} else if (column.getPropertyType() == Boolean.class && cell.getCellType() == CellType.BOOLEAN) {
value = cell.getBooleanCellValue();
} else if (column.getPropertyType() == Calendar.class && cell.getCellTypeEnum() == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell)) {
} else if (column.getPropertyType() == Calendar.class && cell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell)) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(cell.getDateCellValue());
value = calendar;
Expand All @@ -284,7 +284,7 @@ private Map<String, Object> readOptionalProperties(Row row, Map<ExportColumn, In
} else {
String cellAddress = new CellReference(row.getRowNum(), cell.getColumnIndex()).formatAsString();
auditLog.info(cellAddress, "Can't set '" + column.getTitle() + "' from a "
+ cell.getCellTypeEnum().toString().toLowerCase() + " cell: '" + cell + "'");
+ cell.getCellType().toString().toLowerCase() + " cell: '" + cell + "'");
}
}
}
Expand Down

0 comments on commit 94846fe

Please sign in to comment.