Replace deprecated function RandomStringUtils.randomAlphanumeric (#1073)

DataBiosphere · Nov 22, 2024 · c82ec6d · c82ec6d
1 parent 08a4ecb
commit c82ec6d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/service/src/main/java/bio/terra/tanagra/db/ArtifactsDao.java b/service/src/main/java/bio/terra/tanagra/db/ArtifactsDao.java
@@ -42,7 +42,7 @@ public String cloneCohort(
       String displayName,
       String description) {
     // Cohort
-    String clCohortId = RandomStringUtils.randomAlphanumeric(10);
+    String clCohortId = RandomStringUtils.secure().nextAlphanumeric(10);
 
     // underlay: same as that of the original rows
     MapSqlParameterSource cohortParamSets =
@@ -72,7 +72,7 @@ public String cloneCohort(
     ogReviews.forEach(
         review -> {
           String ogReviewId = review.getId();
-          String clReviewId = RandomStringUtils.randomAlphanumeric(10);
+          String clReviewId = RandomStringUtils.secure().nextAlphanumeric(10);
           ogRevisionIdReviewIdMap.put(review.getRevision().getId(), ogReviewId);
           reviewIdMap.put(ogReviewId, clReviewId);
 
@@ -118,7 +118,7 @@ public String cloneCohort(
         builderPair -> {
           CohortRevision ogRevision = builderPair.getValue().build();
           String ogRevisionId = ogRevision.getId();
-          String clRevisionId = RandomStringUtils.randomAlphanumeric(10);
+          String clRevisionId = RandomStringUtils.secure().nextAlphanumeric(10);
 
           revisionParamSets.add(
               CohortDao.buildRevisionParam(

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/AnnotationKey.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/AnnotationKey.java
@@ -142,7 +142,7 @@ public void addEnumVal(String enumVal) {
 
     public AnnotationKey build() {
       if (id == null) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       if (displayName == null) {
         throw new BadRequestException("Annotation key requires a display name");

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/Cohort.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/Cohort.java
@@ -155,7 +155,7 @@ public Builder isDeleted(boolean isDeleted) {
 
     public Cohort build() {
       if (id == null) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       if (displayName != null && displayName.length() > MAX_DISPLAY_NAME_LENGTH) {
         throw new BadRequestException(

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/CohortRevision.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/CohortRevision.java
@@ -167,7 +167,7 @@ public Builder recordsCount(Long recordsCount) {
 
     public CohortRevision build() {
       if (id == null) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       if (lastModifiedBy == null) {
         lastModifiedBy = createdBy;
@@ -390,7 +390,7 @@ public Builder setIsDisabled(boolean isDisabled) {
 
       public CriteriaGroupSection build() {
         if (id == null) {
-          id = RandomStringUtils.randomAlphanumeric(10);
+          id = RandomStringUtils.secure().nextAlphanumeric(10);
         }
         return new CriteriaGroupSection(
             id,
@@ -520,7 +520,7 @@ public Builder isDisabled(boolean isDisabled) {
 
       public CriteriaGroup build() {
         if (id == null) {
-          id = RandomStringUtils.randomAlphanumeric(10);
+          id = RandomStringUtils.secure().nextAlphanumeric(10);
         }
         return new CriteriaGroup(id, displayName, criteria, isDisabled);
       }

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/Criteria.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/Criteria.java
@@ -136,7 +136,7 @@ public Builder tags(Map<String, String> tags) {
 
     public Criteria build() {
       if (id == null) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       return new Criteria(
           id,

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/FeatureSet.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/FeatureSet.java
@@ -183,7 +183,7 @@ public Builder isDeleted(boolean isDeleted) {
 
     public FeatureSet build() {
       if (id == null) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       if (displayName != null && displayName.length() > MAX_DISPLAY_NAME_LENGTH) {
         throw new BadRequestException(

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/Review.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/Review.java
@@ -140,7 +140,7 @@ public Builder isDeleted(boolean isDeleted) {
 
     public Review build() {
       if (id == null) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       if (displayName != null && displayName.length() > MAX_DISPLAY_NAME_LENGTH) {
         throw new BadRequestException(

diff --git a/service/src/main/java/bio/terra/tanagra/service/artifact/model/Study.java b/service/src/main/java/bio/terra/tanagra/service/artifact/model/Study.java
@@ -194,7 +194,7 @@ public Builder isDeleted(boolean isDeleted) {
     public Study build() {
       // true if the id is empty or null
       if (StringUtils.isEmpty(id)) {
-        id = RandomStringUtils.randomAlphanumeric(10);
+        id = RandomStringUtils.secure().nextAlphanumeric(10);
       }
       // Always have a map, even if it is empty
       if (properties == null) {