Formatting, fix Maven plugin test

Signed-off-by: Michael Edgar <michael@xlate.io>
smallrye · Mar 15, 2024 · d3020d9 · d3020d9
1 parent a6b8ef0
commit d3020d9
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 48 deletions.
diff --git a/core/src/main/java/io/smallrye/openapi/api/SmallRyeOpenAPI.java b/core/src/main/java/io/smallrye/openapi/api/SmallRyeOpenAPI.java
@@ -18,6 +18,7 @@
 import java.util.function.UnaryOperator;
 
 import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.openapi.OASFilter;
 import org.eclipse.microprofile.openapi.models.Components;
 import org.eclipse.microprofile.openapi.models.OpenAPI;
@@ -223,7 +224,8 @@ public <V, A extends V, O extends V, AB, OB> SmallRyeOpenAPI build() {
             ClassLoader appClassLoader = applicationClassLoader != null ? applicationClassLoader
                     : Thread.currentThread().getContextClassLoader();
 
-            OpenApiConfig buildConfig = OpenApiConfig.fromConfig(this.config);
+            OpenApiConfig buildConfig = OpenApiConfig.fromConfig(Optional.ofNullable(this.config)
+                    .orElseGet(ConfigProvider::getConfig));
             IOContext<V, A, O, AB, OB> io = IOContext.forJson(JsonIO.newInstance(buildConfig));
             OpenAPIDefinitionIO<V, A, O, AB, OB> modelIO = new OpenAPIDefinitionIO<>(io);
             FilteredIndexView filteredIndex = new FilteredIndexView(index, buildConfig);
@@ -252,7 +254,8 @@ public <V, A extends V, O extends V, AB, OB> SmallRyeOpenAPI build() {
                                 debugModel("static file", fileModel);
                                 return fileModel;
                             } catch (IOException e) {
-                                throw new OpenApiRuntimeException("IOException reading " + file.getFormat() + " static file", e);
+                                throw new OpenApiRuntimeException("IOException reading " + file.getFormat() + " static file",
+                                        e);
                             }
                         })
                         .reduce(MergeUtil::merge)

diff --git a/core/src/main/java/io/smallrye/openapi/runtime/OpenApiStaticFile.java b/core/src/main/java/io/smallrye/openapi/runtime/OpenApiStaticFile.java
@@ -32,7 +32,6 @@ public OpenApiStaticFile(InputStream content, Format format) {
         this(null, content, format);
     }
 
-
     /**
      * @see java.io.Closeable#close()
      */

diff --git a/core/src/test/java/io/smallrye/openapi/runtime/scanner/IndexScannerTestBase.java b/core/src/test/java/io/smallrye/openapi/runtime/scanner/IndexScannerTestBase.java
@@ -169,8 +169,8 @@ private static boolean isPathMatrixObject(Parameter parameter) {
 
     public static String schemaToString(String entityName, Schema schema) {
         return toJSON(OASFactory.createOpenAPI()
-                        .components(OASFactory.createComponents()
-                                .addSchema(entityName, schema)));
+                .components(OASFactory.createComponents()
+                        .addSchema(entityName, schema)));
     }
 
     public static void assertJsonEquals(String entityName, String expectedResource, Schema actual)
@@ -204,7 +204,8 @@ public static OpenAPI scan(Config config, Class<?>... classes) {
         return scan(config, false, null, classes);
     }
 
