added dbo for template; added primary keys

src/com/rthoni/intellij/codefromds/business/Generator.java

@@ -1,9 +1,14 @@
 package com.rthoni.intellij.codefromds.business;
 
 import com.intellij.database.psi.DbDataSource;
+import com.intellij.database.util.DasUtil;
 import com.intellij.openapi.project.Project;
-import com.rthoni.intellij.codefromds.dbo.GenerateOptions;
-import com.rthoni.intellij.codefromds.dbo.TableSelection;
+import com.rthoni.intellij.codefromds.dbo.options.ColumnSelection;
+import com.rthoni.intellij.codefromds.dbo.options.GenerateOptions;
+import com.rthoni.intellij.codefromds.dbo.options.TableSelection;
+import com.rthoni.intellij.codefromds.dbo.template.ColumnDataSourceDbo;
+import com.rthoni.intellij.codefromds.dbo.template.DataSourceDbo;
+import com.rthoni.intellij.codefromds.dbo.template.TableDataSourceDbo;
 import org.json.JSONObject;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
@@ -15,6 +20,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.stream.Collectors;
 
 /**
  * Created by robin on 11/15/16.
@@ -48,14 +54,43 @@ public abstract class Generator {
         return options;
     }
 
-    public static void generateFile(String templatePath, String outputFile, GenerateOptions options, TableSelection table) throws IOException
+    public static ColumnDataSourceDbo convertColumn(ColumnSelection columnSelection)
+    {
+        ColumnDataSourceDbo dbo = new ColumnDataSourceDbo();
+        dbo.setName(columnSelection.getColumn().getName());
+        dbo.setPrimary(DasUtil.isPrimary(columnSelection.getColumn()));
+        dbo.setSelected(columnSelection.isSelected());
+        return dbo;
+    }
+
+    public static TableDataSourceDbo convertTable(TableSelection tableSelection)
+    {
+        TableDataSourceDbo dbo = new TableDataSourceDbo();
+        dbo.setName(tableSelection.getTable().getName());
+        dbo.setColumns(tableSelection.getColumns().stream().map(Generator::convertColumn).collect(Collectors.toList()));
+        dbo.setPrimaryKeys(tableSelection.getColumns().stream().filter(c -> DasUtil.isPrimary(c.getColumn())).map(Generator::convertColumn).collect(Collectors.toList()));
+        dbo.setHasAny(!tableSelection.hasNone());
+        return dbo;
+    }
+
+    public static DataSourceDbo convertOptions(GenerateOptions options)
+    {
+        DataSourceDbo dbo = new DataSourceDbo();
+
+        dbo.setName(options.getSelection().getSource().getName());
+        dbo.setTables(options.getSelection().getTables().stream().map(Generator::convertTable).collect(Collectors.toList()));
+
+        return dbo;
+    }
+
+    public static void generateFile(String templatePath, String outputFile, DataSourceDbo dataSource, TableDataSourceDbo table) throws IOException
     {
         String data = Helper.readFile(templatePath);
 
         FileOutputStream file = new FileOutputStream(outputFile);
 
         JtwigTemplate template = JtwigTemplate.inlineTemplate(data);
-        JtwigModel model = JtwigModel.newModel().with("options", options).with("table", table);
+        JtwigModel model = JtwigModel.newModel().with("dataSource", dataSource).with("table", table);
 
         template.render(model, file);
 
@@ -68,12 +103,14 @@ public abstract class Generator {
         String dataSourceTemplateAbsolutePath = Helper.getAbsolutePath(project, options.getDataSourceTemplateRelativePath());
         String modelsTemplateAbsolutePath = Helper.getAbsolutePath(project, options.getModelsTemplateRelativePath());
 
+        DataSourceDbo dbo = convertOptions(options);
+
         generateFile(dataSourceTemplateAbsolutePath, modelsAbsolutePath + File.separator +
-                "Database." + options.getFilesExtension(), options, null);
-        for (TableSelection table : options.getSelection().getTables()) {
-            if (!table.hasNone()) {
+                "Database." + options.getFilesExtension(), dbo, null);
+        for (TableDataSourceDbo table : dbo.getTables()) {
+            if (table.hasAny()) {
                 generateFile(modelsTemplateAbsolutePath, modelsAbsolutePath + File.separator +
-                        table.getTable().getName() + "." + options.getFilesExtension(), options, table);
+                        table.getName() + "." + options.getFilesExtension(), dbo, table);
             }
         }
     }

src/com/rthoni/intellij/codefromds/business/Helper.java

@@ -4,15 +4,12 @@ import com.intellij.database.psi.DbDataSource;
 import com.intellij.database.psi.DbPsiFacade;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
-import com.rthoni.intellij.codefromds.dbo.TableSelection;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;

src/com/rthoni/intellij/codefromds/dbo/ColumnSelection.java → src/com/rthoni/intellij/codefromds/dbo/options/ColumnSelection.java

@@ -1,4 +1,4 @@
-package com.rthoni.intellij.codefromds.dbo;
+package com.rthoni.intellij.codefromds.dbo.options;
 
 import com.intellij.database.model.DasColumn;
 import org.json.JSONObject;

src/com/rthoni/intellij/codefromds/dbo/DataSourceSelection.java → src/com/rthoni/intellij/codefromds/dbo/options/DataSourceSelection.java

@@ -1,4 +1,4 @@
-package com.rthoni.intellij.codefromds.dbo;
+package com.rthoni.intellij.codefromds.dbo.options;
 
 import com.intellij.database.model.DasTable;
 import com.intellij.database.psi.DbDataSource;

src/com/rthoni/intellij/codefromds/dbo/GenerateOptions.java → src/com/rthoni/intellij/codefromds/dbo/options/GenerateOptions.java

@@ -1,15 +1,12 @@
-package com.rthoni.intellij.codefromds.dbo;
+package com.rthoni.intellij.codefromds.dbo.options;
 
 import com.intellij.database.model.DasTable;
 import com.intellij.database.psi.DbDataSource;
 import com.intellij.database.util.DasUtil;
-import com.intellij.openapi.project.Project;
 import com.rthoni.intellij.codefromds.business.Helper;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;

src/com/rthoni/intellij/codefromds/dbo/TableSelection.java → src/com/rthoni/intellij/codefromds/dbo/options/TableSelection.java

@@ -1,4 +1,4 @@
-package com.rthoni.intellij.codefromds.dbo;
+package com.rthoni.intellij.codefromds.dbo.options;
 
 import com.intellij.database.model.DasTable;
 import com.rthoni.intellij.codefromds.business.Helper;

src/com/rthoni/intellij/codefromds/dbo/template/ColumnDataSourceDbo.java

@@ -0,0 +1,37 @@
+package com.rthoni.intellij.codefromds.dbo.template;
+
+/**
+ * Created by robin on 11/18/16.
+ */
+public class ColumnDataSourceDbo {
+
+    private String _name;
+
+    private boolean _isPrimary;
+
+    private boolean _isSelected;
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public boolean isPrimary() {
+        return _isPrimary;
+    }
+
+    public void setPrimary(boolean primary) {
+        _isPrimary = primary;
+    }
+
+    public boolean isSelected() {
+        return _isSelected;
+    }
+
+    public void setSelected(boolean selected) {
+        _isSelected = selected;
+    }
+}

