Fix PUT/PATCH return types + clearing checkstyle

Brian Melton · Brian Melton · commit 2db804bf6be3 · 2016-10-10T13:26:52.000-07:00
diff --git a/Templates/Android/BaseModel.template.tt b/Templates/Android/BaseModel.template.tt
@@ -5,7 +5,7 @@
     CustomT4Host host          = (CustomT4Host) Host;
     var model                  = host.CurrentModel;
     CodeWriterAndroid writer   = (CodeWriterAndroid) host.CodeWriter;
-    bool logTemplateSrc        = false;
+    bool logTemplateSrc        = true;
     var c = host.CurrentType;
 #>
 <# if (logTemplateSrc) { #>
diff --git a/Templates/Android/generated/BaseClient.java.tt b/Templates/Android/generated/BaseClient.java.tt
@@ -35,7 +35,6 @@ foreach (var prop in model.EntityContainer.Properties)
     var propertyName = prop.Name.ToUpperFirstChar();
     if (prop.IsCollection())
     {
-        var requestCollectionBuilder = TypeCollectionRequestBuilder(prop);
 #>
 
     /**
diff --git a/Templates/Android/generated/BaseEntityCollectionReferenceRequest.java.tt b/Templates/Android/generated/BaseEntityCollectionReferenceRequest.java.tt
@@ -14,7 +14,7 @@
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      */
     public <#=BaseTypeCollectionReferenceRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final List<Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
diff --git a/Templates/Android/generated/BaseEntityCollectionRequest.java.tt b/Templates/Android/generated/BaseEntityCollectionRequest.java.tt
@@ -14,7 +14,7 @@
      *
      * @param requestUrl The request url
      * @param client The service client
-     * @param options The options for this request
+     * @param requestOptions The options for this request
      */
     public <#=BaseTypeCollectionRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final List<Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
diff --git a/Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt b/Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt
@@ -50,7 +50,6 @@ if (c.AsOdcmClass() != null)
     foreach(var prop in c.AsOdcmClass().NavigationProperties())
     {
         var propName = prop.Name.ToUpperFirstChar();
-        var propRequestBuilder = TypeRequestBuilder(prop);
         if (prop.IsCollection()) {
 #>
     public <#=ITypeCollectionRequestBuilder(prop)#> get<#=propName#>() {
diff --git a/Templates/Android/generated/BaseMethodRequest.java.tt b/Templates/Android/generated/BaseMethodRequest.java.tt
@@ -24,7 +24,7 @@ if (c.AsOdcmMethod().IsAction()) {
     if (c.AsOdcmMethod().ReturnType != null) {
 #>
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
@@ -33,7 +33,7 @@ if (c.AsOdcmMethod().IsAction()) {
     }
 
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
      * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
@@ -93,7 +93,7 @@ if (c.AsOdcmMethod().IsAction()) {
     } else {
 #>
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
@@ -113,9 +113,8 @@ if (c.AsOdcmMethod().IsAction()) {
     }
 
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
-     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
     public void post() throws ClientException {
@@ -128,7 +127,7 @@ if (c.AsOdcmMethod().IsAction()) {
         if (c.AsOdcmMethod().IsComposable) {
 #>
     /**
-     * Patches the <#=ReturnType(c)#>
+     * Patches the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure
      */
@@ -137,17 +136,17 @@ if (c.AsOdcmMethod().IsAction()) {
     }
 
     /**
-     * Patches the <#=ReturnType(c)#>
+     * Patches the <#=TypeName(c)#>
      *
      * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent
      */
-     public void patch() throws ClientException {
-        this.send(HttpMethod.PATCH, null);
+     public <#=ReturnType(c)#> patch() throws ClientException {
+        return this.send(HttpMethod.PATCH, null);
     }
 
     /**
-     * Puts the <#=ReturnType(c)#>
+     * Puts the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure
      */
@@ -156,13 +155,13 @@ if (c.AsOdcmMethod().IsAction()) {
     }
 
     /**
-     * Puts the <#=ReturnType(c)#>
+     * Puts the <#=TypeName(c)#>
      *
      * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent
      */
-     public void put() throws ClientException {
-        this.send(HttpMethod.PUT, null);
+     public <#=ReturnType(c)#> put() throws ClientException {
+        return this.send(HttpMethod.PUT, null);
     }
 <#
         }
diff --git a/Templates/Android/generated/IBaseClient.java.tt b/Templates/Android/generated/IBaseClient.java.tt
@@ -12,7 +12,6 @@ foreach (var prop in model.EntityContainer.Properties)
     var propertyName = prop.Name.ToUpperFirstChar();
     if (prop.IsCollection())
     {
-        var requestCollectionBuilder = TypeCollectionRequestBuilder(prop);
 #>
 
     /**
diff --git a/Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt b/Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt
@@ -33,7 +33,6 @@ if (c.AsOdcmClass() != null)
     foreach(var prop in c.AsOdcmClass().NavigationProperties())
     {
         var propName = prop.Name.ToUpperFirstChar();
-        var propRequestBuilder = TypeRequestBuilder(prop);
         if (prop.IsCollection()) {
 #>
 
diff --git a/Templates/Android/generated/IBaseMethodRequest.java.tt b/Templates/Android/generated/IBaseMethodRequest.java.tt
@@ -16,14 +16,14 @@ if (c.AsOdcmMethod().IsAction()) {
     if (c.AsOdcmMethod().ReturnType != null) {
 #>
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
     void post(final ICallback<<#=ReturnType(c)#>> callback);
 
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
      * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
@@ -73,16 +73,15 @@ if (c.AsOdcmMethod().IsAction()) {
     } else {
 #>
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
     void post(final ICallback<Void> callback);
 
     /**
-     * Creates the <#=ReturnType(c)#>
+     * Creates the <#=TypeName(c)#>
      *
-     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
     void post() throws ClientException;
@@ -94,34 +93,34 @@ if (c.AsOdcmMethod().IsAction()) {
         if (c.AsOdcmMethod().IsComposable) {
 #>
     /**
-     * Patches the <#=ReturnType(c)#>
+     * Patches the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure
      */
-    public void patch(final ICallback<<#=ReturnType(c)#>> callback);
+    void patch(final ICallback<<#=ReturnType(c)#>> callback);
 
     /**
-     * Patches the <#=ReturnType(c)#>
+     * Patches the <#=TypeName(c)#>
      *
      * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent
      */
-     public void patch() throws ClientException;
+    <#=ReturnType(c)#> patch() throws ClientException;
 
     /**
-     * Puts the <#=ReturnType(c)#>
+     * Puts the <#=TypeName(c)#>
      *
      * @param callback The callback to be called after success or failure
      */
-    public void put(final ICallback<<#=ReturnType(c)#>> callback);
+    void put(final ICallback<<#=ReturnType(c)#>> callback);
 
     /**
-     * Puts the <#=ReturnType(c)#>
+     * Puts the <#=TypeName(c)#>
      *
      * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent
      */
-     public void put() throws ClientException;
+     <#=ReturnType(c)#> put() throws ClientException;
 <#
         }
 #>

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ foreach (var prop in model.EntityContainer.Properties)`
`35`	`35`	`var propertyName = prop.Name.ToUpperFirstChar();`
`36`	`36`	`if (prop.IsCollection())`
`37`	`37`	`{`
`38`		`- var requestCollectionBuilder = TypeCollectionRequestBuilder(prop);`
`39`	`38`	`#>`
`40`	`39`
`41`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* @param requestUrl The request url`
`16`	`16`	`* @param client The service client`
`17`		`- * @param options The options for this request`
	`17`	`+ * @param requestOptions The options for this request`
`18`	`18`	`*/`
`19`	`19`	`public <#=BaseTypeCollectionReferenceRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final List<Option> requestOptions) {`
`20`	`20`	`super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ if (c.AsOdcmClass() != null)`
`50`	`50`	`foreach(var prop in c.AsOdcmClass().NavigationProperties())`
`51`	`51`	`{`
`52`	`52`	`var propName = prop.Name.ToUpperFirstChar();`
`53`		`- var propRequestBuilder = TypeRequestBuilder(prop);`
`54`	`53`	`if (prop.IsCollection()) {`
`55`	`54`	`#>`
`56`	`55`	`public <#=ITypeCollectionRequestBuilder(prop)#> get<#=propName#>() {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ if (c.AsOdcmMethod().IsAction()) {`
`24`	`24`	`if (c.AsOdcmMethod().ReturnType != null) {`
`25`	`25`	`#>`
`26`	`26`	`/**`
`27`		`- * Creates the <#=ReturnType(c)#>`
	`27`	`+ * Creates the <#=TypeName(c)#>`
`28`	`28`	`*`
`29`	`29`	`* @param callback The callback to be called after success or failure.`
`30`	`30`	`*/`
`@@ -33,7 +33,7 @@ if (c.AsOdcmMethod().IsAction()) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * Creates the <#=ReturnType(c)#>`
	`36`	`+ * Creates the <#=TypeName(c)#>`
`37`	`37`	`*`
`38`	`38`	`* @return The <#=ReturnType(c)#>`
`39`	`39`	`* @throws ClientException An exception occurs if there was an error while the request was sent.`
`@@ -93,7 +93,7 @@ if (c.AsOdcmMethod().IsAction()) {`
`93`	`93`	`} else {`
`94`	`94`	`#>`
`95`	`95`	`/**`
`96`		`- * Creates the <#=ReturnType(c)#>`
	`96`	`+ * Creates the <#=TypeName(c)#>`
`97`	`97`	`*`
`98`	`98`	`* @param callback The callback to be called after success or failure.`
`99`	`99`	`*/`
`@@ -113,9 +113,8 @@ if (c.AsOdcmMethod().IsAction()) {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`116`		`- * Creates the <#=ReturnType(c)#>`
	`116`	`+ * Creates the <#=TypeName(c)#>`
`117`	`117`	`*`
`118`		`- * @return The <#=ReturnType(c)#>`
`119`	`118`	`* @throws ClientException An exception occurs if there was an error while the request was sent.`
`120`	`119`	`*/`
`121`	`120`	`public void post() throws ClientException {`
`@@ -128,7 +127,7 @@ if (c.AsOdcmMethod().IsAction()) {`
`128`	`127`	`if (c.AsOdcmMethod().IsComposable) {`
`129`	`128`	`#>`
`130`	`129`	`/**`
`131`		`- * Patches the <#=ReturnType(c)#>`
	`130`	`+ * Patches the <#=TypeName(c)#>`
`132`	`131`	`*`
`133`	`132`	`* @param callback The callback to be called after success or failure`
`134`	`133`	`*/`
`@@ -137,17 +136,17 @@ if (c.AsOdcmMethod().IsAction()) {`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`/**`
`140`		`- * Patches the <#=ReturnType(c)#>`
	`139`	`+ * Patches the <#=TypeName(c)#>`
`141`	`140`	`*`
`142`	`141`	`* @return The <#=ReturnType(c)#>`
`143`	`142`	`* @throws ClientException An exception occurs if there was an error while the request was sent`
`144`	`143`	`*/`
`145`		`- public void patch() throws ClientException {`
`146`		`- this.send(HttpMethod.PATCH, null);`
	`144`	`+ public <#=ReturnType(c)#> patch() throws ClientException {`
	`145`	`+ return this.send(HttpMethod.PATCH, null);`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`/**`
`150`		`- * Puts the <#=ReturnType(c)#>`
	`149`	`+ * Puts the <#=TypeName(c)#>`
`151`	`150`	`*`
`152`	`151`	`* @param callback The callback to be called after success or failure`
`153`	`152`	`*/`
`@@ -156,13 +155,13 @@ if (c.AsOdcmMethod().IsAction()) {`
`156`	`155`	`}`
`157`	`156`
`158`	`157`	`/**`
`159`		`- * Puts the <#=ReturnType(c)#>`
	`158`	`+ * Puts the <#=TypeName(c)#>`
`160`	`159`	`*`
`161`	`160`	`* @return The <#=ReturnType(c)#>`
`162`	`161`	`* @throws ClientException An exception occurs if there was an error while the request was sent`
`163`	`162`	`*/`
`164`		`- public void put() throws ClientException {`
`165`		`- this.send(HttpMethod.PUT, null);`
	`163`	`+ public <#=ReturnType(c)#> put() throws ClientException {`
	`164`	`+ return this.send(HttpMethod.PUT, null);`
`166`	`165`	`}`
`167`	`166`	`<#`
`168`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ foreach (var prop in model.EntityContainer.Properties)`
`12`	`12`	`var propertyName = prop.Name.ToUpperFirstChar();`
`13`	`13`	`if (prop.IsCollection())`
`14`	`14`	`{`
`15`		`- var requestCollectionBuilder = TypeCollectionRequestBuilder(prop);`
`16`	`15`	`#>`
`17`	`16`
`18`	`17`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ if (c.AsOdcmClass() != null)`
`33`	`33`	`foreach(var prop in c.AsOdcmClass().NavigationProperties())`
`34`	`34`	`{`
`35`	`35`	`var propName = prop.Name.ToUpperFirstChar();`
`36`		`- var propRequestBuilder = TypeRequestBuilder(prop);`
`37`	`36`	`if (prop.IsCollection()) {`
`38`	`37`	`#>`
`39`	`38`