-    public static OpenAPI scan(Config config, boolean defaultRequiredProperties, InputStream customStaticFile, Class<?>... classes) {
+    public static OpenAPI scan(Config config, boolean defaultRequiredProperties, InputStream customStaticFile,
+            Class<?>... classes) {
         Index index = indexOf(classes);
 
         OpenAPI result = SmallRyeOpenAPI.builder()

diff --git a/core/src/test/java/io/smallrye/openapi/runtime/scanner/PropertyNamingStrategyTest.java b/core/src/test/java/io/smallrye/openapi/runtime/scanner/PropertyNamingStrategyTest.java
@@ -27,24 +27,24 @@ class PropertyNamingStrategyTest extends IndexScannerTestBase {
     @Test
     void testSnakeCase() throws Exception {
         OpenAPI result = scan(config(OpenApiConstants.SMALLRYE_PROPERTY_NAMING_STRATEGY,
-                        "com.fasterxml.jackson.databind.PropertyNamingStrategies$SnakeCaseStrategy"),
+                "com.fasterxml.jackson.databind.PropertyNamingStrategies$SnakeCaseStrategy"),
                 NameStrategyBean1.class);
         assertJsonEquals("components.schemas.name-strategy-snake.json", result);
     }
 
     @Test
     void testJacksonNamingIgnoresConfig() throws Exception {
         OpenAPI result = scan(config(OpenApiConstants.SMALLRYE_PROPERTY_NAMING_STRATEGY,
-                        "com.fasterxml.jackson.databind.PropertyNamingStrategies$SnakeCaseStrategy"),
-            NameStrategyBean2.class);
+                "com.fasterxml.jackson.databind.PropertyNamingStrategies$SnakeCaseStrategy"),
+                NameStrategyBean2.class);
         assertJsonEquals("components.schemas.name-strategy-ignored.json", result);
     }
 
     @Test
     void testJacksonNamingOverridesConfig() throws Exception {
         OpenAPI result = scan(config(OpenApiConstants.SMALLRYE_PROPERTY_NAMING_STRATEGY,
-                        "com.fasterxml.jackson.databind.PropertyNamingStrategies$SnakeCaseStrategy"),
-            NameStrategyKebab.class);
+                "com.fasterxml.jackson.databind.PropertyNamingStrategies$SnakeCaseStrategy"),
+                NameStrategyKebab.class);
         assertJsonEquals("components.schemas.name-strategy-kebab.json", result);
     }
 
@@ -58,7 +58,7 @@ void testInvalidNamingStrategyClass() throws Exception {
     @Test
     void testNoValidTranslationMethods() throws Exception {
         Config config = config(OpenApiConstants.SMALLRYE_PROPERTY_NAMING_STRATEGY,
-            NoValidTranslationMethods.class.getName());
+                NoValidTranslationMethods.class.getName());
         assertThrows(OpenApiRuntimeException.class, () -> scan(config, NameStrategyKebab.class));
     }
 

diff --git a/core/src/test/java/io/smallrye/openapi/runtime/scanner/StandaloneSchemaScanTest.java b/core/src/test/java/io/smallrye/openapi/runtime/scanner/StandaloneSchemaScanTest.java
@@ -159,11 +159,11 @@ static class AlligatorNoAllOf extends ReptileNoAllOf {
     @Test
     void testRegisteredSchemaTypePreserved() throws IOException, JSONException {
         assertJsonEquals("components.schemas.registered-schema-type-preserved.json",
-            RegisteredSchemaTypePreservedModel.Animal.class,
-            RegisteredSchemaTypePreservedModel.AnimalListEnvelope.class,
-            RegisteredSchemaTypePreservedModel.MessageBase.class,
-            RegisteredSchemaTypePreservedModel.MessageData.class,
-            RegisteredSchemaTypePreservedModel.MessageDataItems.class);
+                RegisteredSchemaTypePreservedModel.Animal.class,
+                RegisteredSchemaTypePreservedModel.AnimalListEnvelope.class,
+                RegisteredSchemaTypePreservedModel.MessageBase.class,
+                RegisteredSchemaTypePreservedModel.MessageData.class,
+                RegisteredSchemaTypePreservedModel.MessageDataItems.class);
     }
 
     static class RegisteredSchemaTypePreservedModel {
@@ -313,13 +313,13 @@ public int getCurrentItemCount() {
     @Test
     void testJavaxJaxbElementUnwrapped() throws IOException, JSONException {
         assertJsonEquals("components.schemas.jaxbelement-generic-type-unwrapped.json",
-            test.io.smallrye.openapi.runtime.scanner.javax.JAXBElementDto.class);
+                test.io.smallrye.openapi.runtime.scanner.javax.JAXBElementDto.class);
     }
 
     @Test
     void testJakartaJaxbElementUnwrapped() throws IOException, JSONException {
         assertJsonEquals("components.schemas.jaxbelement-generic-type-unwrapped.json",
-            test.io.smallrye.openapi.runtime.scanner.jakarta.JAXBElementDto.class);
+                test.io.smallrye.openapi.runtime.scanner.jakarta.JAXBElementDto.class);
     }
 
     /****************************************************************/
