Skip to content

Add DELETE/POST/PATCH to (I)EntityWithReferenceRequest #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caitlinrussell merged 2 commits into from
May 2, 2018
Merged

Add DELETE/POST/PATCH to (I)EntityWithReferenceRequest #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd91356
CSharp template updates to support withReferenceRequest generation
Apr 30, 2018
9c71a24
Add withReferenceRequest methods to Java/Android templates
Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Templates/Android/generated/BaseEntityWithReferenceRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@
return send(HttpMethod.GET, null);
}

public void delete(final ICallback<<#=TypeName(c)#>> callback) {
send(HttpMethod.DELETE, callback, null);
}

public void delete() throws ClientException {
send(HttpMethod.DELETE, null);
}

public void patch(final <#=TypeName(c)#> source<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback) {
send(HttpMethod.PATCH, callback, source<#=TypeName(c)#>);
}

public <#=TypeName(c)#> patch(final <#=TypeName(c)#> source<#=TypeName(c)#>) throws ClientException {
return send(HttpMethod.PATCH, source<#=TypeName(c)#>);
}

<# if (c.GetFeatures().CanSelect) { #>
/**
* Sets the select clause for the request
Expand Down
8 changes: 8 additions & 0 deletions Templates/Android/generated/IBaseEntityWithReferenceRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@

<#=TypeName(c)#> get() throws ClientException;

void delete(final ICallback<<#=TypeName(c)#>> callback);

void delete() throws ClientException;

void patch(final <#=TypeName(c)#> source<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback);

<#=TypeName(c)#> patch(final <#=TypeName(c)#> source<#=TypeName(c)#>) throws ClientException;

<# if (c.GetFeatures().CanSelect) { #>
<#=IBaseTypeWithReferencesRequest(c)#> select(final String value);

Expand Down
23 changes: 15 additions & 8 deletions Templates/CSharp/Base/EntityRequest.Base.template.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public void AppendCreateAsyncHeader(string entityName, string lowerCaseEntityNam
stringBuilder.AppendFormat(" /// <returns>The created {0}.</returns>", entityName);
}

public string GetEntityCreateAsyncMethod(OdcmClass odcmClass)
public string GetEntityCreateAsyncMethod(OdcmClass odcmClass, bool initializeCollectionProperties = true)
{
var stringBuilder = new StringBuilder();

Expand Down Expand Up @@ -238,10 +238,14 @@ public string GetEntityCreateAsyncMethod(OdcmClass odcmClass)
stringBuilder.Append(Environment.NewLine);
stringBuilder.AppendFormat(" var newEntity = await this.SendAsync<{0}>({1}ToCreate, cancellationToken).ConfigureAwait(false);", entityName, lowerCaseEntityName);
stringBuilder.Append(Environment.NewLine);
stringBuilder.Append(
@" this.InitializeCollectionProperties(newEntity);
return newEntity;
if (initializeCollectionProperties) {
stringBuilder.Append(
@" this.InitializeCollectionProperties(newEntity);");
stringBuilder.Append(Environment.NewLine);
}
stringBuilder.Append(@" return newEntity;
}");


return stringBuilder.ToString();
}
Expand Down Expand Up @@ -352,7 +356,7 @@ public void AppendUpdateAsyncHeader(string entityName, string lowerCaseEntityNam
stringBuilder.AppendFormat(" /// <returns>The updated {0}.</returns>", entityName);
}

public string GetEntityUpdateAsyncMethod(OdcmClass odcmClass)
public string GetEntityUpdateAsyncMethod(OdcmClass odcmClass, bool initializeCollectionProperties = true)
{
var stringBuilder = new StringBuilder();

Expand Down Expand Up @@ -393,9 +397,12 @@ public string GetEntityUpdateAsyncMethod(OdcmClass odcmClass)
stringBuilder.Append(Environment.NewLine);
stringBuilder.AppendFormat(" var updatedEntity = await this.SendAsync<{0}>({1}ToUpdate, cancellationToken).ConfigureAwait(false);", entityName, lowerCaseEntityName);
stringBuilder.Append(Environment.NewLine);
stringBuilder.Append(
@" this.InitializeCollectionProperties(updatedEntity);
return updatedEntity;
if (initializeCollectionProperties) {
stringBuilder.Append(
@" this.InitializeCollectionProperties(updatedEntity);");
stringBuilder.Append(Environment.NewLine);
}
stringBuilder.Append(@" return updatedEntity;
}");

return stringBuilder.ToString();
Expand Down
6 changes: 6 additions & 0 deletions Templates/CSharp/Requests/EntityWithReferenceRequest.cs.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ namespace <#=this.GetNamespaceName(entity)#>

<#=this.GetEntityGetAsyncMethod(entity, false)#>

<#=this.GetEntityCreateAsyncMethod(entity, false)#>

<#=this.GetEntityUpdateAsyncMethod(entity, false)#>

<#=this.GetEntityDeleteAsyncMethod(entity)#>

<#
if (features.CanExpand)
{
Expand Down
8 changes: 7 additions & 1 deletion Templates/CSharp/Requests/IEntityWithReferenceRequest.cs.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ namespace <#=this.GetNamespaceName(entity)#>

<#=this.GetEntityWithReferenceRequestInterfaceDefinition(entity)#>
{
<#=this.GetEntityGetAsyncMethod(entity)#>
<#=this.GetEntityGetAsyncMethod(entity, false)#>

<#=this.GetEntityCreateAsyncMethod(entity, false)#>

<#=this.GetEntityUpdateAsyncMethod(entity, false)#>

<#=this.GetEntityDeleteAsyncMethod(entity)#>

<#
if (features.CanExpand)
Expand Down
17 changes: 17 additions & 0 deletions Templates/Java/requests_generated/BaseEntityWithReferenceRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,23 @@
return send(HttpMethod.GET, null);
}

public void delete(final ICallback<<#=TypeName(c)#>> callback) {
send(HttpMethod.DELETE, callback, null);
}

public void delete() throws ClientException {
send(HttpMethod.DELETE, null);
}

public void patch(final <#=TypeName(c)#> source<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback) {
send(HttpMethod.PATCH, callback, source<#=TypeName(c)#>);
}

public <#=TypeName(c)#> patch(final <#=TypeName(c)#> source<#=TypeName(c)#>) throws ClientException {
return send(HttpMethod.PATCH, source<#=TypeName(c)#>);
}


<# if (c.GetFeatures().CanSelect) { #>
/**
* Sets the select clause for the request
Expand Down
8 changes: 8 additions & 0 deletions Templates/Java/requests_generated/IBaseEntityWithReferenceRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@

<#=TypeName(c)#> get() throws ClientException;

void delete(final ICallback<<#=TypeName(c)#>> callback);

void delete() throws ClientException;

void patch(final <#=TypeName(c)#> source<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback);

<#=TypeName(c)#> patch(final <#=TypeName(c)#> source<#=TypeName(c)#>) throws ClientException;

<# if (c.GetFeatures().CanSelect) { #>
<#=IBaseTypeWithReferencesRequest(c)#> select(final String value);

Expand Down