qdsl-predicate rollback

Author: bnasslahsen

pom.xml

@@ -73,16 +73,10 @@
 		<webjars-locator.version>0.38</webjars-locator.version>
 		<spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
 		<classgraph.version>4.8.44</classgraph.version>
-		<javassist.version>3.26.0-GA</javassist.version>
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.javassist</groupId>
-				<artifactId>javassist</artifactId>
-				<version>${javassist.version}</version>
-			</dependency>
 			<!-- swagger dependencies -->
 			<dependency>
 				<groupId>io.swagger.core.v3</groupId>

springdoc-openapi-common/src/main/java/org/springdoc/ui/AbstractSwaggerIndexTransformer.java

@@ -1,3 +1,21 @@
+/*
+ *
+ *  * 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.ui;
 
 import java.io.ByteArrayOutputStream;

springdoc-openapi-common/src/main/java/org/springdoc/ui/SpringDocUIException.java

@@ -0,0 +1,26 @@
+/*
+ *
+ *  * 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.ui;
+
+public class SpringDocUIException extends RuntimeException{
+
+	public SpringDocUIException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}

springdoc-openapi-data-rest/pom.xml

@@ -19,16 +19,6 @@
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-rest-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>

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

@@ -29,17 +29,14 @@
 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 javassist.ClassPool;
 import org.springdoc.core.converters.Pageable;
-import org.springdoc.core.converters.QueryDslPredicateConverter;
 import org.springdoc.core.converters.RepresentationModelLinksOASMixin;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.querydsl.binding.QuerydslBindingsFactory;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.Links;
@@ -57,17 +54,6 @@ public class SpringDocDataRestConfiguration {
 				.replaceWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class);
 	}
 
-
-	@Configuration
-	@ConditionalOnClass(value = {QuerydslBindingsFactory.class, ClassPool.class})
-	class QuerydslProvider {
-
-		@Bean
-		public QueryDslPredicateConverter qdslConverter(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
-			return querydslBindingsFactory.isPresent() ?  new QueryDslPredicateConverter(querydslBindingsFactory.get()) : null;
-		}
-	}
-
 	@Configuration
 	@ConditionalOnClass(RepositoryRestConfiguration.class)
 	class HalProviderConfiguration {

springdoc-openapi-data-rest/src/main/java/org/springdoc/core/converters/QueryDslPredicateConverter.java

@@ -52,7 +52,7 @@ public Mono<Resource> transform(ServerWebExchange serverWebExchange, Resource re
 			}
 		}
 		catch (Exception e) {
-			throw new RuntimeException("Failed to transform Index", e);
+			throw new SpringDocUIException("Failed to transform Index", e);
 		}
 	}