Skip to content

Prepare for v6.2.0 and deprecate GetContainersResponse permissions methods #73

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 3 commits into from
Jul 29, 2024
Merged

Prepare for v6.2.0 and deprecate GetContainersResponse permissions methods #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd80b7c
Deprecate GetContainersResponse permissions methods
labkey-adam Jul 29, 2024
b0e1332
Prepare for v6.2.0
labkey-adam Jul 29, 2024
847dfa2
Update dependencies
labkey-adam Jul 29, 2024
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
6 changes: 4 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# The LabKey Remote API Library for Java - Change Log

## version TBD
*Released*: TBD
## version 6.2.0
*Released*: 29 July 2024
* Add support for `auditUserComment` field for assay import
* Add support for `allowPlateMetadata`, `plateMetadata` fields for assay plate support
* Deprecate `GetContainersResponse` permissions methods which are incompatible with LabKey Server v24.8 and
* Update Commons Codec, Commons Logging, Gradle, Gradle Plugins, HttpCore, and JSONObject versions

## version 6.1.0
*Released*: 26 February 2024
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ repositories {

group "org.labkey.api"

version "6.2.0-SNAPSHOT"
version "6.2.0"

dependencies {
api "org.json:json:${jsonObjectVersion}"
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ artifactory_contextUrl=https://labkey.jfrog.io/artifactory
sourceCompatibility=17
targetCompatibility=17

gradlePluginsVersion=2.2.1
gradlePluginsVersion=3.0.1

commonsCodecVersion=1.16.0
commonsLoggingVersion=1.3.0
commonsCodecVersion=1.17.1
commonsLoggingVersion=1.3.3

httpclient5Version=5.3.1
httpcore5Version=5.2.4
httpcore5Version=5.2.5

jsonObjectVersion=20231013
jsonObjectVersion=20240303

junitVersion=4.13.2

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 4 additions & 0 deletions src/org/labkey/remoteapi/security/GetContainersResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,27 @@ public String getContainerId()
return getProperty("id");
}

@Deprecated(forRemoval = true)
public Integer getUserPermissions()
{
return getUserPermissions(null);
}

@Deprecated(forRemoval = true)
public Integer getUserPermissions(String containerPath)
{
Map<String, Object> containerInfo = findContainer(containerPath, getParsedData());
return (null == containerInfo) ? null : ((Number)containerInfo.get("userPermissions")).intValue();
}

@Deprecated(forRemoval = true)
public Boolean hasPermission(int perm)
{
Integer userPerms = getUserPermissions();
return (null == userPerms) ? null : userPerms == (userPerms | perm);
}

@Deprecated(forRemoval = true)
public Boolean hasPermission(int perm, String containerPath)
{
Integer userPerms = getUserPermissions(containerPath);
Expand Down