Merge pull request #138 from TNG/update-java-expression-language

Update Java Expression Language

Author: hankem

.github/workflows/build.yml

@@ -39,3 +39,12 @@ jobs:
         with:
           files: target/site/jacoco/jacoco.xml
           name: codecov
+
+  dependency-check:
+      needs: test
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+        - name: Check dependencies
+          run: mvn -e dependency-check:check

pom.xml

@@ -88,17 +88,13 @@
                     </execution>
                 </executions>
             </plugin>
-              <plugin>
-              <groupId>org.owasp</groupId>
-              <artifactId>dependency-check-maven</artifactId>
-              <version>7.2.1</version>
-              <executions>
-                  <execution>
-                      <goals>
-                          <goal>check</goal>
-                      </goals>
-                  </execution>
-              </executions>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>7.2.1</version>
+                <configuration>
+                    <failBuildOnCVSS>5</failBuildOnCVSS>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -207,8 +203,8 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>3.0.1-b12</version>
+            <artifactId>jakarta.el</artifactId>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>

src/main/java/com/tngtech/configbuilder/util/ConfigValidator.java

@@ -8,6 +8,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 import java.lang.reflect.Method;
 import java.util.Set;
@@ -45,7 +46,7 @@ private void callValidationMethods(T instanceOfConfigClass) {
 
     private void callJSRValidation(T instanceOfConfigClass) {
         ValidatorFactory factory = configBuilderFactory.getInstance(ValidatorFactory.class);
-        javax.validation.Validator validator = factory.getValidator();
+        Validator validator = factory.getValidator();
         Set<ConstraintViolation<T>> constraintViolations = validator.validate(instanceOfConfigClass);
         if (!constraintViolations.isEmpty()) {
             StringBuilder stringBuilder = new StringBuilder(errorMessageSetup.getErrorMessage(ValidatorException.class) + "\n");

src/test/java/com/tngtech/configbuilder/ConfigBuilderExceptionTest.java

@@ -6,25 +6,22 @@
 import com.tngtech.configbuilder.testclasses.TestConfigThrowsInvocationTargetExceptionException;
 import com.tngtech.configbuilder.testclasses.TestConfigThrowsPrimitiveParsingException;
 import com.tngtech.configbuilder.testclasses.TestConfigWithoutDefaultConstructor;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 @RunWith(Parameterized.class)
 public class ConfigBuilderExceptionTest {
 
     private Class configClass;
     private Class<? extends Throwable> exceptionClass;
     private String message;
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
     @Parameterized.Parameters
     public static Collection configs() {
         return Arrays.asList(new Object[][]{
@@ -42,9 +39,9 @@ public ConfigBuilderExceptionTest(Class configClass, Class<? extends Throwable>
 
     @Test
     public void testConfigBuilderExceptions() {
-        expectedException.expect(exceptionClass);
-        expectedException.expectMessage(message);
         ConfigBuilder configBuilder = new ConfigBuilder(configClass);
-        configBuilder.build();
+        assertThatThrownBy(() -> configBuilder.build())
+                .isInstanceOf(exceptionClass)
+                .hasMessageContaining(message);
     }
 }

src/test/java/com/tngtech/configbuilder/ConfigBuilderIntegrationTest.java

@@ -1,10 +1,12 @@
 package com.tngtech.configbuilder;
 
+import com.tngtech.configbuilder.exception.ValidatorException;
 import com.tngtech.configbuilder.testclasses.TestConfig;
 import com.tngtech.configbuilder.testutil.SystemOutRule;
 import org.junit.Rule;
 import org.junit.Test;
 
+import javax.validation.constraints.NotNull;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -13,15 +15,15 @@
 
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Sets.newHashSet;
-import static com.google.common.collect.Sets.newLinkedHashSet;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class ConfigBuilderIntegrationTest {
 
     @Rule
     public SystemOutRule systemOut = new SystemOutRule();
 
-    private ConfigBuilder configBuilder = ConfigBuilder.on(TestConfig.class);
+    private ConfigBuilder<TestConfig> configBuilder = ConfigBuilder.on(TestConfig.class);
 
     @Test
     public void testConfigBuilderWithParameters() {
@@ -38,7 +40,7 @@ public void testConfigBuilderWithParameters() {
         String[] args = {"-u", "--collection", "first entry,second entry"};
         Object result = configBuilder.withCommandLineArgs(args).build();
 
-        assertThat(result).isEqualToComparingFieldByField(expectedTestConfig);
+        assertThat(result).usingRecursiveComparison().isEqualTo(expectedTestConfig);
         assertThat(systemOut.getLog()).contains("config validated");
     }
 
@@ -55,7 +57,7 @@ public void testWithImportedConfig() {
         TestConfig expectedTestConfig = new TestConfig();
         expectedTestConfig.setSomeNumber(5);
         List<Path> paths = Arrays.asList(Paths.get("/mnt"), Paths.get("/home"));
-        expectedTestConfig.setPathCollection(newLinkedHashSet(paths));
+        expectedTestConfig.setPathCollection(newHashSet(paths));
         expectedTestConfig.setCopiedStringCollection(importedTestConfig.getStringCollection());
         expectedTestConfig.setSomeString("Hello, World!");
         expectedTestConfig.setBoolean(true);
@@ -68,7 +70,20 @@ public void testWithImportedConfig() {
         String[] args = {"-u", "--collection", "collection,two"};
         Object result = configBuilder.withCommandLineArgs(args).withImportedConfiguration(importedTestConfig).build();
 
-        assertThat(result).isEqualToComparingFieldByField(expectedTestConfig);
+        assertThat(result).usingRecursiveComparison().isEqualTo(expectedTestConfig);
         assertThat(systemOut.getLog()).contains("config validated");
     }
+
+    static class ConfigWithNotNullValidation {
+        @NotNull
+        private String notNullString;
+    }
+
+    @Test
+    public void testValidation(){
+        ConfigBuilder<ConfigWithNotNullValidation> configBuilder = new ConfigBuilder<>(ConfigWithNotNullValidation.class);
+        assertThatThrownBy(configBuilder::build)
+                .isInstanceOf(ValidatorException.class)
+                .hasMessageContaining("must not be null");
+    }
 }

src/test/java/com/tngtech/configbuilder/ConfigBuilderWithoutAnnotationsIntegrationTest.java

@@ -48,7 +48,7 @@ public void testConfigBuilderWithParameters() {
                 .withCommandLineArgs(args)
                 .addProperties(additionalProperties)
                 .build();
-        assertThat(result).isEqualToComparingFieldByField(expectedConfig);
+        assertThat(result).usingRecursiveComparison().isEqualTo(expectedConfig);
         assertThat(systemOut.getLog()).contains("config validated");
     }
 }

src/test/java/com/tngtech/configbuilder/annotation/propertyloaderconfiguration/PropertyFiltersProcessorTest.java

@@ -5,16 +5,15 @@
 import com.tngtech.propertyloader.impl.filters.*;
 import com.tngtech.propertyloader.impl.interfaces.PropertyLoaderFilter;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Properties;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -27,9 +26,6 @@ protected String filterValue(String key, String value, Properties properties) {
         }
     }
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
     @Mock
     private PropertyFilters propertyFilters;
     @Mock
@@ -82,8 +78,8 @@ public void testAnnotationWithUnknownValuesShouldThrowException() {
         @SuppressWarnings("unchecked") Class<? extends PropertyLoaderFilter>[] classes = new Class[]{TestPropertyFilter.class};
         when(propertyFilters.value()).thenReturn(classes);
 
-        expectedException.expect(IllegalStateException.class);
-        expectedException.expectMessage("unhandled filter class TestPropertyFilter");
-        propertyFiltersProcessor.configurePropertyLoader(propertyFilters, propertyLoader);
+        assertThatThrownBy(() -> propertyFiltersProcessor.configurePropertyLoader(propertyFilters, propertyLoader))
+                .isInstanceOf(IllegalStateException.class)
+                .hasMessage("unhandled filter class TestPropertyFilter");
     }
 }

src/test/java/com/tngtech/configbuilder/annotation/valueextractor/DefaultValueProcessorTest.java

@@ -21,13 +21,12 @@ public class DefaultValueProcessorTest {
     private DefaultValue defaultValue;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         defaultValueProcessor = new DefaultValueProcessor();
     }
 
     @Test
     public void testDefaultValueProcessor() {
-
         when(defaultValue.value()).thenReturn("value");
         assertThat(defaultValueProcessor.getValue(defaultValue, configBuilderFactory)).isEqualTo("value");
     }

src/test/java/com/tngtech/configbuilder/annotation/valueextractor/SystemPropertyProcessorTest.java

@@ -20,7 +20,7 @@ public class SystemPropertyProcessorTest {
     private ConfigBuilderFactory configBuilderFactory;
 
     @Test
-    public void testGetValue() throws Exception {
+    public void testGetValue() {
         when(systemPropertyValue.value()).thenReturn("user.language");
         assertThat(systemPropertyProcessor.getValue(systemPropertyValue, configBuilderFactory)).isEqualTo(System.getProperty("user.language"));
     }