Merge pull request #5 from spacious-team/develop

Релиз 2022.2

Author: vananiev

.idea/copyright/GNU_AGPLv3.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Table Wrapper Xml SpreadsheetML Impl
-  ~ Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+  ~ Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU Affero General Public License as
@@ -24,13 +24,13 @@
 
     <groupId>org.spacious-team</groupId>
     <artifactId>table-wrapper-xml-impl</artifactId>
-    <version>2021.4</version>
+    <version>2022.2</version>
     <packaging>jar</packaging>
 
     <name>Table Wrapper API Xml SpreadsheetML Implementation</name>
     <description>
         Implements unified Table Wrapper API for SpreadsheetML format and helps to
-        easily search and access to rows, columns, and cell values.
+        easily search and access to row, column, and cell value.
     </description>
     <url>https://github.com/spacious-team/table-wrapper-xml-impl</url>
 
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.github.spacious-team</groupId>
             <artifactId>table-wrapper-api</artifactId>
-            <version>2021.4</version>
+            <version>2022.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.VEINHORN</groupId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.18</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

pom.xml

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2021  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2021  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/xml/XmlCellDataAccessObject.java

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/xml/XmlReportPage.java

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/xml/XmlTable.java

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/xml/XmlTableCell.java

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/xml/XmlTableFactory.java

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -43,8 +43,8 @@ static TableCellAddress find(Worksheet sheet, Object value, int startRow, int en
         }
         for(int rowNum = startRow; rowNum < endRow; rowNum++) {
             Row row = sheet.getRowAt(rowNum + 1);
-            TableCellAddress address;
-            if ((address = find(row, value, startColumn, endColumn, stringPredicate)) != null) {
+            TableCellAddress address = find(row, value, startColumn, endColumn, stringPredicate);
+            if (address != NOT_FOUND) {
                 return address;
             }
         }
@@ -65,7 +65,7 @@ static TableCellAddress find(Row row, Object value, int startColumn, int endColu
                 }
             }
         }
-        return null;
+        return NOT_FOUND;
     }
 
     static int getLastRowNum(Worksheet sheet) {

src/main/java/org/spacious_team/table_wrapper/xml/XmlTableHelper.java

@@ -1,6 +1,6 @@
 /*
  * Table Wrapper Xml SpreadsheetML Impl
- * Copyright (C) 2020  Vitalii Ananev <an-vitek@ya.ru>
+ * Copyright (C) 2020  Vitalii Ananev <spacious-team@ya.ru>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as