From d84e43f23b5552ccaa17ab2cc1b740241b6aba60 Mon Sep 17 00:00:00 2001
From: subbotin <a.subbotin@haulmont.com>
Date: Wed, 11 Aug 2021 18:02:52 +0400
Subject: [PATCH] Support service method result with generics
 cuba-platform/cuba#3176

---
 .../haulmont/rest/demo/core/app/PortalTestServiceBean.java  | 6 ++----
 .../com/haulmont/rest/demo/core/app/PortalTestService.java  | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/restapi-demo/modules/core/src/com/haulmont/rest/demo/core/app/PortalTestServiceBean.java b/test/restapi-demo/modules/core/src/com/haulmont/rest/demo/core/app/PortalTestServiceBean.java
index 3cdb19a..28e7a2b 100644
--- a/test/restapi-demo/modules/core/src/com/haulmont/rest/demo/core/app/PortalTestServiceBean.java
+++ b/test/restapi-demo/modules/core/src/com/haulmont/rest/demo/core/app/PortalTestServiceBean.java
@@ -14,9 +14,7 @@
 import com.haulmont.cuba.core.global.Metadata;
 import com.haulmont.cuba.core.global.View;
 import com.haulmont.cuba.core.global.validation.CustomValidationException;
-import com.haulmont.rest.demo.core.entity.Car;
-import com.haulmont.rest.demo.core.entity.RefappNotPersistentStringIdEntity;
-import com.haulmont.rest.demo.core.entity.TransientDriver;
+import com.haulmont.rest.demo.core.entity.*;
 import com.haulmont.rest.demo.core.exception.CustomHttpClientErrorException;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -187,7 +185,7 @@ public <M extends Model> M getEntityOfBoundedType() {
 
     @Override
     @SuppressWarnings("unchecked")
-    public <M extends Model> List<M> getBoundedEntitiesList() {
+    public <M extends Model> List<M> getEntitiesListWithBoundedTypeVar() {
         Model model = metadata.create(Model.class);
         ExtModel extModel = metadata.create(ExtModel.class);
 
diff --git a/test/restapi-demo/modules/global/src/com/haulmont/rest/demo/core/app/PortalTestService.java b/test/restapi-demo/modules/global/src/com/haulmont/rest/demo/core/app/PortalTestService.java
index 419d1eb..66f127c 100644
--- a/test/restapi-demo/modules/global/src/com/haulmont/rest/demo/core/app/PortalTestService.java
+++ b/test/restapi-demo/modules/global/src/com/haulmont/rest/demo/core/app/PortalTestService.java
@@ -7,6 +7,7 @@
 
 import com.haulmont.bpm.entity.stencil.Stencil;
 import com.haulmont.rest.demo.core.entity.Car;
+import com.haulmont.rest.demo.core.entity.Model;
 import com.haulmont.rest.demo.core.entity.RefappNotPersistentStringIdEntity;
 import com.haulmont.rest.demo.core.entity.TransientDriver;
 import org.springframework.validation.annotation.Validated;