Fixed NPE in MAQL generator

gooddata · Jun 21, 2012 · 9118404 · 9118404
1 parent 0782eaa
commit 9118404
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/backend/src/main/java/com/gooddata/modeling/generator/MaqlGenerator.java b/backend/src/main/java/com/gooddata/modeling/generator/MaqlGenerator.java
@@ -266,19 +266,25 @@ private String generateFoldersMaqlDdl(List<SourceColumn> columns) {
         for (SourceColumn column : columns) {
             String folder = column.getFolder();
             if (folder != null && folder.length() > 0) {
-                if (column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_ATTRIBUTE) ||
+                String ldmType = column.getLdmType();
-                        column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_LABEL) ||
+                if(ldmType != null && ldmType.length()>0) {
-                        column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_HYPERLINK) ||
+                    if (column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_ATTRIBUTE) ||
-                        column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_CONNECTION_POINT) ||
+                            column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_LABEL) ||
-                        column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_REFERENCE) ||
+                            column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_HYPERLINK) ||
-                        column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_DATE)) {
+                            column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_CONNECTION_POINT) ||
-                    if (!attributeFolders.contains(folder))
+                            column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_REFERENCE) ||
-                        attributeFolders.add(folder);
+                            column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_DATE)) {
+                        if (!attributeFolders.contains(folder))
+                            attributeFolders.add(folder);
+                    }
+                    if (column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_FACT) ||
+                            column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_DATE)) {
+                        if (!factFolders.contains(folder))
+                            factFolders.add(folder);
+                    }
                 }
-                if (column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_FACT) ||
+                else {
-                        column.getLdmType().equalsIgnoreCase(SourceColumn.LDM_TYPE_DATE)) {
+                    throw new IllegalArgumentException("Column " + column.getName()+ " doesn't contain the LDM type specification.");
-                    if (!factFolders.contains(folder))
-                        factFolders.add(folder);
                 }
             }
         }