You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/01/13 17:05:08 UTC
[tomcat] branch master updated: Remove deprecated constructors for
now as they create ambiguous calls
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new cb791c1 Remove deprecated constructors for now as they create ambiguous calls
cb791c1 is described below
commit cb791c14e5760247a0bfd585b67a48e2494e4323
Author: remm <re...@apache.org>
AuthorDate: Mon Jan 13 18:04:56 2020 +0100
Remove deprecated constructors for now as they create ambiguous calls
---
.../apache/catalina/realm/GenericPrincipal.java | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java b/java/org/apache/catalina/realm/GenericPrincipal.java
index 26d4ef6..1c29f5c 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -50,11 +50,6 @@ public class GenericPrincipal implements TomcatPrincipal, Serializable {
this(name, roles, null);
}
- @Deprecated
- public GenericPrincipal(String name, String password, List<String> roles) {
- this(name, roles, null);
- }
-
/**
* Construct a new Principal, associated with the specified Realm, for the
* specified username, with the specified role names (as Strings).
@@ -69,12 +64,6 @@ public class GenericPrincipal implements TomcatPrincipal, Serializable {
this(name, roles, userPrincipal, null);
}
- @Deprecated
- public GenericPrincipal(String name, String password, List<String> roles,
- Principal userPrincipal) {
- this(name, roles, userPrincipal, null);
- }
-
/**
* Construct a new Principal, associated with the specified Realm, for the
* specified username, with the specified role names (as Strings).
@@ -91,12 +80,6 @@ public class GenericPrincipal implements TomcatPrincipal, Serializable {
this(name, roles, userPrincipal, loginContext, null);
}
- @Deprecated
- public GenericPrincipal(String name, String password, List<String> roles,
- Principal userPrincipal, LoginContext loginContext) {
- this(name, roles, userPrincipal, loginContext, null);
- }
-
/**
* Construct a new Principal, associated with the specified Realm, for the
* specified username, with the specified role names (as Strings).
@@ -128,14 +111,6 @@ public class GenericPrincipal implements TomcatPrincipal, Serializable {
}
- @Deprecated
- public GenericPrincipal(String name, String password, List<String> roles,
- Principal userPrincipal, LoginContext loginContext,
- GSSCredential gssCredential) {
- this(name, roles, userPrincipal, loginContext, gssCredential);
- }
-
-
// -------------------------------------------------------------- Properties
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Remove deprecated constructors
for now as they create ambiguous calls
Posted by Mark Thomas <ma...@apache.org>.
On 13/01/2020 19:33, Rémy Maucherat wrote:
> On Mon, Jan 13, 2020 at 6:05 PM <remm@apache.org
> <ma...@apache.org>> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> remm pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new cb791c1 Remove deprecated constructors for now as they
> create ambiguous calls
> cb791c1 is described below
>
>
> Ok, so it's not possible to have both constructors set (with and without
> the password.
>
> Decision time:
> - Keep the Tomcat 9 constructors, with one ignored argument
> - Remove the ignored argument (that's what I did here)
>
> Comments ?
How about:
- Revert cb791c1
- Cast the nulls to the appropriate type so the calls are not ambiguous
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Remove deprecated constructors
for now as they create ambiguous calls
Posted by Rémy Maucherat <re...@apache.org>.
On Mon, Jan 13, 2020 at 6:05 PM <re...@apache.org> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> remm pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new cb791c1 Remove deprecated constructors for now as they create
> ambiguous calls
> cb791c1 is described below
>
Ok, so it's not possible to have both constructors set (with and without
the password.
Decision time:
- Keep the Tomcat 9 constructors, with one ignored argument
- Remove the ignored argument (that's what I did here)
Comments ?
Rémy
>
> commit cb791c14e5760247a0bfd585b67a48e2494e4323
> Author: remm <re...@apache.org>
> AuthorDate: Mon Jan 13 18:04:56 2020 +0100
>
> Remove deprecated constructors for now as they create ambiguous calls
> ---
> .../apache/catalina/realm/GenericPrincipal.java | 25
> ----------------------
> 1 file changed, 25 deletions(-)
>
> diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java
> b/java/org/apache/catalina/realm/GenericPrincipal.java
> index 26d4ef6..1c29f5c 100644
> --- a/java/org/apache/catalina/realm/GenericPrincipal.java
> +++ b/java/org/apache/catalina/realm/GenericPrincipal.java
> @@ -50,11 +50,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
> this(name, roles, null);
> }
>
> - @Deprecated
> - public GenericPrincipal(String name, String password, List<String>
> roles) {
> - this(name, roles, null);
> - }
> -
> /**
> * Construct a new Principal, associated with the specified Realm,
> for the
> * specified username, with the specified role names (as Strings).
> @@ -69,12 +64,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
> this(name, roles, userPrincipal, null);
> }
>
> - @Deprecated
> - public GenericPrincipal(String name, String password, List<String>
> roles,
> - Principal userPrincipal) {
> - this(name, roles, userPrincipal, null);
> - }
> -
> /**
> * Construct a new Principal, associated with the specified Realm,
> for the
> * specified username, with the specified role names (as Strings).
> @@ -91,12 +80,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
> this(name, roles, userPrincipal, loginContext, null);
> }
>
> - @Deprecated
> - public GenericPrincipal(String name, String password, List<String>
> roles,
> - Principal userPrincipal, LoginContext loginContext) {
> - this(name, roles, userPrincipal, loginContext, null);
> - }
> -
> /**
> * Construct a new Principal, associated with the specified Realm,
> for the
> * specified username, with the specified role names (as Strings).
> @@ -128,14 +111,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
> }
>
>
> - @Deprecated
> - public GenericPrincipal(String name, String password, List<String>
> roles,
> - Principal userPrincipal, LoginContext loginContext,
> - GSSCredential gssCredential) {
> - this(name, roles, userPrincipal, loginContext, gssCredential);
> - }
> -
> -
> // --------------------------------------------------------------
> Properties
>
> /**
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>