Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/addTestFCR' into addTestFCR
Browse files Browse the repository at this point in the history
# Conflicts:
#	equinix-openapi-fabric/src/main/java/com/equinix/openapi/fabric/JacksonObjectMapper.java
  • Loading branch information
tutkat committed Jul 29, 2024
2 parents 27ad24a + 16f117b commit 8844b28
Showing 1 changed file with 15 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
/*
* Equinix Fabric API v4
*
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/
* Equinix Fabric API v4
*
* Contact: [email protected]
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/


package com.equinix.openapi.fabric;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.*;
import org.openapitools.jackson.nullable.JsonNullableModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

import io.restassured.internal.mapping.Jackson2Mapper;
import io.restassured.path.json.mapper.factory.Jackson2ObjectMapperFactory;
import org.openapitools.jackson.nullable.JsonNullableModule;


public class JacksonObjectMapper extends Jackson2Mapper {
Expand Down Expand Up @@ -47,7 +46,7 @@ private static Jackson2ObjectMapperFactory createFactory() {
};
}

public static JacksonObjectMapper jackson() {
return new JacksonObjectMapper();
}
public static JacksonObjectMapper jackson() {
return new JacksonObjectMapper();
}
}

0 comments on commit 8844b28

Please sign in to comment.