Skip to content

Commit fd7ca00

Browse files
lpandzicfrantuma
lpandzic
authored and
frantuma
committed
reverted changes to imports
1 parent 79584cc commit fd7ca00

File tree

3 files changed

+92
-23
lines changed

3 files changed

+92
-23
lines changed

‎modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java‎

Lines changed: 77 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,97 @@
11
package io.swagger.v3.core.jackson;
22

3-
import static io.swagger.v3.core.jackson.JAXBAnnotationsHelper.JAXB_DEFAULT;
4-
import static io.swagger.v3.core.util.RefUtils.constructRef;
5-
6-
import javax.validation.constraints.*;
7-
import javax.xml.bind.annotation.*;
8-
import java.io.IOException;
9-
import java.lang.annotation.Annotation;
10-
import java.lang.reflect.*;
11-
import java.math.BigDecimal;
12-
import java.util.*;
13-
import java.util.stream.Collectors;
14-
import java.util.stream.Stream;
15-
16-
import com.fasterxml.jackson.annotation.*;
17-
import com.fasterxml.jackson.databind.*;
3+
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
4+
import com.fasterxml.jackson.annotation.JsonIdentityReference;
5+
import com.fasterxml.jackson.annotation.JsonIgnore;
6+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
7+
import com.fasterxml.jackson.annotation.JsonProperty;
8+
import com.fasterxml.jackson.annotation.JsonTypeInfo;
9+
import com.fasterxml.jackson.annotation.JsonTypeName;
10+
import com.fasterxml.jackson.annotation.JsonUnwrapped;
11+
import com.fasterxml.jackson.annotation.JsonValue;
12+
import com.fasterxml.jackson.annotation.JsonView;
13+
import com.fasterxml.jackson.annotation.ObjectIdGenerator;
14+
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
15+
import com.fasterxml.jackson.databind.AnnotationIntrospector;
16+
import com.fasterxml.jackson.databind.BeanDescription;
17+
import com.fasterxml.jackson.databind.JavaType;
18+
import com.fasterxml.jackson.databind.ObjectMapper;
19+
import com.fasterxml.jackson.databind.PropertyMetadata;
20+
import com.fasterxml.jackson.databind.SerializationFeature;
1821
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1922
import com.fasterxml.jackson.databind.introspect.*;
2023
import com.fasterxml.jackson.databind.jsontype.NamedType;
2124
import com.fasterxml.jackson.databind.util.Annotations;
2225
import io.swagger.v3.core.converter.AnnotatedType;
2326
import io.swagger.v3.core.converter.ModelConverter;
2427
import io.swagger.v3.core.converter.ModelConverterContext;
25-
import io.swagger.v3.core.util.*;
28+
import io.swagger.v3.core.util.AnnotationsUtils;
29+
import io.swagger.v3.core.util.Constants;
30+
import io.swagger.v3.core.util.Json;
31+
import io.swagger.v3.core.util.ObjectMapperFactory;
32+
import io.swagger.v3.core.util.ReferenceTypeUtils;
33+
import io.swagger.v3.core.util.PrimitiveType;
34+
import io.swagger.v3.core.util.ReflectionUtils;
2635
import io.swagger.v3.oas.annotations.Hidden;
27-
import io.swagger.v3.oas.annotations.media.*;
36+
import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
37+
import io.swagger.v3.oas.annotations.media.PatternProperties;
38+
import io.swagger.v3.oas.annotations.media.PatternProperty;
39+
import io.swagger.v3.oas.annotations.media.SchemaProperties;
40+
import io.swagger.v3.oas.annotations.media.SchemaProperty;
2841
import io.swagger.v3.oas.models.Components;
2942
import io.swagger.v3.oas.models.ExternalDocumentation;
30-
import io.swagger.v3.oas.models.media.*;
43+
import io.swagger.v3.oas.models.media.ArraySchema;
44+
import io.swagger.v3.oas.models.media.ComposedSchema;
45+
import io.swagger.v3.oas.models.media.Discriminator;
46+
import io.swagger.v3.oas.models.media.IntegerSchema;
47+
import io.swagger.v3.oas.models.media.MapSchema;
48+
import io.swagger.v3.oas.models.media.NumberSchema;
49+
import io.swagger.v3.oas.models.media.ObjectSchema;
50+
import io.swagger.v3.oas.models.media.Schema;
51+
import io.swagger.v3.oas.models.media.StringSchema;
52+
import io.swagger.v3.oas.models.media.UUIDSchema;
53+
import io.swagger.v3.oas.models.media.XML;
3154
import org.apache.commons.lang3.StringUtils;
3255
import org.apache.commons.lang3.math.NumberUtils;
3356
import org.slf4j.Logger;
3457
import org.slf4j.LoggerFactory;
3558

