diff --git a/pom.xml b/pom.xml index 5d130514..c73c27f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,352 +1,360 @@ - - 4.0.0 - - ch.ethz.seb - seb-server - ${sebserver-version}-SNAPSHOT - seb-server - web-service for SEB maintenance and monitoring active SEB sessions - - - org.springframework.boot - spring-boot-starter-parent - 2.1.0.RELEASE - - - jar - - - 0.5.4-beta - UTF-8 - UTF-8 - - - - - - Java 11 - - true - - - 11 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - - - - - - - org.glassfish.jaxb - jaxb-runtime - 2.4.0-b180830.0438 - - - - - - let_reporting - - 1.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.19.1 - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.10.0 - - false - false - ${java.version} - false - - pmd-rulesets.xml - - - - - - check - cpd-check - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.4 - - Max - false - Low + + 4.0.0 + + ch.ethz.seb + seb-server + ${sebserver-version}-SNAPSHOT + seb-server + web-service for SEB maintenance and monitoring active SEB sessions + + + org.springframework.boot + spring-boot-starter-parent + 2.1.0.RELEASE + + + jar + + + 0.5.4-beta + UTF-8 + UTF-8 + + + + + + Java 11 + + true + + + 11 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + + + + + + + org.glassfish.jaxb + jaxb-runtime + 2.4.0-b180830.0438 + + + + + + let_reporting + + 1.8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.10.0 + + false + false + ${java.version} + false + + pmd-rulesets.xml + + + + + + check + cpd-check + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.4 + + Max + false + Low true findbugs-excludes.xml - - - - analyze-compile - compile - - check - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.3 - - - prepare-agent - - prepare-agent - - - - report - prepare-package - - report - - - - ch/ethz/seb/sebserver/gui/**/* - ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/**/* - ch/ethz/seb/sebserver/webservice/datalayer/batis/model/**/* - - - - - - - target/jacoco.exec - - - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - - - org.mariadb.jdbc - mariadb-java-client - - - - - org.mybatis - mybatis - 3.4.6 - - - org.mybatis.dynamic-sql - mybatis-dynamic-sql - 1.1.0 - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.2 - - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.2.10 - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-cache - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - org.springframework.boot - spring-boot-starter-webflux - - - spring-boot-starter-reactor-netty - org.springframework.boot - - - - - - org.springframework.security.oauth - spring-security-oauth2 - 2.3.6.RELEASE - - - org.springframework.security - spring-security-jwt - 1.0.9.RELEASE - - - - - - - - - - - org.apache.httpcomponents - httpclient - - - - - org.eclipse.rap - org.eclipse.rap.rwt - 3.5.0 - - - org.eclipse.rap - org.eclipse.rap.fileupload - 3.7.0 - - - - - joda-time - joda-time - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - org.apache.commons - commons-lang3 - - - org.cryptonode.jncryptor - jncryptor - 1.2.0 - - - org.apache.commons - commons-text - 1.8 - - - - - - junit - junit - test - - - - - - - - - - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - com.h2database - h2 - test - - - - + + + + analyze-compile + compile + + check + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.3 + + + prepare-agent + + prepare-agent + + + + report + prepare-package + + report + + + + ch/ethz/seb/sebserver/gui/**/* + ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/**/* + ch/ethz/seb/sebserver/webservice/datalayer/batis/model/**/* + + + + + + + target/jacoco.exec + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 10 + 10 + + + + + + + + + org.mariadb.jdbc + mariadb-java-client + + + + + org.mybatis + mybatis + 3.4.6 + + + org.mybatis.dynamic-sql + mybatis-dynamic-sql + 1.1.0 + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.2 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.10 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-cache + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + org.springframework.boot + spring-boot-starter-webflux + + + spring-boot-starter-reactor-netty + org.springframework.boot + + + + + + org.springframework.security.oauth + spring-security-oauth2 + 2.3.6.RELEASE + + + org.springframework.security + spring-security-jwt + 1.0.9.RELEASE + + + + + + + + + + + org.apache.httpcomponents + httpclient + + + + + org.eclipse.rap + org.eclipse.rap.rwt + 3.5.0 + + + org.eclipse.rap + org.eclipse.rap.fileupload + 3.7.0 + + + + + joda-time + joda-time + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + + + org.apache.commons + commons-lang3 + + + org.cryptonode.jncryptor + jncryptor + 1.2.0 + + + org.apache.commons + commons-text + 1.8 + + + + + + junit + junit + test + + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + com.h2database + h2 + test + + + + \ No newline at end of file diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java index fc53f449..f8863fff 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java @@ -169,9 +169,9 @@ public final class Utils { } public static > Collection> createSelectionResource(final Class enumClass) { - return Arrays.stream(enumClass.getEnumConstants()) + return Collections.unmodifiableList(Arrays.stream(enumClass.getEnumConstants()) .map(e -> new Tuple<>(e.name(), e.name())) - .collect(Collectors.toUnmodifiableList()); + .collect(Collectors.toList())); } public static Collection getListOfLines(final String list) {