added groovy module

Author: bnasslahsen

pom.xml

@@ -58,6 +58,7 @@
 		<module>springdoc-openapi-kotlin</module>
 		<module>springdoc-openapi-data-rest</module>
 		<module>springdoc-openapi-security</module>
+		<module>springdoc-openapi-groovy</module>
 	</modules>
 
 	<properties>

springdoc-openapi-common/pom.xml

@@ -41,10 +41,5 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 </project>

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java

@@ -25,7 +25,6 @@
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import groovy.lang.MetaClass;
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -34,15 +33,13 @@
 import org.springdoc.core.converters.AdditionalModelsConverter;
 import org.springdoc.core.converters.ModelConverterRegistrar;
 import org.springdoc.core.converters.PropertyCustomizingConverter;
-import org.springdoc.core.converters.RequestTypeToIgnoreConverter;
 import org.springdoc.core.converters.ResponseSupportConverter;
 import org.springdoc.core.customizers.OpenApiBuilderCustomiser;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springdoc.core.customizers.PropertyCustomizer;
 
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -91,20 +88,6 @@ ResponseSupportConverter responseSupportConverter() {
 		return new ResponseSupportConverter();
 	}
 
-	@ConditionalOnClass(value = { MetaClass.class })
-	class GroovyProvider {
-		@Bean
-		Object ignoreGroovyMetaClass() {
-			SpringDocUtils.getConfig().addRequestWrapperToIgnore(MetaClass.class);
-			return null;
-		}
-
-		@Bean
-		RequestTypeToIgnoreConverter requestTypeToIgnoreConverter() {
-			return new RequestTypeToIgnoreConverter();
-		}
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context,

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java

@@ -30,10 +30,10 @@
 import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import org.springdoc.core.customizers.OpenApiCustomiser;
+import org.springdoc.data.rest.converters.Pageable;
 import org.springdoc.data.rest.converters.RepresentationModelLinksOASMixin;
 import org.springdoc.data.rest.customisers.QuerydslPredicateOperationCustomizer;
-import org.springdoc.data.rest.converters.Pageable;
-import org.springdoc.core.customizers.OpenApiCustomiser;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

springdoc-openapi-groovy/pom.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>springdoc-openapi</artifactId>
+		<groupId>org.springdoc</groupId>
+		<version>1.3.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>springdoc-openapi-groovy</artifactId>
+
+
+	<dependencies>
+		<!-- springdoc-common -->
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-webmvc-core</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.gmavenplus</groupId>
+				<artifactId>gmavenplus-plugin</artifactId>
+				<version>1.8.1</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>addSources</goal>
+							<goal>addTestSources</goal>
+							<goal>generateStubs</goal>
+							<goal>compile</goal>
+							<goal>generateTestStubs</goal>
+							<goal>compileTests</goal>
+							<goal>removeStubs</goal>
+							<goal>removeTestStubs</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

springdoc-openapi-groovy/src/main/java/org/springdoc/groovy/SpringDocGroovyConfiguration.java

@@ -0,0 +1,45 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.springdoc.groovy;
+
+import groovy.lang.MetaClass;
+import org.springdoc.core.SpringDocUtils;
+import org.springdoc.core.converters.RequestTypeToIgnoreConverter;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
+
+@Configuration
+@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
+public class SpringDocGroovyConfiguration {
+
+	@Bean
+	Object ignoreGroovyMetaClass() {
+		SpringDocUtils.getConfig().addRequestWrapperToIgnore(MetaClass.class);
+		return null;
+	}
+
+	@Bean
+	RequestTypeToIgnoreConverter requestTypeToIgnoreConverter() {
+		return new RequestTypeToIgnoreConverter();
+	}
+}

springdoc-openapi-groovy/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springdoc.groovy.SpringDocGroovyConfiguration

springdoc-openapi-groovy/src/test/groovy/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -0,0 +1,78 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.api;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import nonapi.io.github.classgraph.utils.FileUtils;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springdoc.core.Constants;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+
+import static org.hamcrest.Matchers.is;
+import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@ActiveProfiles("test")
+@SpringBootTest
+@AutoConfigureMockMvc
+public abstract class AbstractSpringDocTest {
+
+	protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractSpringDocTest.class);
+
+	public static String className;
+
+	@Autowired
+	protected MockMvc mockMvc;
+
+	public static String getContent(String fileName) throws Exception {
+		try {
+			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			byte[] fileBytes = Files.readAllBytes(path);
+			return new String(fileBytes, StandardCharsets.UTF_8);
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Failed to read file: " + fileName, e);
+		}
+	}
+
+	@Test
+	public void testApp() throws Exception {
+		className = getClass().getSimpleName();
+		String testNumber = className.replaceAll("[^0-9]", "");
+		MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk())
+				.andExpect(jsonPath("$.openapi", is("3.0.1"))).andReturn();
+		String result = mockMvcResult.getResponse().getContentAsString();
+		String expected = getContent("results/app" + testNumber + ".json");
+		assertEquals(expected, result, true);
+	}
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app103/Car.groovy renamed to springdoc-openapi-groovy/src/test/groovy/test/org/springdoc/api/app1/Car.groovy

@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app103
+package test.org.springdoc.api.app1
 
 class Car {
     Long id

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app103/CarController.groovy renamed to springdoc-openapi-groovy/src/test/groovy/test/org/springdoc/api/app1/CarController.groovy

@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app103
+package test.org.springdoc.api.app1
 
 
 import org.springframework.web.bind.annotation.GetMapping