59+
import javax.validation.constraints.DecimalMax;
60+
import javax.validation.constraints.DecimalMin;
61+
import javax.validation.constraints.Max;
62+
import javax.validation.constraints.Min;
63+
import javax.validation.constraints.Pattern;
64+
import javax.validation.constraints.Size;
65+
import javax.xml.bind.annotation.XmlElementRef;
66+
import javax.xml.bind.annotation.XmlElementRefs;
67+
import javax.xml.bind.annotation.XmlAccessType;
68+
import javax.xml.bind.annotation.XmlAccessorType;
69+
import javax.xml.bind.annotation.XmlElement;
70+
import javax.xml.bind.annotation.XmlAttribute;
71+
import javax.xml.bind.annotation.XmlRootElement;
72+
import javax.xml.bind.annotation.XmlSchema;
73+
import java.io.IOException;
74+
import java.lang.annotation.Annotation;
75+
import java.lang.reflect.*;
76+
import java.math.BigDecimal;
77+
import java.util.ArrayList;
78+
import java.util.Arrays;
79+
import java.util.Collection;
80+
import java.util.Collections;
81+
import java.util.HashMap;
82+
import java.util.HashSet;
83+
import java.util.Iterator;
84+
import java.util.LinkedHashMap;
85+
import java.util.List;
86+
import java.util.Map;
87+
import java.util.Optional;
88+
import java.util.Set;
89+
import java.util.stream.Collectors;
90+
import java.util.stream.Stream;
91+
92+
import static io.swagger.v3.core.jackson.JAXBAnnotationsHelper.JAXB_DEFAULT;
93+
import static io.swagger.v3.core.util.RefUtils.constructRef;
94+
3695
public class ModelResolver extends AbstractModelConverter implements ModelConverter {
3796

3897
Logger LOGGER = LoggerFactory.getLogger(ModelResolver.class);

‎modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/BeanValidationsModel.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package io.swagger.v3.core.oas.models;
22

3-
import javax.validation.constraints.*;
3+
import javax.validation.constraints.DecimalMax;
4+
import javax.validation.constraints.DecimalMin;
5+
import javax.validation.constraints.Max;
6+
import javax.validation.constraints.Min;
7+
import javax.validation.constraints.NotNull;
8+
import javax.validation.constraints.Pattern;
9+
import javax.validation.constraints.Size;
410
import java.util.List;
511
import java.util.Optional;
612

‎modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/BeanValidatorTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package io.swagger.v3.core.resolving;
22

3-
import java.math.BigDecimal;
4-
import java.util.Map;
5-
63
import io.swagger.v3.core.converter.ModelConverters;
74
import io.swagger.v3.core.oas.models.BeanValidationsModel;
8-
import io.swagger.v3.oas.models.media.*;
5+
import io.swagger.v3.oas.models.media.ArraySchema;
6+
import io.swagger.v3.oas.models.media.IntegerSchema;
7+
import io.swagger.v3.oas.models.media.NumberSchema;
8+
import io.swagger.v3.oas.models.media.Schema;
9+
import io.swagger.v3.oas.models.media.StringSchema;
910
import org.testng.Assert;
1011
import org.testng.annotations.Test;
1112

13+
import java.math.BigDecimal;
14+
import java.util.Map;
15+
1216
public class BeanValidatorTest {
1317

1418
@Test(description = "read bean validations")

0 commit comments

Comments
 (0)