REST API modification

kaaproject · Jul 8, 2016 · 706acc1 · 706acc1
1 parent a69cbcf
commit 706acc1
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/services/KaaAdminServiceImpl.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/services/KaaAdminServiceImpl.java
@@ -100,7 +100,6 @@
 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.file.FileData;
 import org.kaaproject.kaa.common.dto.logs.LogAppenderDto;
 import org.kaaproject.kaa.common.dto.logs.LogSchemaDto;
@@ -2692,11 +2691,6 @@ public EventClassFamilyDto getEventClassFamily(String eventClassFamilyId) throws
             EventClassFamilyDto eventClassFamily = controlService.getEventClassFamily(eventClassFamilyId);
             Utils.checkNotNull(eventClassFamily);
             checkTenantId(eventClassFamily.getTenantId());
-            for (EventSchemaVersionDto eventSchemaVersion : eventClassFamily.getSchemas()) {
-                Schema schema = new Schema.Parser().parse(eventSchemaVersion.getSchema());
-                RecordField schemaForm = ecfSchemaFormAvroConverter.createSchemaFormFromSchema(schema);
-                eventSchemaVersion.setSchemaForm(schemaForm);
-            }
             return eventClassFamily;
         } catch (Exception e) {
             throw Utils.handleException(e);
@@ -2734,7 +2728,7 @@ public void addEventClassFamilySchemaForm(String eventClassFamilyId, RecordField
             checkTenantId(storedEventClassFamily.getTenantId());
 
             String username = getCurrentUser().getUsername();
-            controlService.addEventClassFamilySchema(eventClassFamilyId, schemaString, username);
+            //todo: load list of ctls
         } catch (Exception e) {
             throw Utils.handleException(e);
         }
@@ -2759,7 +2753,7 @@ public void addEventClassFamilySchema(String eventClassFamilyId, byte[] data) th
             checkTenantId(storedEventClassFamily.getTenantId());
 
             String username = getCurrentUser().getUsername();
-            controlService.addEventClassFamilySchema(eventClassFamilyId, schema, username);
+            //todo: load list of ctls
         } catch (Exception e) {
             throw Utils.handleException(e);
         }