locusworks/commons
4
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Upgraded to jdk21, package versions, and added test coverage

Browse Source
This commit is contained in:
Isaac Parenteau
2026-07-12 22:15:45 -05:00
parent 800cabda34
commit 61efd0eaec
81 changed files with 7235 additions and 5128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -12,3 +12,6 @@
**/*.iml
**/git.properties
.metadata/
id_rsa*
named*
short*

55
pom.xml
View File

@@ -18,11 +18,11 @@
</scm>
<properties>
<log4j.version>2.20.0</log4j.version>
<slf4j.version>2.0.9</slf4j.version>
<jackson.version>2.15.2</jackson.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<log4j.version>2.26.1</log4j.version>
<slf4j.version>2.0.18</slf4j.version>
<jackson.version>2.22.1</jackson.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
</properties>
@@ -31,12 +31,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.5.6</version>
<configuration>
<argLine>@{argLine} --add-exports java.base/sun.security.jca=ALL-UNNAMED</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.15.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -51,7 +54,14 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>8.4.0</version>
<version>12.2.2</version>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
<skipTestScope>true</skipTestScope>
<failOnError>true</failOnError>
<versionCheckEnabled>true</versionCheckEnabled>
<nvdApiKey>e2eb1036-9b5b-4df9-95e7-0888be947011</nvdApiKey>
</configuration>
<executions>
<execution>
<goals>
@@ -63,7 +73,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<version>0.8.15</version>
<executions>
<execution>
<goals>
@@ -108,29 +118,37 @@
</build>
<dependencies>
<!-- Source: https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.22.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.0</version>
<version>6.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.10.0</version>
<version>6.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>9.22.1</version>
<version>12.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -161,12 +179,7 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.14</version>
<version>5.6.2</version>
</dependency>
<!-- Jackson -->
@@ -178,7 +191,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>2.22</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -189,7 +202,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.14.0</version>
</dependency>
</dependencies>

5
src/main/java/net/locusworks/common/Charsets.java
View File

