Refactored dependencies

Author: palemieux

class-generator/pom.xml

@@ -26,4 +26,23 @@
       <version>4.4.0</version>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

class-generator/src/main/java/com/sandflow/smpte/mxf/ClassGenerator.java

@@ -131,11 +131,11 @@ public class ClassGenerator {
       classTemplate = handlebars.with(EscapingStrategy.HTML_ENTITY).compile("hbs/Class.java");
       enumerationTemplate = handlebars.compile("hbs/Enumeration.java");
       recordTemplate = handlebars.compile("hbs/Record.java");
-      classFactoryTemplate = handlebars.compile("hbs/ClassFactoryInitializer.java");
+      classFactoryTemplate = handlebars.compile("hbs/ClassFactory.java");
       fixedArrayTemplate = handlebars.compile("hbs/FixedArray.java");
       variableArrayTemplate = handlebars.compile("hbs/VariableArray.java");
       labelsTemplate = handlebars.compile("hbs/Labels.java");
-      localTagsTemplate = handlebars.compile("hbs/StaticLocalTagsInitializer.java");
+      localTagsTemplate = handlebars.compile("hbs/StaticLocalTags.java");
       essenceKeysTemplate = handlebars.compile("hbs/EssenceKeys.java");
     } catch (Exception e) {
       throw new InternalError("Failed to load class generator templates", e);
@@ -726,10 +726,10 @@ public static void generate(MetaDictionaryCollection mds, LabelsRegister lr, Ess
     }
 
     /* generate the class factory */
-    g.generateSource(classFactoryTemplate, "com.sandflow.smpte.mxf", "ClassFactoryInitializer", g.classList);
+    g.generateSource(classFactoryTemplate, "com.sandflow.smpte.mxf", "ClassFactory", g.classList);
 
     /* generate the static local tags */
-    g.generateSource(localTagsTemplate, "com.sandflow.smpte.mxf", "StaticLocalTagsInitializer", propList);
+    g.generateSource(localTagsTemplate, "com.sandflow.smpte.mxf", "StaticLocalTags", propList);
 
     /* generate labels */
     g.generateSource(

class-generator/src/main/resources/hbs/Class.java.hbs

@@ -34,7 +34,7 @@ import java.io.IOException;
 
 {{#if ownMembers}}import com.sandflow.smpte.klv.Triplet;
 import com.sandflow.smpte.util.AUID;
-import com.sandflow.smpte.mxf.SetItemAdapter;{{/if}}
+import com.sandflow.smpte.mxf.adapters.SetItemAdapter;{{/if}}
 import com.sandflow.smpte.util.UL;
 import com.sandflow.smpte.util.UUID;
 import com.sandflow.smpte.mxf.ClassFactory;

…com/sandflow/smpte/mxf/ClassFactory.java …main/resources/hbs/ClassFactory.java.hbsclass-generator/src/main/java/com/sandflow/smpte/mxf/ClassFactory.java renamed to class-generator/src/main/resources/hbs/ClassFactory.java.hbs class-generator/src/main/java/com/sandflow/smpte/mxf/ClassFactory.java renamed to class-generator/src/main/resources/hbs/ClassFactory.java.hbs

@@ -32,18 +32,17 @@
 
 import java.util.HashMap;
 
+{{#.}}import com.sandflow.smpte.mxf.types.{{getSymbol}};
+{{/.}}
 import com.sandflow.smpte.mxf.types.IndexTableSegment;
 import com.sandflow.smpte.util.UL;
 
 public class ClassFactory {
   static protected final HashMap<UL, Class<?>> classMap = new HashMap<>();
 
   static {
-    try {
-      Class.forName("com.sandflow.smpte.mxf.ClassFactoryInitializer");
-    } catch (Exception e) {
-      throw new InternalError("Could not initialize the MXF class factory", e);
-    }
+{{#.}}
+    ClassFactory.putClass({{getSymbol}}.getKey(), {{getSymbol}}.class);{{/.}}
 
     ClassFactory.putClass(IndexTableSegment.getKey(), IndexTableSegment.class);
   }

class-generator/src/main/resources/hbs/ClassFactoryInitializer.java.hbs

@@ -39,11 +39,8 @@ public class StaticLocalTags {
   private static final LocalTagRegister reg = new LocalTagRegister();
 
   static {
-    try {
-      Class.forName("com.sandflow.smpte.mxf.StaticLocalTagsInitializer");
-    } catch (Exception e) {
-      throw new InternalError("Cannot initialize local tag register", e);
-    }
+{{#.}}
+    StaticLocalTags.add({{getLocalIdentification}}, AUID.fromURN("{{getIdentification}}"));{{/.}}
   }
 
   private StaticLocalTags() {