Skip to content
This repository was archived by the owner on Jul 3, 2020. It is now read-only.

Commit 19028ba

Browse files
authored
Merge pull request #227 from tkrille/update-deprecations-from-scim-schema
Update deprecations from scim-schema
2 parents e788818 + c9e7932 commit 19028ba

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

src/main/java/org/osiam/resources/helper/SCIMHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* This class is a collection of different helper methods around the scim schema context
3232
* This class has been deprecated. If You want to use the only method it contains please see
3333
* {@link User#getPrimaryOrFirstEmail()}
34+
* @deprecated Will be removed in 1.11 or 2.0.
3435
*/
3536
@Deprecated
3637
public class SCIMHelper {
@@ -44,7 +45,7 @@ public class SCIMHelper {
4445
*
4546
* @param user a {@link User} with a possible email
4647
* @return an email if found
47-
* @deprecated Please use the method {@link User#getPrimaryOrFirstEmail()}
48+
* @deprecated Please use the method {@link User#getPrimaryOrFirstEmail()}. Will be removed in 1.11 or 2.0.
4849
*/
4950
@Deprecated
5051
public static Optional<Email> getPrimaryOrFirstEmail(User user) {

src/main/java/org/osiam/resources/helper/UserDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public UserDeserializer(String schema) {
7272

7373
/**
7474
* @deprecated Use {@link UserDeserializer#UserDeserializer()} or
75-
* {@link UserDeserializer#UserDeserializer(String)}. Will be removed in 1.9 or 2.0.
75+
* {@link UserDeserializer#UserDeserializer(String)}. Will be removed in 1.11 or 2.0.
7676
*/
7777
public UserDeserializer(Class<?> valueClass) {
7878
super(valueClass);

src/main/java/org/osiam/resources/scim/Constants.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,29 @@
2424
package org.osiam.resources.scim;
2525

2626
/**
27-
* Some needed Constants
28-
*
29-
* @deprecated This interface has been deprecated and is going to be removed in a future release.
27+
* @deprecated These constants have been moved to their corresponding classes. Will be removed in 1.11 or 2.0.
3028
*/
3129
@Deprecated
3230
public interface Constants {
3331

3432
/**
35-
* @deprecated please use {@link User}.SCHEMA
33+
* @deprecated Please use {@link User}.SCHEMA. Will be removed in 1.11 or 2.0.
3634
*/
3735
String USER_CORE_SCHEMA = "urn:ietf:params:scim:schemas:core:2.0:User";
3836
/**
39-
* @deprecated please use {@link Group}.SCHEMA
37+
* @deprecated Please use {@link Group}.SCHEMA. Will be removed in 1.11 or 2.0.
4038
*/
4139
String GROUP_CORE_SCHEMA = "urn:ietf:params:scim:schemas:core:2.0:Group";
4240
/**
43-
* @deprecated please use {@link SCIMSearchResult}.SCHEMA
41+
* @deprecated Please use {@link SCIMSearchResult}.SCHEMA. Will be removed in 1.11 or 2.0.
4442
*/
4543
String LIST_RESPONSE_CORE_SCHEMA = "urn:ietf:params:scim:api:messages:2.0:ListResponse";
4644
/**
47-
* @deprecated This constant is going to be removed soon.
45+
* @deprecated This constant is going to be removed in 1.11 or 2.0.
4846
*/
4947
String SERVICE_PROVIDER_CORE_SCHEMA = "urn:ietf:params:scim:schemas:core:2.0:ServiceProviderConfig";
5048
/**
51-
* @deprecated This constant is going to be removed soon.
49+
* @deprecated This constant is going to be removed in 1.11 or 2.0.
5250
*/
5351
int MAX_RESULT = 100;
5452
}

src/main/java/org/osiam/resources/scim/Group.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public Builder setExternalId(String externalId) {
185185

186186
/**
187187
* @deprecated Don't use this method - let the extensions add their schema themselves. Will be removed in
188-
* version 1.8 or 2.0
188+
* version 1.10 or 2.0
189189
*/
190190
@Override
191191
@Deprecated

src/main/java/org/osiam/resources/scim/Resource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public Builder(Resource resource) {
144144

145145
/**
146146
* @deprecated Don't use this method - let the extensions add their schema themselves. Will be removed in
147-
* version 1.8 or 2.0
147+
* version 1.10 or 2.0
148148
*/
149149
@Deprecated
150150
public Builder setSchemas(Set<String> schemas) {

src/main/java/org/osiam/resources/scim/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ public Builder setId(String id) {
12061206

12071207
/**
12081208
* @deprecated Don't use this method - let the extensions add their schema themselves. Will be removed in
1209-
* version 1.8 or 2.0
1209+
* version 1.10 or 2.0
12101210
*/
12111211
@Override
12121212
@Deprecated

0 commit comments

Comments
 (0)