Skip to content

Commit 6ed0e69

Browse files
reeshika-hclaude
andcommitted
Merge master into development (back-merge of 1.15.0 Snyk fixes)
Resolved conflicts in changelog.md (kept v1.16.0; v1.15.0 takes master's release date and Tests line) and pom.xml (kept version 1.16.0). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2 parents a2eaf9c + 4a1f951 commit 6ed0e69

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
* @contentstack/developer-ecosystem-pr-reviewers
22
.github/workflows/ @contentstack/security-admin
33
**/.snyk @contentstack/security-admin
4-
**/CODEOWNERS @contentstack/security-admin
4+
**/CODEOWNERS @contentstack/security-admin
5+
**/.gitguardian.yaml @contentstack/security-admin

‎changelog.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
## v1.15.0
1010

11-
### Oct 21, 2026
11+
### Nov 02, 2026
1212

1313
- Feat: Added the opt-in `Contentstack.Builder.setSerializeNulls(boolean)` option. When enabled, `null` values in request bodies are sent to the API instead of being dropped, so a field's value (for example a Number field on a localized entry) can be cleared. Off by default; existing behavior is unchanged.
14+
- Tests: Replaced hardcoded usernames and API keys in `LoginDetailTest` and `TestClient` with generated values to resolve Snyk Code findings (DX-22133, DX-22134). No change to the published artifact.
1415

1516
## v1.14.1
1617

‎src/test/java/com/contentstack/cms/TestClient.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.contentstack.cms;
22

3+
import java.util.UUID;
34
import com.contentstack.cms.core.Util;
45
import com.contentstack.cms.stack.Stack;
56
import io.github.cdimascio.dotenv.Dotenv;
@@ -17,8 +18,8 @@ public class TestClient {
1718
public final static String USER_ID = (env.get("userId") != null) ? env.get("userId") : "c11e668e0295477f";
1819
public final static String OWNERSHIP = (env.get("ownershipToken") != null) ? env.get("ownershipToken")
1920
: "ownershipTokenId";
20-
// file deepcode ignore NonCryptoHardcodedSecret/test: <please specify a reason of ignoring this>
21-
public final static String API_KEY = (env.get("apiKey") != null) ? env.get("apiKey") : "apiKey99999999";
21+
public final static String API_KEY = (env.get("apiKey") != null) ? env.get("apiKey")
22+
: "blt" + UUID.randomUUID().toString().replace("-", "").substring(0, 16);
2223
public final static String MANAGEMENT_TOKEN = (env.get("managementToken") != null) ? env.get("managementToken")
2324
: "managementToken99999999";
2425

‎src/test/java/com/contentstack/cms/models/LoginDetailTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.contentstack.cms.models;
22

3+
import java.util.UUID;
34
import com.contentstack.cms.core.AuthInterceptor;
45
import okhttp3.Interceptor;
56
import okhttp3.internal.http.RealInterceptorChain;
@@ -102,9 +103,9 @@ void getterSetterUserModelLastName() {
102103
@Test
103104
void getterSetterUserModelUsername() {
104105
UserModel userModel = new UserModel();
105-
// deepcode ignore NoHardcodedCredentials/test: <please specify a reason of ignoring this>
106-
userModel.setUsername("***REMOVED***");
107-
Assertions.assertEquals("***REMOVED***",
106+
String username = UUID.randomUUID().toString();
107+
userModel.setUsername(username);
108+
Assertions.assertEquals(username,
108109
userModel.getUsername());
109110
}
110111

0 commit comments

Comments
 (0)