@@ -330,8 +330,8 @@ void testJakartaJaxbElementUnwrapped() throws IOException, JSONException {
     @Test
     void testJacksonJsonUnwrapped() throws IOException, JSONException {
         assertJsonEquals("components.schemas-jackson-jsonunwrapped.json",
-            JacksonJsonPerson.class, JacksonJsonPersonWithPrefixedAddress.class,
-            JacksonJsonPersonWithSuffixedAddress.class, JacksonJsonAddress.class);
+                JacksonJsonPerson.class, JacksonJsonPersonWithPrefixedAddress.class,
+                JacksonJsonPersonWithSuffixedAddress.class, JacksonJsonAddress.class);
     }
 
     @Schema
@@ -378,17 +378,17 @@ static class JacksonJsonAddress {
     void testNestedCollectionSchemas() throws IOException, JSONException {
         // Place the JDK classes in the index to simulate Quarkus
         assertJsonEquals("components.schemas.nested-parameterized-collection-types.json", CollectionBean.class,
-            EntryBean.class,
-            MultivaluedCollection.class,
-            MultivaluedMap.class,
-            // CustomMap.class excluded intentionally
-            Collection.class,
-            ArrayList.class,
-            HashMap.class,
-            List.class,
-            Map.class,
-            Set.class,
-            UUID.class);
+                EntryBean.class,
+                MultivaluedCollection.class,
+                MultivaluedMap.class,
+                // CustomMap.class excluded intentionally
+                Collection.class,
+                ArrayList.class,
+                HashMap.class,
+                List.class,
+                Map.class,
+                Set.class,
+                UUID.class);
     }
 
     @Schema
