Merge remote-tracking branch 'refs/remotes/origin/add-kotlin-support'

Author: Layoric

.gitignore

@@ -28,6 +28,7 @@ src/ServiceStackIDEA/.idea/workspace.xml
 src/ServiceStackIDEA/lib/sdk/
 src/ServiceStackIDEA/lib/idea-sdk.zip
 src/ServiceStackIDEA/.idea/libraries
+src/ServiceStackIDEA/.idea/
 linux.gtk.x86/
 linux.gtk.x86_64/
 macosx.cocoa.x86/

src/ServiceStackIDEA/.idea/gradle.xml

@@ -157,7 +157,7 @@
               </grid>
             </constraints>
             <properties>
-              <text value="dto.java"/>
+              <text value="dtos.java"/>
             </properties>
           </component>
         </children>

src/ServiceStackIDEA/.idea/misc.xml

@@ -43,6 +43,8 @@ public class AddRef extends JDialog {
     private String errorMessage;
     private String selectedDirectory;
 
+    private INativeTypesHandler defaultNativeTypesHandler;
+
     public AddRef(@NotNull Module module) {
         this.module = module;
         setContentPane(contentPane);
@@ -187,6 +189,14 @@ public void setSelectedPackage(@NotNull PsiPackage selectedPackage) {
         setPackageBrowseText(selectedPackage.getQualifiedName());
     }
 
+    public void setFileName(@NotNull String fileName) {
+        nameTextField.setText(fileName);
+    }
+
+    public void setDefaultNativeTypesHandler(INativeTypesHandler nativeTypesHandler) {
+        defaultNativeTypesHandler = nativeTypesHandler;
+    }
+
     public void setSelectedDirectory(@NotNull String selectedDirectory) {
         this.selectedDirectory = selectedDirectory;
     }
@@ -358,7 +368,7 @@ private void onOK() {
         label3.setText("Name");
         panel4.add(label3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         nameTextField = new JTextField();
-        nameTextField.setText("dto.java");
+        nameTextField.setText("dtos.java");
         panel4.add(nameTextField, new GridConstraints(2, 1, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
         label1.setLabelFor(addressUrlTextField);
         label3.setLabelFor(nameTextField);

src/ServiceStackIDEA/.idea/vcs.xml

@@ -4,24 +4,23 @@
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiPackage;
-import org.apache.http.client.utils.URIBuilder;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 
 public class AddServiceStackRefHandler {
 
@@ -30,55 +29,19 @@ public class AddServiceStackRefHandler {
     //Fallback version of dependencies if GitHub tags can't be checked.
     private static String dependencyVersion = "1.0.15";
     private static final String clientPackageId = "client";
+    private static INativeTypesHandler defaultNativeTypesHandler;
 
     public static void setDependencyVersion(String version) {
         dependencyVersion = version;
     }
 
-    public static void handleOk(String addressUrl, String qualifiedPackageName, String fileName, String selectedDirectory, Module module, StringBuilder errorMessage) {
-        String url;
-        List<String> javaCodeLines = new ArrayList<String>();
-        try {
-            URIBuilder urlBuilder = createUrl(addressUrl);
-            urlBuilder.addParameter("Package", qualifiedPackageName);
-            String name = getDtoNameWithoutExtension(fileName).replaceAll("\\.", "_");
-            urlBuilder.addParameter("GlobalNamespace", name);
-            url = urlBuilder.build().toString();
-
-            URL serviceUrl = new URL(url);
-            URLConnection javaResponseConnection = serviceUrl.openConnection();
-            BufferedReader javaResponseReader = new BufferedReader(
-                    new InputStreamReader(
-                            javaResponseConnection.getInputStream()));
-            String metadataInputLine;
 
-            while ((metadataInputLine = javaResponseReader.readLine()) != null)
-                javaCodeLines.add(metadataInputLine);
-
-            javaResponseReader.close();
-
-            if(!javaCodeLines.get(0).startsWith("/* Options:")) {
-                //Invalid endpoint
-                errorMessage.append("The address url is not a valid ServiceStack endpoint.");
-                return;
-            }
-
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-            errorMessage.append(e.getClass().getName()).append(" - Invalid ServiceStack endpoint provided - ").append(addressUrl);
-            return;
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-            errorMessage.append(e.getClass().getName()).append(" - Invalid ServiceStack endpoint provided - ").append(addressUrl);
-            return;
-        } catch (IOException e) {
-            e.printStackTrace();
-            errorMessage.append(e.getClass().getName()).append(" - Failed to read response - ").append(addressUrl);
-            return;
-        }
-
-
-        GradleBuildFileHelper gradleBuildFileHelper = new GradleBuildFileHelper(module);
+    public static void handleOk(String addressUrl, String qualifiedPackageName,
+                                String fileName, String selectedDirectory,
+                                Module module, StringBuilder errorMessage) {
+        List<String> javaCodeLines = getDtoLines(addressUrl, qualifiedPackageName, fileName, errorMessage);
+        if (javaCodeLines == null) return;
+        defaultNativeTypesHandler = IDEAUtils.getDefaultNativeTypesHandler(module);
         boolean showDto = true;
         final MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(module.getProject());
 
@@ -88,7 +51,7 @@ public static void handleOk(String addressUrl, String qualifiedPackageName, Stri
         } else {
             //Gradle
             try {
-                showDto = addGradleDependencyIfRequired(module,gradleBuildFileHelper);
+                showDto = addGradleDependencyIfRequired(module);
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
                 String message = "Failed to update build.gradle with '" +
@@ -118,6 +81,44 @@ public static void handleOk(String addressUrl, String qualifiedPackageName, Stri
         VirtualFileManager.getInstance().syncRefresh();
     }
 
+    @Nullable
+    private static List<String> getDtoLines(String addressUrl, String qualifiedPackageName, String fileName, StringBuilder errorMessage) {
+        Map<String,String> options = new HashMap<String,String>();
+        List<String> javaCodeLines;
+        try {
+            options.put("Package", qualifiedPackageName);
+            String name = getDtoNameWithoutExtension(fileName).replaceAll("\\.", "_");
+            options.put("GlobalNamespace", name);
+            javaCodeLines = getNativeTypesHandler(fileName).getUpdatedCode(addressUrl,options);
+
+            if(!javaCodeLines.get(0).startsWith("/* Options:")) {
+                //Invalid endpoint
+                errorMessage.append("The address url is not a valid ServiceStack endpoint.");
+                return null;
+            }
+
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            errorMessage.append(e.getClass().getName()).append(" - Invalid ServiceStack endpoint provided - ").append(addressUrl);
+            return null;
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            errorMessage.append(e.getClass().getName()).append(" - Invalid ServiceStack endpoint provided - ").append(addressUrl);
+            return null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            errorMessage.append(e.getClass().getName()).append(" - Failed to read response - ").append(addressUrl);
+            return null;
+        }
+        return javaCodeLines;
+    }
+
+    private static INativeTypesHandler getNativeTypesHandler(String fileName) {
+        if(fileName.endsWith(".kt")) return new KotlinNativeTypesHandler();
+        if(fileName.endsWith(".java")) return new JavaNativeTypesHandler();
+        return defaultNativeTypesHandler;
+    }
+
     private static boolean tryAddMavenDependency(Module module) {
         boolean showDto;
         String message = "Unable to locate module pom.xml file. Can't add required dependency '" +
@@ -130,7 +131,7 @@ private static boolean tryAddMavenDependency(Module module) {
                 NotificationType.WARNING);
         try {
             IDEAPomFileHelper pomFileHelper = new IDEAPomFileHelper();
-            String pomFilePath = pomFileHelper.findNearestModulePomFile(module);
+            String pomFilePath = IDEAPomFileHelper.findNearestModulePomFile(module);
             if(pomFilePath == null) {
                 Notifications.Bus.notify(notification);
                 return false;
@@ -151,9 +152,9 @@ private static boolean tryAddMavenDependency(Module module) {
         return showDto;
     }
 
-    private static boolean addGradleDependencyIfRequired(Module module, GradleBuildFileHelper gradleBuildFileHelper) throws FileNotFoundException {
+    private static boolean addGradleDependencyIfRequired(Module module) throws FileNotFoundException {
         boolean result = true;
-        if(gradleBuildFileHelper.addDependency(dependencyGroupId, dependencyPackageId, dependencyVersion)) {
+        if(GradleBuildFileHelper.addDependency(module,dependencyGroupId, dependencyPackageId, dependencyVersion)) {
             result = false;
             IDEAUtils.refreshBuildFile(module);
         }
@@ -193,8 +194,8 @@ private static String getDtoPath(Module module, String qualifiedPackageName, Str
 
         PsiPackage mainPackage = JavaPsiFacade.getInstance(module.getProject()).findPackage(qualifiedPackageName);
         if(mainPackage != null && mainPackage.isValid() && mainPackage.getDirectories().length > 0) {
-            File foo = new File(selectedDirectory);
-            VirtualFile selectedFolder = LocalFileSystem.getInstance().findFileByIoFile(foo);
+            File file = new File(selectedDirectory);
+            VirtualFile selectedFolder = LocalFileSystem.getInstance().findFileByIoFile(file);
             if(selectedFolder == null) {
                 errorMessage.append("Unable to determine path for DTO file.");
                 throw new FileNotFoundException();
@@ -217,43 +218,24 @@ private static String getDtoPath(Module module, String qualifiedPackageName, Str
         return fullDtoPath;
     }
 
-    public static URIBuilder createUrl(String text) throws MalformedURLException, URISyntaxException {
-        String serverUrl = text.endsWith("/") ? text : (text + "/");
-        serverUrl = (serverUrl.startsWith("http://") || serverUrl.startsWith("https://")) ? serverUrl : ("http://" + serverUrl);
-        URL url = new URL(serverUrl);
-        String path = url.getPath().contains("?") ? url.getPath().split("\\?", 2)[0] : url.getPath();
-        if (!path.endsWith("types/java/")) {
-            serverUrl += "types/java/";
-        }
-        URIBuilder builder;
-
-        try {
-            builder = new URIBuilder(serverUrl);
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-            throw e;
-        }
-
-
-        return builder;
-    }
-
     public static String getDtoFileName(String name) {
+        INativeTypesHandler nativeTypesHandler = getNativeTypesHandler(name);
         int p = name.lastIndexOf(".");
-        String e = name.substring(p + 1);
-        if (p == -1 || !e.equals("java")) {
+        String e = name.substring(p);
+        if (p == -1 || !e.equals(nativeTypesHandler.getFileExtension())) {
             /* file has no extension */
-            return name + ".java";
+            return name + nativeTypesHandler.getFileExtension();
         } else {
             /* file has extension e */
             return name;
         }
     }
 
     public static String getDtoNameWithoutExtension(String name) {
+        INativeTypesHandler nativeTypesHandler = getNativeTypesHandler(name);
         int p = name.lastIndexOf(".");
-        String e = name.substring(p + 1);
-        if (p == -1 || !e.equals("java")) {
+        String e = name.substring(p);
+        if (p == -1 || !e.equals(nativeTypesHandler.getFileExtension())) {
             /* file has no extension */
             return name;
         } else {

src/ServiceStackIDEA/.idea/workspace.xml

@@ -75,7 +75,7 @@ public void actionPerformed(AnActionEvent e) {
                     //do nothing, can't get package name.
                 }
             }
-            dialog.setVisible(true);
+            ShowDialog(module, dialog);
             return;
         }
 
@@ -99,14 +99,14 @@ public void actionPerformed(AnActionEvent e) {
         //Check for document, display without a package name if no document.
         Document document = FileDocumentManager.getInstance().getDocument(selectedFile);
         if (document == null) {
-            dialog.setVisible(true);
+            ShowDialog(module, dialog);
             return;
         }
 
         //Check if a 'PsiFile', display without a package name if no PsiFile.
         PsiFile psiFile = PsiDocumentManager.getInstance(module.getProject()).getPsiFile(document);
         if (psiFile == null) {
-            dialog.setVisible(true);
+            ShowDialog(module, dialog);
             return;
         }
 
@@ -118,7 +118,17 @@ public void actionPerformed(AnActionEvent e) {
                 dialog.setSelectedPackage(mainPackage);
             }
         }
+        ShowDialog(module, dialog);
+    }
 
+    private void ShowDialog(Module module, AddRef dialog) {
+        if(GradleBuildFileHelper.isGradleModule(module) && GradleBuildFileHelper.isUsingKotlin(module)) {
+            dialog.setFileName("dtos.kt");
+        }
+
+        if(IDEAPomFileHelper.isMavenProjectWithKotlin(module)) {
+            dialog.setFileName("dtos.kt");
+        }
         dialog.setVisible(true);
     }