Skip to content

Commit 6981222

Browse files
committed
Remove deprecated methods
1 parent 2cf6296 commit 6981222

3 files changed

Lines changed: 5 additions & 42 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# The LabKey Remote API Library for Java - Change Log
22

3-
## version 7.4.0-SNAPSHOT
3+
## version 8.0.0-SNAPSHOT
44
*Released*: TBD
5+
* POTENTIALLY BREAKING CHANGES
6+
* Eliminate the `RequestType` generic type parameter on `Command`
7+
* Eliminate unnecessary `BaseSelect` interface
8+
* Remove deprecated methods from `GetContainersResponse` and `GetUsersCommand`
59
* Merge `ExecuteSqlCommand` into the `SelectRowsCommand` hierarchy to add `includeMetadata` support, eliminate redundant
610
code, and ensure future shared properties can be implemented in both easily.
7-
* Eliminate unnecessary `BaseSelect` interface
8-
* Eliminate the `RequestType` generic type parameter on `Command`
911
* Update `StopImpersonatingCommand` to use the `stopImpersonatingApi` action
1012
* Update Gradle plugins, Commons Codec, Commons Logging, HttpClient, and JSON-java versions
1113

src/org/labkey/remoteapi/security/GetContainersResponse.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,6 @@ public String getContainerId()
3333
return getProperty("id");
3434
}
3535

36-
@Deprecated(forRemoval = true)
37-
public Integer getUserPermissions()
38-
{
39-
return getUserPermissions(null);
40-
}
41-
42-
@Deprecated(forRemoval = true)
43-
public Integer getUserPermissions(String containerPath)
44-
{
45-
Map<String, Object> containerInfo = findContainer(containerPath, getParsedData());
46-
return (null == containerInfo) ? null : ((Number)containerInfo.get("userPermissions")).intValue();
47-
}
48-
49-
@Deprecated(forRemoval = true)
50-
public Boolean hasPermission(int perm)
51-
{
52-
Integer userPerms = getUserPermissions();
53-
return (null == userPerms) ? null : userPerms == (userPerms | perm);
54-
}
55-
56-
@Deprecated(forRemoval = true)
57-
public Boolean hasPermission(int perm, String containerPath)
58-
{
59-
Integer userPerms = getUserPermissions(containerPath);
60-
return (null == userPerms) ? null : userPerms == (userPerms | perm);
61-
}
62-
6336
protected Map<String, Object> findContainer(String containerPath, Map<String, Object> root)
6437
{
6538
if(null == containerPath)

src/org/labkey/remoteapi/security/GetUsersCommand.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,6 @@ public void setName(String name)
8282
_name = name;
8383
}
8484

85-
@Deprecated(forRemoval = true) // Remove in 7.0.0
86-
public Boolean getIncludeDeactivated()
87-
{
88-
return _includeInactive;
89-
}
90-
91-
@Deprecated(forRemoval = true) // Remove in 7.0.0
92-
public void setIncludeDeactivated(Boolean includeInactive)
93-
{
94-
_includeInactive = (null != includeInactive && includeInactive);
95-
}
96-
9785
/**
9886
* @return Flag to request inactive users as well
9987
*/

0 commit comments

Comments
 (0)