Update to version 1.4.2

Elhussein-Hamed · Dec 3, 2022 · a2c3f29 · a2c3f29
1 parent c10ad50
commit a2c3f29
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 35 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
     id("java")
-    id("org.jetbrains.intellij") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.8.0"
 }
 
 group = "com.hamed"
-version = "1.4.1"
+version = "1.4.2"
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/com/hamed/postmantoretrofit2v2/Model.java b/src/main/java/com/hamed/postmantoretrofit2v2/Model.java
@@ -162,28 +162,31 @@ private String getMethod(Collection.ItemBean item, boolean isDynamicHeader, Stri
 
     private String addFieldParams(Collection.ItemBean item, String result) {
 
-        //from Url-encoded
-        if(item.getRequest().getBody().getUrlencoded()!=null) {
-            StringBuilder resultBuilder = new StringBuilder(result);
-            for (Collection.ItemBean.RequestBean.BodyBean.UrlencodedBean urlencoded : item.getRequest().getBody().getUrlencoded()) {
-                resultBuilder.append("@Field(\"").append(urlencoded.getKey()).append("\") ").append("String ").append(urlencoded.getKey());
-                if (item.getRequest().getBody().getUrlencoded().indexOf(urlencoded) != item.getRequest().getBody().getUrlencoded().size() - 1)
-                    resultBuilder.append(", ");
+        // It is possible to have a Post without a body
+        if (item.getRequest().getBody() != null) {
+            //from Url-encoded
+            if (item.getRequest().getBody().getUrlencoded() != null) {
+                StringBuilder resultBuilder = new StringBuilder(result);
+                for (Collection.ItemBean.RequestBean.BodyBean.UrlencodedBean urlencoded : item.getRequest().getBody().getUrlencoded()) {
+                    resultBuilder.append("@Field(\"").append(urlencoded.getKey()).append("\") ").append("String ").append(urlencoded.getKey());
+                    if (item.getRequest().getBody().getUrlencoded().indexOf(urlencoded) != item.getRequest().getBody().getUrlencoded().size() - 1)
+                        resultBuilder.append(", ");
+                }
+                result = resultBuilder.toString();
+                return result + ");";
             }
-            result = resultBuilder.toString();
-            return result + ");";
-        }
 
-        //from form-data
-        if(item.getRequest().getBody().getFormdata()!=null) {
-            StringBuilder resultBuilder = new StringBuilder(result);
-            for (Collection.ItemBean.RequestBean.BodyBean.FormdataBean formdata : item.getRequest().getBody().getFormdata()) {
-                resultBuilder.append("@Field(\"").append(formdata.getKey()).append("\") ").append("String ").append(formdata.getKey());
-                if (item.getRequest().getBody().getFormdata().indexOf(formdata) != item.getRequest().getBody().getFormdata().size() - 1)
-                    resultBuilder.append(", ");
+            //from form-data
+            if (item.getRequest().getBody().getFormdata() != null) {
+                StringBuilder resultBuilder = new StringBuilder(result);
+                for (Collection.ItemBean.RequestBean.BodyBean.FormdataBean formdata : item.getRequest().getBody().getFormdata()) {
+                    resultBuilder.append("@Field(\"").append(formdata.getKey()).append("\") ").append("String ").append(formdata.getKey());
+                    if (item.getRequest().getBody().getFormdata().indexOf(formdata) != item.getRequest().getBody().getFormdata().size() - 1)
+                        resultBuilder.append(", ");
+                }
+                result = resultBuilder.toString();
+                return result + ");";
             }
-            result = resultBuilder.toString();
-            return result + ");";
         }
         return result+");";
     }

diff --git a/src/main/java/com/hamed/postmantoretrofit2v2/eventlisteners/MyBulkFileListener.java b/src/main/java/com/hamed/postmantoretrofit2v2/eventlisteners/MyBulkFileListener.java
@@ -35,11 +35,21 @@ public void before(@NotNull List<? extends @NotNull VFileEvent> events) {
     @Override
     public void after(@NotNull List<? extends @NotNull VFileEvent> events) {
         ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(mProject).getFileIndex();
+
+       if (mProject.getProjectFile() == null)
+       {
+           System.out.println("The project file doesn't seem to exit yet, " +
+                   "hence it cannot be used to deduce the project directory. " +
+                   "The following events are ignored: " + events);
+           return;
+       }
+
+        VirtualFile projectRootDir = projectFileIndex.getContentRootForFile(mProject.getProjectFile());
         events = events.stream()
                 .filter(event -> event.getFile() != null
                         && (projectFileIndex.isInContent(event.getFile())
-                        || event.getFile().getPath().contains(projectFileIndex.getContentRootForFile(mProject.getProjectFile()).getPath()))
-                        && event.getFile().getName().contains(".java"))
+                        || event.getFile().getPath().contains(projectRootDir.getPath())
+                        && event.getFile().getName().contains(".java")))
                 .collect(Collectors.toList());
 
         events.forEach(this::handleEvent);
@@ -66,7 +76,7 @@ private void handleEvent(VFileEvent event) {
             System.out.println("Handle event: " + event);
             if (event.getFile().getParent().equals(responseTypeClassesDirVirtualFile)) {
                 String filename = event.getFile().getName().replace(".java", "");
-                System.out.println("Removed file: " + event.getFile().toString());
+                System.out.println("Removed file: " + filename);
                 ArrayList<String> classesList = state.getResponseTypeClassesList();
                 if (classesList.contains(filename)) {
                     classesList.remove(filename);

diff --git a/src/main/java/com/hamed/postmantoretrofit2v2/eventlisteners/MyProjectStartupListener.java b/src/main/java/com/hamed/postmantoretrofit2v2/eventlisteners/MyProjectStartupListener.java
@@ -6,7 +6,7 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManagerListener;
+import com.intellij.openapi.startup.StartupActivity;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packageDependencies.ForwardDependenciesBuilder;
@@ -16,12 +16,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class MyProjectStartupListener implements ProjectManagerListener {
-    @Override
-    public void projectOpened(@NotNull Project project) {
-        ProjectManagerListener.super.projectOpened(project);
+public class MyProjectStartupListener implements StartupActivity {
 
+    @Override
+    public void runActivity(@NotNull Project project) {
         PluginState state = PluginService.getInstance(project).getState();
+        System.out.println("Re-calculate the ResponseTypeClassesList");
         if(!state.getResponseTypeClassesDirectory().isEmpty())
         {
             VirtualFile file = LocalFileSystem.getInstance().findFileByPath(state.getResponseTypeClassesDirectory());

diff --git a/src/main/java/com/hamed/postmantoretrofit2v2/forms/OptionsDialog.form b/src/main/java/com/hamed/postmantoretrofit2v2/forms/OptionsDialog.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.hamed.postmantoretrofit2v2.forms.OptionsDialog">
-  <grid id="27dc6" binding="panel1" default-binding="true" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="8" left="8" bottom="8" right="8"/>
     <constraints>
       <xy x="20" y="20" width="874" height="498"/>

diff --git a/src/main/java/com/hamed/postmantoretrofit2v2/forms/OptionsDialog.java b/src/main/java/com/hamed/postmantoretrofit2v2/forms/OptionsDialog.java
@@ -21,7 +21,7 @@
 import static javax.swing.JFileChooser.DIRECTORIES_ONLY;
 
 public class OptionsDialog extends JDialog {
-    private JPanel panel1;
+    private JPanel contentPane;
     private JLabel generationOptionsLabel;
     private JComboBox<String> responseTypeComboBox;
     private JButton buttonCancel;
@@ -49,7 +49,7 @@ public OptionsDialog(JDialog owner, Project project) {
         super(owner);
         mProject = project;
 
-        setContentPane(panel1);
+        setContentPane(contentPane);
         getRootPane().setDefaultButton(buttonOk);
         System.out.println("OptionsDialog");
         storedSelectedResponseType = "";
@@ -101,7 +101,7 @@ public void windowClosing(WindowEvent e) {
         });
 
         // call onCancel() on ESCAPE
-        panel1.registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        contentPane.registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
     }
 
     private void onResponseTypeComboBoxChanged(ActionEvent e) {

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -21,6 +21,13 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <h2>1.4.2</h2>
+        <h3>Bug fixes</h3>
+        <ul>
+          <li>Fixed exception when a new project is created</li>
+          <li>Fixed exception when parsing a Post request without a body in Postman collection (<a href="https://github.com/Elhussein-Hamed/PostmanToRetrofit2-v2/issues/4#issue">Issue #4</a>)</li>
+        </ul>
+
         <h2>1.4.1</h2>
         <h3>Improvements</h3>
         <ul>
@@ -74,6 +81,7 @@
     <extensions defaultExtensionNs="com.intellij">
         <projectService serviceImplementation="com.hamed.postmantoretrofit2v2.PluginService"/>
         <errorHandler implementation="com.hamed.postmantoretrofit2v2.errorreporting.PluginErrorReportSubmitter"/>
+        <postStartupActivity implementation="com.hamed.postmantoretrofit2v2.eventlisteners.MyProjectStartupListener"/>
     </extensions>
 
     <actions>
@@ -87,8 +95,6 @@
     <projectListeners>
         <listener class="com.hamed.postmantoretrofit2v2.eventlisteners.MyBulkFileListener"
                   topic="com.intellij.openapi.vfs.newvfs.BulkFileListener"/>
-        <listener class="com.hamed.postmantoretrofit2v2.eventlisteners.MyProjectStartupListener"
-                  topic="com.intellij.openapi.project.ProjectManagerListener"/>
     </projectListeners>
 
 </idea-plugin>