Skip to content

[class-parse] Fix Java parameter loader for generics involved methods. #215

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
merged 1 commit into from
Nov 16, 2017
Merged

[class-parse] Fix Java parameter loader for generics involved methods. #215

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
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.Bytecode/JavaParameterNamesLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ List<Package> LoadParameterFixupDescription (string path)
Name = name,
Parameters = parameters.Replace (", ", "\0").Split ('\0')
.Select (s => s.Split (' '))
.Select (a => new Parameter { Type = string.Join (" ", a.Take (a.Length - 1)), Name = a.Last () }).ToList ()
.Select (a => new Parameter { Type = string.Join (" ", a.Take (a.Length - 1)).Replace (",", ", "), Name = a.Last () }).ToList ()
});
} else {
type = line.Substring (line.IndexOf (' ', 2) + 1);
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Tools.Bytecode/Tests/ParameterDescription.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ package java.util ; Anything after semicolon is comment.
class Collection<E>
add(E e)
#ctor()

package com.xamarin
interface NestedInterface.DnsSdTxtRecordListener
onDnsSdTxtRecordAvailable(java.lang.String fullDomainName, java.util.Map<java.lang.String,java.lang.String> txtRecordMap, java.lang.String srcDevice)
43 changes: 43 additions & 0 deletions src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupFromDescriptionText.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<api
api-source="class-parse">
<package
name="com.xamarin"
jni-name="com/xamarin">
<interface
abstract="true"
deprecated="not deprecated"
final="false"
name="NestedInterface.DnsSdTxtRecordListener"
jni-signature="Lcom/xamarin/NestedInterface$DnsSdTxtRecordListener;"
static="true"
visibility="public">
<method
abstract="true"
deprecated="not deprecated"
final="false"
name="onDnsSdTxtRecordAvailable"
native="false"
return="void"
jni-return="V"
static="false"
synchronized="false"
visibility="public"
bridge="false"
synthetic="false"
jni-signature="(Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V">
<parameter
name="fullDomainName"
type="java.lang.String"
jni-type="Ljava/lang/String;" />
<parameter
name="txtRecordMap"
type="java.util.Map&lt;java.lang.String, java.lang.String&gt;"
jni-type="Ljava/util/Map&lt;Ljava/lang/String;Ljava/lang/String;&gt;;" />
<parameter
name="srcDevice"
type="java.lang.String"
jni-type="Ljava/lang/String;" />
</method>
</interface>
</package>
</api>
9 changes: 9 additions & 0 deletions src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ public void XmlDeclaration_FixedUpFromParameterDescription ()
if (File.Exists (tempFile))
File.Delete (tempFile);
}

try {
tempFile = LoadToTempFile ("ParameterDescription.txt");

AssertXmlDeclaration (new string [] { "NestedInterface$DnsSdTxtRecordListener.class" }, "ParameterFixupFromDescriptionText.xml", tempFile);
} finally {
if (File.Exists (tempFile))
File.Delete (tempFile);
}
}
}
}
Expand Down
23 changes: 13 additions & 10 deletions src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,9 @@
<Compile Include="ParameterFixupTests.cs" />
</ItemGroup>
<ItemGroup>
<TestJar
Include="java\**\*.java"
Exclude="java\java\util\Collection.java"
/>
<TestJarNoParameters
Include="java\java\util\Collection.java"
/>
<TestJar Include="java\**\*.java" Exclude="java\java\util\Collection.java" />
<TestJarNoParameters Include="java\java\util\Collection.java" />
<TestJar Include="java\com\xamarin\NestedInterface.java" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Expand All @@ -74,8 +70,8 @@
</PropertyGroup>
<Target Name="BuildClasses" Inputs="@(TestJar)" Outputs="@(TestJar-&gt;'$(IntermediateOutputPath)classes\%(RecursiveDir)%(Filename).class')">
<MakeDir Directories="$(IntermediateOutputPath)classes" />
<Exec Command="&quot;$(JavaCPath)&quot; -parameters -source 1.5 -target 1.6 -g -d &quot;$(IntermediateOutputPath)classes&quot; @(TestJar->'%(Identity)', ' ')" />
<Exec Command="&quot;$(JavaCPath)&quot; -source 1.5 -target 1.6 -g -d &quot;$(IntermediateOutputPath)classes&quot; @(TestJarNoParameters->'%(Identity)', ' ')" />
<Exec Command="&quot;$(JavaCPath)&quot; -parameters -source 1.5 -target 1.6 -g -d &quot;$(IntermediateOutputPath)classes&quot; @(TestJar-&gt;'%(Identity)', ' ')" />
<Exec Command="&quot;$(JavaCPath)&quot; -source 1.5 -target 1.6 -g -d &quot;$(IntermediateOutputPath)classes&quot; @(TestJarNoParameters-&gt;'%(Identity)', ' ')" />
</Target>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Android.Tools.Bytecode.csproj">
Expand Down Expand Up @@ -141,6 +137,9 @@
<EmbeddedResource Include="$(IntermediateOutputPath)classes\com\xamarin\IJavaInterface.class">
<LogicalName>IJavaInterface.class</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="$(IntermediateOutputPath)classes\com\xamarin\NestedInterface$DnsSdTxtRecordListener.class">
<LogicalName>NestedInterface$DnsSdTxtRecordListener.class</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="$(IntermediateOutputPath)classes\NonGenericGlobalType.class">
<LogicalName>NonGenericGlobalType.class</LogicalName>
</EmbeddedResource>
Expand All @@ -164,7 +163,11 @@
</EmbeddedResource>
<EmbeddedResource Include="ParameterDescription.txt">
<LogicalName>ParameterDescription.txt</LogicalName>
</EmbeddedResource> </ItemGroup>
</EmbeddedResource>
<EmbeddedResource Include="ParameterFixupFromDescriptionText.xml">
<LogicalName>ParameterFixupFromDescriptionText.xml</LogicalName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
Expand Down
11 changes: 11 additions & 0 deletions src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/NestedInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.xamarin;

import java.util.Map;

public class NestedInterface
{
public interface DnsSdTxtRecordListener
{
void onDnsSdTxtRecordAvailable(String p1, Map<String, String> p2, String p3);
}
}