Skip to content

Excavator: Migrate to the logsafe SafeLogger API #569

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

Closed
wants to merge 1 commit into from
Closed

Excavator: Migrate to the logsafe SafeLogger API #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions crypto-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile 'org.openjdk.jmh:jmh-core'
implementation 'com.palantir.safe-logging:logger'
}

project.task(type: JavaExec, 'benchmarks') {
Expand Down
6 changes: 3 additions & 3 deletions crypto-core/src/main/java/com/palantir/crypto2/io/CryptoStreamFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import com.palantir.crypto2.cipher.SeekableCipher;
import com.palantir.crypto2.cipher.SeekableCipherFactory;
import com.palantir.crypto2.keys.KeyMaterial;
import com.palantir.logsafe.logger.SafeLogger;
import com.palantir.logsafe.logger.SafeLoggerFactory;
import com.palantir.seekio.SeekableInput;
import java.io.FilterOutputStream;
import java.io.IOException;
Expand All @@ -33,12 +35,10 @@
import javax.crypto.CipherOutputStream;
import javax.crypto.SecretKey;
import org.apache.commons.crypto.stream.CtrCryptoOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class CryptoStreamFactory {

private static final Logger log = LoggerFactory.getLogger(CryptoStreamFactory.class);
private static final SafeLogger log = SafeLoggerFactory.get(CryptoStreamFactory.class);
private static final Properties PROPS = ApacheCiphers.forceOpenSsl(new Properties());
private static final String AES_ALGORITHM = "AES/CTR/NoPadding";

Expand Down