Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Java

Author: mythz

src/ServiceStackIDEA/.idea/workspace.xml

@@ -1,17 +1,16 @@
 <idea-plugin version="2">
   <id>net.servicestack.ideaplugin</id>
-  <name>ServiceStackIDEA</name>
+  <name>ServiceStack</name>
   <version>1.0</version>
   <vendor email="team@servicestack.net" url="https://servicestack.net/">ServiceStack</vendor>
 
   <description><![CDATA[
-      Enter short description for your plugin here.<br>
-      <em>most HTML tags may be used</em>
+      Integration with ServiceStack Web Services, includes support for Java Add ServiceStack Reference.
     ]]></description>
 
   <change-notes><![CDATA[
-      Add change notes here.<br>
-      <em>most HTML tags may be used</em>
+      1.0 - Initial release.<br>
+      <em></em>
     ]]>
   </change-notes>
 
@@ -27,7 +26,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
     <intentionAction>
-      <className>UpdateServiceStackReference</className>
+      <className>UpdateServiceStackReferenceIntention</className>
       <category>ServiceStack</category>
       <descriptionDirectoryName>ServiceStack</descriptionDirectoryName>
     </intentionAction>
@@ -47,5 +46,9 @@
       <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewAction"/>
       <keyboard-shortcut keymap="$default" first-keystroke="shift ctrl alt R"/>
     </action>
+    <action id="UpdateServiceStackReference" class="UpdateServiceStackReference" text="Update ServiceStack Reference" icon="/icons/logo-16.png"
+            description="Updates the selected ServiceStack reference.">
+      <add-to-group group-id="ProjectViewPopupMenu"/>
+    </action>
   </actions>
 </idea-plugin>

src/ServiceStackIDEA/META-INF/plugin.xml

@@ -0,0 +1,51 @@
+## AndroidStudio ServiceStack Plugin
+
+ServiceStackIDEA is a plugin for AndroidStudio to make working with ServiceStack services easier when building Android apps. 
+
+Using this plugin, you can add a ServiceStack reference to your existing Android application which generates required POJOs for interactive with the specific ServiceStack server.
+
+![](https://github.com/ServiceStack/Assets/raw/master/img/servicestackidea/android-context-menu.png)
+
+Once added, the plugin also adds a reference to the ServiceStack.Android library which uses the ServiceStack.Client Java library to to make HTTP requests. 
+
+```
+AndroidServiceClient client = new AndroidServiceClient("http://techstacks.io");
+client.getAsync(new AppOverview(), new AsyncResult<AppOverviewResponse>() {
+                @Override
+                public void success(AppOverviewResponse response){
+                    appOverviewResponse = response;
+                    onUpdate(DataType.AppOverview);
+                }
+            });
+```
+
+This reduces the amount of code required when interacting with ServiceStack web services and also reduces guesswork around request and response types by using the generated POJOs.
+
+![](https://github.com/ServiceStack/Assets/raw/master/img/servicestackidea/android-client-example.gif)
+
+#### Add a ServiceStack Reference
+
+To add a ServiceStack reference, right click on a file or folder inside your project module.
+> Alternatively, select the module/package folder/Java file and press **Ctrl+Alt+Shift+R**.
+
+![](https://github.com/ServiceStack/Assets/raw/master/img/servicestackidea/android-dialog.png)
+
+If you right click of an existing Java class (with a package) or package folder, the package field will be populated automatically.
+
+![](https://github.com/ServiceStack/Assets/raw/master/img/servicestackidea/android-dialog-example.gif)
+
+Then provide the base URL to the ServiceStack server. This is usually the domian where your ServiceStack application is hosted.
+
+Also, you can change the required file name for where the POJOs will be stored.
+
+The Java file will then be added to the related package or `/src/main/java` folder of the module. If it has not already been added, the Module's `build.gradle` dependencies will be updated with the `net.servicestack:android` client dependency.
+
+#### Update ServiceStack Reference
+
+Once you have added a ServiceStack reference, it can be easily updated by using AndroidStudio `Intension` shortcut, usually Alt+Enter when in the file.
+
+![](https://github.com/ServiceStack/Assets/raw/master/img/servicestackidea/android-update-example.gif)
+
+This will read all of the used options in the commented file header to generate a new request. This can be handy if the server has been updated and you need to update your client side POJOs, or if you want to include get/set methods by default.
+
+For documentation on all options for both server and client, see the Java Add ServiceStack Reference wiki page. 

src/ServiceStackIDEA/README.MD

@@ -0,0 +1,7 @@
+<html>
+<body>
+Update the current ServiceStack reference.
+<!-- tooltip end -->
+
+</body>
+</html>

src/ServiceStackIDEA/ServiceStackIDEA.zip

@@ -9,7 +9,7 @@
       <maximumSize width="550" height="220"/>
       <minimumSize width="400" height="220"/>
       <opaque value="true"/>
-      <preferredSize width="550" height="220"/>
+      <preferredSize width="550" height="300"/>
       <requestFocusEnabled value="true"/>
     </properties>
     <border type="none"/>
@@ -65,20 +65,6 @@
         </properties>
         <border type="none"/>
         <children>
-          <component id="e88c4" class="javax.swing.JTextPane" binding="errorTextPane">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="50"/>
-              </grid>
-            </constraints>
-            <properties>
-              <editable value="false"/>
-              <focusCycleRoot value="false"/>
-              <focusable value="false"/>
-              <opaque value="false"/>
-              <visible value="false"/>
-            </properties>
-          </component>
           <component id="bc9e3" class="javax.swing.JTextPane" binding="infoTextPane">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
@@ -95,6 +81,31 @@
               <text value="To generate the DTO Service Model types for a specific ServiceStack instance, enter the base URI for the remote ServiceStack server and click OK."/>
             </properties>
           </component>
+          <grid id="76624" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="e88c4" class="javax.swing.JTextPane" binding="errorTextPane">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="2" hsize-policy="2" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                    <preferred-size width="150" height="25"/>
+                  </grid>
+                </constraints>
+                <properties>
+                  <editable value="false"/>
+                  <focusCycleRoot value="false"/>
+                  <focusable value="true"/>
+                  <font name="Arial"/>
+                  <opaque value="false"/>
+                  <visible value="false"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
         </children>
       </grid>
       <grid id="d865d" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">