From dade14fd8029f4bfa2a5383bbcd958f8e33d5169 Mon Sep 17 00:00:00 2001
From: Paul Dudenkov <nocs00@gmail.com>
Date: Mon, 11 Jul 2016 13:03:30 +0300
Subject: [PATCH] SDK generation modification

---
 .../control/service/ControlService.java       | 15 ----------
 .../service/DefaultControlService.java        | 30 ++++---------------
 2 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
index 81a4558051..c21b904a53 100644
--- a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
+++ b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
@@ -1031,21 +1031,6 @@ List<NotificationSchemaDto> findNotificationSchemasByAppIdAndType(String applica
      */
     EventClassFamilyDto getEventClassFamily(String eventClassFamilyId) throws ControlServiceException;
 
-    /**
-     * Adds the event class family schema.
-     *
-     * @param eventClassFamilyId
-     *            the event class family id
-     * @param eventClassFamilySchema
-     *            the event class family schema
-     * @param createdUsername
-     *            the created username
-     * @throws ControlServiceException
-     *             the control service exception
-     */
-    void addEventClassFamilySchema(String eventClassFamilyId, String eventClassFamilySchema, String createdUsername)
-            throws ControlServiceException;
-
     /**
      * Gets the event classes by family id version and type.
      *
diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java
index d13328d024..fdfc77f3dd 100644
--- a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java
+++ b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java
@@ -47,13 +47,7 @@
 import org.kaaproject.kaa.common.dto.credentials.EndpointRegistrationDto;
 import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto;
 import org.kaaproject.kaa.common.dto.ctl.CTLSchemaMetaInfoDto;
-import org.kaaproject.kaa.common.dto.event.AefMapInfoDto;
-import org.kaaproject.kaa.common.dto.event.ApplicationEventFamilyMapDto;
-import org.kaaproject.kaa.common.dto.event.EcfInfoDto;
-import org.kaaproject.kaa.common.dto.event.EventClassDto;
-import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto;
-import org.kaaproject.kaa.common.dto.event.EventClassType;
-import org.kaaproject.kaa.common.dto.event.EventSchemaVersionDto;
+import org.kaaproject.kaa.common.dto.event.*;
 import org.kaaproject.kaa.common.dto.file.FileData;
 import org.kaaproject.kaa.common.dto.logs.LogAppenderDto;
 import org.kaaproject.kaa.common.dto.logs.LogSchemaDto;
@@ -84,7 +78,6 @@
 import org.kaaproject.kaa.server.common.dao.exception.EndpointRegistrationServiceException;
 import org.kaaproject.kaa.server.common.dao.exception.IncorrectParameterException;
 import org.kaaproject.kaa.server.common.dao.exception.NotFoundException;
-import org.kaaproject.kaa.server.common.dao.model.sql.NotificationSchema;
 import org.kaaproject.kaa.server.common.log.shared.RecordWrapperSchemaGenerator;
 import org.kaaproject.kaa.server.common.thrift.KaaThriftService;
 import org.kaaproject.kaa.server.common.thrift.gen.operations.Notification;
@@ -1088,10 +1081,12 @@ public FileData generateSdk(SdkProfileDto sdkProfile, SdkPlatform platform) thro
                 efm.setEcfName(ecf.getName());
                 efm.setEcfNamespace(ecf.getNamespace());
                 efm.setEcfClassName(ecf.getClassName());
-                List<EventSchemaVersionDto> ecfSchemas = ecf.getSchemas();
-                for (EventSchemaVersionDto ecfSchema : ecfSchemas) {
+                List<EventClassFamilyVersionDto> ecfSchemas = eventClassService.findEventClassFamilyVersionsById(aefMap.getEcfId());
+                for (EventClassFamilyVersionDto ecfSchema : ecfSchemas) {
                     if (ecfSchema.getVersion() == efm.getVersion()) {
-                        efm.setEcfSchema(ecfSchema.getSchema());
+                        List<EventClassDto> records = eventClassService.findEventClassesByFamilyIdVersionAndType(ecfSchema.getId(), ecfSchema.getVersion(), EventClassType.EVENT);
+                        records.addAll(eventClassService.findEventClassesByFamilyIdVersionAndType(ecfSchema.getId(), ecfSchema.getVersion(), EventClassType.OBJECT));
+                        efm.setRecords(records);
                         break;
                     }
                 }
@@ -1516,19 +1511,6 @@ public EventClassFamilyDto getEventClassFamily(String eventClassFamilyId) throws
         return eventClassService.findEventClassFamilyById(eventClassFamilyId);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.kaaproject.kaa.server.control.service.ControlService#
-     * addEventClassFamilySchema(java.lang.String, java.lang.String,
-     * java.lang.String)
-     */
-    @Override
-    public void addEventClassFamilySchema(String eventClassFamilyId, String eventClassFamilySchema, String createdUsername)
-            throws ControlServiceException {
-        eventClassService.addEventClassFamilySchema(eventClassFamilyId, eventClassFamilySchema, createdUsername);
-    }
-
     /*
      * (non-Javadoc)
      *