Skip to content

[Java.Base] Fix CS0108 Warnings #1008

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
jonpryor merged 1 commit into from
Jul 11, 2022
Merged

[Java.Base] Fix CS0108 Warnings #1008

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
24 changes: 12 additions & 12 deletions src/Java.Base-ref.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected ByteArrayInputStream(ref Java.Interop.JniObjectReference reference, Ja
[System.ComponentModel.EditorBrowsableAttribute(1)]
[System.Diagnostics.DebuggerBrowsableAttribute(0)]
public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
protected int Mark { get { throw null; } set { } }
protected int MarkedPosition { get { throw null; } set { } }
protected int Pos { get { throw null; } set { } }
[Java.Interop.JniMethodSignatureAttribute("read", "()I")]
public override int Read() { throw null; }
Expand Down Expand Up @@ -511,7 +511,7 @@ public override void Write(Java.Interop.JavaCharArray? cbuf, int off, int len) {
public partial interface ICloseable : Java.Interop.IJavaPeerable, Java.Lang.IAutoCloseable, System.IDisposable
{
[Java.Interop.JniMethodSignatureAttribute("close", "()V")]
new void Close();
void Java.Lang.IAutoCloseable.Close();
}
[Java.Interop.JniTypeSignatureAttribute("java/io/DataInput", GenerateJavaPeer=false)]
public partial interface IDataInput : Java.Interop.IJavaPeerable, System.IDisposable
Expand Down Expand Up @@ -693,7 +693,7 @@ public partial interface IObjectInput : Java.Interop.IJavaPeerable, Java.IO.IDat
[Java.Interop.JniMethodSignatureAttribute("available", "()I")]
int Available();
[Java.Interop.JniMethodSignatureAttribute("close", "()V")]
new void Close();
void Java.Lang.IAutoCloseable.Close();
[Java.Interop.JniMethodSignatureAttribute("read", "()I")]
int Read();
[Java.Interop.JniMethodSignatureAttribute("read", "([B)I")]
Expand Down Expand Up @@ -770,16 +770,16 @@ public partial interface IObjectInputValidation : Java.Interop.IJavaPeerable, Sy
[Java.Interop.JniTypeSignatureAttribute("java/io/ObjectOutput", GenerateJavaPeer=false)]
public partial interface IObjectOutput : Java.Interop.IJavaPeerable, Java.IO.IDataOutput, Java.Lang.IAutoCloseable, System.IDisposable
{
[Java.Interop.JniMethodSignatureAttribute("close", "()V")]
new void Close();
[Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
void Flush();
[Java.Interop.JniMethodSignatureAttribute("write", "([B)V")]
new void Write(Java.Interop.JavaSByteArray? p0);
void Java.IO.IDataOutput.Write(Java.Interop.JavaSByteArray? p0);
[Java.Interop.JniMethodSignatureAttribute("write", "([BII)V")]
new void Write(Java.Interop.JavaSByteArray? p0, int p1, int p2);
void Java.IO.IDataOutput.Write(Java.Interop.JavaSByteArray? p0, int p1, int p2);
[Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
new void Write(int p0);
void Java.IO.IDataOutput.Write(int p0);
[Java.Interop.JniMethodSignatureAttribute("close", "()V")]
void Java.Lang.IAutoCloseable.Close();
[Java.Interop.JniMethodSignatureAttribute("writeObject", "(Ljava/lang/Object;)V")]
void WriteObject(Java.Lang.Object? p0);
}
Expand Down Expand Up @@ -6621,7 +6621,7 @@ public GenericSignatureFormatError(string? message) { }
public partial interface IAnnotatedArrayType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
{
Java.Lang.Reflect.IAnnotatedType? AnnotatedGenericComponentType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedGenericComponentType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
Java.Lang.Reflect.IAnnotatedType? Java.Lang.Reflect.IAnnotatedType.AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
}
[Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedElement", GenerateJavaPeer=false)]
public partial interface IAnnotatedElement : Java.Interop.IJavaPeerable, System.IDisposable
Expand All @@ -6648,7 +6648,7 @@ public partial interface IAnnotatedElement : Java.Interop.IJavaPeerable, System.
[Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedParameterizedType", GenerateJavaPeer=false)]
public partial interface IAnnotatedParameterizedType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
{
new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
Java.Lang.Reflect.IAnnotatedType? Java.Lang.Reflect.IAnnotatedType.AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
[Java.Interop.JniMethodSignatureAttribute("getAnnotatedActualTypeArguments", "()[Ljava/lang/reflect/AnnotatedType;")]
Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedActualTypeArguments();
}
Expand All @@ -6661,14 +6661,14 @@ public partial interface IAnnotatedType : Java.Interop.IJavaPeerable, Java.Lang.
[Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedTypeVariable", GenerateJavaPeer=false)]
public partial interface IAnnotatedTypeVariable : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
{
new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
Java.Lang.Reflect.IAnnotatedType? Java.Lang.Reflect.IAnnotatedType.AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
[Java.Interop.JniMethodSignatureAttribute("getAnnotatedBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedBounds();
}
[Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedWildcardType", GenerateJavaPeer=false)]
public partial interface IAnnotatedWildcardType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
{
new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
Java.Lang.Reflect.IAnnotatedType? Java.Lang.Reflect.IAnnotatedType.AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
[Java.Interop.JniMethodSignatureAttribute("getAnnotatedLowerBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedLowerBounds();
[Java.Interop.JniMethodSignatureAttribute("getAnnotatedUpperBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
Expand Down
3 changes: 1 addition & 2 deletions src/Java.Base/Java.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<!-- TODO: CS0108 is due to e.g. interfaces re-abstracting default interface methods -->
<NoWarn>$(NoWarn);8764;CS0108</NoWarn>
<NoWarn>$(NoWarn);8764</NoWarn>
</PropertyGroup>

<Import Project="..\..\TargetFrameworkDependentValues.props" />
Expand Down
40 changes: 40 additions & 0 deletions src/Java.Base/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,46 @@
<!-- warning CS0672: Member 'Enum.JavaFinalize()' overrides obsolete member 'Object.JavaFinalize()'. Add the Obsolete attribute to 'Enum.JavaFinalize()'. -->
<attr path="/api/package[@name='java.lang']/class[@name='Enum']/method[@name='finalize' and count(parameter)=0]" name="deprecated">deprecated</attr>

<!-- warning CS0108: 'MEMBER' hides inherited member 'MEMBER'. Use the new keyword if hiding was intended. -->
<attr path="/api/package[@name='java.io']/class[
@name='ByteArrayInputStream'
]/field[@name='mark']"
name="managedName">MarkedPosition</attr>
<attr path="/api/package[@name='java.lang.reflect']/interface[
@name='AnnotatedArrayType'
or @name='AnnotatedParameterizedType'
or @name='AnnotatedTypeVariable'
or @name='AnnotatedWildcardType'
]/method[@name='getAnnotatedOwnerType' and count(parameter)=0]"
name="managedOverride">reabstract</attr>
<attr path="/api/package[@name='java.lang.reflect']/interface[
@name='AnnotatedArrayType'
or @name='AnnotatedParameterizedType'
or @name='AnnotatedTypeVariable'
or @name='AnnotatedWildcardType'
]/method[@name='getAnnotatedOwnerType' and count(parameter)=0]"
name="explicitInterface">IAnnotatedType</attr>
<attr path="/api/package[@name='java.io']/interface[
@name='Closeable'
or @name='ObjectInput'
or @name='ObjectOutput'
]/method[@name='close' and count(parameter)=0]"
name="managedOverride">reabstract</attr>
<attr path="/api/package[@name='java.io']/interface[
@name='Closeable'
or @name='ObjectInput'
or @name='ObjectOutput'
]/method[@name='close' and count(parameter)=0]"
name="explicitInterface">Java.Lang.IAutoCloseable</attr>
<attr path="/api/package[@name='java.io']/interface[
@name='ObjectOutput'
]/method[@name='write']"
name="managedOverride">reabstract</attr>
<attr path="/api/package[@name='java.io']/interface[
@name='ObjectOutput'
]/method[@name='write']"
name="explicitInterface">IDataOutput</attr>

<!-- AbstractStringBuilder is package-private; fixity fix -->
<remove-node path="//api/package[@name='java.lang']/class[@name='AbstractStringBuilder']" />

Expand Down