fixing usages

kaaproject · Jul 11, 2016 · 39b2101 · 39b2101
1 parent 873a0f0
commit 39b2101
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...ain/java/org/kaaproject/kaa/server/common/dao/service/ApplicationEventMapServiceImpl.java b/...ain/java/org/kaaproject/kaa/server/common/dao/service/ApplicationEventMapServiceImpl.java
@@ -36,6 +36,7 @@
 import org.kaaproject.kaa.server.common.dao.model.sql.Application;
 import org.kaaproject.kaa.server.common.dao.model.sql.ApplicationEventFamilyMap;
 import org.kaaproject.kaa.server.common.dao.model.sql.EventClassFamily;
+import org.kaaproject.kaa.server.common.dao.model.sql.EventClassFamilyVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -123,7 +124,7 @@ public List<EcfInfoDto> findVacantEventClassFamiliesByApplicationId(
             ApplicationDto application = getDto(applicationDao.findById(applicationId));
             if (application != null) {
                 String tenantId = application.getTenantId();
-                List<EventClassFamilyDto> eventClassFamilies = convertDtoList(eventClassFamilyDao.findByTenantId(tenantId));
+                List<EventClassFamily> eventClassFamilies = eventClassFamilyDao.findByTenantId(tenantId);
                 List<AefMapInfoDto> aefMaps = findEventClassFamiliesByApplicationId(applicationId);
                 List<EcfInfoDto> occupiedEcfs = new ArrayList<>();
                 for (AefMapInfoDto aefMap : aefMaps) {
@@ -134,11 +135,12 @@ public List<EcfInfoDto> findVacantEventClassFamiliesByApplicationId(
                     occupiedEcfs.add(ecf);
                 }
                 if (eventClassFamilies != null) {
-                    for (EventClassFamilyDto eventClassFamily : eventClassFamilies) {
+                    for (EventClassFamily eventClassFamily : eventClassFamilies) {
+
                         if (eventClassFamily.getSchemas() != null) {
-                            for (EventClassFamilyVersionDto eventClassFamilyVersion : eventClassFamily.getSchemas()) {
+                            for (EventClassFamilyVersion eventClassFamilyVersion : eventClassFamily.getSchemas()) {
                                 EcfInfoDto ecf = new EcfInfoDto();
-                                ecf.setEcfId(eventClassFamily.getId());
+                                ecf.setEcfId(String.valueOf(eventClassFamily.getId()));
                                 ecf.setEcfName(eventClassFamily.getName());
                                 ecf.setVersion(eventClassFamilyVersion.getVersion());
                                 if (occupiedEcfs != null && !occupiedEcfs.contains(ecf)) {