11 Commits

13 changed files with 468 additions and 464 deletions

View File

@ -24,7 +24,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>
<name>shared-configuration</name> <name>shared-configuration</name>

View File

@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
@ -26,7 +25,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>
<name>shared-db</name> <name>shared-db</name>
@ -76,7 +75,6 @@ limitations under the License.
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<scope>provided</scope> <scope>provided</scope>
<version>1.18.12</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -20,7 +20,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>

View File

@ -57,8 +57,8 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
} }
@Override @Override
public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException { public Object nullSafeGet(ResultSet rs, int index, SharedSessionContractImplementor implementor, Object o) throws SQLException {
return nullSafeGet(rs, names, owner); return nullSafeGet(rs, index, implementor);
} }
@Override @Override
@ -104,8 +104,8 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
return false; return false;
} }
public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws SQLException { public Object nullSafeGet(ResultSet rs, int index, Object owner) throws SQLException {
String value = rs.getString(names[0]); String value = rs.getString(index);
if (!rs.wasNull()) { if (!rs.wasNull()) {
return enumMap.get(value); return enumMap.get(value);
} }
@ -130,9 +130,5 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
return clazz; return clazz;
} }
@Override
public int[] sqlTypes() {
return new int[]{sqlType};
}
} }

View File

@ -15,14 +15,14 @@
*/ */
package de.muehlencord.shared.jeeutil.restexfw; package de.muehlencord.shared.jeeutil.restexfw;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/** /**
* *

View File

@ -15,12 +15,12 @@
*/ */
package de.muehlencord.shared.jeeutil.restexfw; package de.muehlencord.shared.jeeutil.restexfw;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.Iterator; import java.util.Iterator;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Path; import javax.validation.Path;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/** /**
* *

View File

@ -15,14 +15,14 @@
*/ */
package de.muehlencord.shared.jeeutil.restexfw; package de.muehlencord.shared.jeeutil.restexfw;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.ws.rs.core.Response.Status;
/** /**
*
* @author Joern Muehlencord (joern@muehlencord.de) * @author Joern Muehlencord (joern@muehlencord.de)
*/ */
public class ResponseStatusAdapter extends XmlAdapter<String, Response.Status> { public class ResponseStatusAdapter extends XmlAdapter<String, Status> {
@Override @Override
public String marshal(Response.Status status) throws Exception { public String marshal(Response.Status status) throws Exception {

View File

@ -13,8 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>shared-network</artifactId> <artifactId>shared-network</artifactId>
<build> <build>
@ -73,7 +72,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -81,5 +80,5 @@ limitations under the License.
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</project> </project>

View File

@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>shared-poi-util</artifactId> <artifactId>shared-poi-util</artifactId>
<dependencies> <dependencies>
@ -48,9 +47,9 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</project> </project>

View File

@ -34,7 +34,6 @@ import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.ptg.RefPtgBase; import org.apache.poi.ss.formula.ptg.RefPtgBase;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DataValidation; import org.apache.poi.ss.usermodel.DataValidation;
import org.apache.poi.ss.usermodel.DataValidationHelper; import org.apache.poi.ss.usermodel.DataValidationHelper;
import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Row;
@ -184,7 +183,7 @@ public class WorkbookApp {
newCell.setCellValue(oldCell.getNumericCellValue()); newCell.setCellValue(oldCell.getNumericCellValue());
break; break;
case BLANK: case BLANK:
newCell.setCellType(CellType.BLANK); newCell.setBlank();
break; break;
case BOOLEAN: case BOOLEAN:
newCell.setCellValue(oldCell.getBooleanCellValue()); newCell.setCellValue(oldCell.getBooleanCellValue());

59
pom.xml
View File

@ -15,12 +15,11 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
<name>shared</name> <name>shared</name>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -50,9 +49,9 @@ limitations under the License.
</developers> </developers>
<scm> <scm>
<connection>scm:git:https://jomu.timelord.de/git/jomu/shared/</connection> <connection>scm:git:git@jomu.timelord.de:jomu/shared.git</connection>
<developerConnection>scm:git:https://jomu.timelord.de/git/jomu/shared/</developerConnection> <developerConnection>scm:git:git@jomu.timelord.de:jomu/shared.git</developerConnection>
<tag>HEAD</tag> <tag>v1.3.1</tag>
<url>https://jomu.timelord.de/git/jomu/shared/</url> <url>https://jomu.timelord.de/git/jomu/shared/</url>
</scm> </scm>
@ -75,12 +74,26 @@ limitations under the License.
<properties> <properties>
<!-- project setup --> <!-- project setup -->
<maven.compiler.source>11</maven.compiler.source> <java.version>17</java.version>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.32</slf4j.version> <slf4j.version>2.0.6</slf4j.version>
<jackson.version>2.13.0</jackson.version> <jackson.version>2.14.2</jackson.version>
<shiro.version>1.11.0</shiro.version>
<lombok.version>1.18.26</lombok.version>
<junit.version>5.9.2</junit.version>
<primefaces.version>12.0.0</primefaces.version>
<adminfaces-template.version>1.6.1</adminfaces-template.version>
<omnifaces.version>4.0.1</omnifaces.version>
<poi.version>5.2.3</poi.version>
<commons-net.version>3.9.0</commons-net.version>
<gson.version>2.10.1</gson.version>
<fusionauth.version>5.2.2</fusionauth.version>
<bouncycastle.version>1.70</bouncycastle.version>
<hibernate.version>6.1.7.Final</hibernate.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -114,7 +127,7 @@ limitations under the License.
<dependency> <dependency>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<version>3.8.0</version> <version>${commons-net.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
@ -155,7 +168,7 @@ limitations under the License.
<dependency> <dependency>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<version>2.8.9</version> <version>${gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
@ -177,12 +190,12 @@ limitations under the License.
<dependency> <dependency>
<artifactId>shiro-core</artifactId> <artifactId>shiro-core</artifactId>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<version>1.7.1</version> <version>${shiro.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>shiro-web</artifactId> <artifactId>shiro-web</artifactId>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<version>1.7.1</version> <version>${shiro.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>javaee-api</artifactId> <artifactId>javaee-api</artifactId>
@ -203,39 +216,39 @@ limitations under the License.
<dependency> <dependency>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<version>1.68</version> <version>${bouncycastle.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<type>jar</type> <type>jar</type>
<version>5.6.3.Final</version> <version>${hibernate.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<version>10.0.0</version> <version>${primefaces.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>admin-template</artifactId> <artifactId>admin-template</artifactId>
<groupId>com.github.adminfaces</groupId> <groupId>com.github.adminfaces</groupId>
<version>1.3.0</version> <version>${adminfaces-template.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>omnifaces</artifactId> <artifactId>omnifaces</artifactId>
<groupId>org.omnifaces</groupId> <groupId>org.omnifaces</groupId>
<version>3.4.1</version> <version>${omnifaces.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<version>5.2.0</version> <version>${poi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>fusionauth-jwt</artifactId> <artifactId>fusionauth-jwt</artifactId>
<groupId>io.fusionauth</groupId> <groupId>io.fusionauth</groupId>
<version>4.1.0</version> <version>${fusionauth.version}</version>
</dependency> </dependency>
<!-- Dev Tools --> <!-- Dev Tools -->
@ -243,7 +256,7 @@ limitations under the License.
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<scope>provided</scope> <scope>provided</scope>
<version>1.18.22</version> <version>${lombok.version}</version>
</dependency> </dependency>
<!-- Testing --> <!-- Testing -->
@ -251,7 +264,7 @@ limitations under the License.
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<scope>test</scope> <scope>test</scope>
<version>5.8.2</version> <version>${junit.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -24,7 +24,7 @@ limitations under the License.
<parent> <parent>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>
<name>shared-shiro-faces</name> <name>shared-shiro-faces</name>

View File

@ -26,7 +26,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>1.2-SNAPSHOT</version> <version>1.3.1</version>
</parent> </parent>