Additional fix for branch import/export

Author: EricWittmann

utils/importexport/src/main/java/io/apicurio/registry/utils/impexp/EntityType.java

@@ -5,6 +5,6 @@
 @RegisterForReflection
 public enum EntityType {
 
-    Manifest, GlobalRule, Content, Group, ArtifactVersion, ArtifactRule, Comment, Branch
+    Manifest, GlobalRule, Content, Group, Artifact, ArtifactVersion, ArtifactRule, Comment, Branch
 
 }

utils/importexport/src/main/java/io/apicurio/registry/utils/impexp/EntityWriter.java

@@ -107,7 +107,7 @@ private void writeEntity(CommentEntity entity) throws IOException {
     }
 
     private void writeEntity(BranchEntity entity) throws IOException {
-        ZipEntry mdEntry = createZipEntry(EntityType.Branch, entity.groupId, entity.artifactId, "branches/" + entity.branchId, "json");
+        ZipEntry mdEntry = createZipEntry(EntityType.Branch, entity.groupId, entity.artifactId, entity.branchId, "json");
         write(mdEntry, entity, BranchEntity.class);
     }
 
@@ -122,6 +122,12 @@ private ZipEntry createZipEntry(EntityType type, String groupId, String artifact
             case ArtifactRule:
                 path = String.format("groups/%s/artifacts/%s/rules/%s.%s.%s", groupOrDefault(groupId), artifactId, fileName, type.name(), fileExt);
                 break;
+            case Artifact:
+                path = String.format("groups/%s/artifacts/%s/%s.%s.%s", groupOrDefault(groupId), artifactId, fileName, type.name(), fileExt);
+                break;
+            case Branch:
+                path = String.format("groups/%s/artifacts/%s/branches/%s.%s.%s", groupOrDefault(groupId), artifactId, fileName, type.name(), fileExt);
+                break;
             case ArtifactVersion:
                 path = String.format("groups/%s/artifacts/%s/versions/%s.%s.%s", groupOrDefault(groupId), artifactId, fileName, type.name(), fileExt);
                 break;