NPE in DataRestResponseService.findSearchReturnType. Fixes #1004

Author: bnasslahsen

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

@@ -168,7 +168,8 @@ private Type findSearchReturnType(HandlerMethod handlerMethod, MethodResourceMap
 		if (methodResourceMapping.isPagingResource()) {
 			returnType = ResolvableType.forClassWithGenerics(PagedModel.class, domainType).getType();
 		}
-		else if (Iterable.class.isAssignableFrom(ResolvableType.forType(returnRepoType).getRawClass())) {
+		else if (ResolvableType.forType(returnRepoType).getRawClass() != null
+				&& Iterable.class.isAssignableFrom(ResolvableType.forType(returnRepoType).getRawClass())) {
 			returnType = ResolvableType.forClassWithGenerics(CollectionModel.class, domainType).getType();
 		}
 		else if (!ClassUtils.isPrimitiveOrWrapper(domainType)) {

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app20/Bank.java

@@ -0,0 +1,86 @@
+package test.org.springdoc.api.app20;
+
+import java.util.Objects;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.NaturalId;
+
+@Entity
+@Table(name = "bank")
+public class Bank implements EntityDefinition {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bnk_seq")
+    @SequenceGenerator(name = "bnk_seq", sequenceName = "bnk_seq", allocationSize = 1)
+    private Long id;
+
+    @Column(unique = true)
+    @NaturalId
+    private String code;
+
+    @Column(unique = true, nullable = false)
+    private String name;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public String getCode() {
+        return this.code;
+    }
+
+    private void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCode());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Bank)) {
+            return false;
+        }
+        Bank bank = (Bank) o;
+        return Objects.equals(getCode(), bank.getCode());
+    }
+
+    @Override
+    public String toString() {
+        return "Bank{" +
+            "id=" + id +
+            ", code='" + code + '\'' +
+            ", name='" + name + '\'' +
+            '}';
+    }
+
+    @Override
+    public String getKey() {
+        return code;
+    }
+
+    @Override
+    public String getDescription() {
+        return name;
+    }
+}

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app20/BankRepository.java

@@ -0,0 +1,12 @@
+package test.org.springdoc.api.app20;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RepositoryRestResource(path = "banks")
+public interface BankRepository extends JpaRepository<Bank, Long>, CodeLookupRepository<Bank, String> {
+    // moved to CodeLookupRepository
+    //Bank findOneByCode(String code);
+}

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app20/CodeLookupRepository.java

@@ -0,0 +1,12 @@
+package test.org.springdoc.api.app20;
+
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.query.Param;
+
+@NoRepositoryBean
+public interface CodeLookupRepository<EntityT, KeyT> {
+    EntityT findOneByCode(@Param("code") KeyT code);
+
+    Long countByCode(KeyT code);
+}
+

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app20/DemoApplication.java

@@ -0,0 +1,21 @@
+package test.org.springdoc.api.app20;
+
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.info.Info;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@OpenAPIDefinition(
+    info = @Info(
+        title = "Core API"
+    )
+)
+public class DemoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(DemoApplication.class, args);
+    }
+
+}

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app20/EntityDefinition.java

@@ -0,0 +1,12 @@
+package test.org.springdoc.api.app20;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public interface EntityDefinition {
+
+    @JsonIgnore
+    String getKey();
+
+    @JsonIgnore
+    String getDescription();
+}

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app20/SpringDocApp20Test.java

@@ -0,0 +1,33 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  * 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.app20;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringDocApp20Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+}