Fix problem with long names of event classes

avrogen/src/main/java/org/kaaproject/kaa/avro/avrogen/compiler/Compiler.java

@@ -30,8 +30,6 @@
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
 import org.apache.avro.Schema.Type;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.kaaproject.kaa.avro.avrogen.GenerationContext;
@@ -61,6 +59,9 @@ public abstract class Compiler {
     protected String namespacePrefix;
 
     protected final Map<Schema, GenerationContext> schemaGenerationQueue;
+    // list of schemas that should be skipped during generation
+    protected Set<Schema> generatedSchemas = new HashSet<>();
+
 
     private void initVelocityEngine() {
         engine = new VelocityEngine();
@@ -98,6 +99,12 @@ public Compiler(List<Schema> schemas, String sourceName, OutputStream hdrS, Outp
         prepareTemplates(false);
     }
 
+
+    public Compiler(List<Schema> schemas, String sourceName, OutputStream hdrS, OutputStream srcS, Set<Schema> generatedSchemas) throws KaaGeneratorException {
+        this(schemas, sourceName, hdrS, srcS);
+        this.generatedSchemas = new HashSet<>(generatedSchemas);
+    }
+
     public Compiler(String schemaPath, String outputPath, String sourceName) throws KaaGeneratorException {
         this(sourceName);
         try {
@@ -172,10 +179,11 @@ private void writeToFile(StringWriter hdrWriter, StringWriter srcWriter) throws
     }
 
 
-    public void generate() throws KaaGeneratorException {
+    public Set<Schema> generate() throws KaaGeneratorException {
         try {
             LOG.debug("Processing schemas: [" + join(schemas, ", ") + "]");
             for (Schema schema : schemas) {
+
                 if (schema.getType() == Type.UNION) {
                     for (Schema s : schema.getTypes()) {
                         addAllSchemasToQueue(s, null);
@@ -185,9 +193,11 @@ public void generate() throws KaaGeneratorException {
                 }
             }
 
+
             doGenerate();
 
             LOG.debug("Sources were successfully generated");
+            return schemaGenerationQueue.keySet();
         } catch (Exception e) {
             LOG.error("Failed to generate C sources: ", e);
             throw new KaaGeneratorException("Failed to generate sources: " + e.toString());
@@ -280,5 +290,4 @@ public void setNamespacePrefix(String namespacePrefix) {
         this.namespacePrefix = namespacePrefix;
     }
 
-
 }

avrogen/src/main/java/org/kaaproject/kaa/avro/avrogen/compiler/ObjectiveCCompiler.java

@@ -24,6 +24,7 @@
 import java.lang.*;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class ObjectiveCCompiler extends Compiler {
 
@@ -42,6 +43,10 @@ public ObjectiveCCompiler(List<Schema> schemas, String sourceName, OutputStream
         super(schemas, sourceName, hdrS, srcS);
     }
 
+    public ObjectiveCCompiler(List<Schema> schemas, String sourceName, OutputStream hdrS, OutputStream srcS, Set<Schema> generatedSchemas) throws KaaGeneratorException {
+        super(schemas, sourceName, hdrS, srcS, generatedSchemas);
+    }
+
     @Override
     protected String headerTemplateGen() {
         return "src/main/resources/ObjC/headerObjC.tmpl.gen";
@@ -70,13 +75,15 @@ protected String getSourceExtension() {
     @Override
     protected void doGenerate() {
         for (Map.Entry<Schema, GenerationContext> cursor : schemaGenerationQueue.entrySet()) {
-            switch (cursor.getKey().getType()) {
-                case RECORD:
-                    processRecord(cursor.getKey(), "ObjC/recordObjC.h.vm", "ObjC/recordObjC.m.vm");
-                    break;
-                case ENUM:
-                    processEnum(cursor.getKey(), "ObjC/enumObjC.h.vm");
-                    break;
+            if (!generatedSchemas.contains(cursor.getKey())) { // process only not generated schemas
+                switch (cursor.getKey().getType()) {
+                    case RECORD:
+                        processRecord(cursor.getKey(), "ObjC/recordObjC.h.vm", "ObjC/recordObjC.m.vm");
+                        break;
+                    case ENUM:
+                        processEnum(cursor.getKey(), "ObjC/enumObjC.h.vm");
+                        break;
+                }
             }
         }
     }

server/node/src/main/java/org/kaaproject/kaa/server/control/service/sdk/event/ObjCEventClassesGenerator.java

@@ -33,8 +33,11 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
+import static org.kaaproject.kaa.server.control.service.sdk.SchemaUtil.getChildSchemas;
+
 public class ObjCEventClassesGenerator {
 
     private static final Logger LOG = LoggerFactory.getLogger(ObjCEventClassesGenerator.class);
@@ -75,7 +78,7 @@ public class ObjCEventClassesGenerator {
     private static final String EVENT_FAMILY_FACTORY_IMPORTS_VAR = "\\{event_family_factory_imports\\}";
     private static final String EVENT_FAMILY_FACTORY_PROPERTIES_VAR = "\\{event_family_factory_properties\\}";
     private static final String EVENT_FAMILY_FACTORY_METHODS_VAR = "\\{event_family_factory_methods\\}";
-    public static final String EVENT_CLASS = "EventClass";
+    public static final String KAA_EVENT_PREFIX = "KAAEvent";
 
     private static String eventFamilyHeader;
     private static String eventFamilySource;
@@ -121,6 +124,7 @@ public static List<TarEntryData> generateEventSources(List<EventFamilyMetadata>
         StringBuilder eventGenSourceBuilder = new StringBuilder();
 
         LOG.debug("Received {} event families", eventFamilies.size());
+        HashSet<Schema> generatedSchemas = new HashSet<>();
         for (EventFamilyMetadata efm : eventFamilies) {
 
             LOG.debug("Generating schemas for event family {}", efm.getEcfName());
@@ -132,9 +136,9 @@ public static List<TarEntryData> generateEventSources(List<EventFamilyMetadata>
                         OutputStream srcStream = new ByteArrayOutputStream()
                 ) {
 
-                    Compiler compiler = new ObjectiveCCompiler(eventCtlSchemas, EVENT_GEN, hdrStream, srcStream);
-                    compiler.setNamespacePrefix(efm.getEcfClassName());
-                    compiler.generate();
+                    Compiler compiler = new ObjectiveCCompiler(eventCtlSchemas, EVENT_GEN, hdrStream, srcStream, generatedSchemas);
+                    compiler.setNamespacePrefix(KAA_EVENT_PREFIX);
+                    generatedSchemas.addAll(compiler.generate());
 
                     eventGenHeaderBuilder.append(hdrStream.toString()).append("\n");
                     eventGenSourceBuilder.append(srcStream.toString()).append("\n");
@@ -168,7 +172,7 @@ public static List<TarEntryData> generateEventSources(List<EventFamilyMetadata>
             String eventFamilyListenerMethods = "";
 
             for (ApplicationEventMapDto eventMap : efm.getEventMaps()) {
-                String eventClassName = efm.getEcfClassName() + eventFqnToClassName(eventMap.getFqn());
+                String eventClassName = eventFqnToClassName(eventMap.getFqn());
                 if (eventMap.getAction() == ApplicationEventAction.SINK ||
                         eventMap.getAction() == ApplicationEventAction.BOTH) {
                     addSupportedEventClassFqns += eventFamilyAddSupportedFqn
@@ -240,6 +244,6 @@ private static String eventFqnToClassName(String fqn) {
         if (fqn == null || fqn.isEmpty()) {
             throw new RuntimeException("Failed to get class name from fqn: " + fqn);
         }
-        return fqn.substring(fqn.lastIndexOf('.') + 1);
+        return KAA_EVENT_PREFIX + fqn.substring(fqn.lastIndexOf('.') + 1);
     }
 }