code clean up + centralize dep config + add gson dep as well

Author: mythz

.idea/ServiceStack.Java.iml

@@ -224,7 +224,7 @@ private void processOK() {
             JsonElement jElement = new JsonParser().parse(builder.toString());
             if (jElement.getAsJsonArray().size() > 0) {
                 String latestTag = jElement.getAsJsonArray().get(0).getAsJsonObject().get("name").getAsJsonPrimitive().getAsString();
-                AddServiceStackRefHandler.setDependencyVersion(latestTag.substring(1));
+                DepConfig.setServiceStackVersion(latestTag.substring(1));
             }
 
         } catch (MalformedURLException e) {

src/ServiceStackIDEA/.idea/misc.xml

@@ -35,18 +35,18 @@ public void actionPerformed(AnActionEvent e) {
 
         //Check if a package was selected in the left hand menu, populate package name
         PsiElement element = LangDataKeys.PSI_ELEMENT.getData(e.getDataContext());
-        if (element != null && element instanceof PsiPackage) {
+        if (element instanceof PsiPackage) {
             PsiPackage psiPackage = (PsiPackage) element;
             dialog.setSelectedPackage(psiPackage);
             dialog.setVisible(true);
             return;
         }
 
         //Check if a directory containing a Java file was selected, populate package name
-        if (element != null && element instanceof PsiDirectory) {
+        if (element instanceof PsiDirectory) {
             PsiElement firstChild = element.getFirstChild();
             dialog.setSelectedDirectory(((PsiDirectory) element).getVirtualFile().getPath());
-            if (firstChild != null && firstChild instanceof PsiJavaFile) {
+            if (firstChild instanceof PsiJavaFile) {
                 PsiJavaFile firstJavaFile = (PsiJavaFile) firstChild;
                 PsiPackage mainPackage = JavaPsiFacade.getInstance(module.getProject()).findPackage(firstJavaFile.getPackageName());
                 if (mainPackage != null) {

src/ServiceStackIDEA/.idea/modules.xml

@@ -23,19 +23,8 @@
 
 public class AddServiceStackRefHandler {
 
-    private static final String dependencyGroupId = "net.servicestack";
-    private static final String androidPackageId = "android";
-    //Fallback version of dependencies if GitHub tags can't be checked.
-    private static String dependencyVersion = "1.0.38";
-    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) {
@@ -53,7 +42,7 @@ public static void handleOk(String addressUrl, String qualifiedPackageName,
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
                 String message = "Failed to update build.gradle with '" +
-                        dependencyGroupId + ":" + clientPackageId + ":" + dependencyVersion +
+                        DepConfig.getClientVersionString() +
                         "'. " + e.getLocalizedMessage();
                 Notification notification = new Notification(
                         "ServiceStackIDEA",
@@ -95,13 +84,9 @@ private static List<String> getDtoLines(String addressUrl, String qualifiedPacka
                 return null;
             }
         }
-        catch (URISyntaxException e) {
-            e.printStackTrace();
-            DialogErrorMessages.appendInvalidEnpoint(errorMessage, addressUrl, e);
-            return null;
-        } catch (MalformedURLException e) {
+        catch (URISyntaxException | MalformedURLException e) {
             e.printStackTrace();
-            DialogErrorMessages.appendInvalidEnpoint(errorMessage, addressUrl, e);
+            DialogErrorMessages.appendInvalidEndpoint(errorMessage, addressUrl, e);
             return null;
         } catch (IOException e) {
             e.printStackTrace();
@@ -122,7 +107,7 @@ private static INativeTypesHandler getNativeTypesHandler(String fileName) {
     private static boolean tryAddMavenDependency(Module module) {
         boolean showDto;
         String message = "Unable to locate module pom.xml file. Can't add required dependency '" +
-                dependencyGroupId + ":" + clientPackageId + ":" + dependencyVersion +
+                DepConfig.getClientVersionString() +
                 "'.";
         Notification notification = new Notification(
                 "ServiceStackIDEA",
@@ -137,7 +122,8 @@ private static boolean tryAddMavenDependency(Module module) {
                 return false;
             }
             File pomLibFile = new File(pomFilePath);
-            showDto = pomFileHelper.addMavenDependency(module,pomLibFile, dependencyGroupId, clientPackageId, dependencyVersion);
+            showDto = pomFileHelper.addMavenDependency(module,pomLibFile, DepConfig.servicestackGroupId, DepConfig.clientPackageId, DepConfig.servicestackVersion) ||
+                      pomFileHelper.addMavenDependency(module,pomLibFile, DepConfig.gsonGroupId, DepConfig.gsonPackageId, DepConfig.gsonVersion);
             IDEAUtils.refreshFile(module,pomFilePath,showDto);
         } catch(Exception e) {
             showDto = false;
@@ -153,12 +139,12 @@ private static boolean tryAddMavenDependency(Module module) {
     }
 
     private static boolean addGradleDependencyIfRequired(Module module) throws FileNotFoundException {
-        boolean result = false;
-        if(GradleBuildFileHelper.addDependency(module,dependencyGroupId, androidPackageId, dependencyVersion)) {
-            result = true;
+        if (GradleBuildFileHelper.addDependency(module, DepConfig.servicestackGroupId, DepConfig.androidPackageId, DepConfig.servicestackVersion) ||
+            GradleBuildFileHelper.addDependency(module, DepConfig.gsonGroupId, DepConfig.gsonPackageId, DepConfig.gsonVersion)) {
             IDEAUtils.refreshBuildFile(module);
+            return true;
         }
-        return result;
+        return false;
     }
 
     private static String getDtoPath(Module module, String qualifiedPackageName, String selectedDirectory, String fileName, StringBuilder errorMessage) throws FileNotFoundException {
@@ -199,8 +185,7 @@ private static String getDtoPath(Module module, String qualifiedPackageName, Str
     public static String getDtoFileName(String name) {
         INativeTypesHandler nativeTypesHandler = getNativeTypesHandler(name);
         int p = name.lastIndexOf(".");
-        String e = name.substring(p);
-        if (p == -1 || !e.equals(nativeTypesHandler.getFileExtension())) {
+        if (p == -1 || !name.substring(p).equals(nativeTypesHandler.getFileExtension())) {
             /* file has no extension */
             return name + nativeTypesHandler.getFileExtension();
         } else {
@@ -212,8 +197,7 @@ public static String getDtoFileName(String name) {
     public static String getDtoNameWithoutExtension(String name) {
         INativeTypesHandler nativeTypesHandler = getNativeTypesHandler(name);
         int p = name.lastIndexOf(".");
-        String e = name.substring(p);
-        if (p == -1 || !e.equals(nativeTypesHandler.getFileExtension())) {
+        if (p == -1 || !name.substring(p).equals(nativeTypesHandler.getFileExtension())) {
             /* file has no extension */
             return name;
         } else {

src/ServiceStackIDEA/.idea/workspace.xml

@@ -27,7 +27,7 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         dialog.setTitle("Add TypeScript ServiceStack Reference");
         PsiElement element = LangDataKeys.PSI_ELEMENT.getData(anActionEvent.getDataContext());
         INativeTypesHandler defaultTsNativeTypesHandler = new TypeScriptNativeTypesHandler();
-        if (element != null && element instanceof PsiDirectory) {
+        if (element instanceof PsiDirectory) {
             PsiDirectory selectedDir = (PsiDirectory)element;
             dialog.setSelectedDirectory(selectedDir.getVirtualFile().getPath());
             String initialName = getInitialFileName(selectedDir.getVirtualFile().getPath(),defaultTsNativeTypesHandler);
@@ -58,11 +58,11 @@ private String getInitialFileName(String path, INativeTypesHandler defaultTsNati
     @Override
     public void update(AnActionEvent e) {
         Module module = getModule(e);
-        if(module == null) {
+        if (module == null) {
             e.getPresentation().setEnabled(false);
         }
 
-        if(!(PlatformUtils.isWebStorm() || PlatformUtils.isPhpStorm() ||
+        if (!(PlatformUtils.isWebStorm() || PlatformUtils.isPhpStorm() ||
                 PlatformUtils.isRubyMine() || PlatformUtils.isIntelliJ() ||
                 PlatformUtils.isPyCharm())) {
             e.getPresentation().setVisible(false);

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddRef.java

@@ -53,21 +53,11 @@ private static List<String> getDtoLines(String addressUrl, INativeTypesHandler n
                 errorMessage.append("The address url is not a valid ServiceStack endpoint.");
                 return null;
             }
-        } catch (URISyntaxException e) {
+        } catch (URISyntaxException | MalformedURLException | FileNotFoundException e) {
             e.printStackTrace();
-            DialogErrorMessages.appendInvalidEnpoint(errorMessage, addressUrl, e);
+            DialogErrorMessages.appendInvalidEndpoint(errorMessage, addressUrl, e);
             return null;
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-            DialogErrorMessages.appendInvalidEnpoint(errorMessage, addressUrl, e);
-            return null;
-        }
-        catch (FileNotFoundException e) {
-            e.printStackTrace();
-            DialogErrorMessages.appendInvalidEnpoint(errorMessage, addressUrl, e);
-            return null;
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
             DialogErrorMessages.appendReadResponseError(errorMessage, addressUrl, e);
             return null;