Skip to content

Commit

Permalink
Merge ab9184a into be727ad
Browse files Browse the repository at this point in the history
  • Loading branch information
@dibimer
dibimer committed Aug 10, 2022
2 parents be727ad + ab9184a commit 223e0c8
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 33 deletions.
21 changes: 13 additions & 8 deletions pom.xml
View file
Expand Up @@ -7,7 +7,7 @@
</parent>
<artifactId>common.rest.schemagen</artifactId>
<groupId>com.mercateo</groupId>
<version>0.19.4-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>rest-schemagen</name>
<description>Jersey add-on for dynamic link and schema building</description>
Expand Down Expand Up @@ -41,7 +41,7 @@
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson.version>2.11.1</jackson.version>
<jackson.version>2.13.3</jackson.version>
<jmh.version>1.20</jmh.version>
<lombok.version>1.18.12</lombok.version>
</properties>
Expand Down Expand Up @@ -165,12 +165,12 @@
<dependency>
<groupId>com.mercateo</groupId>
<artifactId>reflection</artifactId>
<version>1.2.14</version>
<version>2.0.0</version>
</dependency>
<dependency>
<artifactId>reflections</artifactId>
<groupId>org.reflections</groupId>
<version>0.9.11</version>
<version>0.10.2</version>
</dependency>
<dependency>
<artifactId>validation-api</artifactId>
Expand Down Expand Up @@ -229,6 +229,11 @@
<artifactId>gentyref</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -247,19 +252,19 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.9.1</version>
<version>3.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.15.0</version>
<version>4.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20171018</version>
<version>20220320</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -287,7 +292,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.2.11</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/SchemaGeneratorTest.java
View file
Expand Up @@ -10,7 +10,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

import com.mercateo.common.rest.schemagen.link.LinkFactory;
import com.mercateo.common.rest.schemagen.link.SchemaGenerator;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/SchemaJsonPropertyGeneratorTest.java
View file
Expand Up @@ -14,7 +14,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

import javax.ws.rs.PathParam;
import java.lang.reflect.Type;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/link/CallScopeTest.java
View file
Expand Up @@ -4,7 +4,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

import com.mercateo.reflection.Call;

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/mercateo/common/rest/schemagen/link/LinkFactoryTest.java
View file
Expand Up @@ -4,8 +4,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;

import com.mercateo.common.rest.schemagen.ResourceClass;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/link/LinkMetaFactoryTest.java
View file
Expand Up @@ -13,7 +13,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class LinkMetaFactoryTest {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/link/helper/BaseUriCreatorDefaultTest.java
View file
Expand Up @@ -12,7 +12,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class BaseUriCreatorDefaultTest {
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/mercateo/common/rest/schemagen/link/injection/LinkFactoryContextFactoryTest.java
View file
Expand Up @@ -8,7 +8,7 @@
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedMap;
Expand Down
17 changes: 6 additions & 11 deletions ...st/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java
View file
Expand Up @@ -2,22 +2,17 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verifyNoInteractions;

import java.net.URI;
import com.mercateo.common.rest.schemagen.JsonSchemaGenerator;
import com.mercateo.common.rest.schemagen.link.LinkFactoryContext;
import com.mercateo.common.rest.schemagen.link.LinkMetaFactory;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;

import com.mercateo.common.rest.schemagen.JsonSchemaGenerator;
import com.mercateo.common.rest.schemagen.link.LinkFactoryContext;
import com.mercateo.common.rest.schemagen.link.LinkMetaFactory;
import com.mercateo.common.rest.schemagen.plugin.FieldCheckerForSchema;
import com.mercateo.common.rest.schemagen.plugin.MethodCheckerForLink;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class LinkMetaFactoryFactoryTest {
Expand All @@ -44,6 +39,6 @@ public void disposeShouldDoNothing() throws Exception {
final LinkMetaFactory linkMetaFactory = mock(LinkMetaFactory.class);
linkMetaFactoryFactory.dispose(linkMetaFactory);

verifyZeroInteractions(schemaGenerator, linkFactoryContext, linkMetaFactory);
verifyNoInteractions(schemaGenerator, linkFactoryContext, linkMetaFactory);
}
}
2 changes: 1 addition & 1 deletion ...ava/com/mercateo/common/rest/schemagen/plugin/common/MethodCheckerForLinkFactoryTest.java
View file
Expand Up @@ -5,7 +5,7 @@
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

import javax.ws.rs.core.SecurityContext;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/types/HyperSchemaCreatorTest.java
View file
Expand Up @@ -15,7 +15,7 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class HyperSchemaCreatorTest {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/types/ListResponseTest.java
View file
Expand Up @@ -70,7 +70,7 @@ public void shouldSerialize() throws Exception {
@Test
public void shouldDeserialize() throws Exception {
final ObjectMapper mapper = new ObjectMapper();
mapper.disableDefaultTyping();
mapper.deactivateDefaultTyping();

final String content = "{\"members\": [{\"value\": \"foo\", \"_schema\":{\"links\":[]}}, {\"value\": \"bar\", \"_schema\":{\"links\":[]}}], \"_schema\":{\"links\":[]}}";

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/mercateo/common/rest/schemagen/types/MessageTest.java
View file
Expand Up @@ -10,7 +10,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

import com.fasterxml.jackson.databind.ObjectMapper;

Expand Down Expand Up @@ -82,7 +82,7 @@ public void shouldSerialize() throws Exception {
@Test
public void shouldDeserialize() throws Exception {
final ObjectMapper mapper = new ObjectMapper();
mapper.disableDefaultTyping();
mapper.deactivateDefaultTyping();

final String content = "{\"type\":\"INFO\",\"code\":\"<code>\",\"data\":{\"value\":\"<data>\"}}";

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/mercateo/common/rest/schemagen/types/ResponseBuilderAbstractTest.java
View file
Expand Up @@ -13,7 +13,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public class ResponseBuilderAbstractTest {
Expand Down

0 comments on commit 223e0c8

Please sign in to comment.