Skip to content

OAK-11399: Remove usage of Guava io.BaseEncoding#1992

Merged
reschke merged 5 commits intotrunkfrom
OAK-11399
Jan 18, 2025
Merged

OAK-11399: Remove usage of Guava io.BaseEncoding#1992
reschke merged 5 commits intotrunkfrom
OAK-11399

Conversation

@reschke
Copy link
Contributor

@reschke reschke commented Jan 16, 2025

No description provided.

@reschke reschke self-assigned this Jan 16, 2025
@reschke reschke marked this pull request as draft January 16, 2025 14:21
@github-actions
Copy link

github-actions bot commented Jan 16, 2025 •
edited
Loading

Commit-Check ❌

Commit rejected by Commit-Check.                                  
                                                                  
  (c).-.(c)    (c).-.(c)    (c).-.(c)    (c).-.(c)    (c).-.(c)  
   / ._. \      / ._. \      / ._. \      / ._. \      / ._. \   
 __\( C )/__  __\( H )/__  __\( E )/__  __\( C )/__  __\( K )/__ 
(_.-/'-'\-._)(_.-/'-'\-._)(_.-/'-'\-._)(_.-/'-'\-._)(_.-/'-'\-._)
   || E ||      || R ||      || R ||      || O ||      || R ||   
 _.' '-' '._  _.' '-' '._  _.' '-' '._  _.' '-' '._  _.' '-' '._ 
(.-./`-´\.-.)(.-./`-´\.-.)(.-./`-´\.-.)(.-./`-´\.-.)(.-./`-´\.-.)
 `-´     `-´  `-´     `-´  `-´     `-´  `-´     `-´  `-´     `-´ 
                                                                  
Commit rejected.                                                  
                                                                  
Type message check failed => Merge branch 'trunk' into OAK-11399

 
It doesn't match regex: ^OAK-\d+:?\s\S+.*
The commit message must start with 'OAK-<ID>[:] ' followed by some descriptive text
Suggest: Please check your commit message whether it matches above regex

@reschke reschke marked this pull request as ready for review January 17, 2025 11:57
mbaedke
mbaedke reviewed Jan 17, 2025
View reviewed changes
oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java Outdated
mac.init(new SecretKeySpec(getReferenceKey(), ALGORITHM));
byte[] hash = mac.doFinal(blobId.getBytes("UTF-8"));
return blobId + ':' + BaseEncoding.base32Hex().encode(hash);
return ':' + BASE32ENCODER.encodeToString(hash);
Copy link
Contributor

@mbaedke mbaedke Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It used to be: return blobId + ':' +...

Copy link
Contributor Author

@reschke reschke Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, so much for opening PRs while tests are still running, and making last-second changes.

@reschke reschke merged commit c6bb208 into trunk Jan 18, 2025
1 of 3 checks passed
@reschke reschke deleted the OAK-11399 branch January 18, 2025 14:24
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jan 18, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
50.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

andreeastroe96 pushed a commit to andreeastroe96/jackrabbit-oak that referenced this pull request Feb 25, 2025
@reschke @andreeastroe96
OAK-11399: Remove usage of Guava io.BaseEncoding (apache#1992)
8c1478d 
* OAK-11399: Remove usage of Guava io.BaseEncoding

* OAK-11399: Remove usage of Guava io.BaseEncoding - restore base32 case

* OAK-11399: Remove usage of Guava io.BaseEncoding

* OAK-11399: Remove usage of Guava io.BaseEncoding
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mbaedke mbaedke mbaedke left review comments

@rishabhdaim rishabhdaim rishabhdaim approved these changes

Assignees

@reschke reschke

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@reschke @mbaedke @rishabhdaim