@@ -447,7 +447,8 @@ static class MultivaluedMap<K, V> extends HashMap<K, List<V>> {
      */
     @Test
     void testNestedCustomGenericSchemas() throws IOException, JSONException {
-        assertJsonEquals("components.schemas.nested-custom-generics.json", Foo.class, Generic0.class, Generic1.class, Generic2.class, CustomMap.class);
+        assertJsonEquals("components.schemas.nested-custom-generics.json", Foo.class, Generic0.class, Generic1.class,
+                Generic2.class, CustomMap.class);
     }
 
     /*
@@ -497,7 +498,8 @@ class A {
             public List<Optional<B>> listOfOptionalB;
         }
 
-        assertJsonEquals("components.schemas.optional-arraytype.json", B.class, A.class, UUID.class, List.class, Optional.class);
+        assertJsonEquals("components.schemas.optional-arraytype.json", B.class, A.class, UUID.class, List.class,
+                Optional.class);
     }
 
     @Target(ElementType.TYPE_USE)
@@ -629,7 +631,8 @@ class Bean {
             OtherBean third;
         }
 
-        assertJsonEquals("components.schemas.field-overrides-type.json", OtherBean.class, /* BeanTwo.class, BeanThree.class, */ Bean.class);
+        assertJsonEquals("components.schemas.field-overrides-type.json", OtherBean.class,
+                /* BeanTwo.class, BeanThree.class, */ Bean.class);
     }
 
     /*
@@ -673,7 +676,8 @@ class ZonedDateTimeArrayWrapper {
             ZonedDateTime[] now;
         }
 
-        assertJsonEquals("components.schemas.terminal-array-item-registration.json", ZonedDateTimeArrayWrapper.class, ZonedDateTime.class);
+        assertJsonEquals("components.schemas.terminal-array-item-registration.json", ZonedDateTimeArrayWrapper.class,
+                ZonedDateTime.class);
     }
 
     /*
@@ -720,9 +724,9 @@ class Bean {
 
         String nullableStringArySig = Nullable.class.getName() + "<java.lang.String[]>";
         OpenAPI result = scan(config(
-                    OASConfig.SCHEMA_PREFIX + nullableStringArySig,
-                    "{ \"name\": \"NullableStringArray\", \"type\": \"array\", \"items\": { \"type\": \"string\" }, \"nullable\": true }"),
-            Nullable.class, Bean.class);
+                OASConfig.SCHEMA_PREFIX + nullableStringArySig,
+                "{ \"name\": \"NullableStringArray\", \"type\": \"array\", \"items\": { \"type\": \"string\" }, \"nullable\": true }"),
+                Nullable.class, Bean.class);
         assertJsonEquals("components.schemas.parameterized-type-schema-config.json", result);
     }
 

diff --git a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ApiResponseTests.java b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ApiResponseTests.java
@@ -411,8 +411,8 @@ public Reference getDefaultBranch() {
         }
 
         assertJsonEquals("responses.nonjaxrs-methods-skipped.json", TreeApi.class,
-            HttpTreeApi.class,
-            Reference.class,
-            ReferencesResponse.class);
+                HttpTreeApi.class,
+                Reference.class,
+                ReferencesResponse.class);
     }
 }
diff --git a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/VersionTest.java b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/VersionTest.java
@@ -27,12 +27,14 @@ class VersionTest extends JaxRsDataObjectScannerTestBase {
      */
     @Test
     void testJavaxSettingViaProvidedSchema() throws IOException, JSONException {
-        testSettingViaProvidedSchema(test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingGetResource.class, Greeting.class);
+        testSettingViaProvidedSchema(test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingGetResource.class,
+                Greeting.class);
     }
 
     @Test
     void testJakartaSettingViaProvidedSchema() throws IOException, JSONException {
-        testSettingViaProvidedSchema(test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingGetResource.class, Greeting.class);
+        testSettingViaProvidedSchema(test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingGetResource.class,
+                Greeting.class);
     }
 
     void testSettingViaProvidedSchema(Class<?>... classes) throws IOException, JSONException {
@@ -42,12 +44,14 @@ void testSettingViaProvidedSchema(Class<?>... classes) throws IOException, JSONE
 
     @Test
     void testJavaxSettingViaConfig() throws IOException, JSONException {
-        testSettingViaConfig(test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingGetResource.class, Greeting.class);
+        testSettingViaConfig(test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingGetResource.class,
+                Greeting.class);
     }
 
     @Test
     void testJakartaSettingViaConfig() throws IOException, JSONException {
-        testSettingViaConfig(test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingGetResource.class, Greeting.class);
+        testSettingViaConfig(test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingGetResource.class,
+                Greeting.class);
     }
 
     void testSettingViaConfig(Class<?>... classes) throws IOException, JSONException {
@@ -63,12 +67,14 @@ void testSettingViaConfig(Class<?>... classes) throws IOException, JSONException
 
     @Test
     void testJavaxSettingViaConfigWhenStaticPresent() throws IOException, JSONException {
-        testSettingViaConfigWhenStaticPresent(test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingGetResource.class, Greeting.class);
+        testSettingViaConfigWhenStaticPresent(
+                test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingGetResource.class, Greeting.class);
     }
 
     @Test
     void testJakartaSettingViaConfigWhenStaticPresent() throws IOException, JSONException {
-        testSettingViaConfigWhenStaticPresent(test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingGetResource.class, Greeting.class);
+        testSettingViaConfigWhenStaticPresent(
+                test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingGetResource.class, Greeting.class);
     }
 
     void testSettingViaConfigWhenStaticPresent(Class<?>... classes) throws IOException, JSONException {

diff --git a/tools/maven-plugin/src/test/java/io/smallrye/openapi/mavenplugin/SchemaTestBase.java b/tools/maven-plugin/src/test/java/io/smallrye/openapi/mavenplugin/SchemaTestBase.java
@@ -12,6 +12,7 @@
 
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
 
+import io.smallrye.config.SmallRyeConfigBuilder;
 import io.smallrye.openapi.api.SmallRyeOpenAPI;
 
 public class SchemaTestBase {
@@ -44,6 +45,7 @@ private OpenAPI read(MavenExecutionResult result, String path) throws IOExceptio
                 .resolve(path);
 
         return SmallRyeOpenAPI.builder()
+                .withConfig(new SmallRyeConfigBuilder().addDefaultSources().build())
                 .enableAnnotationScan(false)
                 .enableModelReader(false)
                 .enableStandardFilter(false)