Fix ServiceStackIDEA to match URL behavior of SSVS

Layoric · Layoric · commit a7bb0301625b · 2016-05-27T09:01:47.000+10:00
diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/BaseNativeTypesHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/BaseNativeTypesHandler.java
@@ -49,6 +49,7 @@ public URIBuilder getUrl(String baseUrl, Map<String, String> options) throws Mal
         if (!path.endsWith(this.getRelativeTypesUrl() + "/")) {
             serverUrl += (this.getRelativeTypesUrl() + "/");
         }
+        serverUrl = toParentPath(serverUrl);
         URIBuilder builder;
 
         try {
@@ -59,4 +60,11 @@ public URIBuilder getUrl(String baseUrl, Map<String, String> options) throws Mal
         }
         return builder;
     }
+
+    public static String toParentPath(String path)
+    {
+        int pos = path.lastIndexOf("/");
+        if (pos == -1) return "/";
+        return path.substring(0, pos);
+    }
 }
diff --git a/src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml b/src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml
@@ -9,7 +9,8 @@
     ]]></description>
 
   <change-notes><![CDATA[
-      1.0.9 - Fix plugin to support Android Studio 2.0.
+      1.0.10 - Fix issue with resolving URL to match behavior of other extensions. <br />
+      1.0.9 - Fix plugin to support Android Studio 2.0. <br />
       1.0.8 - Add support for Kotlin projects with Add/Update ServiceStack reference. <br />
       1.0.7 - Bug fixes and client now gets dependency version from ServiceStack.Java tags, falls back to 1.0.15 if it fails. <br />
       1.0.6 - Update client and android dependency versions to 1.0.13. <br />
diff --git a/src/ServiceStackIDEA/src/test/java/AddRefTest.java b/src/ServiceStackIDEA/src/test/java/AddRefTest.java
@@ -28,9 +28,9 @@ public void testCreateUrl() throws MalformedURLException, URISyntaxException {
         INativeTypesHandler javaNativeTypesHanlder = new JavaNativeTypesHandler();
         INativeTypesHandler kotlinNativeTypesHandler = new KotlinNativeTypesHandler();
         URIBuilder javaUriBuilder = javaNativeTypesHanlder.getUrl("techstacks.io", null);
-        assertEquals(javaUriBuilder.build().toString(),"http://techstacks.io/types/java/");
+        assertEquals(javaUriBuilder.build().toString(),"http://techstacks.io/types/java");
 
         URIBuilder kotlinUriBuilder = kotlinNativeTypesHandler.getUrl("techstacks.io", null);
-        assertEquals(kotlinUriBuilder.build().toString(),"http://techstacks.io/types/kotlin/");
+        assertEquals(kotlinUriBuilder.build().toString(),"http://techstacks.io/types/kotlin");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public URIBuilder getUrl(String baseUrl, Map<String, String> options) throws Mal`
`49`	`49`	`if (!path.endsWith(this.getRelativeTypesUrl() + "/")) {`
`50`	`50`	`serverUrl += (this.getRelativeTypesUrl() + "/");`
`51`	`51`	`}`
	`52`	`+ serverUrl = toParentPath(serverUrl);`
`52`	`53`	`URIBuilder builder;`
`53`	`54`
`54`	`55`	`try {`
`@@ -59,4 +60,11 @@ public URIBuilder getUrl(String baseUrl, Map<String, String> options) throws Mal`
`59`	`60`	`}`
`60`	`61`	`return builder;`
`61`	`62`	`}`
	`63`	`+`
	`64`	`+ public static String toParentPath(String path)`
	`65`	`+ {`
	`66`	`+ int pos = path.lastIndexOf("/");`
	`67`	`+ if (pos == -1) return "/";`
	`68`	`+ return path.substring(0, pos);`
	`69`	`+ }`
`62`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ public void testCreateUrl() throws MalformedURLException, URISyntaxException {`
`28`	`28`	`INativeTypesHandler javaNativeTypesHanlder = new JavaNativeTypesHandler();`
`29`	`29`	`INativeTypesHandler kotlinNativeTypesHandler = new KotlinNativeTypesHandler();`
`30`	`30`	`URIBuilder javaUriBuilder = javaNativeTypesHanlder.getUrl("techstacks.io", null);`
`31`		`- assertEquals(javaUriBuilder.build().toString(),"http://techstacks.io/types/java/");`
	`31`	`+ assertEquals(javaUriBuilder.build().toString(),"http://techstacks.io/types/java");`
`32`	`32`
`33`	`33`	`URIBuilder kotlinUriBuilder = kotlinNativeTypesHandler.getUrl("techstacks.io", null);`
`34`		`- assertEquals(kotlinUriBuilder.build().toString(),"http://techstacks.io/types/kotlin/");`
	`34`	`+ assertEquals(kotlinUriBuilder.build().toString(),"http://techstacks.io/types/kotlin");`
`35`	`35`	`}`
`36`	`36`	`}`