diff --git a/checkstyle.xml b/checkstyle.xml
index 5d8c0e3..33e1f53 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,4 +1,24 @@
+
+
@@ -38,7 +58,7 @@
+ value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
@@ -65,7 +85,7 @@
+ value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
@@ -73,9 +93,9 @@
+ value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+ value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
@@ -98,49 +118,49 @@
+ value="Package name ''{0}'' must match pattern ''{1}''."/>
+ value="Type name ''{0}'' must match pattern ''{1}''."/>
+ value="Member name ''{0}'' must match pattern ''{1}''."/>
+ value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+ value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+ value="Class type name ''{0}'' must match pattern ''{1}''."/>
+ value="Method type name ''{0}'' must match pattern ''{1}''."/>
+ value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+ value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+ value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+ value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
@@ -160,13 +180,13 @@
+ value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
+ value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
@@ -179,7 +199,7 @@
+ value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
@@ -198,7 +218,7 @@
+ value="Method name ''{0}'' must match pattern ''{1}''."/>
@@ -207,5 +227,7 @@
+
+
diff --git a/crypto-conditions/src/test/java/com/ripple/cryptoconditions/PreimageSha256FulfillmentTest.java b/crypto-conditions/src/test/java/com/ripple/cryptoconditions/PreimageSha256FulfillmentTest.java
index 97015d7..6f0a690 100644
--- a/crypto-conditions/src/test/java/com/ripple/cryptoconditions/PreimageSha256FulfillmentTest.java
+++ b/crypto-conditions/src/test/java/com/ripple/cryptoconditions/PreimageSha256FulfillmentTest.java
@@ -87,13 +87,13 @@ public final void testNullPreimage() {
*/
@Test
public final void testSmallToLargePreimage() {
- for (int PREIMAGE_LENGTH = 0; PREIMAGE_LENGTH < 100; PREIMAGE_LENGTH++) {
- // Fill the array with PREIMAGE_LENGTH bytes...
- final byte[] preimageBytes = new byte[PREIMAGE_LENGTH];
+ for (int preimageLength = 0; preimageLength < 100; preimageLength++) {
+ // Fill the array with preimageLength bytes...
+ final byte[] preimageBytes = new byte[preimageLength];
new SecureRandom().nextBytes(preimageBytes);
final PreimageSha256Fulfillment fulfillment = PreimageSha256Fulfillment.from(preimageBytes);
- assertThat(fulfillment.getDerivedCondition().getCost(), is(Long.valueOf(PREIMAGE_LENGTH)));
+ assertThat(fulfillment.getDerivedCondition().getCost(), is(Long.valueOf(preimageLength)));
assertTrue("Invalid condition", fulfillment.verify(fulfillment.getDerivedCondition(), new byte[]{}));
}
}
@@ -120,8 +120,7 @@ public final void testValidateWithDifferentConditionType() {
TestConditionFactory.constructPrefixSha256Condition("invalid"), new byte[]{})
);
- final Fulfillment actual = narrowlyTypedActual;
- assertFalse("Invalid condition", actual.verify(
+ assertFalse("Invalid condition", narrowlyTypedActual.verify(
TestConditionFactory.constructPrefixSha256Condition("invalid"), new byte[]{})
);
}
diff --git a/crypto-conditions/src/test/java/com/ripple/cryptoconditions/ThresholdFactoryTest.java b/crypto-conditions/src/test/java/com/ripple/cryptoconditions/ThresholdFactoryTest.java
index b9359a3..7cfb031 100644
--- a/crypto-conditions/src/test/java/com/ripple/cryptoconditions/ThresholdFactoryTest.java
+++ b/crypto-conditions/src/test/java/com/ripple/cryptoconditions/ThresholdFactoryTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -147,7 +147,7 @@ public void twoOfTwoCondition() {
}
@Test(expected = NullPointerException.class)
- public void mOfNWithNullSubConditionsList() {
+ public void mkeysOfnWithNullSubConditionsList() {
try {
ThresholdFactory.constructMOfNCondition(1, 2, null);
} catch (NullPointerException e) {
@@ -157,7 +157,7 @@ public void mOfNWithNullSubConditionsList() {
}
@Test(expected = IllegalArgumentException.class)
- public void mOfNWithNegativeThreshold() {
+ public void mkeysOfnWithNegativeThreshold() {
try {
ThresholdFactory
.constructMOfNCondition(-1, 2, Lists.newArrayList(subcondition1, subcondition2));
@@ -168,7 +168,7 @@ public void mOfNWithNegativeThreshold() {
}
@Test
- public void mOfNWithZeroThreshold() {
+ public void mkeysOfnWithZeroThreshold() {
// Create a control threshold fulfillment that has no fulfillments (0) to satisfy the
// threshold of a 0-of-3 condition.
final ThresholdSha256Fulfillment thresholdFulfillment = ThresholdSha256Fulfillment.from(
@@ -183,7 +183,7 @@ public void mOfNWithZeroThreshold() {
}
@Test(expected = IllegalArgumentException.class)
- public void mOfNWithIncorrectNumSubConditions() {
+ public void mkeysOfnWithIncorrectNumSubConditions() {
try {
ThresholdFactory.constructMOfNCondition(0, 2, Lists.newArrayList(subcondition1));
} catch (IllegalArgumentException e) {
@@ -196,7 +196,7 @@ public void mOfNWithIncorrectNumSubConditions() {
* Test {@link ThresholdFactory#constructMOfNCondition(int, int, List)}.
*/
@Test
- public void mOfNConditionTest() {
+ public void mkeysOfnConditionTest() {
// Create a control threshold fulfillment that has enough fulfillments (3) to satisfy the
// threshold of a 3-of-5 condition.
@@ -420,7 +420,7 @@ public void twoOfTwoFulfillment() {
}
@Test(expected = NullPointerException.class)
- public void mOfNFulfillmentWithFirstNull() {
+ public void mkeysOfnFulfillmentWithFirstNull() {
try {
ThresholdFactory.constructMOfNFulfillment(1, 2, null, Lists.newArrayList());
} catch (NullPointerException e) {
@@ -430,7 +430,7 @@ public void mOfNFulfillmentWithFirstNull() {
}
@Test(expected = NullPointerException.class)
- public void mOfNFulfillmentWithSecondNull() {
+ public void mkeysOfnFulfillmentWithSecondNull() {
try {
ThresholdFactory.constructMOfNFulfillment(1, 2, Lists.newArrayList(), null);
} catch (NullPointerException e) {
@@ -440,7 +440,7 @@ public void mOfNFulfillmentWithSecondNull() {
}
@Test(expected = IllegalArgumentException.class)
- public void mOfNFulfillmenttsWithNegativeThreshold() {
+ public void mkeysOfnFulfillmenttsWithNegativeThreshold() {
try {
ThresholdFactory.constructMOfNFulfillment(-1, 2, Lists.newArrayList(),
Lists.newArrayList(subfulfillment1, subfulfillment2));
@@ -451,7 +451,7 @@ public void mOfNFulfillmenttsWithNegativeThreshold() {
}
@Test(expected = IllegalArgumentException.class)
- public void mOfNFulfillmentWithIncorrectTotalN() {
+ public void mkeysOfnFulfillmentWithIncorrectTotalN() {
try {
ThresholdFactory.constructMOfNFulfillment(1, 2,
Lists.newArrayList(),
@@ -469,7 +469,7 @@ public void mOfNFulfillmentWithIncorrectTotalN() {
* pair.
*/
@Test
- public void mOfNFulfillmentForOneOfTwo() {
+ public void mkeysOfnFulfillmentForOneOfTwo() {
// The condition to fulfill...
final ThresholdSha256Condition thresholdCondition = ThresholdSha256Condition.from(
diff --git a/crypto-conditions/src/test/java/com/ripple/cryptoconditions/helpers/TestFulfillmentFactory.java b/crypto-conditions/src/test/java/com/ripple/cryptoconditions/helpers/TestFulfillmentFactory.java
index 957797f..f6f4a23 100644
--- a/crypto-conditions/src/test/java/com/ripple/cryptoconditions/helpers/TestFulfillmentFactory.java
+++ b/crypto-conditions/src/test/java/com/ripple/cryptoconditions/helpers/TestFulfillmentFactory.java
@@ -60,14 +60,14 @@ public static PreimageSha256Fulfillment constructPreimageFulfillment(final Strin
*/
public static PrefixSha256Fulfillment constructPrefixSha256Fulfillment(final String prefix) {
return PrefixSha256Fulfillment
- .from(prefix.getBytes(), 1000, constructPreimageFulfillment(PREIMAGE1));
+ .from(prefix.getBytes(), 1000, constructPreimageFulfillment(PREIMAGE1));
}
/**
* Helper to construct a {@link RsaSha256Fulfillment} with a known public key.
*/
public static RsaSha256Fulfillment constructRsaSha256Fulfillment(
- final KeyPair rsaKeyPair
+ final KeyPair rsaKeyPair
) {
try {
final Signature rsaSigner = Signature.getInstance("SHA256withRSA/PSS");
@@ -85,8 +85,8 @@ public static RsaSha256Fulfillment constructRsaSha256Fulfillment(
* corresponding private key.
*/
public static RsaSha256Fulfillment constructRsaSha256Fulfillment(
- final RSAPublicKey rsaPublicKey,
- final byte[] signature
+ final RSAPublicKey rsaPublicKey,
+ final byte[] signature
) {
return RsaSha256Fulfillment.from(rsaPublicKey, signature);
}
@@ -103,8 +103,8 @@ public static Ed25519Sha256Fulfillment constructEd25519Sha256Fulfillment(final K
byte[] edDsaSignature = edDsaSigner.sign();
return constructEd25519Sha256Fulfillment(
- (EdDSAPublicKey) ed25519KeyPair.getPublic(),
- edDsaSignature
+ (EdDSAPublicKey) ed25519KeyPair.getPublic(),
+ edDsaSignature
);
} catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
throw new RuntimeException(e);
@@ -116,7 +116,7 @@ public static Ed25519Sha256Fulfillment constructEd25519Sha256Fulfillment(final K
* corresponding private key.
*/
public static Ed25519Sha256Fulfillment constructEd25519Sha256Fulfillment(
- final EdDSAPublicKey edDsaPublicKey, final byte[] signature
+ final EdDSAPublicKey edDsaPublicKey, final byte[] signature
) {
return Ed25519Sha256Fulfillment.from(edDsaPublicKey, signature);
}
@@ -126,12 +126,12 @@ public static Ed25519Sha256Fulfillment constructEd25519Sha256Fulfillment(
*/
public static ThresholdSha256Fulfillment constructThresholdFulfillment() {
return ThresholdSha256Fulfillment.from(
- Lists.newArrayList(TestConditionFactory
- .constructRsaSha256Condition(TestKeyFactory.constructRsaPublicKey(RSA_MODULUS))),
- Lists.newArrayList(
- TestFulfillmentFactory.constructPreimageFulfillment(PREIMAGE1),
- TestFulfillmentFactory.constructPrefixSha256Fulfillment(PREFIX1)
- )
+ Lists.newArrayList(TestConditionFactory
+ .constructRsaSha256Condition(TestKeyFactory.constructRsaPublicKey(RSA_MODULUS))),
+ Lists.newArrayList(
+ TestFulfillmentFactory.constructPreimageFulfillment(PREIMAGE1),
+ TestFulfillmentFactory.constructPrefixSha256Fulfillment(PREFIX1)
+ )
);
}
}
diff --git a/jackson-datatype-cryptoconditions/src/main/java/com/ripple/cryptoconditions/jackson/ConditionDeserializer.java b/jackson-datatype-cryptoconditions/src/main/java/com/ripple/cryptoconditions/jackson/ConditionDeserializer.java
index 17ddad9..edbec9d 100644
--- a/jackson-datatype-cryptoconditions/src/main/java/com/ripple/cryptoconditions/jackson/ConditionDeserializer.java
+++ b/jackson-datatype-cryptoconditions/src/main/java/com/ripple/cryptoconditions/jackson/ConditionDeserializer.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/Ed25519Sha256ConditionCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/Ed25519Sha256ConditionCryptoConditionModuleTest.java
index 5c6de04..a5efa53 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/Ed25519Sha256ConditionCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/Ed25519Sha256ConditionCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,19 +20,18 @@
* =========================LICENSE_END==================================
*/
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.HEX;
-
-import com.ripple.cryptoconditions.Ed25519Sha256Condition;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.Ed25519Sha256Condition;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,6 +76,7 @@ public Ed25519Sha256ConditionCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericConditionCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericConditionCryptoConditionModuleTest.java
index e6b96dc..f8047a1 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericConditionCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericConditionCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.Condition;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.Condition;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -72,6 +71,7 @@ public GenericConditionCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericFulfillmentCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericFulfillmentCryptoConditionModuleTest.java
index 32602d7..33d224a 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericFulfillmentCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/GenericFulfillmentCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.Fulfillment;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.Fulfillment;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -72,6 +71,7 @@ public GenericFulfillmentCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256ConditionCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256ConditionCryptoConditionModuleTest.java
index 68c744e..bd71dd8 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256ConditionCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256ConditionCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,19 +20,18 @@
* =========================LICENSE_END==================================
*/
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.HEX;
-
-import com.ripple.cryptoconditions.PrefixSha256Condition;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.PrefixSha256Condition;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,6 +76,7 @@ public PrefixSha256ConditionCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256FulfillmentCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256FulfillmentCryptoConditionModuleTest.java
index 306b006..fde5ebd 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256FulfillmentCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PrefixSha256FulfillmentCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,19 +20,18 @@
* =========================LICENSE_END==================================
*/
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.HEX;
-
-import com.ripple.cryptoconditions.PrefixSha256Fulfillment;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.PrefixSha256Fulfillment;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -82,6 +81,7 @@ public PrefixSha256FulfillmentCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256ConditionCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256ConditionCryptoConditionModuleTest.java
index ba3d684..6621bd5 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256ConditionCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256ConditionCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,19 +20,18 @@
* =========================LICENSE_END==================================
*/
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64URL_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.BASE64_WITHOUT_PADDING;
import static com.ripple.cryptoconditions.jackson.Encoding.HEX;
-
-import com.ripple.cryptoconditions.PreimageSha256Condition;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.PreimageSha256Condition;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,6 +76,7 @@ public PreimageSha256ConditionCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256FulfillmentCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256FulfillmentCryptoConditionModuleTest.java
index 73d6788..2a85398 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256FulfillmentCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/PreimageSha256FulfillmentCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.PreimageSha256Fulfillment;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.PreimageSha256Fulfillment;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -72,6 +71,7 @@ public PreimageSha256FulfillmentCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256ConditionCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256ConditionCryptoConditionModuleTest.java
index 1289190..6600c35 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256ConditionCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256ConditionCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.RsaSha256Condition;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.RsaSha256Condition;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256FulfillmentCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256FulfillmentCryptoConditionModuleTest.java
index 285cfca..38582bc 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256FulfillmentCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/RsaSha256FulfillmentCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.RsaSha256Fulfillment;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.RsaSha256Fulfillment;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -86,6 +85,7 @@ public RsaSha256FulfillmentCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256ConditionCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256ConditionCryptoConditionModuleTest.java
index e46916c..275c144 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256ConditionCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256ConditionCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.ThresholdSha256Condition;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.ThresholdSha256Condition;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -72,6 +71,7 @@ public TresholdSha256ConditionCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256FulfillmentCryptoConditionModuleTest.java b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256FulfillmentCryptoConditionModuleTest.java
index 93b8a2d..dbe3cc6 100644
--- a/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256FulfillmentCryptoConditionModuleTest.java
+++ b/jackson-datatype-cryptoconditions/src/test/java/com/ripple/cryptoconditions/jackson/TresholdSha256FulfillmentCryptoConditionModuleTest.java
@@ -9,9 +9,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.ripple.cryptoconditions.ThresholdSha256Fulfillment;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ripple.cryptoconditions.ThresholdSha256Fulfillment;
import org.immutables.value.Value;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -94,6 +93,7 @@ public TresholdSha256FulfillmentCryptoConditionModuleTest(
/**
* Get test parameters.
+ *
* @return the parameters for the tests
*/
@Parameters
diff --git a/pom.xml b/pom.xml
index c3d2525..e0d5ef8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,17 @@
+
+ owasp
+
+
+
+ org.owasp
+ dependency-check-maven
+
+
+
+
@@ -85,14 +96,11 @@
argLinecheckstyle.xml
-
- ${project.build.directory}/checkstyle-reports/checkstyle-result.xml
- warningtrue
- 2.9.8
+ [2.9.10.1,)
@@ -194,7 +202,7 @@
org.apache.maven.pluginsmaven-dependency-plugin
- 3.1.0
+ 3.1.1analyze
@@ -257,7 +265,7 @@
org.apache.maven.pluginsmaven-enforcer-plugin
- 3.0.0-M1
+ 3.0.0-M2enforce-maven
@@ -300,8 +308,7 @@
check
- true
-
+ falsefalse
@@ -309,7 +316,7 @@
maven-compiler-plugin
- 3.6.2
+ 3.8.1${maven.compiler.source}${maven.compiler.target}
@@ -317,7 +324,7 @@
maven-source-plugin
- 2.2.1
+ 3.2.0attach-sources
@@ -329,7 +336,13 @@
maven-javadoc-plugin
- 2.10.4
+ 3.1.0
+
+
+ .*\/generated.*sources\/.*
+
+ 8
+ attach-javadocs
@@ -342,19 +355,30 @@
maven-checkstyle-plugin
- 3.0.0
+ 3.1.0true
+
+
+ ${project.build.sourceDirectory}
+ ${project.build.testSourceDirectory}
+
+ .*\/generated.*sources\/.*
+ UTF-8
+ true
+ false
+ true
+ com.puppycrawl.toolscheckstyle
- [8.18,)
+ 8.23
- process-sources
+ testcheck
@@ -363,7 +387,7 @@
org.jacoco
- 0.8.1
+ 0.8.4jacoco-maven-plugin
@@ -382,7 +406,7 @@
maven-surefire-plugin
- 2.20
+ 2.22.2@{argLine}false
@@ -405,10 +429,6 @@
org.apache.maven.pluginsmaven-enforcer-plugin
-
- org.owasp
- dependency-check-maven
- com.ning.maven.pluginsmaven-duplicate-finder-plugin
@@ -448,7 +468,6 @@
-
@@ -465,6 +484,16 @@
maven-checkstyle-plugin
+
+
+ ${project.build.sourceDirectory}
+ ${project.build.testSourceDirectory}
+
+ .*\/generated.*sources\/.*
+ UTF-8
+ true
+ false
+
@@ -475,6 +504,11 @@
maven-javadoc-plugin
+
+
+ .*\/generated.*sources\/.*
+
+