@@ -24,7 +24,7 @@ import java.nio.charset.Charset;
*
* <p>See the Guava User Guide article on <a
* href="https://github.com/google/guava/wiki/StringsExplained#charsets">{@code Charsets}</a>.
*
* <p>
* Please do not add new Charset references to this class, unless those character encodings are
* part of the set required to be supported by all Java platform implementations! Any Charsets
* initialized here may cause unexpected delays when this class is loaded. See the Charset
@@ -32,7 +32,8 @@ import java.nio.charset.Charset;
*
*/
public final class Charsets {
private Charsets() {}
private Charsets() {
}
/**
* US-ASCII: seven-bit ASCII, the Basic Latin block of the Unicode character set (ISO646-US).

1
src/main/java/net/locusworks/common/annotations/MapValue.java
View File

@@ -10,6 +10,7 @@ import java.lang.annotation.Target;
* This is at the field level and will map the
* filed name as the key and the field value as the value
* in the map
*
* @author Isaac Parenteau
*
*/

6
src/main/java/net/locusworks/common/configuration/ConfigurationManager.java
View File

@@ -85,6 +85,7 @@ public class ConfigurationManager {
/**
* Save the configuration values to file
*
* @param confs Configuration property values to save
* @throws Exception general exception
*/
@@ -97,6 +98,7 @@ public class ConfigurationManager {
public String getPropertyValue(String key) {
return getPropertyValue(key, null);
}
public String getPropertyValue(String key, String defaultValue) {
return configuration.containsKey(key) ? configuration.getProperty(key) : defaultValue;
}
@@ -128,7 +130,9 @@ public class ConfigurationManager {
//Check to see if the old value changed
String oldValue = props.getProperty(fieldName);
if (Utils.isNotValid(oldValue, fieldValue) || oldValue.equals(fieldValue)) { continue; }
if (Utils.isNotValid(oldValue, fieldValue) || oldValue.equals(fieldValue)) {
continue;
}
changed = true;

15
src/main/java/net/locusworks/common/configuration/PropertiesManager.java
View File

@@ -19,13 +19,15 @@ import net.locusworks.common.immutables.Unit;
/**
* Properties manager class to help load and read properties
*
* @author Isaac Parenteau
* @version 2.0.0
* @date 09/17/2023
*/
public class PropertiesManager {
/**
* Load a configuration from resource
* Load a configuration from a resource
*
* @param clazz class loader
* @param src source of the file
* @return properties
@@ -46,6 +48,7 @@ public class PropertiesManager {
/**
* Load configuration from a file. This method has been deprecated and may be removed in
* future released. Please use java.nio.Path
*
* @param file File to load
* @return properties
* @throws IOException Exception thrown the file can't be read
@@ -57,6 +60,7 @@ public class PropertiesManager {
/**
* Load configuration from a file.
*
* @param path the path to the file
* @return properties
* @throws IOException Exception thrown the file can't be read
@@ -66,13 +70,14 @@ public class PropertiesManager {
return new Properties();
}
try(BufferedReader br = Files.newBufferedReader(path)) {
try (BufferedReader br = Files.newBufferedReader(path)) {
return loadConfiguration(br);
}
}
/**
* Load configuration from a buffered reader
*
* @param reader Buffered reader to read the properties values from
* @return properties
* @throws IOException Exception thrown the file can't be read
@@ -85,6 +90,7 @@ public class PropertiesManager {
/**
* Add configurations from one properties file to another
*
* @param to Properties file to copy values to
* @param from Properties file to copy values from
* @return a map containing the results of the values added
@@ -105,6 +111,7 @@ public class PropertiesManager {
/**
* Removes configuration values that are not present in the comparedTo
*
* @param from Properties file to remove values from
* @param comparedTo Properties file to compare to
* @return a map containing the results of the values removed
@@ -126,6 +133,7 @@ public class PropertiesManager {
/**
* <p>Save the properties file to disk.</p>
* <p><b>This method has been depecreated and could be removed in future release.<br/>Please use java.nio.Path</b></p>
*
* @param props Properties file to save
* @param fileToSave File to save to
* @param comment Any comments to add
@@ -138,12 +146,13 @@ public class PropertiesManager {
/**
* <p>Save the properties file to disk.</p>
*
* @param props Properties file to save
* @param fileToSave File to save to
* @param comment Any comments to add
*/
public static void saveConfiguration(Properties props, Path fileToSave, String comment) {
try(OutputStream fos = Files.newOutputStream(fileToSave)) {
try (OutputStream fos = Files.newOutputStream(fileToSave)) {
props.store(fos, comment == null ? "" : comment);
} catch (IOException ex) {
throw new RuntimeException(ex.getMessage(), ex);

11
src/main/java/net/locusworks/common/crypto/AES.java
View File

@@ -12,6 +12,7 @@ import java.util.Base64;
import net.locusworks.common.utils.RandomString;
import net.locusworks.common.utils.Utils;
import static net.locusworks.common.Charsets.UTF_8;
@@ -21,6 +22,7 @@ import static net.locusworks.common.Charsets.UTF_8;
* Instead, it is generated by the provided seed. As long as the seed stays the same
* the key will remain the same and the encryption/decryption will work. This
* provides and added security.
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
@@ -29,7 +31,7 @@ import static net.locusworks.common.Charsets.UTF_8;
public class AES {
private static final String ENCRYPTION_TYPE = "AES";
private static final String ENCRYPTION_ALGORITH = "AES/CBC/PKCS5Padding";
private static final String ENCRYPTION_ALGORITHM = "AES/CBC/PKCS5Padding";
private static final String PROVIDER = "SunJCE";
private static final String ALGORITHM = "SHA1PRNG";
@@ -59,6 +61,7 @@ public class AES {
/**
* Initializes the secure random object to be the same across all platforms
* with regard to provider and algorithm used
*
* @param seed Seed to initialize SecureRandom with
* @return SecureRandom object
* @throws NoSuchAlgorithmException thrown when algorithm can't be used
@@ -71,11 +74,12 @@ public class AES {
/**
* Initialize the aes engine
*
* @param key secret key to use
*/
private void init(final byte[] key) {
try {
this.cipher = Cipher.getInstance(ENCRYPTION_ALGORITH, PROVIDER);
this.cipher = Cipher.getInstance(ENCRYPTION_ALGORITHM, PROVIDER);
this.secretKeySpec = new SecretKeySpec(key, ENCRYPTION_TYPE);
this.ivParamSpec = new IvParameterSpec(randomizer.getBytes(16));
} catch (Exception ex) {
@@ -114,7 +118,8 @@ public class AES {
try {
cipher.init(Cipher.DECRYPT_MODE, this.secretKeySpec, this.ivParamSpec);
return new String(cipher.doFinal(cipherText), UTF_8);
} catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException | InvalidAlgorithmParameterException e) {
} catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException |
InvalidAlgorithmParameterException e) {
throw new IllegalArgumentException(e.getMessage(), e);
}
}

3
src/main/java/net/locusworks/common/crypto/AESKey.java
View File

@@ -7,7 +7,8 @@ import net.locusworks.common.Charsets;
public class AESKey implements PrivateKey {
@Serial private static final long serialVersionUID = -8452357427706386362L;
@Serial
private static final long serialVersionUID = -8452357427706386362L;
private final String seed;
public AESKey(String seed) {

6
src/main/java/net/locusworks/common/crypto/EncryptionKeyFactory.java
View File

@@ -20,19 +20,19 @@ public class EncryptionKeyFactory extends KeyFactory {
public PrivateKey generatePrivateKey(KeySpec keySpec) throws InvalidKeySpecException {
if (keySpec instanceof AESKeySpec) {
return ((AESKeySpec)keySpec).generateKey();
return ((AESKeySpec) keySpec).generateKey();
}
return super.generatePrivate(keySpec);
}
public PublicKey generatePublicKey(KeySpec keySpec) throws InvalidKeySpecException {
keySpec = keySpec instanceof SSHEncodedKeySpec ? ((SSHEncodedKeySpec)keySpec).convertToRSAPubKeySpec() : keySpec;
keySpec = keySpec instanceof SSHEncodedKeySpec ? ((SSHEncodedKeySpec) keySpec).convertToRSAPubKeySpec() : keySpec;
return super.generatePublic(keySpec);
}
public static EncryptionKeyFactory getInstance(String algorithm) throws NoSuchAlgorithmException {
Instance instance = GetInstance.getInstance("KeyFactory", KeyFactorySpi.class, algorithm);
return new EncryptionKeyFactory((KeyFactorySpi)instance.impl, instance.provider, algorithm);
return new EncryptionKeyFactory((KeyFactorySpi) instance.impl, instance.provider, algorithm);
}
}

15
src/main/java/net/locusworks/common/crypto/HashSalt.java
View File

@@ -9,6 +9,7 @@ import javax.crypto.spec.PBEKeySpec;
/**
* The type Hash salt.
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
@@ -51,7 +52,6 @@ public class HashSalt {
* Returns a salted PBKDF2 hash of the password.
*
* @param password the password to hash
*
* @return a salted PBKDF2 hash of the password
* @throws NoSuchAlgorithmException the no such algorithm exception
* @throws InvalidKeySpecException the invalid key spec exception
@@ -64,7 +64,6 @@ public class HashSalt {
* Returns a salted PBKDF2 hash of the password.
*
* @param password the password to hash
*
* @return a salted PBKDF2 hash of the password
* @throws NoSuchAlgorithmException the no such algorithm exception
* @throws InvalidKeySpecException the invalid key spec exception
@@ -86,7 +85,6 @@ public class HashSalt {
*
* @param password the password to check
* @param correctHash the hash of the valid password
*
* @return true if the password is correct, false if not
* @throws NoSuchAlgorithmException the no such algorithm exception
* @throws InvalidKeySpecException the invalid key spec exception
@@ -100,7 +98,6 @@ public class HashSalt {
*
* @param password the password to check
* @param correctHash the hash of the valid password
*
* @return true if the password is correct, false if not
* @throws NoSuchAlgorithmException the no such algorithm exception
* @throws InvalidKeySpecException the invalid key spec exception
@@ -130,7 +127,7 @@ public class HashSalt {
*/
private static boolean slowEquals(byte[] a, byte[] b) {
int diff = a.length ^ b.length;
for(int i = 0; i < a.length && i < b.length; i++)
for (int i = 0; i < a.length && i < b.length; i++)
diff |= a[i] ^ b[i];
return diff == 0;
}
@@ -158,8 +155,8 @@ public class HashSalt {
*/
private static byte[] fromHex(String hex) {
byte[] binary = new byte[hex.length() / 2];
for(int i = 0; i < binary.length; i++) {
binary[i] = (byte)Integer.parseInt(hex.substring(2*i, 2*i+2), 16);
for (int i = 0; i < binary.length; i++) {
binary[i] = (byte) Integer.parseInt(hex.substring(2 * i, 2 * i + 2), 16);
}
return binary;
}
@@ -174,13 +171,13 @@ public class HashSalt {
BigInteger bi = new BigInteger(1, array);
String hex = bi.toString(16);
int paddingLength = (array.length * 2) - hex.length();
if(paddingLength > 0)
if (paddingLength > 0)
return String.format("%0" + paddingLength + "d", 0) + hex;
else
return hex;
}
public static void main (String[] args) throws Exception {
public static void main(String[] args) throws Exception {
if (args == null || !(args.length > 0)) {
throw new IllegalArgumentException("No args provided. Need password as argument");
}

30
src/main/java/net/locusworks/common/crypto/KeyFile.java
View File

@@ -53,7 +53,8 @@ public class KeyFile implements AutoCloseable {
this.encryptionType = encryptionType;
}
private KeyFile() {}
private KeyFile() {
}
private void loadFromFile(String fileName) {
if (Utils.isEmptyString(fileName)) return;
@@ -65,16 +66,20 @@ public class KeyFile implements AutoCloseable {
throw new IllegalArgumentException(String.format("Unable to find file with name %s. Please check path", fileName));
}
String contentStr = IOUtils.toString(new FileInputStream(keyFile), Charsets.UTF_8);
String contentStr;
try (FileInputStream input = new FileInputStream(keyFile)) {
contentStr = IOUtils.toString(input, Charsets.UTF_8);
}
boolean rsaFormat = !contentStr.startsWith("ssh-rsa") && !contentStr.startsWith("aes-seed");
if (rsaFormat) {
contentStr = contentStr.replace("-----.*", "");
contentStr = contentStr.replaceAll("-----[^-]+-----", "");
contentStr = contentStr.replaceAll("\\s", "");
} else {
contentStr = contentStr.trim();
}
contentStr = contentStr.replace("\\r?\\n", "");
byte[] content = rsaFormat ? Base64.getDecoder().decode(contentStr): contentStr.getBytes(Charsets.UTF_8);
byte[] content = rsaFormat ? Base64.getDecoder().decode(contentStr) : contentStr.getBytes(Charsets.UTF_8);
EncryptionKeyFactory kf = EncryptionKeyFactory.getInstance("RSA");
@@ -90,10 +95,13 @@ public class KeyFile implements AutoCloseable {
this.key = ksh.isPrivate() ? kf.generatePrivateKey(ksh.getKeySpec()) : kf.generatePublicKey(ksh.getKeySpec());
this.encryptionType = ksh.getEncryptionType();
break;
} catch (NullPointerException | InvalidKeySpecException ikse) { continue; }
} catch (NullPointerException | InvalidKeySpecException ikse) {
continue;
}
}
if (this.key == null) {
throw new InvalidKeySpecException(String.format("Unable to determine if file %s is a private or public key. Not type of PKCS8, X509, SSH or AES spec", fileName));
}
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -102,7 +110,7 @@ public class KeyFile implements AutoCloseable {
public void write(String fileName) {
try {
String data;
switch(this.encryptionType) {
switch (this.encryptionType) {
case AES:
data = String.format("%s %s", this.key.getFormat(), Base64.getEncoder().encodeToString(this.key.getEncoded()));
IOUtils.writeStringToFile(fileName, data);
@@ -110,7 +118,7 @@ public class KeyFile implements AutoCloseable {
case SSH:
try (DataOutputStreamHelper dosh = new DataOutputStreamHelper()) {
getSSHPubKeyBytes(this.key)
.forEach(handleExceptionWrapper(item ->{
.forEach(handleExceptionWrapper(item -> {
dosh.writeInt(item.length);
dosh.write(item);
}));
@@ -178,7 +186,7 @@ public class KeyFile implements AutoCloseable {
}
private List<byte[]> getSSHPubKeyBytes(Key key) {
RSAPublicKey rpk = (RSAPublicKey)key;
RSAPublicKey rpk = (RSAPublicKey) key;
return Arrays.asList("ssh-rsa".getBytes(Charsets.UTF_8),
rpk.getPublicExponent().toByteArray(),
rpk.getModulus().toByteArray()

8
src/main/java/net/locusworks/common/crypto/RSA.java
View File

@@ -23,7 +23,7 @@ import net.locusworks.common.io.IOUtils;
public class RSA {
private static final String ENCRYPTION_TYPE = "RSA";
private static final String ENCRYPTION_ALGORITHM = "RSA/ECB/PKCS10PADDING";
private static final String ENCRYPTION_ALGORITHM = "RSA/ECB/PKCS1PADDING";
private static final String PROVIDER = "SunJCE";
private static final String RANDOM_ALGORITHM = "SHA1PRNG";
@@ -56,7 +56,7 @@ public class RSA {
public static KeyPair loadKeyPair(String publicKey, String privateKey) {
KeyFile pubKey = KeyFile.read(publicKey);
KeyFile prvKey = KeyFile.read(privateKey);
return new KeyPair((PublicKey)pubKey.getKey(), (PrivateKey)prvKey.getKey());
return new KeyPair((PublicKey) pubKey.getKey(), (PrivateKey) prvKey.getKey());
}
public static boolean generateAndWriteSSHKeys() {
@@ -139,14 +139,14 @@ public class RSA {
}
private static boolean writePemFile(Key key, String fileName, String description, boolean sshFormat) {
try(KeyFile kf = sshFormat ? new KeyFile(key, description, EncryptionType.SSH) : new KeyFile(key, description)) {
try (KeyFile kf = sshFormat ? new KeyFile(key, description, EncryptionType.SSH) : new KeyFile(key, description)) {
kf.write(fileName);
}
return Files.exists(Paths.get(fileName));
}
private static void calculateKeyLength(Key key, String message) throws IllegalBlockSizeException {
int keyLength = ((RSAKey)key).getModulus().bitLength();
int keyLength = ((RSAKey) key).getModulus().bitLength();
int requiredKeyLength = calculateRequiredKeyLength(message);
if (keyLength < requiredKeyLength) {
throw new IllegalBlockSizeException(String.format("RSA key size of %d is not large enough to encrypt message of length %d. "

6
src/main/java/net/locusworks/common/crypto/SSHEncodedKeySpec.java
View File

@@ -49,11 +49,11 @@ public class SSHEncodedKeySpec extends EncodedKeySpec {
}
private static byte[] readLengthFirst(InputStream in) throws IOException {
int[] bytes = new int[] {in.read(), in.read(), in.read(), in.read()};
int[] bytes = new int[]{in.read(), in.read(), in.read(), in.read()};
int length = 0;
int shift = 24;
for (int i = 0; i < bytes.length; i++) {
length += bytes[i] << shift;
for (int aByte : bytes) {
length += aByte << shift;
shift -= 8;
}
byte[] val = new byte[length];

3
src/main/java/net/locusworks/common/exceptions/ApplicationException.java
View File

@@ -10,7 +10,8 @@ import java.io.Serial;
public class ApplicationException extends Exception {
private final Integer code;
boolean success = false;
@Serial private static final long serialVersionUID = 1L;
@Serial
private static final long serialVersionUID = 1L;
public static ApplicationException egregiousServer() {
return new ApplicationException(9001, "Something went wrong. Please see logs for details");

21
src/main/java/net/locusworks/common/immutables/Pair.java
View File

@@ -1,11 +1,14 @@
package net.locusworks.common.immutables;
import java.util.Objects;
/**
* Class that holds two immutable objects as a pair
* @author Isaac Parenteau
* @version 1.0.0
*
* @param <V1> class type of object 1
* @param <V2> class type of object 2
* @author Isaac Parenteau
* @version 1.0.0
*/
public class Pair<V1, V2> extends Unit<V1> {
@@ -20,6 +23,7 @@ public class Pair<V1, V2> extends Unit<V1> {
/**
* Constructor
*
* @param value1 Object 1
* @param value2 Object 2
*/
@@ -30,14 +34,19 @@ public class Pair<V1, V2> extends Unit<V1> {
/**
* Set value2
*
* @param value2 value to set it
*/
public void setValue2(V2 value2) {
if (Objects.nonNull(this.value2)) {
throw new IllegalArgumentException("Value2 already set. Cannot change");
}
this.value2 = value2;
}
/**
* Get value2
*
* @return value2
*/
public V2 getValue2() {
@@ -46,10 +55,10 @@ public class Pair<V1, V2> extends Unit<V1> {
@Override
public boolean equals(Object other) {
if (!(other instanceof Pair)) return false;
if (other == null) return false;
if (!(other instanceof Pair<?, ?> pair)) return false;
Pair<?, ?> otherPair = (Pair<?, ?>)other;
return super.equals(otherPair) && this.getValue2().equals(otherPair.getValue2());
return this.getValue2().equals(pair.getValue2()) &&
this.getValue1().equals(pair.getValue1());
}
}

20
src/main/java/net/locusworks/common/immutables/Triplet.java
View File

@@ -1,12 +1,15 @@
package net.locusworks.common.immutables;
import java.util.Objects;
/**
* Class that holds three immutable objects as triplets
* @author Isaac Parenteau
* @version 1.0.0
*
* @param <V1> class type of object 1
* @param <V2> class type of object 2
* @param <V3> class type of object 3
* @author Isaac Parenteau
* @version 1.0.0
*/
public class Triplet<V1, V2, V3> extends Pair<V1, V2> {
@@ -21,6 +24,7 @@ public class Triplet<V1, V2, V3> extends Pair<V1, V2> {
/**
* Constructor
*
* @param value1 Object 1
* @param value2 Object 2
* @param value3 Object 3
@@ -32,14 +36,19 @@ public class Triplet<V1, V2, V3> extends Pair<V1, V2> {
/**
* Set value 3
*
* @param value3 value 3
*/
public void setValue3(V3 value3) {
if (Objects.nonNull(this.value3)) {
throw new IllegalArgumentException("Value3 already set. Cannot change");
}
this.value3 = value3;
}
/**
* Get value 3
*
* @return value 3
*/
public V3 getValue3() {
@@ -48,8 +57,11 @@ public class Triplet<V1, V2, V3> extends Pair<V1, V2> {
@Override
public boolean equals(Object other) {
if (!(other instanceof Triplet<?, ?, ?> otherTriplet)) return false;
if (other == null) return false;
if (!(other instanceof Triplet<?, ?, ?> triplet)) return false;
return super.equals(otherTriplet) && this.getValue3().equals(otherTriplet.getValue3());
return this.getValue3().equals(triplet.getValue3()) &&
this.getValue2().equals(triplet.getValue2()) &&
this.getValue1().equals(triplet.getValue1());
}
}

24
src/main/java/net/locusworks/common/immutables/Unit.java
View File

@@ -1,10 +1,13 @@
package net.locusworks.common.immutables;
import java.util.Objects;
/**
* Class that holds three immutable objects as triplets
*
* @param <V1> class type of object 1
* @author Isaac Parenteau
* @version 1.0.0
* @param <V1> class type of object 1
*/
public class Unit<V1> {
@@ -13,10 +16,12 @@ public class Unit<V1> {
/**
* Default constructor with no values
*/
public Unit() {}
public Unit() {
}
/**
* Constuctor
* Constructor
*
* @param value1 value 1
*/
public Unit(V1 value1) {
@@ -25,14 +30,19 @@ public class Unit<V1> {
/**
* Set value 1
*
* @param value1 value 1
*/
public void setValue1(V1 value1) {
if (Objects.nonNull(this.value1)) {
throw new IllegalArgumentException("Value1 already set. Cannot change");
}
this.value1 = value1;
}
/**
* Get value 1
*
* @return value1
*/
public V1 getValue1() {
@@ -41,10 +51,8 @@ public class Unit<V1> {
@Override
public boolean equals(Object other) {
if (!(other instanceof Unit)) return false;
Unit<?> otherUnit = (Unit<?>)other;
return this.getValue1().equals(otherUnit.getValue1());
if (other == null) return false;
if (!(other instanceof Unit<?>)) return false;
return this.getValue1().equals(((Unit<?>) other).getValue1());
}
}

9
src/main/java/net/locusworks/common/io/IOUtils.java
View File

@@ -48,8 +48,8 @@ public class IOUtils {
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
*
* @param input the <code>InputStream</code> to read from, not null
* @param encoding the encoding to use, null means platform default
* @param stream the <code>InputStream</code> to read from, not null
* @param charset the encoding to use, null means platform default
* @return the list of Strings, never null
* @throws NullPointerException if the input is null
* @throws IOException if an I/O error occurs
@@ -74,7 +74,7 @@ public class IOUtils {
public static List<String> readLines(final Reader input) throws IOException {
final BufferedReader reader = toBufferedReader(input);
final List<String> list = new ArrayList<>();
for(String line = reader.readLine(); line != null; line = reader.readLine()) {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
list.add(line);
}
return list;
@@ -136,6 +136,7 @@ public class IOUtils {
}
return (int) count;
}
/**
* Copies bytes from an <code>InputStream</code> to an <code>OutputStream</code> using an internal buffer of the
* given size.
@@ -329,7 +330,7 @@ public class IOUtils {
}
public static void writeStringToFile(Path file, String data, Charset charset) throws IOException {
try(Writer writer = Files.newBufferedWriter(file, charset)) {
try (Writer writer = Files.newBufferedWriter(file, charset)) {
writer.write(data);
writer.flush();
}

4
src/main/java/net/locusworks/common/migration/MigrationItem.java
View File

@@ -11,12 +11,12 @@ public class MigrationItem {
protected Flyway flyway = null;
protected MigrationInfo[] pendingMigrations;
protected MigrationInfo[] allMigrations;
private MigrationCallback callback;
private final MigrationCallback callback;
public MigrationItem(Flyway flyway, MigrationCallback callback) {
this.allMigrations = flyway.info().all();
this.pendingMigrations = flyway.info().pending();
this.flyway=flyway;
this.flyway = flyway;
this.callback = callback;
}

54
src/main/java/net/locusworks/common/net/HttpClientHelper.java
View File

@@ -1,20 +1,12 @@
package net.locusworks.common.net;
import java.security.SecureRandom;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import net.locusworks.common.net.certmanagers.TrustAllCertsManager;
import net.locusworks.common.net.hostverifiers.AllHostValidVerifyer;
import net.locusworks.common.net.ssl.SSLManager;
import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
public class HttpClientHelper {
@@ -32,13 +24,14 @@ public class HttpClientHelper {
}
}
private static final String[] TLS = new String[] {"TLSv1", "TLSv1.1", "TLSv1.2"};
private static final String[] TLS = new String[]{"TLSv1", "TLSv1.1", "TLSv1.2"};
private HttpClient client;
private String baseUrl;
private final HttpClient client;
private final String baseUrl;
/**
* Constructor to handle http connection
*
* @param protocol protocol to use (http or https)
* @param host the host url
* @param port the host port
@@ -60,36 +53,27 @@ public class HttpClientHelper {
return builder.build();
}
TrustManager[] trustAllCerts = new TrustManager[] { new TrustAllCertsManager() };
//Setup the ssl instance using tls
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(null, trustAllCerts, new SecureRandom());
SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, TLS, null, new AllHostValidVerifyer());
builder = builder.setSSLSocketFactory(sslsf);
return builder.build();
return SSLManager.getTrustAllTLSClient();
}
/**
* Get the http GET response code
*
* @param endpoint endpoint to get the response from
* @return responseCode
* @throws Exception general exception
*/
public Integer getGetResponseCode(String endpoint) throws Exception {
public Integer getResponseCode(String endpoint) throws Exception {
String url = this.baseUrl + endpoint;
HttpResponse response = this.client.execute(new HttpGet(url));
return this.client.execute(new HttpGet(url), response -> {
HttpEntity entity = response.getEntity();
Integer responseCode = response.getStatusLine().getStatusCode();
int responseCode = response.getCode();
EntityUtils.consume(entity);
return responseCode;
};
});
}
;
}

12
src/main/java/net/locusworks/common/net/certmanagers/TrustAllCertsManager.java
View File

@@ -9,16 +9,20 @@ import javax.net.ssl.X509TrustManager;
public class TrustAllCertsManager implements X509TrustManager {
@Override
public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { }
public void checkClientTrusted(X509Certificate[] arg0, String arg1) {
}
@Override
public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { }
public void checkServerTrusted(X509Certificate[] arg0, String arg1) {
}
@Override
public X509Certificate[] getAcceptedIssuers() { return null; }
public X509Certificate[] getAcceptedIssuers() {
return null;
}
public static TrustManager[] trustAllCerts() {
return new TrustManager[] { new TrustAllCertsManager() };
return new TrustManager[]{new TrustAllCertsManager()};
}
}

13
src/main/java/net/locusworks/common/net/hostverifiers/AllHostValidVerifier.java Normal file
View File

@@ -0,0 +1,13 @@
package net.locusworks.common.net.hostverifiers;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
public class AllHostValidVerifier implements HostnameVerifier {
@Override
public boolean verify(String arg0, SSLSession arg1) {
return true;
}
}

11
src/main/java/net/locusworks/common/net/hostverifiers/AllHostValidVerifyer.java
View File

@@ -1,11 +0,0 @@
package net.locusworks.common.net.hostverifiers;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
public class AllHostValidVerifyer implements HostnameVerifier {
@Override
public boolean verify(String arg0, SSLSession arg1) { return true; }
}

29
src/main/java/net/locusworks/common/net/ssl/SSLManager.java
View File

@@ -7,24 +7,35 @@ import java.security.SecureRandom;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import org.apache.http.client.HttpClient;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.HttpClientBuilder;
import net.locusworks.common.net.certmanagers.TrustAllCertsManager;
import net.locusworks.common.net.hostverifiers.AllHostValidVerifyer;
import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.apache.hc.client5.http.io.HttpClientConnectionManager;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
public class SSLManager {
public static final String[] TLS = new String[] {"TLSv1", "TLSv1.1", "TLSv1.2"};
public static final String[] TLS = new String[] {"TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"};
public static HttpClient getTrustAllTLSClient() throws NoSuchAlgorithmException, KeyManagementException {
SSLContext context = SSLContext.getInstance("TLS");
context.init(null, new TrustManager[] { new TrustAllCertsManager() }, new SecureRandom());
TrustManager[] trustAllCerts = new TrustManager[]{new TrustAllCertsManager()};
//Setup the ssl instance using tls
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(null, trustAllCerts, new SecureRandom());
TlsSocketStrategy tlsStrategy = new DefaultClientTlsStrategy(sslContext);
SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(context, TLS, null, new AllHostValidVerifyer());
HttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
.setTlsSocketStrategy(tlsStrategy)
.build();
return HttpClientBuilder.create().setSSLSocketFactory(sslsf).build();
return HttpClients.custom()
.setConnectionManager(connectionManager)
.build();
}
private SSLManager() { }
}

1
src/main/java/net/locusworks/common/objectmapper/ObjectMapperError.java
View File

@@ -2,6 +2,7 @@ package net.locusworks.common.objectmapper;
/**
* Error handler for the object mapper class
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018

19
src/main/java/net/locusworks/common/objectmapper/ObjectMapperHelper.java
View File

@@ -14,6 +14,7 @@ import com.google.gson.GsonBuilder;
/**
* Object mapper to map to convert objects to json string or
* json string back to object
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
@@ -21,14 +22,16 @@ import com.google.gson.GsonBuilder;
public class ObjectMapperHelper {
private static final ObjectMapper mapper;
static {
mapper = new ObjectMapper();
mapper.setSerializationInclusion(Include.NON_NULL);
mapper.setDefaultPropertyInclusion(Include.NON_NULL);
mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
}
/**
* Write an object out to json
*
* @param object Object to convert to json
* @return return a string representation of the object converted to json
*/
@@ -42,8 +45,8 @@ public class ObjectMapperHelper {
gsonBuilder.setPrettyPrinting();
Gson gson = gsonBuilder.create();
results = gson.toJson(object);
} catch (Exception e) {
new ObjectMapperResults<>(e);
} catch (Throwable e) {
return new ObjectMapperResults<>(e);
}
}
return new ObjectMapperResults<>(results);
@@ -51,6 +54,7 @@ public class ObjectMapperHelper {
/**
* Convert binary data to an object
*
* @param src Binary data to convert
* @param clazz Class to convert the data to
* @param <T> The expected class of the value
@@ -66,6 +70,7 @@ public class ObjectMapperHelper {
/**
* Convert a json string to an object
*
* @param src Json String
* @param clazz Class to convert the json string to
* @param <T> The expected class of the value
@@ -81,6 +86,7 @@ public class ObjectMapperHelper {
/**
* Convert an java object to a class
*
* @param src Object to convert
* @param clazz Class to convert the object to
* @param <T> The expected class of the value
@@ -89,7 +95,7 @@ public class ObjectMapperHelper {
public static <T> ObjectMapperResults<T> readValue(Object src, Class<T> clazz) {
try {
if (src instanceof String) {
return readValue((String)src, clazz);
return readValue((String) src, clazz);
}
return readValue(mapper.writeValueAsString(src), clazz);
} catch (Exception ex) {
@@ -99,6 +105,7 @@ public class ObjectMapperHelper {
/**
* Converts an object to a list
*
* @param object Object to convert
* @param objectClass Class to convert the object to
* @param <T> The expected class of the object
@@ -110,6 +117,7 @@ public class ObjectMapperHelper {
/**
* Converts an object to a list
*
* @param object Object to convert
* @param objectClass Class to convert the object to
* @param listClass List type to make
@@ -120,7 +128,7 @@ public class ObjectMapperHelper {
public static <T, L extends Collection<?>> ObjectMapperListResults<List<T>> readListValue(Object object, Class<T> objectClass, Class<L> listClass) {
try {
if (object instanceof String) {
return readListValue((String)object, objectClass, listClass);
return readListValue((String) object, objectClass, listClass);
}
return readListValue(mapper.writeValueAsString(object), objectClass, listClass);
} catch (Exception ex) {
@@ -130,6 +138,7 @@ public class ObjectMapperHelper {
/**
* Converts an object to a list
*
* @param src Source to convert
* @param objectClass Class to convert the object to
* @param listClass List type to make

7
src/main/java/net/locusworks/common/objectmapper/ObjectMapperListResults.java
View File

@@ -4,15 +4,17 @@ import java.util.Collection;
/**
* Holds the results from the object mapper list conversion
*
* @param <T> class type of the object mapper
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
* @param <T> class type of the object mapper
*/
public class ObjectMapperListResults<T extends Collection<?>> extends ObjectMapperResults<T> {
/**
* Constructor
*
* @param results results from the conversion
*/
public ObjectMapperListResults(T results) {
@@ -21,6 +23,7 @@ public class ObjectMapperListResults<T extends Collection<?>> extends ObjectMapp
/**
* Constructor
*
* @param exception exception that was thrown during conversion
*/
public ObjectMapperListResults(Throwable exception) {
@@ -29,6 +32,7 @@ public class ObjectMapperListResults<T extends Collection<?>> extends ObjectMapp
/**
* Constructor
*
* @param results results from the conversion
* @param exception exception that was thrown during conversion
*/
@@ -39,6 +43,7 @@ public class ObjectMapperListResults<T extends Collection<?>> extends ObjectMapp
/**
* Add the error handler to the results to retrieve the error that caused
* the exception
*
* @param error the error handler to use
* @return this
*/

12
src/main/java/net/locusworks/common/objectmapper/ObjectMapperResults.java
View File

@@ -2,10 +2,11 @@ package net.locusworks.common.objectmapper;
/**
* Holds the results from the object mapper list conversion
*
* @param <T> class type of the object being converted from json to object
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
* @param <T> class type of the object being converted from json to object
*/
public class ObjectMapperResults<T> {
@@ -14,6 +15,7 @@ public class ObjectMapperResults<T> {
/**
* Constructor
*
* @param results results from the conversion
*/
public ObjectMapperResults(T results) {
@@ -22,6 +24,7 @@ public class ObjectMapperResults<T> {
/**
* Constructor
*
* @param exception exception that was thrown during conversion
*/
public ObjectMapperResults(Throwable exception) {
@@ -30,6 +33,7 @@ public class ObjectMapperResults<T> {
/**
* Constructor
*
* @param results results from the conversion
* @param exception exception that was thrown during conversion
*/
@@ -40,6 +44,7 @@ public class ObjectMapperResults<T> {
/**
* get the exception that happened during conversion
*
* @return exception
*/
public Throwable getException() {
@@ -48,6 +53,7 @@ public class ObjectMapperResults<T> {
/**
* Set the exception
*
* @param exception
*/
public void setException(Throwable exception) {
@@ -56,6 +62,7 @@ public class ObjectMapperResults<T> {
/**
* Get the result
*
* @return the converted results
*/
public T getResults() {
@@ -64,6 +71,7 @@ public class ObjectMapperResults<T> {
/**
* set the results
*
* @param results results to set
*/
public void setResults(T results) {
@@ -72,6 +80,7 @@ public class ObjectMapperResults<T> {
/**
* Check to see if the conversion caused an error
*
* @return true if there is an error, false otherwise
*/
public boolean hasError() {
@@ -81,6 +90,7 @@ public class ObjectMapperResults<T> {
/**
* Add the error handler to the results to retrieve the error that caused
* the exception
*
* @param error the error handler to use
* @return this
*/

3
src/main/java/net/locusworks/common/properties/ImmutableProperties.java
View File

@@ -5,7 +5,8 @@ import java.util.Properties;
public class ImmutableProperties extends Properties {
@Serial private static final long serialVersionUID = 65942088008978137L;
@Serial
private static final long serialVersionUID = 65942088008978137L;
public ImmutableProperties() {
super();

235
src/main/java/net/locusworks/common/properties/OrderedProperties.java
View File

@@ -1,30 +1,7 @@
package net.locusworks.common.properties;
/*
* Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
@@ -59,7 +36,7 @@ import java.util.Set;
* {@link #store(java.io.Writer, java.lang.String) store(Writer, String)}
* methods load and store properties from and to a character based stream
* in a simple line-oriented format specified below.
*
* <p>
* The {@link #load(java.io.InputStream) load(InputStream)} <tt>/</tt>
* {@link #store(java.io.OutputStream, java.lang.String) store(OutputStream, String)}
* methods work the same way as the load(Reader)/store(Writer, String) pair, except
@@ -103,19 +80,19 @@ import java.util.Set;
* <p>This class is thread-safe: multiple threads can share a single
* <tt>Properties</tt> object without the need for external synchronization.
*
* @see <a href="../../../technotes/tools/solaris/native2ascii.html">native2ascii tool for Solaris</a>
* @see <a href="../../../technotes/tools/windows/native2ascii.html">native2ascii tool for Windows</a>
*
* @author Arthur van Hoff
* @author Michael McCloskey
* @author Xueming Shen
* @see <a href="../../../technotes/tools/solaris/native2ascii.html">native2ascii tool for Solaris</a>
* @see <a href="../../../technotes/tools/windows/native2ascii.html">native2ascii tool for Windows</a>
* @since JDK1.0
*/
public class OrderedProperties extends LinkedHashMap<Object,Object> {
public class OrderedProperties extends LinkedHashMap<Object, Object> {
/**
* use serialVersionUID from JDK 1.1.X for interoperability
*/
@Serial private static final long serialVersionUID = 4112578634023874840L;
@Serial
private static final long serialVersionUID = 4112578634023874840L;
/**
* A property list that contains default values for any keys not
@@ -216,9 +193,9 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* terminator. All of these key termination characters may be
* included in the key by escaping them with a preceding backslash
* character; for example,<p>
*
* <p>
* {@code \:\=}<p>
*
* <p>
* would be the two-character key {@code ":="}. Line
* terminator characters can be included using {@code \r} and
* {@code \n} escape sequences. Any white space after the
@@ -239,7 +216,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* <pre>
* Truth = Beauty
* Truth:Beauty
* Truth :Beauty
* Truth: Beauty
* </pre>
* As another example, the following three lines specify a single
* property:
@@ -267,7 +244,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* sequences similar to those used for character and string literals
* (see sections 3.3 and 3.10.6 of
* <cite>The Java&trade; Language Specification</cite>).
*
* <p>
* The differences from the character escape sequences and Unicode
* escapes used for characters and strings are:
*
@@ -323,7 +300,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* The specified stream remains open after this method returns.
*
* @param inStream the input stream.
* @exception IOException if an error occurred when reading from the
* @throws IOException if an error occurred when reading from the
* input stream.
* @throws IllegalArgumentException if the input stream contains a
* malformed Unicode escape sequence.
@@ -333,7 +310,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
load0(new LineReader(inStream));
}
private void load0 (LineReader lr) throws IOException {
private void load0(LineReader lr) throws IOException {
char[] convtBuf = new char[1024];
int limit;
int keyLen;
@@ -391,7 +368,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* Method returns the char length of the "logical line" and stores
* the line in "lineBuf".
*/
class LineReader {
static class LineReader {
public LineReader(InputStream inStream) {
this.inStream = inStream;
inByteBuf = new byte[8192];
@@ -423,8 +400,8 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
while (true) {
if (inOff >= inLimit) {
inLimit = (inStream==null)?reader.read(inCharBuf)
:inStream.read(inByteBuf);
inLimit = (inStream == null) ? reader.read(inCharBuf)
: inStream.read(inByteBuf);
inOff = 0;
if (inLimit <= 0) {
if (len == 0 || isCommentLine) {
@@ -471,9 +448,6 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
lineBuf[len++] = c;
if (len == lineBuf.length) {
int newLength = lineBuf.length * 2;
if (newLength < 0) {
newLength = Integer.MAX_VALUE;
}
char[] buf = new char[newLength];
System.arraycopy(lineBuf, 0, buf, 0, lineBuf.length);
lineBuf = buf;
@@ -484,10 +458,9 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
} else {
precedingBackslash = false;
}
}
else {
} else {
// reached EOL
if (isCommentLine || len == 0) {
if (isCommentLine) {
isCommentLine = false;
isNewLine = true;
skipWhiteSpace = true;
@@ -495,9 +468,9 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
continue;
}
if (inOff >= inLimit) {
inLimit = (inStream==null)
?reader.read(inCharBuf)
:inStream.read(inByteBuf);
inLimit = (inStream == null)
? reader.read(inCharBuf)
: inStream.read(inByteBuf);
inOff = 0;
if (inLimit <= 0) {
if (precedingBackslash) {
@@ -527,12 +500,9 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* Converts encoded &#92;uxxxx to unicode chars
* and changes special saved chars to their original forms
*/
private String loadConvert (char[] in, int off, int len, char[] convtBuf) {
private String loadConvert(char[] in, int off, int len, char[] convtBuf) {
if (convtBuf.length < len) {
int newLen = len * 2;
if (newLen < 0) {
newLen = Integer.MAX_VALUE;
}
convtBuf = new char[newLen];
}
char aChar;
@@ -544,30 +514,20 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
aChar = in[off++];
if (aChar == '\\') {
aChar = in[off++];
if(aChar == 'u') {
if (aChar == 'u') {
// Read the xxxx
int value=0;
for (int i=0; i<4; i++) {
int value = 0;
for (int i = 0; i < 4; i++) {
aChar = in[off++];
switch (aChar) {
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
value = (value << 4) + aChar - '0';
break;
case 'a': case 'b': case 'c':
case 'd': case 'e': case 'f':
value = (value << 4) + 10 + aChar - 'a';
break;
case 'A': case 'B': case 'C':
case 'D': case 'E': case 'F':
value = (value << 4) + 10 + aChar - 'A';
break;
default:
throw new IllegalArgumentException(
value = switch (aChar) {
case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' -> (value << 4) + aChar - '0';
case 'a', 'b', 'c', 'd', 'e', 'f' -> (value << 4) + 10 + aChar - 'a';
case 'A', 'B', 'C', 'D', 'E', 'F' -> (value << 4) + 10 + aChar - 'A';
default -> throw new IllegalArgumentException(
"Malformed \\uxxxx encoding.");
};
}
}
out[outLen++] = (char)value;
out[outLen++] = (char) value;
} else {
if (aChar == 't') aChar = '\t';
else if (aChar == 'r') aChar = '\r';
@@ -579,7 +539,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
out[outLen++] = aChar;
}
}
return new String (out, 0, outLen);
return new String(out, 0, outLen);
}
/*
@@ -591,51 +551,58 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
boolean escapeUnicode) {
int len = theString.length();
int bufLen = len * 2;
if (bufLen < 0) {
bufLen = Integer.MAX_VALUE;
}
StringBuffer outBuffer = new StringBuffer(bufLen);
for(int x=0; x<len; x++) {
for (int x = 0; x < len; x++) {
char aChar = theString.charAt(x);
// Handle common case first, selecting largest block that
// avoids the specials below
if ((aChar > 61) && (aChar < 127)) {
if (aChar == '\\') {
outBuffer.append('\\'); outBuffer.append('\\');
outBuffer.append('\\');
outBuffer.append('\\');
continue;
}
outBuffer.append(aChar);
continue;
}
switch(aChar) {
switch (aChar) {
case ' ':
if (x == 0 || escapeSpace)
outBuffer.append('\\');
outBuffer.append(' ');
break;
case '\t':outBuffer.append('\\'); outBuffer.append('t');
case '\t':
outBuffer.append('\\');
outBuffer.append('t');
break;
case '\n':outBuffer.append('\\'); outBuffer.append('n');
case '\n':
outBuffer.append('\\');
outBuffer.append('n');
break;
case '\r':outBuffer.append('\\'); outBuffer.append('r');
case '\r':
outBuffer.append('\\');
outBuffer.append('r');
break;
case '\f':outBuffer.append('\\'); outBuffer.append('f');
case '\f':
outBuffer.append('\\');
outBuffer.append('f');
break;
case '=': // Fall through
case ':': // Fall through
case '#': // Fall through
case '!':
outBuffer.append('\\'); outBuffer.append(aChar);
outBuffer.append('\\');
outBuffer.append(aChar);
break;
default:
if (((aChar < 0x0020) || (aChar > 0x007e)) & escapeUnicode ) {
if (((aChar < 0x0020) || (aChar > 0x007e)) & escapeUnicode) {
outBuffer.append('\\');
outBuffer.append('u');
outBuffer.append(toHex((aChar >> 12) & 0xF));
outBuffer.append(toHex((aChar >> 8) & 0xF));
outBuffer.append(toHex((aChar >> 4) & 0xF));
outBuffer.append(toHex( aChar & 0xF));
outBuffer.append(toHex(aChar & 0xF));
} else {
outBuffer.append(aChar);
}
@@ -655,14 +622,14 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
uu[1] = 'u';
while (current < len) {
char c = comments.charAt(current);
if (c > '\u00ff' || c == '\n' || c == '\r') {
if (c > 'ÿ' || c == '\n' || c == '\r') {
if (last != current)
bw.write(comments.substring(last, current));
if (c > '\u00ff') {
if (c > 'ÿ') {
uu[2] = toHex((c >> 12) & 0xf);
uu[3] = toHex((c >> 8) & 0xf);
uu[4] = toHex((c >> 4) & 0xf);
uu[5] = toHex( c & 0xf);
uu[5] = toHex(c & 0xf);
bw.write(new String(uu));
} else {
bw.newLine();
@@ -689,23 +656,21 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* Calls the {@code store(OutputStream out, String comments)} method
* and suppresses IOExceptions that were thrown.
*
* @param out an output stream.
* @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not
* {@code Strings}.
* @deprecated This method does not throw an IOException if an I/O error
* occurs while saving the property list. The preferred way to save a
* properties list is via the {@code store(OutputStream out,
* String comments)} method or the
* {@code storeToXML(OutputStream os, String comment)} method.
*
* @param out an output stream.
* @param comments a description of the property list.
* @exception ClassCastException if this {@code Properties} object
* contains any keys or values that are not
* {@code Strings}.
*/
@Deprecated
public void save(OutputStream out, String comments) {
try {
store(out, comments);
} catch (IOException e) {
} catch (IOException ignored) {
}
}
@@ -750,17 +715,16 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
*
* @param writer an output character stream writer.
* @param comments a description of the property list.
* @exception IOException if writing this property list to the specified
* @throws IOException if writing this property list to the specified
* output stream throws an <tt>IOException</tt>.
* @exception ClassCastException if this {@code Properties} object
* @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not {@code Strings}.
* @exception NullPointerException if {@code writer} is null.
* @throws NullPointerException if {@code writer} is null.
* @since 1.6
*/
public void store(Writer writer, String comments)
throws IOException
{
store0((writer instanceof BufferedWriter)?(BufferedWriter)writer
throws IOException {
store0((writer instanceof BufferedWriter) ? (BufferedWriter) writer
: new BufferedWriter(writer),
comments,
false);
@@ -795,35 +759,34 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* After the entries have been written, the output stream is flushed.
* The output stream remains open after this method returns.
* <p>
*
* @param out an output stream.
* @param comments a description of the property list.
* @exception IOException if writing this property list to the specified
* @throws IOException if writing this property list to the specified
* output stream throws an <tt>IOException</tt>.
* @exception ClassCastException if this {@code Properties} object
* @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not {@code Strings}.
* @exception NullPointerException if {@code out} is null.
* @throws NullPointerException if {@code out} is null.
* @since 1.2
*/
public void store(OutputStream out, String comments)
throws IOException
{
store0(new BufferedWriter(new OutputStreamWriter(out, "8859_1")),
throws IOException {
store0(new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.ISO_8859_1)),
comments,
true);
}
private void store0(BufferedWriter bw, String comments, boolean escUnicode)
throws IOException
{
throws IOException {
if (comments != null) {
writeComments(bw, comments);
}
bw.write("#" + new Date().toString());
bw.newLine();
synchronized (this) {
for (Enumeration<?> e = keys(); e.hasMoreElements();) {
String key = (String)e.nextElement();
String val = (String)get(key);
for (Enumeration<?> e = keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
String val = (String) get(key);
key = saveConvert(key, true, escUnicode);
/* No need to escape embedded and trailing spaces for value, hence
* pass false to flag.
@@ -849,7 +812,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
*/
public String getProperty(String key) {
Object oval = super.get(key);
String sval = (oval instanceof String) ? (String)oval : null;
String sval = (oval instanceof String) ? (String) oval : null;
return ((sval == null) && (defaults != null)) ? defaults.getProperty(key) : sval;
}
@@ -861,7 +824,6 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
*
* @param key the hashtable key.
* @param defaultValue a default value.
*
* @return the value in this property list with the specified key value.
* @see #setProperty
* @see #defaults
@@ -886,7 +848,7 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* @see #stringPropertyNames
*/
public Enumeration<?> propertyNames() {
LinkedHashMap<String,Object> h = new LinkedHashMap<>();
LinkedHashMap<String, Object> h = new LinkedHashMap<>();
enumerate(h);
return Collections.enumeration(h.keySet());
}
@@ -924,17 +886,9 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
* is not a string.
*/
public void list(PrintStream out) {
out.println("-- listing properties --");
LinkedHashMap<String,Object> h = new LinkedHashMap<>();
enumerate(h);
for (Enumeration<String> e = Collections.enumeration(h.keySet()) ; e.hasMoreElements() ;) {
String key = e.nextElement();
String val = (String)h.get(key);
if (val.length() > 40) {
val = val.substring(0, 37) + "...";
}
out.println(key + "=" + val);
}
PrintWriter writer = new PrintWriter(out);
list(writer);
writer.flush();
}
/**
@@ -953,11 +907,11 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
*/
public void list(PrintWriter out) {
out.println("-- listing properties --");
LinkedHashMap<String,Object> h = new LinkedHashMap<>();
LinkedHashMap<String, Object> h = new LinkedHashMap<>();
enumerate(h);
for (Enumeration<String> e = Collections.enumeration(h.keySet()) ; e.hasMoreElements() ;) {
for (Enumeration<String> e = Collections.enumeration(h.keySet()); e.hasMoreElements(); ) {
String key = e.nextElement();
String val = (String)h.get(key);
String val = (String) h.get(key);
if (val.length() > 40) {
val = val.substring(0, 37) + "...";
}
@@ -966,17 +920,18 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
}
/**
* Enumerates all key/value pairs in the specified hashtable.
* Lists all key/value pairs in the specified hashtable.
*
* @param h the hashtable
* @throws ClassCastException if any of the property keys
* is not of String type.
* is not of the String type.
*/
private synchronized void enumerate(LinkedHashMap<String,Object> h) {
private synchronized void enumerate(LinkedHashMap<String, Object> h) {
if (defaults != null) {
defaults.enumerate(h);
}
for (Enumeration<?> e = keys() ; e.hasMoreElements() ;) {
String key = (String)e.nextElement();
for (Enumeration<?> e = keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
h.put(key, get(key));
}
}
@@ -988,13 +943,14 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
/**
* Enumerates all key/value pairs in the specified hashtable
* and omits the property if the key or value is not a string.
*
* @param h the hashtable
*/
private synchronized void enumerateStringProperties(Map<String, String> h) {
if (defaults != null) {
defaults.enumerateStringProperties(h);
}
for (Enumeration<?> e = keys() ; e.hasMoreElements() ;) {
for (Enumeration<?> e = keys(); e.hasMoreElements(); ) {
Object k = e.nextElement();
Object v = get(k);
if (k instanceof String && v instanceof String) {
@@ -1005,14 +961,17 @@ public class OrderedProperties extends LinkedHashMap<Object,Object> {
/**
* Convert a nibble to a hex character
*
* @param nibble the nibble to convert.
*/
private static char toHex(int nibble) {
return hexDigit[(nibble & 0xF)];
}
/** A table of hex digits */
/**
* A table of hex digits
*/
private static final char[] hexDigit = {
'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
};
}

9
src/main/java/net/locusworks/common/utils/Constants.java
View File

@@ -2,17 +2,18 @@ package net.locusworks.common.utils;
/**
* Class to hold final static constant values used across the system
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
*/
public class Constants {
public static final short TRUE = (short)1;
public static final short FALSE = (short)0;
public static final short TRUE = (short) 1;
public static final short FALSE = (short) 0;
public static final short EXIT_SUCCESS = (short)0;
public static final short EXIT_FAIL = (short)1;
public static final short EXIT_SUCCESS = (short) 0;
public static final short EXIT_FAIL = (short) 1;
public static final String LOG4J_CONFIG_PROPERTY = "log4j.configurationFile";
public static final String JUNIT_TEST_CHECK = "junit.test";

5
src/main/java/net/locusworks/common/utils/DataOutputStreamHelper.java
View File

@@ -23,7 +23,7 @@ public class DataOutputStreamHelper extends DataOutputStream implements AutoClos
return new byte[0];
}
if (super.out instanceof ByteArrayOutputStream) {
return ((ByteArrayOutputStream)super.out).toByteArray();
return ((ByteArrayOutputStream) super.out).toByteArray();
}
return super.out.toString().getBytes(Charsets.UTF_8);
}
@@ -43,7 +43,8 @@ public class DataOutputStreamHelper extends DataOutputStream implements AutoClos
try {
super.out.close();
super.out = null;
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
}

22
src/main/java/net/locusworks/common/utils/DateTimeStampDeserializer.java
View File

@@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
* </pre>
* Will specify to use this deserializer class when a json field {@code purgeEndDate} is encountered in the json
* string and will try to convert the string into a date object and inject the value back into the class
*
* @author Isaac Parenteau
* @version 1.0
* @date 02/15/2018
@@ -30,14 +31,14 @@ public class DateTimeStampDeserializer extends JsonDeserializer<Date> {
private static final String EXPANDED_WITH_TIMEZONE = "MMM d, yyyy HH:mm:ss z";
private static final String EXPANDED_WITH_AM_PM = "MMM d, yyyy h:mm:ss a";
private static final String[] formats = new String[] {
private static final String[] formats = new String[]{
DEFAULT,
EXPANDED,
EXPANDED_WITH_TIMEZONE,
EXPANDED_WITH_AM_PM,
};
private static final Integer[] styles = new Integer[] {
private static final Integer[] styles = new Integer[]{
SimpleDateFormat.LONG,
SimpleDateFormat.FULL,
SimpleDateFormat.MEDIUM,
@@ -45,25 +46,26 @@ public class DateTimeStampDeserializer extends JsonDeserializer<Date> {
};
@Override
public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
public Date deserialize(JsonParser p, DeserializationContext context) throws IOException {
String value = p.getText();
Date date = null;
//First try to see if the value can be parsed into a long
Date date;
//First, try to see if the value can be parsed into along
try {
date = new Date(Long.parseLong(value));
return date;
} catch (Exception ex) { }
} catch (Exception ignored) {
}
//Next iterate over the built in styles to see if it can be converted
for (Integer style: styles) {
//Next, iterate over the built-in styles to see if it can be converted
for (Integer style : styles) {
date = formatDate(style, value);
if (date != null) {
return date;
}
}
//Lastly iterate over the custom styles specified in format to see if it can be converted
//Lastly, iterate over the custom styles specified in format to see if it can be converted
for (String fmt : formats) {
date = formatDate(fmt, value);
if (date != null) {
@@ -77,6 +79,7 @@ public class DateTimeStampDeserializer extends JsonDeserializer<Date> {
/**
* Convert a string value to a date object
*
* @param format The format to use in reference to the source
* @param source the source to convert
* @return Date object if the conversion was success; null otherwise
@@ -92,6 +95,7 @@ public class DateTimeStampDeserializer extends JsonDeserializer<Date> {
/**
* Convert a string value to a date object using SimpleDateFormats
* built in styles
*
* @param style The style to use
* @param source the source to convert
* @return Date object if the conversion was success; null otherwise

6
src/main/java/net/locusworks/common/utils/DateTimeStampSerializer.java
View File

@@ -19,9 +19,10 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer;
* </pre>
* Will specify to use this serializer class when the {@code purgeEndDate} is encountered when converting to json
* and will try to convert the date object to its timestamp equivalent
*
* @author Isaac Parenteau
* @date 02/15/2018
* @version 1.0
* @date 02/15/2018
* @see com.fasterxml.jackson.databind.annotation.JsonSerialize
* @see com.fasterxml.jackson.databind.ser.std.StdSerializer
*/
@@ -30,7 +31,8 @@ public class DateTimeStampSerializer extends StdSerializer<Date> {
/**
*
*/
@Serial private static final long serialVersionUID = -4753139740916300831L;
@Serial
private static final long serialVersionUID = -4753139740916300831L;
public DateTimeStampSerializer() {
this(null);

25
src/main/java/net/locusworks/common/utils/FileReader.java
View File

@@ -1,6 +1,7 @@
package net.locusworks.common.utils;
import static net.locusworks.common.Charsets.UTF_8;
import static net.locusworks.common.utils.ObjectUtils.getResourceStream;
import java.io.BufferedReader;
import java.io.File;
@@ -11,11 +12,13 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Objects;
import net.locusworks.common.interfaces.AutoCloseableIterator;
/**
* Class to read in a file that can be used in the try-with-resource block
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
@@ -28,6 +31,7 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Constructor
*
* @param fileName Name of the file to read
*/
public FileReader(String fileName) {
@@ -36,6 +40,7 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Constructor
*
* @param file File to read
*/
@Deprecated
@@ -45,6 +50,7 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Constructor
*
* @param file File to read
*/
public FileReader(Path file) {
@@ -53,6 +59,7 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Constructor
*
* @param reader Buffered reader to read data from
*/
public FileReader(BufferedReader reader) {
@@ -61,11 +68,15 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Initialization helper
*
* @param fileName Name of the file to load
* This will look into the resources directory if it cannot
* find the file directly.
*/
private void init(String fileName) {
if (fileName == null) {
throw new IllegalArgumentException("File name cannot be null");
}
//check to see if the file exists
Path f = Paths.get(fileName);
if (Files.exists(f)) {
@@ -74,14 +85,7 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
}
//Check to see if the file is in the resources directory
InputStream is = this.getClass().getResourceAsStream(fileName);
if (is == null) {
is = this.getClass().getClassLoader().getResourceAsStream(fileName);
}
//If it cant be found, throw a runtime exception
if (is == null) {
throw new IllegalArgumentException("Unable to find resource with name of" + fileName);
}
InputStream is = getResourceStream(fileName);
BufferedReader br = new BufferedReader(new InputStreamReader(is, UTF_8));
init(br);
@@ -89,6 +93,7 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Initializer helper to load file
*
* @param file File to load
*/
private void init(Path file) {
@@ -106,9 +111,13 @@ public class FileReader implements AutoCloseableIterator<FileReader.LineInfo>, I
/**
* Initializer helper for buffered reader
* This is ultimately where all initializers end as a buffered reader
*
* @param reader buffered reader to load
*/
private void init(BufferedReader reader) {
if (reader == null) {
throw new IllegalArgumentException("Buffered Reader cannot be null");
}
this.reader = reader;
this.lineNumber = 0;
}

24
src/main/java/net/locusworks/common/utils/HashUtils.java
View File

@@ -13,6 +13,7 @@ import java.security.MessageDigest;
/**
* Wrapper class that leverages java's MessageDigest to hash files
*
* @author Isaac Parenteau
*
*/
@@ -37,6 +38,7 @@ public class HashUtils {
/**
* Hash a string literal
*
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @param data String to hash
* @return hash value of the string literal
@@ -47,9 +49,10 @@ public class HashUtils {
/**
* Hash a string literal
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
*
* @param hashType Hash types supported by MessageDigest (i.e., MD5, SHA-1, SHA-512)
* @param data String to hash
* @param toLower True to output the hash in lower case. False to output in upper case
* @param toLower True to output the hash in lower case. False to output in the upper case
* @return hash value of the string literal
*/
public static String hash(String hashType, String data, boolean toLower) {
@@ -64,6 +67,7 @@ public class HashUtils {
/**
* Hash a file
*
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @param data File to hash
* @return hash value of the file
@@ -79,6 +83,7 @@ public class HashUtils {
/**
* Hash a file
*
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @param data File to hash
* @param toLower True to output the hash in lower case. False to output in upper case
@@ -94,6 +99,7 @@ public class HashUtils {
/**
* Hash a byte array
*
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @param data data to hash
* @return hash value of the data
@@ -104,6 +110,7 @@ public class HashUtils {
/**
* Hash a byte array
*
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @param data data to hash
* @param toLower True to output the hash in lower case. False to output in upper case
@@ -115,6 +122,7 @@ public class HashUtils {
/**
* Hash an input stream
*
* @param stream Stream with the data to hash
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @return Hash value of the input stream
@@ -125,6 +133,7 @@ public class HashUtils {
/**
* Hash an input stream
*
* @param stream Stream with the data to hash
* @param hashType Hash types supported by MessageDigest (i.e MD5, SHA-1, SHA-512)
* @param toLower True to output the hash in lower case. False to output in upper case
@@ -132,7 +141,7 @@ public class HashUtils {
*/
public static String hash(InputStream stream, String hashType, boolean toLower) {
MessageDigest digest = null;
try(InputStream is = stream) {
try (InputStream is = stream) {
digest = MessageDigest.getInstance(hashType);
byte[] buffer = new byte[STREAM_BUFFER_LENGTH];
@@ -151,9 +160,10 @@ public class HashUtils {
/**
* Encode the hash data back to a string
*
* @param data Data to encode
* @param toLower output to lower case
* @return
* @return encoded string
*/
private static String encodeHexString(byte[] data, boolean toLower) {
return new String(encodeHex(data, toLower));
@@ -161,9 +171,10 @@ public class HashUtils {
/**
* Encode the hash data to a character array
*
* @param data Data to encode
* @param toLower output to lower case
* @return
* @return encoded character array
*/
private static char[] encodeHex(byte[] data, boolean toLower) {
return encodeHex(data, toLower ? DIGITS_LOWER : DIGITS_UPPER);
@@ -171,9 +182,10 @@ public class HashUtils {
/**
* Encode the hex to a character array
*
* @param data Data to encode
* @param toDigits digits to use
* @return
* @return encoded character array
*/
private static char[] encodeHex(byte[] data, char[] toDigits) {
int l = data.length;

38
src/main/java/net/locusworks/common/utils/ObjectUtils.java Normal file
View File

@@ -0,0 +1,38 @@
package net.locusworks.common.utils;
import java.io.InputStream;
import java.util.Objects;
import java.util.function.Consumer;
/**
* Object Utils. Functions to perform on objects
*/
public class ObjectUtils {
/**
* Perform an action if an object is not null otherwise do nothing.
*
* @param object the object to test
* @param consumer the consumer to perform.
* @param <T> the type
*/
public static <T> void performIfNotNull(T object, Consumer<T> consumer) {
if (Objects.isNull(object)) {
return;
}
consumer.accept(object);
}
public static InputStream getResourceStream(String resourceName) {
InputStream is = ObjectUtils.class.getResourceAsStream(resourceName);
if (is == null) {
is = ObjectUtils.class.getClassLoader().getResourceAsStream(resourceName);
}
if (is == null) {
throw new NullPointerException("Unable to find resource with name of " + resourceName);
}
return is;
}
}

10
src/main/java/net/locusworks/common/utils/Splitter.java
View File

@@ -18,6 +18,7 @@ public class Splitter {
PARTITION,
SEQUENCE
}
private String splitSeq;
private boolean omitEmptyStrings = false;
private int partition;
@@ -37,6 +38,7 @@ public class Splitter {
/**
* Remove empty string from the resulting lists
*
* @return this
*/
public Splitter omitEmptyStrings() {
@@ -46,6 +48,7 @@ public class Splitter {
/**
* Return a subset of the resulting list
*
* @param limit how many items to retrieve
* @return this
*/
@@ -56,6 +59,7 @@ public class Splitter {
/**
* Return an array instead of a list
*
* @param sentence the string sentence to split
* @return this
*/
@@ -66,6 +70,7 @@ public class Splitter {
/**
* Split the string
*
* @param sentence the string to split
* @return the resulting list.
*/
@@ -101,6 +106,7 @@ public class Splitter {
/**
* Split the string on fixed length partitions
*
* @param partition the length to split the string on
* @return this
*/
@@ -111,6 +117,7 @@ public class Splitter {
/**
* Split the length on a specified string sequence
*
* @param split the sequence to split
* @return this
*/
@@ -121,6 +128,7 @@ public class Splitter {
/**
* Split on new line sequence
*
* @return this
*/
public static Splitter onNewLine() {
@@ -129,6 +137,7 @@ public class Splitter {
/**
* Split on spaces
*
* @return this
*/
public static Splitter onSpace() {
@@ -137,6 +146,7 @@ public class Splitter {
/**
* Separator on what the key value is. return map
*
* @param separator the separator value
* @return this
*/

7
src/main/java/net/locusworks/common/utils/StreamUtils.java
View File

@@ -7,6 +7,7 @@ import java.util.stream.StreamSupport;
/**
* Utility class to make iterators streamable
*
* @author Isaac Parenteau
* @version 1.0.0
* @date 02/15/2018
@@ -14,7 +15,8 @@ import java.util.stream.StreamSupport;
public class StreamUtils {
/**
* Convert a iterator to a stream
* Convert an iterator to a stream
*
* @param iterator the iterator to convert
* @param <T> the class type
* @return stream of the iterator
@@ -29,6 +31,7 @@ public class StreamUtils {
/**
* Converts an array to a stream
*
* @param items the items to convert
* @param <T> the class type
* @return stream of the array
@@ -39,6 +42,7 @@ public class StreamUtils {
/**
* Converts an array to a stream
*
* @param items the items to convert
* @param parallel make the stream parallel if set to true
* @param <T> the class type
@@ -54,6 +58,7 @@ public class StreamUtils {
/**
* Convert an iterator to a stream
*
* @param iterator iterator to convert
* @param parallel make the stream parallel if set to true.
* @param <T> the class type

2
src/main/java/net/locusworks/common/utils/Success.java
View File

@@ -8,7 +8,7 @@ package net.locusworks.common.utils;
*/
public class Success {
private boolean success = true;
private Object body;
private final Object body;
protected Success() {
this(true, true);

91
src/main/java/net/locusworks/common/utils/Utils.java
View File

@@ -25,6 +25,7 @@ public class Utils {
/**
* Finds if all the values are equal
*
* @param or first value is equal to at least one other value
* @param values the values to compare
* @return true if the first value is equal to at least one other value; false otherwise
@@ -50,9 +51,9 @@ public class Utils {
/**
* Checks to see if values entered are all equal
*
* @param <E> the type parameter
* @param values the values
*
* @return boolean
*/
@SafeVarargs
@@ -63,6 +64,7 @@ public class Utils {
/**
* Checks to see if a group of values are not valid. All values have to be invalid to return true
* One valid value will return false
*
* @param values Values to check
* @param <V> the expected class type of the objects passed in. All objects need to be of same type
* @return true if all values are invalid, false otherwise
@@ -75,6 +77,7 @@ public class Utils {
/**
* Checks to see if a group of values are valid. All values have to be valid to return true
* One invalid value will return false
*
* @param <V> the expected class type of the objects passed in. All objects need to be of same type
* @param values the values to check
* @return true if the values are valid, false otherwise
@@ -93,7 +96,6 @@ public class Utils {
* @param mapKey the map key
* @param mapValue the map value
* @param data The data to place in the map
*
* @return map The map with the objects
*/
@SuppressWarnings("unchecked")
@@ -112,7 +114,7 @@ public class Utils {
throw new IllegalArgumentException("Odd number of arguments provided");
}
for(int i = 0; i < data.length; i+=2) {
for (int i = 0; i < data.length; i += 2) {
Object key = data[i];
Object value = data[i + 1];
@@ -131,6 +133,7 @@ public class Utils {
/**
* Builds a set of objects
*
* @param setClass Class type of the set to create
* @param setValue Class type of the objects being placed in the set
* @param <E> Class type of the return object (should be the same as setValue)
@@ -145,11 +148,13 @@ public class Utils {
/**
* Builds a set of objects
*
* @param data the data to set
* @return the set
* @param <E> the type
* @return the set
*/
@SafeVarargs public static <E> Set<E> buildSet(E... data) {
@SafeVarargs
public static <E> Set<E> buildSet(E... data) {
return Set.of(data);
}
@@ -157,6 +162,7 @@ public class Utils {
* Public method of type HashMap called "buildStringHashMap".
* The method takes String parameters and a data parameter.
* The method returns a new HashMap that uses String types as key / value pairs.
*
* @param data - The data
* @return - Returns a HashMap using the data.
*/
@@ -175,6 +181,7 @@ public class Utils {
/**
* Clone object object.
*
* @param obj the obj
* @return the object
* @throws IllegalAccessException thrown when the filed cannot be access
@@ -186,7 +193,7 @@ public class Utils {
Object clone = obj.getClass().getDeclaredConstructor().newInstance();
for (Field field : obj.getClass().getDeclaredFields()) {
field.setAccessible(true);
if (field.get(obj) == null || Modifier.isFinal(field.getModifiers())){
if (field.get(obj) == null || Modifier.isFinal(field.getModifiers())) {
continue;
}
@@ -213,7 +220,6 @@ public class Utils {
Map<String, Object> map = new LinkedHashMap<>();
for (Field field : clazz.getDeclaredFields()) {
field.setAccessible(true);
boolean hasAnnotations = field.isAnnotationPresent(MapValue.class);
@@ -240,6 +246,7 @@ public class Utils {
/**
* Convert a generic map to Stringed map where the key and value are both strings
*
* @param map map to convert
* @param <K> The expected class of the key
* @param <V> The expected class of the value
@@ -256,6 +263,7 @@ public class Utils {
/**
* Converts an object toa string map;
*
* @param obj the object to convert
* @return the map
* @throws Exception thrown if something happens
@@ -278,6 +286,7 @@ public class Utils {
/**
* Extract a field from an iterable object and place them in a set
*
* @param fieldName field to check
* @param list list to iterate
* @param <E> The expected class of the Set
@@ -296,7 +305,7 @@ public class Utils {
throw new IllegalArgumentException("Unable to find field with name " + fieldName);
}
E val = (E)field.get(item);
E val = (E) field.get(item);
newSet.add(val);
} catch (Exception ex) {
@@ -308,6 +317,7 @@ public class Utils {
/**
* Filters out items in a list with the given parameters
*
* @param fieldName the field name to inspect for the filter value
* @param filter the filter value to retrieve
* @param list the list to inspect
@@ -328,7 +338,7 @@ public class Utils {
throw new IllegalArgumentException("Unable to find field with name " + fieldName);
}
E val = (E)field.get(item);
E val = (E) field.get(item);
if (val.equals(filter)) {
newList.add(item);
}
@@ -346,6 +356,7 @@ public class Utils {
* The method takes a parameter of type E called "itemToFind" and a String parameter called "fieldName" and a parameter of type List called "list".
* The method loops through each item in the list and tries to get the class name and return it as an item.
* The method the takes each item and searches for it in the list.
*
* @param itemToFind - The Item to find
* @param fieldName - The field name where the item is in
* @param list - The list to search
@@ -354,7 +365,7 @@ public class Utils {
* @return - Returns the value of the specified field or null if there is no value.
*
*/
@SuppressWarnings({"unlikely-arg-type" })
@SuppressWarnings({"unlikely-arg-type"})
public static <E, K> E findValue(E itemToFind, String fieldName, List<K> list) {
return findValues(itemToFind, fieldName, list).stream().findFirst().orElse(null);
}
@@ -366,6 +377,7 @@ public class Utils {
* The method creates a new array list called "tmpList".
* The method then iterates through the list and gets all the classes as items.
* If it can't find the fields, it will throw an illegal argument exception.
*
* @param valueToFind - The value to find
* @param fieldName - The field name
* @param list - The list
@@ -373,7 +385,7 @@ public class Utils {
* @param <K> - The expected class of the Iterable list
* @return - Returns the list.
*/
@SuppressWarnings({"unlikely-arg-type" })
@SuppressWarnings({"unlikely-arg-type"})
public static <E, K> List<E> findValues(E valueToFind, String fieldName, List<K> list) {
List<E> extracted = extractFieldToList(fieldName, list);
return extracted.stream()
@@ -383,18 +395,19 @@ public class Utils {
/**
* Use reflection to get the field values
*
* @param clazz the class to find the field
* @param fieldName the field name
* @return field
*/
private static Field getField(Class<?> clazz, String fieldName) {
Field field = null;
while(clazz != null) {
while (clazz != null) {
try {
field = clazz.getDeclaredField(fieldName);
field.setAccessible(true);
break;
} catch(Exception ex) {
} catch (Exception ex) {
clazz = clazz.getSuperclass();
}
}
@@ -408,13 +421,12 @@ public class Utils {
*
* @param message the message
* @param args the args
*
* @return string
*/
public static String formatString(String message, Object... args) {
String tmp = message;
for(Object arg : args) {
for (Object arg : args) {
tmp = tmp.replaceFirst("\\{\\}", String.valueOf(arg));
}
@@ -426,7 +438,6 @@ public class Utils {
*
* @param <V> the type parameter
* @param obj the obj
*
* @return class name
*/
public static <V> String getClassName(V obj) {
@@ -439,7 +450,6 @@ public class Utils {
* @param <V> the type parameter
* @param obj the obj
* @param verbose the verbose
*
* @return class name
*/
public static <V> String getClassName(V obj, boolean verbose) {
@@ -453,7 +463,6 @@ public class Utils {
* @param <K> the type parameter
* @param map the map with values
* @param key the key to find
*
* @return map value
*/
public static <T, K> T getMapValue(Map<K, T> map, K key) {
@@ -468,7 +477,6 @@ public class Utils {
* @param map the map with the values
* @param key the key to find
* @param defaultValue the default value if the key is not found
*
* @return map value
*/
public static <T, K> T getMapValue(Map<K, T> map, K key, T defaultValue) {
@@ -482,6 +490,7 @@ public class Utils {
* new String(" ") = true
* new String("foo") = false
* new String(" bar ") = false
*
* @param string String to check
* @return true if the string is empty false otherwise
*/
@@ -494,6 +503,7 @@ public class Utils {
* For Strings checks to see if they are empty or not null
* For collections checks to see if they are null or empty
* for all others just checks if they are null
*
* @param <V> the expected class type of the object
* @param values The value to check
* @return true if the value is not valid, false otherwise
@@ -508,6 +518,7 @@ public class Utils {
* For Strings checks to see if they are not empty or not null
* For collections checks to see if they are not null and not empty
* for all others just checks if they are not null
*
* @param <V> the expected class type of the object
* @param values The value to check
* @return true if the value is valid, false otherwise
@@ -521,7 +532,6 @@ public class Utils {
* Is primitive or wrapper boolean.
*
* @param clazz the clazz
*
* @return the boolean
*/
public static boolean isPrimitiveOrWrapper(Class<?> clazz) {
@@ -535,19 +545,18 @@ public class Utils {
* @param <V> the type parameter
* @param keyFieldName the name of the field that will be used as the key
* @param list the list to convert
*
* @return a map
*/
@SuppressWarnings("unchecked")
public static <K, V> Map<K, V> listToMap(String keyFieldName, List<V> list) {
Map<K, V> map = new HashMap<>();
for(V value : Utils.safeList(list)) {
for (V value : Utils.safeList(list)) {
try {
Field field = getField(value.getClass(), keyFieldName);
K key = (K) field.get(value);
map.put(key, value);
} catch(Exception e) {
} catch (Exception e) {
throw new IllegalArgumentException(String.format("Unable to find field %s. -> %s", keyFieldName, e.getMessage()));
}
}
@@ -560,7 +569,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param valueSet the value set
*
* @return the set
*/
public static <E> Set<E> listToSet(Collection<E> valueSet) {
@@ -576,6 +584,7 @@ public class Utils {
* The method then creates an Int variable called "index" and sets the value to zero.
* The method then iterates through the collection and adds all the items to the results array.
* The method then returns the results array.
*
* @param <E> - The type parameter
* @param collection - The collection
* @param clazz - The clazz
@@ -587,7 +596,7 @@ public class Utils {
return null;
}
E[] results = (E[])Array.newInstance(clazz, collection.size());
E[] results = (E[]) Array.newInstance(clazz, collection.size());
int index = 0;
for (E item : collection) {
@@ -605,6 +614,7 @@ public class Utils {
* Otherwise, it creates an ArrayList object called "list".
* It then iterates through the Collection Object and adds all the collection items to that list.
* The method then returns the list.
*
* @param <E> - The type parameter
* @param collection - The collection
* @return - Returns the list.
@@ -623,6 +633,7 @@ public class Utils {
* Otherwise, it creates an ArrayList object called "newList".
* It then iterates through the array and adds all the items to the new list.
* The method then returns the list.
*
* @param <E> - The type parameter
* @param array - The array
* @return - Returns the list.
@@ -643,6 +654,7 @@ public class Utils {
* Otherwise, it creates a new ArrayList object called "list".
* It then iterates through the Iterable object and adds items to it.
* After that it returns the list.
*
* @param iter - The object to iterate over.
* @param <E> - The expected class of the Iterable object
* @return - Returns the list.
@@ -664,6 +676,7 @@ public class Utils {
* The method first creates a new HashSet called "set".
* The method then iterates through the collection and adds all the items from it to the HashSet.
* The method then returns the HashSet.
*
* @param <E> - The type parameter
* @param collection - The iterable object name.
* @return - Returns the HashSet with all the items of the collection inside of it.
@@ -682,7 +695,6 @@ public class Utils {
* @param <K> the type parameter
* @param <V> the type parameter
* @param map the map
*
* @return the list
*/
public static <K, V> List<V> mapToList(Map<K, V> map) {
@@ -696,7 +708,6 @@ public class Utils {
* @param <K> the type parameter
* @param <V> the type parameter
* @param map the map
*
* @return the set
*/
public static <K, V> Set<V> mapToSet(Map<K, V> map) {
@@ -710,10 +721,9 @@ public class Utils {
* @param <K> the type parameter
* @param <V> the type parameter
* @param map the map
*
* @return map with reverse key value pairs
*/
public static <K,V> Map<K, V> reverseMap(Map<V, K> map) {
public static <K, V> Map<K, V> reverseMap(Map<V, K> map) {
return map.entrySet().stream().collect(Collectors.toMap(Entry::getValue, Entry::getKey));
}
@@ -722,7 +732,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param list the list
*
* @return the e [ ]
*/
@SuppressWarnings("unchecked")
@@ -739,7 +748,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param list The list to check
*
* @return an empty list if list is invalid or the list if its valid
*/
public static <E> Collection<E> safeList(Collection<E> list) {
@@ -755,7 +763,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param list The list to check
*
* @return an empty list if list is invalid or the list if its valid
*/
public static <E> Iterable<E> safeIterable(Iterable<E> list) {
@@ -767,6 +774,7 @@ public class Utils {
/**
* Creates a safe set
*
* @param <E> the type parameter
* @param set the set to check
* @return an empty set if the set is null otherwise the set
@@ -782,6 +790,7 @@ public class Utils {
* Checks to see if a string is not blank or null.
* if it's not blank it will return the string
* otherwise it will return an empty string
*
* @param string The string to check
* @return the passed in string if it's not null either empty string
*/
@@ -794,7 +803,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param valueSet the value set
*
* @return the to list
*/
public static <E> List<E> setToList(Set<E> valueSet) {
@@ -803,6 +811,7 @@ public class Utils {
/**
* Converts a String into an integer without exception
*
* @param value The string value to convert
* @param defaultValue The default value to return if the string cant be converted
* @return the integer representation of the passed in string or the default value if an exception occurred
@@ -820,7 +829,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param values the values to add the list
*
* @return List containing said values
*/
@SafeVarargs
@@ -841,7 +849,6 @@ public class Utils {
*
* @param <E> the type parameter
* @param values the values to add the set
*
* @return Set containing said values
*/
@SafeVarargs
@@ -857,6 +864,7 @@ public class Utils {
/**
* Converts an iterable object to a hash set
*
* @param iterable The Iterable object to convert
* @param <E> the class type of the set
* @return set with the iterable items inside
@@ -871,7 +879,9 @@ public class Utils {
public static <E> long size(Iterable<E> iterable) {
long count = 0;
for (Iterator<E> iter = iterable.iterator(); iter.hasNext(); iter.next()) { count++; }
for (Iterator<E> iter = iterable.iterator(); iter.hasNext(); iter.next()) {
count++;
}
return count;
}
@@ -905,6 +915,7 @@ public class Utils {
* Otherwise, it will check to see if value is an instance of a Collection Object.
* If so, it will return that the value is not null and if the value size is greater than zero.
* Otherwise, it will just return that the value is not null and not empty.
*
* @param <V> - The type parameter
* @param value - Value to validate
* @return - Returns true if it is valid; false otherwise
@@ -915,9 +926,9 @@ public class Utils {
return false;
}
if (value instanceof Collection) {
return !((Collection)value).isEmpty();
} else if (value instanceof Map){
return !((Map)value).isEmpty();
return !((Collection) value).isEmpty();
} else if (value instanceof Map) {
return !((Map) value).isEmpty();
} else if (value instanceof Boolean) {
return ((Boolean) value);
}
@@ -934,6 +945,7 @@ public class Utils {
* The method sets valid equal to the result of true and false.
* If the method cannot validate the object values, it will throw an exception. If so, it returns false.
* Otherwise, the method will return the variable called "valid".
*
* @param <V> - The type parameter
* @param objectsToValidate - Objects to validate
* @return - Returns true if all objects are valid false otherwise.
@@ -950,6 +962,7 @@ public class Utils {
/**
* Validates all given values to
*
* @param or Set the or flag to check for at least one validated value
* @param objectsToValidate objects to validate.
* @param <V> the expected class type of the objects passed in. All objects need to be of same type

165
src/test/java/net/locusworks/common/configuration/ConfigurationCoverageTest.java Normal file
View File

@@ -0,0 +1,165 @@
package net.locusworks.common.configuration;
import net.locusworks.common.exceptions.ApplicationException;
import net.locusworks.common.interfaces.PersistableRequest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.BufferedReader;
import java.io.StringReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.mockStatic;
import org.mockito.MockedStatic;
class ConfigurationCoverageTest {
@TempDir
Path tempDir;
static class Manager extends ConfigurationManager {
void initialize(Path base, byte[] key, ConfigurationCallback callback) throws Exception {
init(base.toString(), "test.properties", key, callback);
}
void initialize(Path base, ConfigurationCallback callback) throws Exception {
init(base.toString(), "test.properties", callback);
}
}
static class Request implements PersistableRequest {
private String dbHost;
private String dbPort;
private String ignored;
Request(String dbHost, String dbPort, String ignored) {
this.dbHost = dbHost;
this.dbPort = dbPort;
this.ignored = ignored;
}
}
@Test
void managerCreatesLoadsReconcilesSavesAndReportsConfiguration() throws Exception {
List<String> messages = new ArrayList<>();
Manager manager = new Manager();
manager.initialize(tempDir, "seed".getBytes(), messages::add);
assertEquals("localhost", manager.getPropertyValue("dbHost"));
assertEquals("fallback", manager.getPropertyValue("missing", "fallback"));
assertNull(manager.getPropertyValue("missing"));
assertEquals(4, manager.getConfiguration().size());
assertTrue(Files.exists(tempDir.resolve("test.properties")));
assertTrue(messages.stream().anyMatch(m -> m.contains("Added new configuration")));
Properties changed = new Properties();
changed.putAll(manager.getConfiguration());
changed.setProperty("dbHost", "remote");
changed.setProperty("obsolete", "remove me");
manager.saveToConf(changed);
assertEquals("remote", manager.getPropertyValue("dbHost"));
assertFalse(manager.getConfiguration().containsKey("obsolete"));
assertTrue(messages.stream().anyMatch(m -> m.contains("Saved config file")));
}
@Test
void managerPersistsSelectedPlainAndEncryptedFieldsAndSkipsUnchangedOnes() throws Exception {
Manager manager = new Manager();
manager.initialize(tempDir, new byte[0], null);
assertThrows(ApplicationException.class,
() -> manager.saveConfiguration(new Request("x", "1", "x"), null, null));
assertThrows(ApplicationException.class,
() -> manager.saveConfiguration(new Request("x", "1", "x"), Set.of(), null));
manager.saveConfiguration(new Request("new-host", "3306", "ignored"),
Set.of("dbHost", "dbPort"), null);
assertEquals("new-host", manager.getPropertyValue("dbHost"));
assertEquals("3306", manager.getPropertyValue("dbPort"));
manager.saveConfiguration(new Request("encrypted-host", "3306", "ignored"),
Set.of("dbHost", "dbPort", "ignored"), Set.of("dbHost"));
assertNotEquals("encrypted-host", manager.getPropertyValue("dbHost"));
assertThrows(ApplicationException.class,
() -> manager.saveConfiguration(null, Set.of("dbHost"), Set.of()));
assertDoesNotThrow(() -> manager.saveConfiguration(
new Request("ignored", "3306", "ignored"), Set.of("dbPort"), Set.of()));
}
@Test
void managerConvenienceInitializationAndBothLoadFailuresAreCovered() throws Exception {
Path convenience = Files.createDirectory(tempDir.resolve("convenience"));
Manager normal = new Manager();
normal.initialize(convenience, null);
assertNotNull(normal.getConfiguration());
try (MockedStatic<PropertiesManager> properties = mockStatic(PropertiesManager.class, CALLS_REAL_METHODS)) {
properties.when(() -> PropertiesManager.loadConfiguration(Manager.class, "test.properties"))
.thenThrow(new java.io.IOException("template failed"));
assertThrows(java.io.IOException.class,
() -> new Manager().initialize(tempDir, "seed".getBytes(), null));
}
Path activeFailure = Files.createDirectory(tempDir.resolve("active-failure"));
try (MockedStatic<PropertiesManager> properties = mockStatic(PropertiesManager.class, CALLS_REAL_METHODS)) {
Path activeFile = activeFailure.resolve("test.properties");
properties.when(() -> PropertiesManager.loadConfiguration(activeFile))
.thenThrow(new java.io.IOException("active failed"));
Manager recovered = new Manager();
recovered.initialize(activeFailure, "seed".getBytes(), null);
assertEquals(4, recovered.getConfiguration().size());
}
}
@SuppressWarnings("deprecation")
@Test
void propertiesManagerCoversResourcesFilesReadersMergeRemovalAndSaveFailures() throws Exception {
assertNotNull(new PropertiesManager());
assertNull(PropertiesManager.loadConfiguration(getClass(), "missing.properties"));
Properties resource = PropertiesManager.loadConfiguration(getClass(), "/test.properties");
assertEquals(4, resource.size());
Path missing = tempDir.resolve("missing.properties");
assertTrue(PropertiesManager.loadConfiguration(missing).isEmpty());
Properties parsed = PropertiesManager.loadConfiguration(
new BufferedReader(new StringReader("one=1\ntwo=2")));
assertEquals("1", parsed.getProperty("one"));
Properties destination = new Properties();
destination.setProperty("one", "existing");
Properties additions = new Properties();
additions.setProperty("one", "replacement");
additions.setProperty("two", "2");
assertEquals(1, PropertiesManager.addConfiguration(destination, additions).size());
assertEquals("existing", destination.getProperty("one"));
destination.setProperty("obsolete", "old");
Properties expected = new Properties();
expected.setProperty("one", "existing");
assertEquals(2, PropertiesManager.removeConfiguration(destination, expected).size());
assertEquals(Set.of("one"), destination.keySet());
Path saved = tempDir.resolve("saved.properties");
PropertiesManager.saveConfiguration(expected, saved.toFile(), null);
assertEquals("existing", PropertiesManager.loadConfiguration(saved.toFile()).getProperty("one"));
assertThrows(RuntimeException.class,
() -> PropertiesManager.saveConfiguration(expected, tempDir, "failure"));
}
}

80
src/test/java/net/locusworks/common/crypto/AESAndHashSaltCoverageTest.java Normal file
View File

@@ -0,0 +1,80 @@
package net.locusworks.common.crypto;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
class AESAndHashSaltCoverageTest {
@Test
void aesFactoriesSeedChangesEmptyValuesAndFailures() throws Exception {
AES bytes = AES.createInstance("byte seed".getBytes());
assertEquals("byte seed", bytes.getSeed());
assertEquals("", bytes.decrypt(bytes.encrypt(null)));
assertEquals("", bytes.decrypt(null));
String encrypted = bytes.encrypt("value");
assertSame(bytes, bytes.withSeed("byte seed"));
assertEquals("value", bytes.decrypt(encrypted));
assertSame(bytes, bytes.withSeed("different seed"));
assertEquals("different seed", bytes.getSeed());
assertThrows(IllegalArgumentException.class, () -> bytes.decrypt(encrypted));
assertThrows(IllegalArgumentException.class, () -> bytes.decrypt("AA=="));
assertNotNull(AES.createInstance());
assertThrows(IllegalArgumentException.class, () -> AES.createInstance((String) null));
AES uninitialized = new AES();
assertThrows(IllegalArgumentException.class, () -> uninitialized.encrypt("value"));
Method init = AES.class.getDeclaredMethod("init", byte[].class);
init.setAccessible(true);
InvocationTargetException initFailure = assertThrows(InvocationTargetException.class,
() -> init.invoke(uninitialized, (Object) new byte[16]));
assertInstanceOf(IllegalArgumentException.class, initFailure.getCause());
}
@Test
void aesMainValidatesArgumentsAndSupportsEncryptAndDecryptModes() throws Exception {
assertThrows(IllegalArgumentException.class, () -> AES.main(null));
assertThrows(IllegalArgumentException.class, () -> AES.main(new String[0]));
assertDoesNotThrow(() -> AES.main(new String[]{"plain"}));
AES aes = AES.createInstance("seed");
assertDoesNotThrow(() -> AES.main(new String[]{aes.encrypt("plain"), "seed"}));
}
@Test
void hashSaltSupportsStringAndCharacterPasswordsAndInvalidInputs() throws Exception {
assertNotNull(new HashSalt());
String hash = HashSalt.createHash("password".toCharArray());
assertTrue(HashSalt.validatePassword("password".toCharArray(), hash));
assertFalse(HashSalt.validatePassword("wrong", hash));
assertFalse(HashSalt.validatePassword("wrong".toCharArray(), hash));
assertThrows(RuntimeException.class, () -> HashSalt.validatePassword("password", "bad"));
Method toHex = HashSalt.class.getDeclaredMethod("toHex", byte[].class);
toHex.setAccessible(true);
assertEquals("0001", toHex.invoke(null, (Object) new byte[]{0, 1}));
Method slowEquals = HashSalt.class.getDeclaredMethod("slowEquals", byte[].class, byte[].class);
slowEquals.setAccessible(true);
assertEquals(false, slowEquals.invoke(null, new byte[]{1}, new byte[]{1, 2}));
assertEquals(false, slowEquals.invoke(null, new byte[]{1, 2}, new byte[]{1}));
}
@Test
void hashSaltMainValidatesArgumentsAndPrintsHash() {
assertThrows(IllegalArgumentException.class, () -> HashSalt.main(null));
assertThrows(IllegalArgumentException.class, () -> HashSalt.main(new String[0]));
assertDoesNotThrow(() -> HashSalt.main(new String[]{"password"}));
}
}

227
src/test/java/net/locusworks/common/crypto/CryptoCoverageTest.java Normal file
View File

@@ -0,0 +1,227 @@
package net.locusworks.common.crypto;
import net.locusworks.common.crypto.KeyFile.EncryptionType;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.KeyPair;
import java.security.spec.InvalidKeySpecException;
import java.util.Base64;
import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Field;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.mockStatic;
import org.mockito.MockedStatic;
class CryptoCoverageTest {
@TempDir
Path tempDir;
@Test
void aesKeyAndSpecRoundTripAndRejectMalformedData() throws Exception {
AESKey key = new AESKey("repeatable seed");
assertEquals("aes", key.getAlgorithm());
assertEquals("aes-seed", key.getFormat());
assertArrayEquals("repeatable seed".getBytes(StandardCharsets.UTF_8), key.getEncoded());
String encoded = "aes-seed " + Base64.getEncoder().encodeToString(key.getEncoded());
AESKeySpec spec = new AESKeySpec(encoded.getBytes(StandardCharsets.UTF_8));
assertEquals("aes", spec.getFormat());
assertArrayEquals(key.getEncoded(), spec.generateKey().getEncoded());
assertThrows(InvalidKeySpecException.class,
() -> new AESKeySpec("wrong value".getBytes(StandardCharsets.UTF_8)).generateKey());
assertThrows(InvalidKeySpecException.class,
() -> new AESKeySpec("aes-seed !!!".getBytes(StandardCharsets.UTF_8)).generateKey());
}
@Test
void encryptionKeyFactoryHandlesAesRsaAndSshSpecs() throws Exception {
EncryptionKeyFactory factory = EncryptionKeyFactory.getInstance("RSA");
String aes = "aes-seed " + Base64.getEncoder().encodeToString("seed".getBytes(StandardCharsets.UTF_8));
assertInstanceOf(AESKey.class, factory.generatePrivateKey(new AESKeySpec(aes.getBytes(StandardCharsets.UTF_8))));
KeyPair pair = RSA.generateKeyPair(1024);
assertEquals(pair.getPrivate(), factory.generatePrivateKey(
new java.security.spec.PKCS8EncodedKeySpec(pair.getPrivate().getEncoded())));
assertEquals(pair.getPublic(), factory.generatePublicKey(
new java.security.spec.X509EncodedKeySpec(pair.getPublic().getEncoded())));
Path ssh = tempDir.resolve("public.ssh");
try (KeyFile file = new KeyFile(pair.getPublic(), "test", EncryptionType.SSH)) {
file.write(ssh.toString());
}
SSHEncodedKeySpec sshSpec = new SSHEncodedKeySpec(Files.readAllBytes(ssh));
assertNull(sshSpec.getFormat());
assertEquals(pair.getPublic(), factory.generatePublicKey(sshSpec));
assertEquals(pair.getPublic(), KeyFile.read(ssh.toString()).getKey());
assertThrows(InvalidKeySpecException.class,
() -> new SSHEncodedKeySpec("ssh-ed25519 bad".getBytes(StandardCharsets.UTF_8)).convertToRSAPubKeySpec());
assertThrows(InvalidKeySpecException.class,
() -> new SSHEncodedKeySpec("ssh-rsa !!!".getBytes(StandardCharsets.UTF_8)).convertToRSAPubKeySpec());
}
@Test
void rsaGeneratesCalculatesEncryptsDecryptsAndRejectsOversizedMessages() {
assertNotNull(new RSA());
KeyPair defaultPair = RSA.generateKeyPair();
assertNotNull(defaultPair.getPrivate());
KeyPair pair = RSA.generateKeyPair(1024);
assertEquals(("hello".getBytes(StandardCharsets.UTF_8).length + 11) * 8,
RSA.calculateRequiredKeyLength("hello"));
String encrypted = RSA.encrypt(pair.getPublic(), "hello RSA");
assertEquals("hello RSA", RSA.decrypt(pair.getPrivate(), encrypted));
assertThrows(RuntimeException.class, () -> RSA.decrypt(pair.getPrivate(), "not base64"));
assertThrows(RuntimeException.class, () -> RSA.encrypt(pair.getPublic(), "x".repeat(200)));
assertThrows(RuntimeException.class, () -> RSA.generateKeyPair(1));
}
@Test
void keyFileWritesAesPemAndSshFormatsAndProvidesDescriptions() throws Exception {
AESKey aesKey = new AESKey("seed");
Path aesPath = tempDir.resolve("aes.key");
try (KeyFile file = new KeyFile(aesKey)) {
assertEquals("PRIVATE KEY", file.getDescription());
file.setDescription("AES KEY");
assertEquals("AES KEY", file.getDescription());
assertSame(aesKey, file.getKey());
file.write(aesPath.toString());
}
assertEquals("aes-seed c2VlZA==", Files.readString(aesPath));
KeyPair pair = RSA.generateKeyPair(1024);
Path privatePath = tempDir.resolve("private.pem");
try (KeyFile file = new KeyFile(pair.getPrivate())) {
file.write(privatePath.toString());
}
assertTrue(Files.readString(privatePath).contains("BEGIN RSA PRIVATE KEY"));
Path publicPath = tempDir.resolve("public.pem");
try (KeyFile file = new KeyFile(pair.getPublic(), "CUSTOM")) {
file.write(publicPath.toString());
}
assertTrue(Files.readString(publicPath).contains("BEGIN RSA CUSTOM"));
assertEquals("PUBLIC KEY", new KeyFile(pair.getPublic()).getDescription());
Path sshPath = tempDir.resolve("id.pub");
try (KeyFile file = new KeyFile(pair.getPublic(), "comment", EncryptionType.SSH)) {
file.write(sshPath.toString());
}
assertTrue(Files.readString(sshPath).startsWith("ssh-rsa "));
assertTrue(Files.readString(sshPath).endsWith(" comment"));
}
@Test
void keyFileReadHandlesEmptyMissingRecognizedAndInvalidFiles() throws Exception {
assertNull(KeyFile.read(null).getKey());
RuntimeException missing = assertThrows(RuntimeException.class,
() -> KeyFile.read(tempDir.resolve("missing").toString()));
assertInstanceOf(IllegalArgumentException.class, missing.getCause());
Path aesPath = tempDir.resolve("recognized-aes.key");
new KeyFile(new AESKey("seed")).write(aesPath.toString());
assertArrayEquals("seed".getBytes(StandardCharsets.UTF_8), KeyFile.read(aesPath.toString()).getKey().getEncoded());
Path invalid = tempDir.resolve("invalid.key");
Files.writeString(invalid, "not a key");
assertThrows(RuntimeException.class, () -> KeyFile.read(invalid.toString()));
}
@Test
void rsaWriteConvenienceOverloadsUseRequestedPaths() {
KeyPair pair = RSA.generateKeyPair(1024);
Path privatePath = tempDir.resolve("private.key");
Path publicPath = tempDir.resolve("public.key");
assertTrue(RSA.writePrivateKey(pair, privatePath.toString(), "PRIVATE KEY"));
assertTrue(RSA.writePublicKey(pair, publicPath.toString(), "PUBLIC KEY"));
assertTrue(Files.exists(privatePath));
assertTrue(Files.exists(publicPath));
Path sshPath = tempDir.resolve("rsa-ssh.pub");
assertTrue(RSA.writePublicKey(pair, sshPath.toString(), "comment", true));
assertTrue(RSA.generateAndWriteKeyPair(tempDir.resolve("generated").toString(), 1024));
assertNotNull(RSA.loadKeyPair(publicPath.toString(), privatePath.toString()));
assertNotNull(RSA.loadPublicKey(publicPath.toString()).getPublic());
assertNotNull(RSA.loadPrivateKey(privatePath.toString()).getPrivate());
}
@Test
void keyFileWrapsWritePemAndCloseFailures() throws Exception {
KeyPair pair = RSA.generateKeyPair(1024);
KeyFile invalidWrite = new KeyFile(pair.getPrivate());
assertThrows(IllegalArgumentException.class, () -> invalidWrite.write(tempDir.toString()));
KeyFile closeFailure = new KeyFile(pair.getPrivate());
Field writerField = KeyFile.class.getDeclaredField("writer");
writerField.setAccessible(true);
writerField.set(closeFailure, new Writer() {
@Override
public void write(char[] cbuf, int off, int len) {
}
@Override
public void flush() throws IOException {
throw new IOException("flush failed");
}
@Override
public void close() {
}
});
assertThrows(RuntimeException.class, closeFailure::close);
}
@Test
void rsaConvenienceDelegatesAndShortCircuitPaths() {
KeyPair pair = RSA.generateKeyPair(1024);
try (MockedStatic<RSA> rsa = mockStatic(RSA.class, CALLS_REAL_METHODS)) {
rsa.when(RSA::generateKeyPair).thenReturn(pair);
rsa.when(() -> RSA.writePrivateKey(pair)).thenReturn(true);
rsa.when(() -> RSA.writePublicKey(pair, true)).thenReturn(true);
assertTrue(RSA.generateAndWriteSSHKeys());
rsa.when(() -> RSA.writePrivateKey(pair)).thenReturn(false);
assertFalse(RSA.generateAndWriteSSHKeys());
rsa.when(() -> RSA.writePrivateKey(pair)).thenReturn(true);
rsa.when(() -> RSA.writePublicKey(pair, true)).thenReturn(false);
assertFalse(RSA.generateAndWriteSSHKeys());
rsa.when(() -> RSA.generateAndWriteKeyPair(2048)).thenReturn(true);
assertTrue(RSA.generateAndWriteKeyPair());
rsa.when(() -> RSA.generateAndWriteKeyPair("named", 2048)).thenReturn(true);
assertTrue(RSA.generateAndWriteKeyPair("named"));
rsa.when(() -> RSA.generateAndWriteKeyPair("id_rsa", 1024)).thenReturn(true);
assertTrue(RSA.generateAndWriteKeyPair(1024));
rsa.when(() -> RSA.generateKeyPair(512)).thenReturn(pair);
rsa.when(() -> RSA.writePrivateKey(pair, "short", "PRIVATE KEY")).thenReturn(false);
assertFalse(RSA.generateAndWriteKeyPair("short", 512));
rsa.when(() -> RSA.writePrivateKey(pair, "short", "PRIVATE KEY")).thenReturn(true);
rsa.when(() -> RSA.writePublicKey(pair, "short.pub", "PUBLIC KEY")).thenReturn(false);
assertFalse(RSA.generateAndWriteKeyPair("short", 512));
rsa.when(() -> RSA.writePrivateKey(pair, "id_rsa", "PRIVATE KEY")).thenReturn(true);
assertTrue(RSA.writePrivateKey(pair));
rsa.when(() -> RSA.writePublicKey(pair, false)).thenReturn(true);
assertTrue(RSA.writePublicKey(pair));
rsa.when(() -> RSA.writePublicKey(pair, "id_rsa.pub", "PUBLIC KEY", true)).thenReturn(true);
rsa.when(() -> RSA.writePublicKey(pair, true)).thenCallRealMethod();
assertTrue(RSA.writePublicKey(pair, true));
}
}
}

43
src/test/java/net/locusworks/common/exceptions/ApplicationExceptionTest.java Normal file
View File

@@ -0,0 +1,43 @@
package net.locusworks.common.exceptions;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import java.util.List;
class ApplicationExceptionTest {
@Test
void factoryMethodsExposeExpectedCodesAndMessages() {
List<ApplicationException> exceptions = List.of(
ApplicationException.egregiousServer(), ApplicationException.invalidCreds(),
ApplicationException.notLoggedIn(), ApplicationException.invalidEmailAddress(),
ApplicationException.actionNotPermitted(), ApplicationException.actionNotPermitted("delete"),
ApplicationException.passwordsNotEqual(), ApplicationException.unAuthorized(),
ApplicationException.duplicateEntry("duplicate"), ApplicationException.duplicateEntry("duplicate %s", "item"),
ApplicationException.noEntryExists("missing"), ApplicationException.noEntryExists("missing %s", "item"),
ApplicationException.constraintViolation("constraint"), ApplicationException.constraintViolation("constraint %s", "x"),
ApplicationException.illegalArgument("illegal"), ApplicationException.generic("generic"));
assertTrue(exceptions.stream().noneMatch(ApplicationException::getSuccess));
assertTrue(exceptions.stream().allMatch(e -> e.getCode() != null && e.getMessage() != null));
}
@Test
void constructorsAndThrowableFactoryPreserveCause() {
IllegalStateException cause = new IllegalStateException("failure");
ApplicationException fromCause = ApplicationException.fromException(cause);
assertEquals(9999, fromCause.getCode());
assertSame(cause, fromCause.getCause());
ApplicationException direct = new ApplicationException(42, cause);
assertEquals("failure", direct.getMessage());
assertSame(cause, direct.getCause());
ApplicationException explicit = new ApplicationException(43, "message", cause);
assertEquals(43, explicit.getCode());
assertSame(cause, explicit.getCause());
}
}

69
src/test/java/net/locusworks/common/immutables/ImmutablesTest.java Normal file
View File

@@ -0,0 +1,69 @@
package net.locusworks.common.immutables;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
class ImmutablesTest {
@Test
void testUnit() {
Unit<String> unit1 = new Unit<>();
unit1.setValue1("123");
Unit<String> unit2 = new Unit<>("123");
Unit<String> unit3 = new Unit<>("1234");
assertEquals(unit1, unit2);
assertNotEquals(null, unit1);
assertNotEquals(new Object(), unit1);
assertNotEquals(unit3, unit1);
assertThrows(IllegalArgumentException.class, () -> unit1.setValue1("value"));
}
@Test
void testPair() {
Pair<String, String> unit1 = new Pair<>();
unit1.setValue2("value2");
unit1.setValue1("123");
Pair<String, String> unit2 = new Pair<>("123", "value2");
Pair<String, String> unit3 = new Pair<>("1234", "value2");
assertEquals(unit1, unit2);
assertNotEquals(null, unit1);
assertNotEquals(new Object(), unit1);
assertNotEquals(unit3, unit1);
assertThrows(IllegalArgumentException.class, () -> unit1.setValue1("value"));
assertThrows(IllegalArgumentException.class, () -> unit1.setValue2("value"));
}
@Test
void testTriplet() {
Triplet<String, String, String> unit1 = new Triplet<>();
unit1.setValue3("value3");
unit1.setValue2("value2");
unit1.setValue1("123");
Triplet<String, String, String> unit2 = new Triplet<>("123", "value2", "value3");
Triplet<String, String, String> unit3 = new Triplet<>("1234", "value2", "value3");
assertEquals(unit1, unit2);
assertNotEquals(null, unit1);
assertNotEquals(new Object(), unit1);
assertNotEquals(unit3, unit1);
assertThrows(IllegalArgumentException.class, () -> unit1.setValue1("value"));
assertThrows(IllegalArgumentException.class, () -> unit1.setValue2("value"));
assertThrows(IllegalArgumentException.class, () -> unit1.setValue3("value"));
}
}

158
src/test/java/net/locusworks/common/io/IOUtilsTest.java Normal file
View File

@@ -0,0 +1,158 @@
package net.locusworks.common.io;
import net.locusworks.common.Charsets;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.MockedStatic;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.mockStatic;
class IOUtilsTest {
@TempDir
Path tempDir;
@Test
void readsLinesFromStreamsAndBothReaderKinds() throws Exception {
byte[] text = "first\nsecond\nthird".getBytes(StandardCharsets.UTF_8);
assertEquals(List.of("first", "second", "third"),
IOUtils.readLines(new ByteArrayInputStream(text), StandardCharsets.UTF_8));
assertEquals(List.of("first", "second", "third"), IOUtils.readLines(new StringReader(new String(text))));
BufferedReader buffered = new BufferedReader(new StringReader("line"));
assertSame(buffered, IOUtils.toBufferedReader(buffered));
assertNotNull(IOUtils.toBufferedReader(new StringReader("line")));
assertThrows(NullPointerException.class, () -> IOUtils.readLines((Reader) null));
}
@Test
void convertsStreamsAndCopiesBytesThroughEveryOverload() throws Exception {
byte[] source = "some binary data".getBytes(StandardCharsets.UTF_8);
assertArrayEquals(source, IOUtils.toByteArray(new ByteArrayInputStream(source)));
ByteArrayOutputStream defaultCopy = new ByteArrayOutputStream();
assertEquals(source.length, IOUtils.copy(new ByteArrayInputStream(source), defaultCopy));
assertArrayEquals(source, defaultCopy.toByteArray());
ByteArrayOutputStream sizedCopy = new ByteArrayOutputStream();
assertEquals(source.length, IOUtils.copy(new ByteArrayInputStream(source), sizedCopy, 2));
assertArrayEquals(source, sizedCopy.toByteArray());
ByteArrayOutputStream bufferedCopy = new ByteArrayOutputStream();
assertEquals(source.length,
IOUtils.copyLarge(new ByteArrayInputStream(source), bufferedCopy, new byte[3]));
assertArrayEquals(source, bufferedCopy.toByteArray());
ByteArrayOutputStream largeCopy = new ByteArrayOutputStream();
assertEquals(source.length, IOUtils.copyLarge(new ByteArrayInputStream(source), largeCopy));
assertArrayEquals(source, largeCopy.toByteArray());
assertEquals(0, IOUtils.copyLarge(new ByteArrayInputStream(new byte[0]), new ByteArrayOutputStream()));
}
@Test
void copiesCharactersThroughEveryOverload() throws Exception {
String source = "characters-å";
StringWriter encoded = new StringWriter();
IOUtils.copy(new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)), encoded,
StandardCharsets.UTF_8);
assertEquals(source, encoded.toString());
StringWriter regular = new StringWriter();
assertEquals(source.length(), IOUtils.copy(new StringReader(source), regular));
assertEquals(source, regular.toString());
StringWriter buffered = new StringWriter();
assertEquals(source.length(), IOUtils.copyLarge(new StringReader(source), buffered, new char[2]));
assertEquals(source, buffered.toString());
StringWriter large = new StringWriter();
assertEquals(source.length(), IOUtils.copyLarge(new StringReader(source), large));
assertEquals(source, large.toString());
assertEquals(0, IOUtils.copyLarge(new StringReader(""), new StringWriter()));
assertEquals(source, IOUtils.toString(
new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8));
}
@Test
void integerCopyMethodsReturnEofMarkerForCountsOverIntegerMaximum() throws Exception {
try (MockedStatic<IOUtils> mocked = mockStatic(IOUtils.class, CALLS_REAL_METHODS)) {
mocked.when(() -> IOUtils.copyLarge(any(InputStream.class), any(OutputStream.class)))
.thenReturn((long) Integer.MAX_VALUE + 1);
assertEquals(IOUtils.EOF,
IOUtils.copy(new ByteArrayInputStream(new byte[0]), new ByteArrayOutputStream()));
mocked.when(() -> IOUtils.copyLarge(any(Reader.class), any(Writer.class)))
.thenReturn((long) Integer.MAX_VALUE + 1);
assertEquals(IOUtils.EOF, IOUtils.copy(new StringReader(""), new StringWriter()));
}
}
@SuppressWarnings("deprecation")
@Test
void writesFilesUsingEveryOverload() throws Exception {
Path byName = tempDir.resolve("name.txt");
IOUtils.writeStringToFile(byName.toString(), "default");
assertEquals("default", Files.readString(byName));
Path namedCharset = tempDir.resolve("name-charset.txt");
IOUtils.writeStringToFile(namedCharset.toString(), "named", StandardCharsets.UTF_16);
assertEquals("named", Files.readString(namedCharset, StandardCharsets.UTF_16));
Path byPath = tempDir.resolve("path.txt");
IOUtils.writeStringToFile(byPath, "path");
assertEquals("path", Files.readString(byPath, Charsets.UTF_8));
Path byFile = tempDir.resolve("file.txt");
IOUtils.writeStringToFile(byFile.toFile(), "file", StandardCharsets.UTF_8);
assertEquals("file", Files.readString(byFile));
}
@SuppressWarnings("deprecation")
@Test
void deletesFilesUsingEveryOverloadAndWrapsIoFailures() throws Exception {
Path byName = Files.createFile(tempDir.resolve("name-delete.txt"));
IOUtils.deleteFile(byName.toString());
assertFalse(Files.exists(byName));
Path byFile = Files.createFile(tempDir.resolve("file-delete.txt"));
IOUtils.deleteFile(byFile.toFile());
assertFalse(Files.exists(byFile));
Path first = Files.createFile(tempDir.resolve("first.txt"));
Path second = Files.createFile(tempDir.resolve("second.txt"));
IOUtils.deleteFiles(first.toString(), second.toString());
assertFalse(Files.exists(first));
assertFalse(Files.exists(second));
Path nonEmptyDirectory = Files.createDirectory(tempDir.resolve("non-empty"));
Files.createFile(nonEmptyDirectory.resolve("child"));
IllegalArgumentException error = assertThrows(IllegalArgumentException.class,
() -> IOUtils.deleteFile(nonEmptyDirectory));
assertInstanceOf(IOException.class, error.getCause());
}
@Test
void constructorAndInvalidInputsAreCovered() {
assertNotNull(new IOUtils());
assertThrows(NullPointerException.class, () -> IOUtils.toByteArray(null));
assertThrows(NegativeArraySizeException.class,
() -> IOUtils.copy(new ByteArrayInputStream(new byte[0]), new ByteArrayOutputStream(), -1));
}
}

83
src/test/java/net/locusworks/common/migration/MigrationItemTest.java Normal file
View File

@@ -0,0 +1,83 @@
package net.locusworks.common.migration;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.MigrationInfo;
import org.flywaydb.core.api.MigrationInfoService;
import org.flywaydb.core.api.configuration.Configuration;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
class MigrationItemTest {
private static Flyway flyway(MigrationInfo[] all, MigrationInfo[] pending) {
Flyway flyway = mock(Flyway.class);
MigrationInfoService info = mock(MigrationInfoService.class);
Configuration configuration = mock(Configuration.class);
when(flyway.info()).thenReturn(info);
when(info.all()).thenReturn(all);
when(info.pending()).thenReturn(pending);
when(flyway.getConfiguration()).thenReturn(configuration);
when(configuration.getSchemas()).thenReturn(new String[]{"first", "second"});
return flyway;
}
@Test
void exposesSchemasPendingCountAndMigrationLog() {
Flyway flyway = flyway(new MigrationInfo[0], new MigrationInfo[]{mock(MigrationInfo.class)});
MigrationItem item = new MigrationItem(flyway);
assertArrayEquals(new String[]{"first", "second"}, item.getSchemas());
assertEquals(1, item.qtyPending());
assertNotNull(item.getAllMigrationsLog());
}
@Test
void repairAndMigrateInvokeCallbackAndFlyway() {
Flyway flyway = flyway(new MigrationInfo[0], new MigrationInfo[0]);
List<String> messages = new ArrayList<>();
MigrationItem item = new MigrationItem(flyway, messages::add);
item.repair();
item.migrate();
verify(flyway).repair();
verify(flyway).migrate();
assertEquals(2, messages.size());
assertTrue(messages.stream().allMatch(s -> s.contains("first, second")));
}
@Test
void repairAndMigrateWrapFlywayFailures() {
Flyway repairFlyway = flyway(new MigrationInfo[0], new MigrationInfo[0]);
doThrow(new IllegalStateException("repair failed")).when(repairFlyway).repair();
RuntimeException repair = assertThrows(RuntimeException.class, () -> new MigrationItem(repairFlyway).repair());
assertTrue(repair.getMessage().contains("repair failed"));
Flyway migrateFlyway = flyway(new MigrationInfo[0], new MigrationInfo[0]);
doThrow(new IllegalStateException("migrate failed")).when(migrateFlyway).migrate();
RuntimeException migrate = assertThrows(RuntimeException.class, () -> new MigrationItem(migrateFlyway).migrate());
assertTrue(migrate.getMessage().contains("migrate failed"));
}
@Test
void baseManagerInitializesMutableMigrationList() {
class Manager extends BaseMigrationManager {
@Override
public void migrate() {
}
}
Manager manager = new Manager();
assertNotNull(manager.migrations);
assertDoesNotThrow(manager::migrate);
}
}

45
src/test/java/net/locusworks/common/net/HttpClientHelperTest.java Normal file
View File

@@ -0,0 +1,45 @@
package net.locusworks.common.net;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.sun.net.httpserver.HttpServer;
import org.junit.jupiter.api.Test;
import java.net.InetSocketAddress;
class HttpClientHelperTest {
@Test
void schemaLookupHandlesBothProtocolsAndUnknownValue() {
assertEquals(HttpClientHelper.HttpSchema.HTTP, HttpClientHelper.HttpSchema.findEnum("http"));
assertEquals(HttpClientHelper.HttpSchema.HTTPS, HttpClientHelper.HttpSchema.findEnum("HtTpS"));
assertNull(HttpClientHelper.HttpSchema.findEnum("ftp"));
}
@Test
void constructorRejectsUnknownProtocol() {
Exception error = assertThrows(Exception.class, () -> new HttpClientHelper("ftp", "localhost", "21"));
assertEquals("Unable to find http schema of ftp", error.getMessage());
}
@Test
void executesHttpGetAndConsumesResponse() throws Exception {
HttpServer server = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
server.createContext("/status", exchange -> {
byte[] body = "ok".getBytes();
exchange.sendResponseHeaders(202, body.length);
exchange.getResponseBody().write(body);
exchange.close();
});
server.start();
try {
HttpClientHelper helper = new HttpClientHelper("http", "localhost", Integer.toString(server.getAddress().getPort()));
assertEquals(202, helper.getResponseCode("/status"));
assertNotNull(new HttpClientHelper("https", "localhost", "443"));
} finally {
server.stop(0);
}
}
}

25
src/test/java/net/locusworks/common/net/certmanagers/TrustAllCertsManagerTest.java Normal file
View File

@@ -0,0 +1,25 @@
package net.locusworks.common.net.certmanagers;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import org.junit.jupiter.api.Test;
import javax.net.ssl.TrustManager;
class TrustAllCertsManagerTest {
@Test
void trustsClientsAndServersAndBuildsTrustManagerArray() throws Exception {
TrustAllCertsManager manager = new TrustAllCertsManager();
assertDoesNotThrow(() -> manager.checkClientTrusted(null, null));
assertDoesNotThrow(() -> manager.checkServerTrusted(null, null));
assertNull(manager.getAcceptedIssuers());
TrustManager[] managers = TrustAllCertsManager.trustAllCerts();
assertEquals(1, managers.length);
assertInstanceOf(TrustAllCertsManager.class, managers[0]);
}
}

17
src/test/java/net/locusworks/common/net/hostverifiers/AllHostValidVerifierTest.java Normal file
View File

@@ -0,0 +1,17 @@
package net.locusworks.common.net.hostverifiers;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
class AllHostValidVerifierTest {
@Test
public void testVerify() {
AllHostValidVerifier verifier = new AllHostValidVerifier();
assertTrue(verifier.verify("localhost", null));
assertTrue(verifier.verify("127.0.0.1", null));
assertTrue(verifier.verify("::1", null));
}
}

25
src/test/java/net/locusworks/common/net/ssl/SSLManagerTest.java Normal file
View File

@@ -0,0 +1,25 @@
package net.locusworks.common.net.ssl;
import org.junit.jupiter.api.Test;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
class SSLManagerTest {
@Test
public void testCreateSSLContext() throws NoSuchAlgorithmException, KeyManagementException {
assertNotNull(SSLManager.getTrustAllTLSClient());
}
@Test
public void testTLS() {
assertNotNull(SSLManager.TLS);
assertEquals(4, SSLManager.TLS.length);
}
}

119
src/test/java/net/locusworks/common/objectmapper/ObjectMapperCoverageTest.java Normal file
View File

@@ -0,0 +1,119 @@
package net.locusworks.common.objectmapper;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
class ObjectMapperCoverageTest {
static class Value {
public String name;
Value() {
}
Value(String name) {
this.name = name;
}
}
static class SelfReference {
SelfReference self = this;
}
static class CyclicReference {
Object next;
}
static class ThrowingGetter {
String name = "field value";
public String getName() {
throw new IllegalStateException("Jackson getter failure");
}
}
@Test
void resultContainersSupportEveryConstructorMutationAndHandlerPath() {
RuntimeException error = new RuntimeException("bad json");
ObjectMapperResults<String> result = new ObjectMapperResults<>("value", null);
assertEquals("value", result.getResults());
assertFalse(result.hasError());
assertSame(result, result.withErrorHandler(e -> fail("handler must not run")));
result.setResults("changed");
result.setException(error);
AtomicReference<Throwable> handled = new AtomicReference<>();
assertSame(result, result.withErrorHandler(handled::set));
assertSame(error, handled.get());
assertSame(result, result.withErrorHandler(null));
assertEquals("simple", new ObjectMapperResults<>("simple").getResults());
assertSame(error, new ObjectMapperResults<String>(error).getException());
ObjectMapperListResults<List<String>> list = new ObjectMapperListResults<>(List.of("a"), null);
assertEquals(List.of("a"), list.getResults());
assertFalse(list.hasError());
assertSame(list, list.withErrorHandler(e -> fail("handler must not run")));
ObjectMapperListResults<List<String>> failed = new ObjectMapperListResults<>(error);
handled.set(null);
assertSame(failed, failed.withErrorHandler(handled::set));
assertSame(error, handled.get());
assertSame(failed, failed.withErrorHandler(null));
assertEquals(List.of("b"), new ObjectMapperListResults<>(List.of("b")).getResults());
}
@Test
void readsBytesStringsObjectsAndCollectionImplementations() {
Value fromBytes = ObjectMapperHelper.readValue("{\"name\":\"bytes\"}".getBytes(), Value.class).getResults();
assertEquals("bytes", fromBytes.name);
assertEquals("string", ObjectMapperHelper.readValue("{\"name\":\"string\"}", Value.class).getResults().name);
assertEquals("object", ObjectMapperHelper.readValue(new Value("object"), Value.class).getResults().name);
Object delegatedJson = "{\"name\":\"delegated\"}";
assertEquals("delegated", ObjectMapperHelper.readValue(delegatedJson, Value.class).getResults().name);
List<Value> values = List.of(new Value("one"), new Value("two"));
assertEquals(2, ObjectMapperHelper.readListValue(values, Value.class).getResults().size());
assertEquals(2, ObjectMapperHelper.readListValue("[{\"name\":\"one\"},{\"name\":\"two\"}]", Value.class, LinkedList.class).getResults().size());
assertInstanceOf(LinkedList.class,
ObjectMapperHelper.readListValue(values, Value.class, LinkedList.class).getResults());
}
@Test
void malformedInputReturnsErrorsForEveryReadOverload() {
assertTrue(ObjectMapperHelper.readValue(new byte[]{1, 2}, Value.class).hasError());
assertTrue(ObjectMapperHelper.readValue("not-json", Value.class).hasError());
assertTrue(ObjectMapperHelper.readValue(new Object(), Thread.class).hasError());
assertTrue(ObjectMapperHelper.readListValue("not-json", Value.class, ArrayList.class).hasError());
assertTrue(ObjectMapperHelper.readListValue(new Object(), Value.class, List.class).hasError());
}
@Test
void writeFallsBackWhenJacksonAndGsonRejectCircularObject() {
CyclicReference first = new CyclicReference();
CyclicReference second = new CyclicReference();
first.next = second;
second.next = first;
ObjectMapperResults<String> result = ObjectMapperHelper.writeValue(first);
assertTrue(result.hasError());
ObjectMapperResults<String> fallback = ObjectMapperHelper.writeValue(new ThrowingGetter());
assertFalse(fallback.hasError());
assertTrue(fallback.getResults().contains("field value"));
assertNotNull(new ObjectMapperHelper());
assertTrue(ObjectMapperHelper.readValue(new SelfReference(), Value.class).hasError());
}
}

41
src/test/java/net/locusworks/common/properties/ImmutablePropertiesTest.java Normal file
View File

@@ -0,0 +1,41 @@
package net.locusworks.common.properties;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
import java.util.Properties;
class ImmutablePropertiesTest {
@Test
public void testImmutableProperties() {
assertNotNull(new ImmutableProperties());
}
@Test
public void testImmutablePropertiesWithEmptyOrNullProperties() {
assertNotNull(new ImmutableProperties(new Properties()));
assertNotNull(new ImmutableProperties(null));
}
@Test
public void testImmutablePropertiesWthProperties() {
final Properties properties = new Properties();
properties.put("Hello", "World");
assertNotNull(new ImmutableProperties(properties));
}
@Test
public void testSetProperties() {
final ImmutableProperties properties = new ImmutableProperties(new Properties());
properties.setProperty("Hello", "World");
assertEquals("World", properties.getProperty("Hello"));
assertThrows(RuntimeException.class, () -> properties.setProperty("Hello", "World"));
}
}

196
src/test/java/net/locusworks/common/properties/OrderedPropertiesCoverageTest.java Normal file
View File

@@ -0,0 +1,196 @@
package net.locusworks.common.properties;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
class OrderedPropertiesCoverageTest {
@Test
void loadsAllPropertySyntaxFromReaderAndInputStream() throws Exception {
String source = "# comment\n! another\n" +
"simple=value\ncolon:value2\nspace value3\n" +
"spaced = spaced-value\n" +
"tabbed\t:\tvalue5\nform\f=\fvalue6\n" +
"slashes\\\\key:value4\n" +
"escaped\\:colon=value7\n" +
"escaped\\ key=escaped\\ value\n" +
"unicode=\\u0041\\tB\\nC\\rD\\fE\n" +
"continued=first\\\n second\n" +
"emptyKey\n=empty-key-value\n";
OrderedProperties readerProperties = new OrderedProperties();
readerProperties.load(new StringReader(source));
assertEquals("value", readerProperties.getProperty("simple"));
assertEquals("value2", readerProperties.getProperty("colon"));
assertEquals("value3", readerProperties.getProperty("space"));
assertEquals("spaced-value", readerProperties.getProperty("spaced"));
assertEquals("value4", readerProperties.getProperty("slashes\\key"));
assertEquals("value5", readerProperties.getProperty("tabbed"));
assertEquals("value6", readerProperties.getProperty("form"));
assertEquals("value7", readerProperties.getProperty("escaped:colon"));
assertEquals("escaped value", readerProperties.getProperty("escaped key"));
assertEquals("A\tB\nC\rD\fE", readerProperties.getProperty("unicode"));
assertEquals("firstsecond", readerProperties.getProperty("continued"));
assertEquals("", readerProperties.getProperty("emptyKey"));
assertEquals("empty-key-value", readerProperties.getProperty(""));
OrderedProperties streamProperties = new OrderedProperties();
streamProperties.load(new ByteArrayInputStream(source.getBytes(StandardCharsets.ISO_8859_1)));
assertEquals(readerProperties, streamProperties);
assertThrows(IllegalArgumentException.class,
() -> streamProperties.load(new StringReader("bad=\\u12G4")));
}
@Test
void storesToWriterAndStreamWithCommentsUnicodeAndEscapes() throws Exception {
OrderedProperties properties = new OrderedProperties();
properties.setProperty(" leading:=#!", " value\t\n\r\f\\é");
StringWriter writer = new StringWriter();
properties.store(writer, "first\nsecond\rthird\r\nfourth\u0100");
String writerText = writer.toString();
assertTrue(writerText.contains("#first"));
assertTrue(writerText.contains("#second"));
assertTrue(writerText.contains("\\ leading\\:\\=\\#\\!"));
assertTrue(writerText.contains("é"));
StringWriter bufferedTarget = new StringWriter();
properties.store(new BufferedWriter(bufferedTarget), "\u0100first\rsolo\n#already\n!also\nlast\r\nend\r");
assertTrue(bufferedTarget.toString().contains("#already"));
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
properties.store(bytes, null);
String streamText = bytes.toString(StandardCharsets.ISO_8859_1);
assertTrue(streamText.contains("\\u00E9"));
assertDoesNotThrow(() -> properties.save(new OutputStream() {
@Override
public void write(int b) throws IOException {
throw new IOException("expected");
}
}, "ignored error"));
}
@Test
void defaultsEnumerationListingAndNonStringValuesAreHandled() {
OrderedProperties defaults = new OrderedProperties();
defaults.setProperty("default", "value");
defaults.put("nonStringDefault", 1);
OrderedProperties properties = new OrderedProperties(defaults);
properties.setProperty("local", "x".repeat(50));
properties.put("nonString", 2);
assertEquals("value", properties.getProperty("default"));
assertEquals("fallback", properties.getProperty("missing", "fallback"));
assertEquals("value", properties.getProperty("default", "fallback"));
Enumeration<?> names = properties.propertyNames();
assertTrue(java.util.Collections.list(names).containsAll(List.of("default", "local")));
properties.put(3, "nonStringKey");
assertTrue(properties.stringPropertyNames().containsAll(java.util.Set.of("default", "local")));
properties.remove("nonString");
properties.remove(3);
defaults.remove("nonStringDefault");
ByteArrayOutputStream printBytes = new ByteArrayOutputStream();
properties.list(new PrintStream(printBytes));
assertTrue(printBytes.toString().contains("..."));
StringWriter output = new StringWriter();
properties.list(new PrintWriter(output));
assertTrue(output.toString().contains("-- listing properties --"));
}
@Test
void lineReaderHandlesCommentsWhitespaceContinuationLongLinesAndEndings() throws Exception {
String longValue = "x".repeat(9000);
String input = " #comment\r\n\t!comment\n key=value\\\r\n continued\r" + longValue;
OrderedProperties.LineReader reader = new OrderedProperties.LineReader(new StringReader(input));
int length = reader.readLine();
assertEquals("key=valuecontinued", new String(reader.lineBuf, 0, length));
assertEquals(9000, reader.readLine());
OrderedProperties.LineReader stream = new OrderedProperties.LineReader(
new ByteArrayInputStream(("a=b\n" + longValue).getBytes(StandardCharsets.ISO_8859_1)));
assertEquals(3, stream.readLine());
assertEquals(9000, stream.readLine());
assertEquals(-1, stream.readLine());
OrderedProperties.LineReader trailingReader = new OrderedProperties.LineReader(new StringReader("key=value\\"));
assertEquals("key=value", new String(trailingReader.lineBuf, 0, trailingReader.readLine()));
OrderedProperties.LineReader trailingStream = new OrderedProperties.LineReader(
new ByteArrayInputStream("key=value\\\n".getBytes(StandardCharsets.ISO_8859_1)));
assertEquals("key=value", new String(trailingStream.lineBuf, 0, trailingStream.readLine()));
OrderedProperties.LineReader whiteContinuation = new OrderedProperties.LineReader(
new StringReader("key=value\\\n \t\fcontinued\n"));
int continuedLength = whiteContinuation.readLine();
assertEquals("key=valuecontinued", new String(whiteContinuation.lineBuf, 0, continuedLength));
assertEquals(-1, new OrderedProperties.LineReader(new StringReader("#comment without newline")).readLine());
OrderedProperties.LineReader crWithoutLf = new OrderedProperties.LineReader(new StringReader("a\\\rb\n"));
int crLength = crWithoutLf.readLine();
assertEquals("ab", new String(crWithoutLf.lineBuf, 0, crLength));
OrderedProperties.LineReader blankEndings = new OrderedProperties.LineReader(new StringReader("\n\r\nvalue\n"));
assertEquals("value", new String(blankEndings.lineBuf, 0, blankEndings.readLine()));
String boundaryInput = "z".repeat(8191) + "\nnext\n";
OrderedProperties.LineReader boundary = new OrderedProperties.LineReader(new StringReader(boundaryInput));
assertEquals(8191, boundary.readLine());
assertEquals(4, boundary.readLine());
}
@Test
void privateConversionHelpersCoverEveryEscapeAndHexPath() throws Exception {
OrderedProperties properties = new OrderedProperties();
Method load = OrderedProperties.class.getDeclaredMethod("loadConvert", char[].class, int.class, int.class, char[].class);
Method save = OrderedProperties.class.getDeclaredMethod("saveConvert", String.class, boolean.class, boolean.class);
Method hex = OrderedProperties.class.getDeclaredMethod("toHex", int.class);
load.setAccessible(true);
save.setAccessible(true);
hex.setAccessible(true);
String escaped = "a\\tb\\nc\\rd\\fe\\\\f\\ g\\:h\\=i\\#j\\!k\\u0041";
assertEquals("a\tb\nc\rd\fe\\f g:h=i#j!kA",
load.invoke(properties, escaped.toCharArray(), 0, escaped.length(), new char[1]));
String hexCases = "\\u00af\\u00AF";
assertEquals("¯¯", load.invoke(properties, hexCases.toCharArray(), 0, hexCases.length(), new char[1]));
assertEquals("\\ a\\:\\=\\#\\!\\t\\n\\r\\f\\\\\\u0100",
save.invoke(properties, " a:=#!\t\n\r\f\\\u0100", true, true));
assertEquals("\\ a\\:\\=\\#\\!\\t\\n\\r\\f\\\\\u0100",
save.invoke(properties, " a:=#!\t\n\r\f\\\u0100", false, false));
assertEquals("a\\ b", save.invoke(properties, "a b", true, false));
assertEquals("a b", save.invoke(properties, "a b", false, false));
assertEquals("\\u0001", save.invoke(properties, "\u0001", false, true));
assertEquals("\u0001", save.invoke(properties, "\u0001", false, false));
assertEquals("0", save.invoke(properties, "0", false, true));
assertEquals('0', hex.invoke(null, 0));
assertEquals('F', hex.invoke(null, 15));
}
@Test
void immutablePropertiesCopiesValuesAndRejectsReplacement() {
Properties source = new Properties();
source.setProperty("key", "value");
ImmutableProperties immutable = new ImmutableProperties(source);
assertEquals("value", immutable.getProperty("key"));
assertThrows(RuntimeException.class, () -> immutable.setProperty("key", "changed"));
}
}

75
src/test/java/net/locusworks/common/properties/OrderedPropertiesTest.java Normal file
View File

@@ -0,0 +1,75 @@
package net.locusworks.common.properties;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
class OrderedPropertiesTest {
@Test
void testSetProperty() {
OrderedProperties properties = new OrderedProperties();
properties.setProperty("Hello", "World");
assertEquals("World", properties.getProperty("Hello"));
}
@Test
void testLoad() throws IOException {
OrderedProperties properties = new OrderedProperties();
properties.load(new ByteArrayInputStream("Hello=World".getBytes()));
assertEquals("World", properties.getProperty("Hello"));
}
@Test
void testSave() {
OrderedProperties properties = new OrderedProperties();
properties.setProperty("Hello", "World");
properties.save(new ByteArrayOutputStream(), "");
}
@Test
void testStore() {
OrderedProperties properties = new OrderedProperties();
properties.setProperty("Hello", "World");
try {
properties.store(new ByteArrayOutputStream(), "");
} catch (IOException e) {
fail("IOException should not be thrown");
}
}
@Test
void testGetProperty() {
OrderedProperties properties = new OrderedProperties();
properties.setProperty("Hello", "World");
assertEquals("World", properties.getProperty("Hello"));
}
@Test
void testPropertyNames() {
OrderedProperties properties = new OrderedProperties();
properties.setProperty("Hello", "World");
var propertyNames = properties.stringPropertyNames();
assertFalse(propertyNames.isEmpty());
assertTrue(propertyNames.contains("Hello"));
assertEquals(1, propertyNames.size());
}
@Test
void testList() {
PrintStream ps = new PrintStream(new ByteArrayOutputStream());
OrderedProperties properties = new OrderedProperties();
properties.setProperty("Hello", "World");
properties.list(ps);
ps.flush();
}
}

28
src/test/java/net/locusworks/common/utils/ChecksTest.java Normal file
View File

@@ -0,0 +1,28 @@
package net.locusworks.common.utils;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
class ChecksTest {
@Test
void testCheckArgument() {
Throwable ex = assertThrows(IllegalArgumentException.class, () -> Checks.checkArguments(false, "One does not equal 2"));
assertEquals("One does not equal 2", ex.getMessage());
assertDoesNotThrow(() -> Checks.checkArguments(true, "One does not equal 2"));
}
@Test
void testCheckState() {
Throwable ex = assertThrows(IllegalStateException.class, () -> Checks.checkState(false, "One does not equal 2"));
assertEquals("One does not equal 2", ex.getMessage());
assertDoesNotThrow(() -> Checks.checkState(true, "One does not equal 2"));
}
}

159
src/test/java/net/locusworks/common/utils/DateTimeStampSerializerTest.java
View File

@@ -1,7 +1,17 @@
package net.locusworks.common.utils;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import com.fasterxml.jackson.annotation.ObjectIdGenerator;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.Base64Variant;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonStreamContext;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.core.SerializableString;
import com.fasterxml.jackson.core.TreeNode;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.introspect.Annotated;
@@ -15,197 +25,237 @@ import java.math.BigInteger;
import java.util.Date;
import java.util.concurrent.atomic.AtomicLong;
import static org.junit.jupiter.api.Assertions.*;
class DateTimeStampSerializerTest {
static AtomicLong atomicLong = new AtomicLong(0);
@Test
void testSerializer(){
void testSerializer() {
DateTimeStampSerializer serializer = new DateTimeStampSerializer();
assertDoesNotThrow(() -> serializer.serialize(new Date(), new MyJsonGenerator(), new MySerializerProvider()));
assertTrue(atomicLong.get() > 0);
}
private static class MyJsonGenerator extends JsonGenerator {
@Override public JsonGenerator setCodec(ObjectCodec objectCodec) {
@Override
public JsonGenerator setCodec(ObjectCodec objectCodec) {
return null;
}
@Override public ObjectCodec getCodec() {
@Override
public ObjectCodec getCodec() {
return null;
}
@Override public Version version() {
@Override
public Version version() {
return null;
}
@Override public JsonStreamContext getOutputContext() {
@Override
public JsonStreamContext getOutputContext() {
return null;
}
@Override public JsonGenerator enable(Feature feature) {
@Override
public JsonGenerator enable(Feature feature) {
return null;
}
@Override public JsonGenerator disable(Feature feature) {
@Override
public JsonGenerator disable(Feature feature) {
return null;
}
@Override public boolean isEnabled(Feature feature) {
@Override
public boolean isEnabled(Feature feature) {
return false;
}
@Override public int getFeatureMask() {
@Override
public int getFeatureMask() {
return 0;
}
@Override public JsonGenerator setFeatureMask(int i) {
@Override
public JsonGenerator setFeatureMask(int i) {
return null;
}
@Override public JsonGenerator useDefaultPrettyPrinter() {
@Override
public JsonGenerator useDefaultPrettyPrinter() {
return null;
}
@Override public void writeStartArray() {
@Override
public void writeStartArray() {
fail();
}
@Override public void writeEndArray() {
@Override
public void writeEndArray() {
fail();
}
@Override public void writeStartObject() {
@Override
public void writeStartObject() {
fail();
}
@Override public void writeEndObject() {
@Override
public void writeEndObject() {
fail();
}
@Override public void writeFieldName(String s) {
@Override
public void writeFieldName(String s) {
fail();
}
@Override public void writeFieldName(SerializableString serializableString)
{
@Override
public void writeFieldName(SerializableString serializableString) {
fail();
}
@Override public void writeString(String s) {
@Override
public void writeString(String s) {
fail();
}
@Override public void writeString(char[] chars, int i, int i1) {
@Override
public void writeString(char[] chars, int i, int i1) {
fail();
}
@Override public void writeString(SerializableString serializableString) {
@Override
public void writeString(SerializableString serializableString) {
fail();
}
@Override public void writeRawUTF8String(byte[] bytes, int i, int i1) {
@Override
public void writeRawUTF8String(byte[] bytes, int i, int i1) {
fail();
}
@Override public void writeUTF8String(byte[] bytes, int i, int i1) {
@Override
public void writeUTF8String(byte[] bytes, int i, int i1) {
fail();
}
@Override public void writeRaw(String s) {
@Override
public void writeRaw(String s) {
fail();
}
@Override public void writeRaw(String s, int i, int i1) {
@Override
public void writeRaw(String s, int i, int i1) {
fail();
}
@Override public void writeRaw(char[] chars, int i, int i1) {
@Override
public void writeRaw(char[] chars, int i, int i1) {
fail();
}
@Override public void writeRaw(char c) {
@Override
public void writeRaw(char c) {
fail();
}
@Override public void writeRawValue(String s) {
@Override
public void writeRawValue(String s) {
fail();
}
@Override public void writeRawValue(String s, int i, int i1) {
@Override
public void writeRawValue(String s, int i, int i1) {
fail();
}
@Override public void writeRawValue(char[] chars, int i, int i1) {
@Override
public void writeRawValue(char[] chars, int i, int i1) {
fail();
}
@Override public void writeBinary(Base64Variant base64Variant, byte[] bytes, int i, int i1)
{
@Override
public void writeBinary(Base64Variant base64Variant, byte[] bytes, int i, int i1) {
fail();
}
@Override public int writeBinary(Base64Variant base64Variant, InputStream inputStream, int i)
{
@Override
public int writeBinary(Base64Variant base64Variant, InputStream inputStream, int i) {
fail();
return 0;
}
@Override public void writeNumber(int i) {
@Override
public void writeNumber(int i) {
fail();
}
@Override public void writeNumber(long l) {
@Override
public void writeNumber(long l) {
atomicLong.set(l);
}
@Override public void writeNumber(BigInteger bigInteger) {
@Override
public void writeNumber(BigInteger bigInteger) {
fail();
}
@Override public void writeNumber(double v) {
@Override
public void writeNumber(double v) {
fail();
}
@Override public void writeNumber(float v) {
@Override
public void writeNumber(float v) {
fail();
}
@Override public void writeNumber(BigDecimal bigDecimal) {
@Override
public void writeNumber(BigDecimal bigDecimal) {
fail();
}
@Override public void writeNumber(String s) {
@Override
public void writeNumber(String s) {
fail();
}
@Override public void writeBoolean(boolean b) {
@Override
public void writeBoolean(boolean b) {
fail();
}
@Override public void writeNull() {
@Override
public void writeNull() {
fail();
}
@Override public void writeObject(Object o) {
@Override
public void writeObject(Object o) {
fail();
}
@Override public void writeTree(TreeNode treeNode) {
@Override
public void writeTree(TreeNode treeNode) {
fail();
}
@Override public void flush() {
@Override
public void flush() {
fail();
}
@Override public boolean isClosed() {
@Override
public boolean isClosed() {
return false;
}
@Override public void close() {
@Override
public void close() {
fail();
}
}
@@ -217,16 +267,19 @@ class DateTimeStampSerializerTest {
return null;
}
@Override public JsonSerializer<Object> serializerInstance(Annotated annotated, Object o) {
@Override
public JsonSerializer<Object> serializerInstance(Annotated annotated, Object o) {
return null;
}
@Override public Object includeFilterInstance(BeanPropertyDefinition beanPropertyDefinition,
@Override
public Object includeFilterInstance(BeanPropertyDefinition beanPropertyDefinition,
Class<?> aClass) {
return null;
}
@Override public boolean includeFilterSuppressNulls(Object o) {
@Override
public boolean includeFilterSuppressNulls(Object o) {
return false;
}
}

191
src/test/java/net/locusworks/common/utils/FileReaderTest.java
View File

@@ -1,26 +1,30 @@
package net.locusworks.common.utils;
import net.locusworks.common.interfaces.AutoCloseableIterator;
import net.locusworks.common.utils.FileReader;
import net.locusworks.common.utils.FileReader.LineInfo;
import net.locusworks.common.utils.RandomString;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import java.io.File;
import java.io.FileOutputStream;
import java.io.*;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
import java.util.NoSuchElementException;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mockStatic;
@@ -28,16 +32,22 @@ public class FileReaderTest {
private static final String TEST_FILE = "test_file.txt";
private static final Map<Integer, Integer> numLines = new LinkedHashMap<>();
private BufferedReader testBufferedReader;
private static final String[] TEST_CONTENT = new String[]{
"Line 1",
"Line 2",
"Line 3"
};
@BeforeAll
public static void setUpBeforeClass() throws Exception {
File testFile = new File(TEST_FILE);
FileOutputStream fos = new FileOutputStream(testFile);
int count = ThreadLocalRandom.current().nextInt(100);
for (int i = 1; i <= count; i++) {
String randomString = RandomString.getInstance().getString(ThreadLocalRandom.current().nextInt(5, 100)) + "\n";
for (int i = 1; i <= TEST_CONTENT.length; i++) {
String randomString = TEST_CONTENT[i - 1] + "\n";
numLines.put(i, randomString.length());
fos.write(randomString.getBytes());
}
@@ -45,8 +55,24 @@ public class FileReaderTest {
fos.close();
}
@BeforeEach
void setUp() throws FileNotFoundException {
testBufferedReader = new BufferedReader(new java.io.FileReader(TEST_FILE));
}
@AfterEach
void tearDown() {
try {
if (testBufferedReader != null) {
testBufferedReader.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
@AfterAll
public static void tearDownAfterClass() throws Exception {
public static void tearDownAfterClass() {
File file = new File(TEST_FILE);
file.delete();
}
@@ -66,12 +92,24 @@ public class FileReaderTest {
assertEquals(lineCount, numLines.size());
}
@Test
void testDeprecatedConstructor() {
try (FileReader fr = new FileReader(new File(TEST_FILE))) {
assertNotNull(fr);
}
}
@Test
void testInit() {
}
@Test
public void testIterator() {
int lineCount = 0;
try(AutoCloseableIterator<LineInfo> iter = new FileReader(Paths.get(TEST_FILE))) {
while(iter.hasNext()) {
try (AutoCloseableIterator<LineInfo> iter = new FileReader(Paths.get(TEST_FILE))) {
while (iter.hasNext()) {
lineCount++;
LineInfo s = iter.next();
Integer lineNumber = s.getLineNumber();
@@ -101,10 +139,137 @@ public class FileReaderTest {
@Test
public void testNoAlgorithmException() {
try(MockedStatic<SecureRandom> mocked = mockStatic(SecureRandom.class)) {
try (MockedStatic<SecureRandom> mocked = mockStatic(SecureRandom.class)) {
mocked.when(() -> SecureRandom.getInstance(anyString())).thenThrow(NoSuchAlgorithmException.class);
assertDoesNotThrow(() -> RandomString.newInstance());
}
}
@Test
void testFileReaderWithBufferedReader() {
try (FileReader fileReader = new FileReader(testBufferedReader)) {
Iterator<FileReader.LineInfo> iterator = fileReader.iterator();
assertTrue(iterator.hasNext());
FileReader.LineInfo lineInfo = iterator.next();
assertEquals(1, lineInfo.getLineNumber());
assertEquals("Line 1", lineInfo.getLine());
assertTrue(iterator.hasNext());
lineInfo = iterator.next();
assertEquals(2, lineInfo.getLineNumber());
assertEquals("Line 2", lineInfo.getLine());
assertTrue(iterator.hasNext());
lineInfo = iterator.next();
assertEquals(3, lineInfo.getLineNumber());
assertEquals("Line 3", lineInfo.getLine());
assertFalse(iterator.hasNext());
}
}
@Test
void testFileReaderWithFile() {
try (FileReader fileReader = new FileReader(TEST_FILE)) {
// Add assertions based on the content of the file
Iterator<FileReader.LineInfo> iterator = fileReader.iterator();
assertTrue(iterator.hasNext());
FileReader.LineInfo lineInfo = iterator.next();
assertNotNull(lineInfo);
}
}
@Test
void testFileReaderWithNonexistentFile() {
// Provide the path to a nonexistent file for testing
String filePath = "path/to/nonexistent/file.txt";
// Ensure that the constructor throws an IllegalArgumentException
assertThrows(NullPointerException.class, () -> new FileReader(filePath));
}
@Test
void testFileReaderInitWithNullFile() {
// Ensure that the constructor throws an IllegalArgumentException with a null file
assertThrows(IllegalArgumentException.class, () -> new FileReader((String) null));
}
@Test
void testFileReaderInitWithNullBufferedReader() {
// Ensure that the constructor throws an IllegalArgumentException with a null BufferedReader
assertThrows(IllegalArgumentException.class, () -> new FileReader((BufferedReader) null));
}
@Test
void testFileReaderInitWithNonexistentResource() {
// Provide the name of a nonexistent resource for testing
String resourceName = "nonexistent_resource.txt";
// Ensure that the constructor throws an IllegalArgumentException
assertThrows(NullPointerException.class, () -> new FileReader(resourceName));
}
@Test
void testFileReaderInitWithInvalidResource() {
// Provide the name of an invalid resource for testing
String resourceName = "invalid_resource.txt";
// Ensure that the constructor throws a RuntimeException
assertThrows(RuntimeException.class, () -> new FileReader(resourceName));
}
@Test
void testFileReaderInitWithNullPath() {
// Ensure that the constructor throws an IllegalArgumentException with a null path
assertThrows(IllegalArgumentException.class, () -> new FileReader((Path) null));
}
@Test
void testFileReaderInitWithNonexistentPath() {
// Provide a nonexistent path for testing
Path path = Paths.get("nonexistent_path.txt");
// Ensure that the constructor throws a RuntimeException
assertThrows(RuntimeException.class, () -> new FileReader(path));
}
@Test
void testFileReaderInitWithNonRegularFile() {
// Provide the path to a non-regular file for testing
Path path = Paths.get("path/to/non_regular_file");
// Ensure that the constructor throws an IllegalArgumentException
assertThrows(IllegalArgumentException.class, () -> new FileReader(path));
}
@Test
void testFileReaderHasNextIOException() {
// Provide a BufferedReader that throws an IOException when reading
BufferedReader bufferedReader = new BufferedReader(new StringReader(TEST_FILE)) {
@Override
public String readLine() throws IOException {
throw new IOException("Simulated IOException");
}
};
try (FileReader fileReader = new FileReader(bufferedReader)) {
Iterator<FileReader.LineInfo> iterator = fileReader.iterator();
assertThrows(RuntimeException.class, iterator::hasNext);
}
}
@Test
void testFileReaderNextNoMoreElements() {
// Provide a BufferedReader with no more elements for testing
BufferedReader bufferedReader = new BufferedReader(new StringReader(""));
try (FileReader fileReader = new FileReader(bufferedReader)) {
Iterator<FileReader.LineInfo> iterator = fileReader.iterator();
assertThrows(NoSuchElementException.class, iterator::next);
}
}
}

7
src/test/java/net/locusworks/common/utils/HashUtilsTest.java
View File

@@ -1,6 +1,5 @@
package net.locusworks.common.utils;
import net.locusworks.common.utils.HashUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.junit.jupiter.api.Test;
@@ -11,7 +10,7 @@ public class HashUtilsTest {
private static final String TEST_STRING = "Hello World";
@Test
public void testMD5() throws Exception {
public void testMD5() {
String digestUtilsMD5 = DigestUtils.md5Hex(TEST_STRING.getBytes());
String hashUtilsMD5 = HashUtils.hash("MD5", TEST_STRING);
@@ -19,7 +18,7 @@ public class HashUtilsTest {
}
@Test
public void testSHA1() throws Exception {
public void testSHA1() {
String digestUtilsMD5 = DigestUtils.sha1Hex(TEST_STRING.getBytes());
String hashUtilsMD5 = HashUtils.hash("SHA-1", TEST_STRING);
@@ -27,7 +26,7 @@ public class HashUtilsTest {
}
@Test
public void testSHA512() throws Exception {
public void testSHA512() {
String digestUtilsMD5 = DigestUtils.sha512Hex(TEST_STRING.getBytes());
String hashUtilsMD5 = HashUtils.hash("SHA-512", TEST_STRING);

81
src/test/java/net/locusworks/common/utils/ObjectUtilsTest.java Normal file
View File

@@ -0,0 +1,81 @@
package net.locusworks.common.utils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Objects;
import static net.locusworks.common.utils.ObjectUtils.performIfNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
class ObjectUtilsTest {
private static final String TEST_FILE = "object-utils-test.txt";
private static Path testFile;
@BeforeAll
public static void setUpBeforeClass() throws Exception {
Path classpathRoot = Paths.get(Objects.requireNonNull(ObjectUtilsTest.class.getResource("/")).toURI());
testFile = classpathRoot.resolve(TEST_FILE);
Files.writeString(testFile, "test resource");
}
@AfterAll
public static void tearDownAfterClass() throws Exception {
Files.deleteIfExists(testFile);
}
@Test
void testNullObject() {
performIfNotNull(null, str -> fail());
}
@Test
void testNotNullObject() {
String str = "hello world";
performIfNotNull(str, obj -> assertEquals(str, obj));
}
@Test
void getResourceStream_whenResourceExists_ReturnsInputStream() throws Exception {
try (InputStream result = ObjectUtils.getResourceStream("/" + TEST_FILE)) {
assertNotNull(result);
}
}
@Test
void getResourceStream_whenResourceDoesNotExist_ThrowsException() {
// Arrange
String resourceName = "nonexistent.txt";
// Act & Assert
assertThrows(NullPointerException.class,
() -> ObjectUtils.getResourceStream(resourceName));
}
@Test
void getResourceStream_whenResourceExistsInClassLoader_ReturnsInputStream() throws Exception {
try (InputStream result = ObjectUtils.getResourceStream(TEST_FILE)) {
assertNotNull(result);
}
}
@Test
void getResourceStream_whenResourceDoesNotExistInClassLoader_ThrowsException() {
// Arrange
String resourceName = "nonexistent.txt";
// Act & Assert
assertThrows(NullPointerException.class,
() -> ObjectUtils.getResourceStream(resourceName));
}
}

4
src/test/java/net/locusworks/common/utils/SplitterTest.java
View File

@@ -5,7 +5,9 @@ import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
class SplitterTest {

2
src/test/java/net/locusworks/common/utils/StreamUtilsTest.java
View File

@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
class StreamUtilsTest {

65
src/test/java/net/locusworks/common/utils/UtilityWrappersTest.java Normal file
View File

@@ -0,0 +1,65 @@
package net.locusworks.common.utils;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class UtilityWrappersTest {
@Test
void successFactoriesAndConstructorExposeBodyAndStatus() {
assertTrue(Success.success().getSuccess());
assertEquals(true, Success.success().getBody());
assertFalse(Success.fail().getSuccess());
assertEquals(false, Success.fail().getBody());
Success value = new Success(true, "body");
assertEquals("body", value.getBody());
}
@Test
void dataOutputStreamConvertsAndClosesByteArrayOutput() throws Exception {
DataOutputStreamHelper stream = new DataOutputStreamHelper();
stream.write("hello".getBytes(StandardCharsets.UTF_8));
assertArrayEquals("hello".getBytes(StandardCharsets.UTF_8), stream.toByteArray());
assertEquals("hello", stream.toString());
assertEquals("aGVsbG8=", stream.base64Encoded());
stream.close();
assertArrayEquals(new byte[0], stream.toByteArray());
assertDoesNotThrow(stream::close);
}
@Test
void dataOutputStreamSupportsOtherOutputsAndSwallowsCloseFailure() throws Exception {
OutputStream custom = new OutputStream() {
@Override
public void write(int b) {
}
@Override
public String toString() {
return "custom";
}
@Override
public void close() {
throw new IllegalStateException("expected");
}
};
DataOutputStreamHelper stream = new DataOutputStreamHelper(custom);
assertEquals("custom", stream.toString());
assertDoesNotThrow(stream::close);
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
try (DataOutputStreamHelper explicit = new DataOutputStreamHelper(bytes)) {
explicit.writeByte(1);
assertArrayEquals(new byte[]{1}, explicit.toByteArray());
}
}
}

161
src/test/java/net/locusworks/common/utils/UtilsPackageCoverageTest.java Normal file
View File

@@ -0,0 +1,161 @@
package net.locusworks.common.utils;
import com.fasterxml.jackson.core.JsonParser;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Locale;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.when;
import org.mockito.MockedStatic;
class UtilsPackageCoverageTest {
@TempDir
Path tempDir;
private static java.util.Date deserialize(String value) throws Exception {
JsonParser parser = mock(JsonParser.class);
when(parser.getText()).thenReturn(value);
return new DateTimeStampDeserializer().deserialize(parser, null);
}
@Test
void dateDeserializerHandlesEpochBuiltInCustomAndInvalidFormats() throws Exception {
assertEquals(1234L, deserialize("1234").getTime());
Locale original = Locale.getDefault();
Locale.setDefault(Locale.US);
try {
assertNotNull(deserialize("January 1, 2020"));
assertNotNull(deserialize("12/31/2020"));
assertNotNull(deserialize("Dec 31, 2020 1:02:03 PM"));
assertNull(deserialize("definitely-not-a-date"));
Field stylesField = DateTimeStampDeserializer.class.getDeclaredField("styles");
stylesField.setAccessible(true);
Integer[] styles = (Integer[]) stylesField.get(null);
Integer[] originalStyles = styles.clone();
java.util.Arrays.fill(styles, -1);
try {
assertNotNull(deserialize("12/31/2020"));
} finally {
System.arraycopy(originalStyles, 0, styles, 0, styles.length);
}
} finally {
Locale.setDefault(original);
}
}
@SuppressWarnings("deprecation")
@Test
void hashUtilsCoversEveryInputOverloadCaseAndFailure() throws Exception {
String expected = HashUtils.hash("SHA-256", "content");
byte[] bytes = "content".getBytes(StandardCharsets.UTF_8);
Path path = tempDir.resolve("hash.txt");
Files.write(path, bytes);
File file = path.toFile();
assertEquals(expected, HashUtils.hash("SHA-256", bytes));
assertEquals(expected, HashUtils.hash("SHA-256", path));
assertEquals(expected, HashUtils.hash("SHA-256", file));
assertEquals(expected.toUpperCase(Locale.ROOT), HashUtils.hash("SHA-256", file, false));
assertEquals(expected.toUpperCase(Locale.ROOT), HashUtils.hash("SHA-256", path, false));
assertEquals(expected, HashUtils.hash(new ByteArrayInputStream(bytes), "SHA-256"));
assertEquals(expected.toUpperCase(Locale.ROOT),
HashUtils.hash(new ByteArrayInputStream(bytes), "SHA-256", false));
assertThrows(IllegalArgumentException.class,
() -> HashUtils.hash("SHA-256", tempDir.resolve("missing")));
assertThrows(IllegalArgumentException.class,
() -> HashUtils.hash(new ByteArrayInputStream(bytes), "not-an-algorithm"));
assertThrows(IllegalArgumentException.class,
() -> HashUtils.hash(new java.io.InputStream() {
@Override public int read() throws IOException { throw new IOException("read failed"); }
}, "SHA-256"));
}
@Test
void fileReaderCoversResourceValidationIterationMutationAndFailures() throws Exception {
try (FileReader resource = new FileReader("test.properties")) {
assertTrue(resource.hasNext());
assertSame(resource, resource.iterator());
assertNotNull(resource.next());
}
assertThrows(IllegalArgumentException.class, () -> new FileReader((String) null));
assertThrows(IllegalArgumentException.class, () -> new FileReader((Path) null));
assertThrows(IllegalArgumentException.class, () -> new FileReader(tempDir.resolve("missing")));
assertThrows(IllegalArgumentException.class, () -> new FileReader(tempDir));
assertThrows(IllegalArgumentException.class, () -> new FileReader((BufferedReader) null));
BufferedReader readFailure = new BufferedReader(new StringReader("")) {
@Override public String readLine() throws IOException { throw new IOException("read failed"); }
};
assertThrows(RuntimeException.class, () -> new FileReader(readFailure).hasNext());
BufferedReader closeFailure = new BufferedReader(new StringReader("")) {
@Override public void close() throws IOException { throw new IOException("close failed"); }
};
assertThrows(RuntimeException.class, () -> new FileReader(closeFailure).close());
FileReader nullReader = new FileReader(new BufferedReader(new StringReader("")));
Field readerField = FileReader.class.getDeclaredField("reader");
readerField.setAccessible(true);
readerField.set(nullReader, null);
assertDoesNotThrow(nullReader::close);
Path simulated = tempDir.resolve("simulated.txt");
try (MockedStatic<Files> files = mockStatic(Files.class, CALLS_REAL_METHODS)) {
files.when(() -> Files.notExists(simulated)).thenReturn(false);
files.when(() -> Files.isRegularFile(simulated)).thenReturn(true);
files.when(() -> Files.newBufferedReader(simulated)).thenThrow(new IOException("open failed"));
assertThrows(RuntimeException.class, () -> new FileReader(simulated));
}
FileReader.LineInfo info = new FileReader.LineInfo(1, "line");
info.setLineNumber(2);
info.setLineLength(10);
info.setLine("changed");
assertEquals(2, info.getLineNumber());
assertEquals(10, info.getLineLength());
assertEquals("changed", info.getLine());
}
@Test
void singletonAndUtilityClassConstructorsAreCovered() throws Exception {
Field instance = RandomString.class.getDeclaredField("instance");
instance.setAccessible(true);
instance.set(null, null);
assertNotNull(RandomString.getInstance());
assertNotNull(new HashUtils());
assertNotNull(new Checks());
assertNotNull(new Utils());
assertNotNull(new Constants());
assertNotNull(new ObjectUtils());
assertNotNull(new StreamUtils());
assertNotNull(ObjectUtils.getResourceStream("/test.properties"));
assertEquals(List.of("a", "b"), StreamUtils.asStream(List.of("a", "b"), true).toList());
assertTrue(StreamUtils.asStream(new String[]{"a"}, true).isParallel());
}
}

16
src/test/java/net/locusworks/common/utils/UtilsTest.java
View File

@@ -1,14 +1,22 @@
package net.locusworks.common.utils;
import net.locusworks.common.annotations.MapValue;
import net.locusworks.common.utils.Utils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.ParameterizedTest;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
@@ -202,7 +210,7 @@ public class UtilsTest {
}
List<Integer> extractedList = Utils.extractFieldToList("field5", list);
Set<Integer> extractedSet = Utils.extractFieldToSet("field5", list);
java.util.Set<Object> extractedSet = Utils.extractFieldToSet("field5", list);
assertEquals(10, extractedList.size());
assertEquals(10, extractedSet.size());
@@ -274,7 +282,7 @@ public class UtilsTest {
@Test
public void testBuildSet() {
Set<String> myset = Utils.buildSet(HashSet.class, String.class, "Hello", "World");
java.util.Set<String> myset = Utils.buildSet(HashSet.class, String.class, "Hello", "World");
assertNotNull(myset);
assertEquals(2, myset.size());
}

7
src/test/java/net/locusworks/test/AESEncryptionTest.java
View File

@@ -1,10 +1,13 @@
package net.locusworks.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.fail;
import net.locusworks.common.crypto.AES;
import net.locusworks.common.utils.Utils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class AESEncryptionTest {
@@ -21,7 +24,7 @@ public class AESEncryptionTest {
@Test
public void testDecryption() {
String testString ="hello world";
String testString = "hello world";
try {
AES aes = AES.createInstance();
String encrypted = aes.encrypt(testString);

7
src/test/java/net/locusworks/test/AllTests.java
View File

@@ -1,7 +0,0 @@
package net.locusworks.test;
import org.junit.jupiter.api.extension.ExtendWith;
public class AllTests {
}

12
src/test/java/net/locusworks/test/HashSaltTest.java
View File

@@ -1,21 +1,23 @@
package net.locusworks.test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import net.locusworks.common.crypto.HashSalt;
import net.locusworks.common.utils.Utils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class HashSaltTest {
private static final String samplePassword="Hello World";
private static final String samplePassword = "Hello World";
@Test
public void testEncryption() {
try {
String hashSalt = HashSalt.createHash(samplePassword);
assertFalse(Utils.isEmptyString(hashSalt), String.format("Encrypted String is not blank? :%s", hashSalt));
} catch(Exception ex) {
} catch (Exception ex) {
fail();
}
}
@@ -26,7 +28,7 @@ public class HashSaltTest {
String hashSalt = HashSalt.createHash(samplePassword);
boolean decrypted = HashSalt.validatePassword(samplePassword, hashSalt);
assertTrue(decrypted, "Test String and Original String the same? :%s");
} catch(Exception ex) {
} catch (Exception ex) {
fail();
}
}

40
src/test/java/net/locusworks/test/ImmutablesTest.java
View File

@@ -1,45 +1,63 @@
package net.locusworks.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import net.locusworks.common.immutables.Pair;
import net.locusworks.common.immutables.Triplet;
import net.locusworks.common.immutables.Unit;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ImmutablesTest {
@Test
public void testUnit() {
Unit<String> unit = new Unit<>("Hello World");
assertEquals("Hello World", unit.getValue1());
Unit<String> unit1 = new Unit<>("Hello World");
Unit<String> unit3 = new Unit<>("Hello World");
assertEquals("Hello World", unit1.getValue1());
Unit<Integer> unit2 = new Unit<>(2);
assertEquals(2, (int) unit2.getValue1());
assertEquals(unit1, unit3);
assertNotEquals(unit1, unit2);
assertNotEquals(unit1, new Object());
assertNotEquals(unit1, null);
}
@Test
public void testPair() {
Pair<String, String> pair1 = new Pair<>("Hello", "World");
Pair<String, String> pair2 = new Pair<>("Hello", "World");
Pair<String, String> pair3 = new Pair<>("Hello", "World2");
assertEquals("Hello", pair1.getValue1());
assertEquals("World", pair1.getValue2());
assertEquals(pair1, pair2);
Pair<String, Integer> pair2 = new Pair<>("Foo", 25);
assertEquals("Foo", pair2.getValue1());
assertEquals(25, (int) pair2.getValue2());
assertNotEquals(pair1, pair3);
assertNotEquals(pair1, new Object());
assertNotEquals(pair1, null);
Pair<Integer, Integer> pair3 = new Pair<>(1, 23);
assertEquals(1, (int) pair3.getValue1());
assertEquals(23, (int) pair3.getValue2());
}
@Test
public void testTriplet() {
Triplet<String, Integer, String> triplet1 = new Triplet<>("Hello", 24, "World");
Triplet<String, Integer, String> triplet2 = new Triplet<>("Hello", 25, "World");
Triplet<String, Integer, String> triplet3 = new Triplet<>("Hello", 24, "World2");
Triplet<String, Integer, String> triplet4 = new Triplet<>("Hello", 24, "World");
assertEquals("Hello", triplet1.getValue1());
assertEquals(24, (int) triplet1.getValue2());
assertEquals("World", triplet1.getValue3());
assertEquals(triplet1, triplet4);
assertNotEquals(triplet1, triplet2);
assertNotEquals(triplet1, triplet3);
assertNotEquals(triplet1, new Object());
assertNotEquals(triplet1, null);
}
}

4
src/test/java/net/locusworks/test/ObjectMapperHelperTest.java
View File

@@ -14,7 +14,9 @@ import org.junit.jupiter.api.Test;
import static net.locusworks.common.utils.Constants.JUNIT_TEST_CHECK;
import static net.locusworks.common.utils.Constants.LOG4J_CONFIG_PROPERTY;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases to test ObjectMapperHelper.class

25
src/test/java/net/locusworks/test/PropertiesManagerTest.java
View File

@@ -1,5 +1,10 @@
package net.locusworks.test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
@@ -10,10 +15,9 @@ import net.locusworks.common.configuration.PropertiesManager;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
/**
* Test cases for the properties manager class
*
* @author Isaac Parenteau
* @since 1.0.0-RELEASE
*
@@ -24,7 +28,7 @@ public class PropertiesManagerTest {
private static final String TMP_PROPS = "temp.properties";
private static final int ENTRY_SIZE = 4;
public static enum Configuration {
public enum Configuration {
DB_HOST("dbHost"),
DB_PORT("dbPort"),
USER_EXPIRATION_DAYS("userExpirationDays"),
@@ -38,6 +42,7 @@ public class PropertiesManagerTest {
/**
* Get the current value of the enumeration
*
* @return value
*/
public String getValue() {
@@ -77,9 +82,9 @@ public class PropertiesManagerTest {
try {
Properties props = PropertiesManager.loadConfiguration(this.getClass(), PROPERTIES_FILE);
Properties tmp = new Properties();
assertEquals(0, tmp.keySet().size());
assertEquals(0, tmp.size());
PropertiesManager.addConfiguration(tmp, props);
assertEquals(ENTRY_SIZE, tmp.keySet().size());
assertEquals(ENTRY_SIZE, tmp.size());
assertTrue(tmp.containsKey(Configuration.USER_EXPIRATION_DAYS.toString()));
assertTrue(tmp.containsKey(Configuration.DB_HOST.toString()));
assertTrue(tmp.containsKey(Configuration.DB_PORT.toString()));
@@ -95,11 +100,11 @@ public class PropertiesManagerTest {
Properties props = PropertiesManager.loadConfiguration(this.getClass(), PROPERTIES_FILE);
Properties tmp = new Properties();
assert props != null;
assertEquals(ENTRY_SIZE, props.keySet().size());
assertEquals(0, tmp.keySet().size());
assertEquals(ENTRY_SIZE, props.size());
assertEquals(0, tmp.size());
PropertiesManager.removeConfiguration(props, tmp);
assertEquals(0, props.keySet().size());
assertEquals(0, tmp.keySet().size());
assertEquals(0, props.size());
assertEquals(0, tmp.size());
} catch (IOException e) {
fail(e.getMessage());
}
@@ -112,7 +117,7 @@ public class PropertiesManagerTest {
Path tmpFile = Paths.get(TMP_PROPS);
PropertiesManager.saveConfiguration(props, tmpFile, "test propertis");
Properties tmp = PropertiesManager.loadConfiguration(tmpFile);
assertEquals(ENTRY_SIZE, tmp.keySet().size());
assertEquals(ENTRY_SIZE, tmp.size());
assertTrue(tmp.containsKey(Configuration.USER_EXPIRATION_DAYS.toString()));
assertTrue(tmp.containsKey(Configuration.DB_HOST.toString()));
assertTrue(tmp.containsKey(Configuration.DB_PORT.toString()));