From b700f302c846c297ac21969e5c0a7d0130210f81 Mon Sep 17 00:00:00 2001 From: Guy Davenport Date: Mon, 20 Jan 2025 17:41:56 +1300 Subject: [PATCH] optimise imports --- .../core/graphql/options/AbstractGraphQLOptions.java | 1 - .../core/graphql/options/CreateMutationOptions.java | 1 - .../core/graphql/options/DeleteMutationOptions.java | 1 - .../core/graphql/options/GraphQLGeneratorOptions.java | 2 -- .../brapi/schematools/core/graphql/options/InputOptions.java | 1 - .../schematools/core/graphql/options/QueryTypeOptions.java | 1 - .../core/graphql/options/UpdateMutationOptions.java | 1 - .../schematools/core/openapi/metadata/DeleteMetadata.java | 4 ---- .../schematools/core/openapi/metadata/ListGetMetadata.java | 4 ---- .../core/openapi/metadata/OpenAPIGeneratorMetadata.java | 1 - .../schematools/core/openapi/metadata/PostMetadata.java | 4 ---- .../brapi/schematools/core/openapi/metadata/PutMetadata.java | 4 ---- .../schematools/core/openapi/metadata/SearchMetadata.java | 4 ---- .../schematools/core/openapi/metadata/SingleGetMetadata.java | 4 ---- .../schematools/core/options/AbstractGeneratorOptions.java | 1 - .../org/brapi/schematools/core/options/AbstractOptions.java | 1 - .../core/xlsx/options/XSSFWorkbookGeneratorOptions.java | 4 ---- .../core/graphql/metadata/GraphQLGeneratorMetadataTest.java | 5 +++-- .../ontmodel/metadata/OntModelGeneratorMetadataTest.java | 2 -- .../core/ontmodel/options/OntModelGeneratorOptionsTest.java | 2 -- .../core/openapi/metadata/OpenAPIGeneratorMetadataTest.java | 5 +++-- .../core/xlsx/options/XSSFWorkbookGeneratorOptionsTest.java | 1 - 22 files changed, 6 insertions(+), 48 deletions(-) diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/AbstractGraphQLOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/AbstractGraphQLOptions.java index bc30026..51714b9 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/AbstractGraphQLOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/AbstractGraphQLOptions.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import org.brapi.schematools.core.model.BrAPIType; -import org.brapi.schematools.core.openapi.options.AbstractOpenAPIOptions; import org.brapi.schematools.core.options.AbstractOptions; import org.brapi.schematools.core.valdiation.Validation; diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/CreateMutationOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/CreateMutationOptions.java index 1009e00..3de6108 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/CreateMutationOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/CreateMutationOptions.java @@ -1,6 +1,5 @@ package org.brapi.schematools.core.graphql.options; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/DeleteMutationOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/DeleteMutationOptions.java index 864b5c7..bdd708c 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/DeleteMutationOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/DeleteMutationOptions.java @@ -1,6 +1,5 @@ package org.brapi.schematools.core.graphql.options; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/GraphQLGeneratorOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/GraphQLGeneratorOptions.java index f037cb1..f2112c3 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/GraphQLGeneratorOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/GraphQLGeneratorOptions.java @@ -7,14 +7,12 @@ import org.brapi.schematools.core.graphql.GraphQLGenerator; import org.brapi.schematools.core.model.BrAPIClass; import org.brapi.schematools.core.model.BrAPIType; -import org.brapi.schematools.core.openapi.options.OpenAPIGeneratorOptions; import org.brapi.schematools.core.options.AbstractGeneratorOptions; import org.brapi.schematools.core.utils.ConfigurationUtils; import org.brapi.schematools.core.valdiation.Validation; import java.io.IOException; import java.io.InputStream; -import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/InputOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/InputOptions.java index 2769cee..51cb970 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/InputOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/InputOptions.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import org.brapi.schematools.core.model.BrAPIType; -import org.brapi.schematools.core.openapi.options.PropertyOptions; import org.brapi.schematools.core.options.Options; import org.brapi.schematools.core.utils.StringUtils; import org.brapi.schematools.core.valdiation.Validation; diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/QueryTypeOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/QueryTypeOptions.java index cf43e70..8b46ae3 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/QueryTypeOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/QueryTypeOptions.java @@ -1,6 +1,5 @@ package org.brapi.schematools.core.graphql.options; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/UpdateMutationOptions.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/UpdateMutationOptions.java index 139986c..39bca37 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/graphql/options/UpdateMutationOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/graphql/options/UpdateMutationOptions.java @@ -1,6 +1,5 @@ package org.brapi.schematools.core.graphql.options; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/DeleteMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/DeleteMetadata.java index e1473ac..e29ba59 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/DeleteMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/DeleteMetadata.java @@ -2,10 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.metadata.Metadata; - -import java.util.HashMap; -import java.util.Map; /** diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/ListGetMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/ListGetMetadata.java index cc07ee3..b9c07bc 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/ListGetMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/ListGetMetadata.java @@ -2,10 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.metadata.Metadata; - -import java.util.HashMap; -import java.util.Map; /** * Provides metadata for the List Get endpoints diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadata.java index 6484d99..ae9861c 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadata.java @@ -2,7 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.graphql.metadata.GraphQLGeneratorMetadata; import org.brapi.schematools.core.metadata.Metadata; import org.brapi.schematools.core.utils.ConfigurationUtils; diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PostMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PostMetadata.java index fc33c5a..2a62dc7 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PostMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PostMetadata.java @@ -2,10 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.metadata.Metadata; - -import java.util.HashMap; -import java.util.Map; /** * Provides metadata for the Post endpoints diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PutMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PutMetadata.java index 292fd05..47c1a20 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PutMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/PutMetadata.java @@ -2,10 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.metadata.Metadata; - -import java.util.HashMap; -import java.util.Map; /** * Provides metadata for the Put endpoints diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SearchMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SearchMetadata.java index 517f837..ed3ed64 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SearchMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SearchMetadata.java @@ -2,10 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.metadata.Metadata; - -import java.util.HashMap; -import java.util.Map; /** * Provides metadata for the Search Post and Get endpoints diff --git a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SingleGetMetadata.java b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SingleGetMetadata.java index b7213f9..dc7b4e1 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SingleGetMetadata.java +++ b/java/core/src/main/java/org/brapi/schematools/core/openapi/metadata/SingleGetMetadata.java @@ -2,10 +2,6 @@ import lombok.Getter; import lombok.Setter; -import org.brapi.schematools.core.metadata.Metadata; - -import java.util.HashMap; -import java.util.Map; /** * Provides metadata for the Single Get endpoints diff --git a/java/core/src/main/java/org/brapi/schematools/core/options/AbstractGeneratorOptions.java b/java/core/src/main/java/org/brapi/schematools/core/options/AbstractGeneratorOptions.java index 59fc0d0..5ef760c 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/options/AbstractGeneratorOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/options/AbstractGeneratorOptions.java @@ -4,7 +4,6 @@ import lombok.AccessLevel; import lombok.NonNull; import lombok.Setter; -import org.brapi.schematools.core.graphql.options.GraphQLGeneratorOptions; import org.brapi.schematools.core.model.BrAPIType; import org.brapi.schematools.core.valdiation.Validation; diff --git a/java/core/src/main/java/org/brapi/schematools/core/options/AbstractOptions.java b/java/core/src/main/java/org/brapi/schematools/core/options/AbstractOptions.java index b001c41..d9b8eb9 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/options/AbstractOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/options/AbstractOptions.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import org.brapi.schematools.core.model.BrAPIType; -import org.brapi.schematools.core.openapi.options.AbstractOpenAPIOptions; import org.brapi.schematools.core.valdiation.Validation; import java.util.HashMap; diff --git a/java/core/src/main/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptions.java b/java/core/src/main/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptions.java index 5d5474f..278e7d5 100644 --- a/java/core/src/main/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptions.java +++ b/java/core/src/main/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptions.java @@ -1,21 +1,17 @@ package org.brapi.schematools.core.xlsx.options; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; import org.brapi.schematools.core.graphql.GraphQLGenerator; -import org.brapi.schematools.core.openapi.options.OpenAPIGeneratorOptions; import org.brapi.schematools.core.options.Options; import org.brapi.schematools.core.utils.ConfigurationUtils; import org.brapi.schematools.core.valdiation.Validation; import java.io.IOException; import java.io.InputStream; -import java.nio.file.Files; import java.nio.file.Path; import java.util.List; diff --git a/java/core/src/test/java/org/brapi/schematools/core/graphql/metadata/GraphQLGeneratorMetadataTest.java b/java/core/src/test/java/org/brapi/schematools/core/graphql/metadata/GraphQLGeneratorMetadataTest.java index 3e80741..ac8de5f 100644 --- a/java/core/src/test/java/org/brapi/schematools/core/graphql/metadata/GraphQLGeneratorMetadataTest.java +++ b/java/core/src/test/java/org/brapi/schematools/core/graphql/metadata/GraphQLGeneratorMetadataTest.java @@ -1,13 +1,14 @@ package org.brapi.schematools.core.graphql.metadata; -import org.brapi.schematools.core.ontmodel.metadata.OntModelGeneratorMetadata; import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Path; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; class GraphQLGeneratorMetadataTest { diff --git a/java/core/src/test/java/org/brapi/schematools/core/ontmodel/metadata/OntModelGeneratorMetadataTest.java b/java/core/src/test/java/org/brapi/schematools/core/ontmodel/metadata/OntModelGeneratorMetadataTest.java index ac56a4f..fac73f6 100644 --- a/java/core/src/test/java/org/brapi/schematools/core/ontmodel/metadata/OntModelGeneratorMetadataTest.java +++ b/java/core/src/test/java/org/brapi/schematools/core/ontmodel/metadata/OntModelGeneratorMetadataTest.java @@ -1,7 +1,5 @@ package org.brapi.schematools.core.ontmodel.metadata; -import org.brapi.schematools.core.xlsx.options.XSSFWorkbookGeneratorOptions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/java/core/src/test/java/org/brapi/schematools/core/ontmodel/options/OntModelGeneratorOptionsTest.java b/java/core/src/test/java/org/brapi/schematools/core/ontmodel/options/OntModelGeneratorOptionsTest.java index 6a6a126..50cf625 100644 --- a/java/core/src/test/java/org/brapi/schematools/core/ontmodel/options/OntModelGeneratorOptionsTest.java +++ b/java/core/src/test/java/org/brapi/schematools/core/ontmodel/options/OntModelGeneratorOptionsTest.java @@ -1,9 +1,7 @@ package org.brapi.schematools.core.ontmodel.options; -import org.brapi.schematools.core.ontmodel.metadata.OntModelGeneratorMetadata; import org.brapi.schematools.core.response.Response; import org.brapi.schematools.core.valdiation.Validation; -import org.brapi.schematools.core.xlsx.options.XSSFWorkbookGeneratorOptions; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/java/core/src/test/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadataTest.java b/java/core/src/test/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadataTest.java index 035b5d2..15ac7e0 100644 --- a/java/core/src/test/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadataTest.java +++ b/java/core/src/test/java/org/brapi/schematools/core/openapi/metadata/OpenAPIGeneratorMetadataTest.java @@ -1,13 +1,14 @@ package org.brapi.schematools.core.openapi.metadata; -import org.brapi.schematools.core.ontmodel.metadata.OntModelGeneratorMetadata; import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Path; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; class OpenAPIGeneratorMetadataTest { diff --git a/java/core/src/test/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptionsTest.java b/java/core/src/test/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptionsTest.java index cd5ebc2..ee74b7c 100644 --- a/java/core/src/test/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptionsTest.java +++ b/java/core/src/test/java/org/brapi/schematools/core/xlsx/options/XSSFWorkbookGeneratorOptionsTest.java @@ -1,6 +1,5 @@ package org.brapi.schematools.core.xlsx.options; -import org.brapi.schematools.core.graphql.options.GraphQLGeneratorOptions; import org.brapi.schematools.core.response.Response; import org.brapi.schematools.core.valdiation.Validation; import org.junit.jupiter.api.Test;