src/com/rthoni/intellij/codefromds/dbo/template/DataSourceDbo.java

@@ -0,0 +1,29 @@
+package com.rthoni.intellij.codefromds.dbo.template;
+
+import java.util.List;
+
+/**
+ * Created by robin on 11/18/16.
+ */
+public class DataSourceDbo {
+
+    private String _name;
+
+    private List<TableDataSourceDbo> _tables;
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public List<TableDataSourceDbo> getTables() {
+        return _tables;
+    }
+
+    public void setTables(List<TableDataSourceDbo> tables) {
+        _tables = tables;
+    }
+}

src/com/rthoni/intellij/codefromds/dbo/template/TableDataSourceDbo.java

@@ -0,0 +1,48 @@
+package com.rthoni.intellij.codefromds.dbo.template;
+
+import java.util.List;
+
+/**
+ * Created by robin on 11/18/16.
+ */
+public class TableDataSourceDbo {
+    private String _name;
+
+    private List<ColumnDataSourceDbo> _columns;
+
+    private List<ColumnDataSourceDbo> _primaryKeys;
+
+    private boolean _hasAny;
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public List<ColumnDataSourceDbo> getColumns() {
+        return _columns;
+    }
+
+    public void setColumns(List<ColumnDataSourceDbo> columns) {
+        _columns = columns;
+    }
+
+    public List<ColumnDataSourceDbo> getPrimaryKeys() {
+        return _primaryKeys;
+    }
+
+    public void setPrimaryKeys(List<ColumnDataSourceDbo> primaryKeys) {
+        _primaryKeys = primaryKeys;
+    }
+
+    public boolean hasAny() {
+        return _hasAny;
+    }
+
+    public void setHasAny(boolean hasAny) {
+        _hasAny = hasAny;
+    }
+}

src/com/rthoni/intellij/codefromds/ui/actions/GenerateAction.java

@@ -1,23 +1,16 @@
 package com.rthoni.intellij.codefromds.ui.actions;
 
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import com.intellij.notification.Notifications;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.rthoni.intellij.codefromds.business.Generator;
-import com.rthoni.intellij.codefromds.dbo.GenerateOptions;
+import com.rthoni.intellij.codefromds.dbo.options.GenerateOptions;
 import com.rthoni.intellij.codefromds.ui.dialogs.GenerateDialog;
 import com.rthoni.intellij.codefromds.ui.others.NotificationsService;
 
-import javax.swing.*;
-
 /**
  * Created by robin on 11/14/16.
  */

src/com/rthoni/intellij/codefromds/ui/dialogs/GenerateDialog.java

@@ -11,10 +11,10 @@ import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBList;
 import com.rthoni.intellij.codefromds.business.Helper;
-import com.rthoni.intellij.codefromds.dbo.ColumnSelection;
-import com.rthoni.intellij.codefromds.dbo.DataSourceSelection;
-import com.rthoni.intellij.codefromds.dbo.GenerateOptions;
-import com.rthoni.intellij.codefromds.dbo.TableSelection;
+import com.rthoni.intellij.codefromds.dbo.options.ColumnSelection;
+import com.rthoni.intellij.codefromds.dbo.options.DataSourceSelection;
+import com.rthoni.intellij.codefromds.dbo.options.GenerateOptions;
+import com.rthoni.intellij.codefromds.dbo.options.TableSelection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;