ATLAS-2549: Regression with respect to Partition keys

repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java

@@ -152,34 +152,22 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
         File[] typeDefFiles = typesDir.exists() ? typesDir.listFiles() : null;
 
         if (typeDefFiles == null || typeDefFiles.length == 0) {
-            LOG.info("Types directory {} does not exist or not readable or has no typedef files", typesDirName);
+            LOG.info("Types directory {} does not exist or not readable or has no typedef files", typesDirName );
         } else {
+
             // sort the files by filename
             Arrays.sort(typeDefFiles);
-            for (File typeDefFile : typeDefFiles) {
-                try {
-                    readTypesFromFile(typeDefFile);
-                } catch (Throwable t) {
-                    LOG.error("error while registering types in file {}", typeDefFile.getAbsolutePath(), t);
-                }
-            }
-        }
-
-        LOG.info("<== AtlasTypeDefStoreInitializer({})", typesDir);
-    }
-
-    public void readTypesFromFile(File typeDefFile) {
-        if (!typeDefFile.isFile()) {
-            return;
-        }
 
+            for (File typeDefFile : typeDefFiles) {
+                if (typeDefFile.isFile()) {
                     try {
                         String        jsonStr  = new String(Files.readAllBytes(typeDefFile.toPath()), StandardCharsets.UTF_8);
                         AtlasTypesDef typesDef = AtlasType.fromJson(jsonStr, AtlasTypesDef.class);
 
                         if (typesDef == null || typesDef.isEmpty()) {
                             LOG.info("No type in file {}", typeDefFile.getAbsolutePath());
-                return;
+
+                            continue;
                         }
 
                         AtlasTypesDef typesToCreate = getTypesToCreate(typesDef, atlasTypeRegistry);
@@ -197,6 +185,12 @@ public class AtlasTypeDefStoreInitializer implements ActiveStateChangeHandler {
                         LOG.error("error while registering types in file {}", typeDefFile.getAbsolutePath(), t);
                     }
                 }
+            }
+
+            applyTypePatches(typesDir.getPath());
+        }
+        LOG.info("<== AtlasTypeDefStoreInitializer({})", typesDir);
+    }
 
     public static AtlasTypesDef getTypesToCreate(AtlasTypesDef typesDef, AtlasTypeRegistry typeRegistry) {
         AtlasTypesDef typesToCreate = new AtlasTypesDef();