Skip to content

Revert change that caused duplicate actions #60

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
zengin merged 1 commit into from
Jan 27, 2021
Merged

Revert change that caused duplicate actions #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 11 additions & 34 deletions transforms/csdl/preprocess_csdl.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,41 +285,18 @@
<xsl:template match="edm:Schema[@Namespace='microsoft.graph.callRecords']/edm:Function[@Name='getDirectRoutingCalls']"/>
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Function[@Name='delta'][edm:Parameter[@Name='token']][edm:Parameter[@Type='Collection(graph.site)']]"/>

<!-- accept, decline and tentativelyAccept action signatures have changed. Following rule set keeps the old signaure in the clean metadata.
New signatures are copied as is, so we have redundant implmenetations to avoid breaking change for existing client applications. -->
<xsl:template name="BackwardsCompatibleEventAction">
<xsl:param name="actionName" />
<xsl:element name="Action">
<xsl:attribute name="Name"><xsl:value-of select = "$actionName" /></xsl:attribute>
<xsl:attribute name="IsBound">true</xsl:attribute>
<xsl:element name="Parameter">
<xsl:attribute name="Name">bindingParameter</xsl:attribute>
<xsl:attribute name="Type">graph.event</xsl:attribute>
</xsl:element>
<xsl:element name="Parameter">
<xsl:attribute name="Name">Comment</xsl:attribute>
<xsl:attribute name="Type">Edm.String</xsl:attribute>
<xsl:attribute name="Unicode">false</xsl:attribute>
</xsl:element>
<xsl:element name="Parameter">
<xsl:attribute name="Name">SendResponse</xsl:attribute>
<xsl:attribute name="Type">Edm.Boolean</xsl:attribute>
</xsl:element>
</xsl:element>
</xsl:template>
<!-- Reorder action parameters -->

<xsl:template match="edm:Schema[@Namespace='microsoft.graph']">
<xsl:copy>
<xsl:apply-templates select="@* | node()"/>
<xsl:call-template name="BackwardsCompatibleEventAction">
<xsl:with-param name="actionName">accept</xsl:with-param>
</xsl:call-template>
<xsl:call-template name="BackwardsCompatibleEventAction">
<xsl:with-param name="actionName">decline</xsl:with-param>
</xsl:call-template>
<xsl:call-template name="BackwardsCompatibleEventAction">
<xsl:with-param name="actionName">tentativelyAccept</xsl:with-param>
</xsl:call-template>
<!-- These actions have the same parameters that need reordering. Will need to create a new template
for each reordering. -->
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='accept'][.//edm:Parameter[@Name='bindingParameter'][@Type='graph.event']]|
edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='decline'][.//edm:Parameter[@Name='bindingParameter'][@Type='graph.event']]|
edm:Schema[@Namespace='microsoft.graph']/edm:Action[@Name='tentativelyAccept'][.//edm:Parameter[@Name='bindingParameter'][@Type='graph.event']]">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates select="edm:Parameter[@Name='bindingParameter'][@Type='graph.event']" />
<xsl:apply-templates select="edm:Parameter[@Name='Comment']" />
<xsl:apply-templates select="edm:Parameter[@Name='SendResponse']" />
</xsl:copy>
</xsl:template>

Expand Down
7 changes: 5 additions & 2 deletions transforms/csdl/preprocess_csdl_test_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,18 @@
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
</Action>
<Action Name="accept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.eventMessage" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
</Action>
<Action Name="decline" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
</Action>
<Action Name="tentativelyAccept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
</Action>
Expand Down
26 changes: 7 additions & 19 deletions transforms/csdl/preprocess_csdl_test_output.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,20 +300,23 @@
</EntityContainer>
<Action Name="accept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
</Action>
<Action Name="accept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.eventMessage" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
</Action>
<Action Name="decline" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
</Action>
<Action Name="tentativelyAccept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="ProposedNewTime" Type="graph.timeSlot" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
</Action>
<Action Name="createUploadSession" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.driveItem" />
Expand All @@ -324,21 +327,6 @@
<Parameter Name="bindingParameter" Type="Collection(graph.site)" />
<ReturnType Type="Collection(graph.site)" />
</Function>
<Action Name="accept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
</Action>
<Action Name="decline" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
</Action>
<Action Name="tentativelyAccept" IsBound="true">
<Parameter Name="bindingParameter" Type="graph.event" />
<Parameter Name="Comment" Type="Edm.String" Unicode="false" />
<Parameter Name="SendResponse" Type="Edm.Boolean" />
</Action>
</Schema>
<Schema Namespace="microsoft.graph.callRecords" xmlns="http://docs.oasis-open.org/odata/ns/edm">
<EnumType Name="callType">
Expand Down