Commit 90b3dcfe authored by Matija Obreza's avatar Matija Obreza
Browse files

Dependency update

parent b9242afb
......@@ -111,5 +111,10 @@
<version>${hibernate.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
</dependencies>
</project>
......@@ -26,7 +26,6 @@ import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.common.collect.Sets;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.StringPath;
......@@ -88,10 +87,10 @@ public class StringFilter implements Serializable {
* @return the string filter
*/
public StringFilter eq(final String... val) {
if (eq != null && !eq.isEmpty()) {
if (eq != null) {
eq.addAll(Arrays.asList(val));
} else {
eq = Sets.newHashSet(val);
eq = new HashSet<>(Set.of(val));
}
return this;
}
......@@ -103,10 +102,10 @@ public class StringFilter implements Serializable {
* @return the string filter
*/
public StringFilter contains(final String... val) {
if (contains != null && !contains.isEmpty()) {
if (contains != null) {
contains.addAll(Arrays.asList(val));
} else {
contains = Sets.newHashSet(val);
contains = new HashSet<>(Set.of(val));
}
return this;
}
......@@ -121,7 +120,7 @@ public class StringFilter implements Serializable {
if (sw != null && !sw.isEmpty()) {
sw.addAll(Arrays.asList(val));
} else {
sw = Sets.newHashSet(val);
sw = new HashSet<>(Set.of(val));
}
return this;
}
......
......@@ -32,18 +32,17 @@
<jdk.target>11</jdk.target>
<jdk.source>11</jdk.source>
<show.deprecations>false</show.deprecations>
<slf4j.version>1.7.31</slf4j.version>
<log4j2.version>2.17.1</log4j2.version>
<log4j2.version>2.17.2</log4j2.version>
<junit.version>4.13.2</junit.version>
<org.hamcrest.version>2.2</org.hamcrest.version>
<jackson.version>2.12.4</jackson.version>
<spring.version>5.3.9</spring.version>
<jackson.version>2.13.2</jackson.version>
<spring.version>5.3.19</spring.version>
<spring.data.version>2.5.3</spring.data.version>
<spring.security.oauth2.version>2.5.1.RELEASE</spring.security.oauth2.version>
<querydsl.version>4.4.0</querydsl.version>
<spring.security.version>5.5.1</spring.security.version>
<hibernate.version>5.5.3.Final</hibernate.version>
<querydsl.version>5.0.0</querydsl.version>
<hibernate.version>5.5.5.Final</hibernate.version>
<hsqldb.version>2.6.0</hsqldb.version>
<tomcat-jdbc.version>10.0.8</tomcat-jdbc.version>
</properties>
......@@ -165,12 +164,6 @@
</dependency>
<!-- Logging dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment