feat(jans-auth-server): updating arquillian tests 1247 (#2017)

* feat(jans-auth-server):upgrade jetty-embedded 11 and confiogure arquillian

* feat(jans-auth):tests running with arquillian testng and jetty11

* feat(jans-auth):add config-oxauth-sql.properties

* feat(jans-auth):disable DefaultPromptLoginTest to test fullRebuild

* feat(jans-auth):remove config-oxauth-sql.properties from profiles properties

* feat(jans-auth):Adding confDir to default profile and parametrize injection for tests

* feat(jans-auth): enable DefaultPromptLoginTest in jans-auth-client

* feat(jans-auth-server): using CdiUtil Injection inside Tests

* feat(jans-auth-server): removing HashMap Injection for tests

jans-auth-server/pom.xml

@@ -39,15 +39,21 @@
         <arquillian.rest.version>1.0.0.Alpha4</arquillian.rest.version>
         <arquillian.drone.version>2.0.0.Final</arquillian.drone.version>
         <arquillian.graphene.version>2.1.0.CR1</arquillian.graphene.version>
-		<shrinkwrap.version>2.1.0</shrinkwrap.version>
+		<arquillian.test.version>1.7.0.Alpha10</arquillian.test.version>
+		<arquillian.jetty.embedded.11.version>1.0.0.CR4</arquillian.jetty.embedded.11.version>
+		<arquillian.ingwar.tools.version>1.2.0</arquillian.ingwar.tools.version>
+
 
+		<shrinkwrap.version>2.1.0</shrinkwrap.version>
 		<!-- argLine property needs to stay as POM property so that JaCoCo plugin can append it at build time -->
 		<argLine>-Xms1024m -Xmx2048m -XX:+DisableExplicitGC</argLine>
 
 		<sonar.projectKey>JanssenProject_jans-auth-server</sonar.projectKey>
 		<sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
 		<sonar.organization>janssenproject</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
+		<weld.version>4.0.3.Final</weld.version>
+		<org.jboss.resteasy.client.microprofile.version>4.7.5.Final</org.jboss.resteasy.client.microprofile.version>
 	</properties>
 
 	<prerequisites>
@@ -117,6 +123,15 @@
                 <version>1.6.0</version>
             </dependency>
 
+			<!-- Weld -->
+			<dependency>
+				<groupId>org.jboss.weld</groupId>
+				<artifactId>weld-core-parent</artifactId>
+				<version>${weld.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
          	<!-- https://github.com/wywygmbh/log4j-plugin-fluency -->
 			<dependency>
 				<groupId>com.wywy</groupId>
@@ -371,6 +386,11 @@
 				<version>${swagger.version}</version>
 	            <scope>provided</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.jboss.resteasy</groupId>
+				<artifactId>resteasy-client-microprofile</artifactId>
+				<version>${org.jboss.resteasy.client.microprofile.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

jans-auth-server/server/conf/jans-sql.properties

@@ -4,6 +4,11 @@ connection.uri=${config.sql.connection.uri}
 
 connection.driver-property.serverTimezone=${config.sql.connection.driver-property.serverTimezone}
 
+# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
+connection.driver-property.cachePrepStmts=false
+connection.driver-property.cacheResultSetMetadata=true
+connection.driver-property.metadataCacheSize=500
+
 auth.userName=${config.sql.auth.userName}
 auth.userPassword=${config.sql.auth.userPassword}
 

jans-auth-server/server/conf/jans.properties

@@ -1,8 +1,8 @@
-persistence.type= ${config.persistence.type}
+persistence.type=${config.persistence.type}
 
 jansAuth_ConfigurationEntryDN=${config.generic.configurationEntryDN}
 
 certsDir=${config.generic.certsDir}
-
+confDir=${config.generic.confDir}
 binaryAttributes=objectGUID
 certificateAttributes=userCertificate

jans-auth-server/server/pom.xml

@@ -143,10 +143,8 @@
 				<configuration>
 					<argLine>-Xms1024m -Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+DisableExplicitGC
 						-Djans.base=${project.build.directory}
-						-Dserver.base=${project.build.directory}
 						-Dlog.base=${project.build.directory}
 						-Dgluu.disable.scheduler=true
-
 					</argLine>
 				</configuration>
 			</plugin>
@@ -290,6 +288,12 @@
 		<dependency>
 			<groupId>io.jans</groupId>
 			<artifactId>jans-auth-common</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jboss.resteasy</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- persistence model -->
 		<dependency>
@@ -310,10 +314,22 @@
 		<dependency>
 			<groupId>io.jans</groupId>
 			<artifactId>jans-core-model</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jboss.resteasy</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.jans</groupId>
 			<artifactId>jans-core-util</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jboss.resteasy</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.jans</groupId>
@@ -326,10 +342,22 @@
 		<dependency>
 			<groupId>io.jans</groupId>
 			<artifactId>jans-core-service</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jboss.resteasy</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.jans</groupId>
 			<artifactId>jans-core-server</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jboss.resteasy</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.jans</groupId>
@@ -578,6 +606,11 @@
             <artifactId>jakarta.websocket-api</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
 
 		<!-- Test: Arquillian container and extensions -->
 		<dependency>
@@ -588,11 +621,13 @@
 		<dependency>
 			<groupId>org.jboss.arquillian.extension</groupId>
 			<artifactId>arquillian-rest-client-impl-3x</artifactId>
+			<version>${arquillian.rest.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eu.ingwar.tools</groupId>
 			<artifactId>arquillian-suite-extension</artifactId>
+			<version>${arquillian.ingwar.tools.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -606,25 +641,34 @@
 		<dependency>
 			<groupId>org.jboss.arquillian.container</groupId>
 			<artifactId>arquillian-container-test-impl-base</artifactId>
-			<version>1.4.0.Final</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.arquillian.container</groupId>
 			<artifactId>arquillian-container-spi</artifactId>
-			<version>1.4.0.Final</version>
+			<version>${arquillian.test.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.arquillian.container</groupId>
 			<artifactId>arquillian-container-test-spi</artifactId>
-			<version>1.4.0.Final</version>
+			<version>${arquillian.test.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.arquillian.testenricher</groupId>
 			<artifactId>arquillian-testenricher-cdi</artifactId>
-			<version>1.4.0.Final</version>
+			<version>${arquillian.test.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.arquillian.test</groupId>
+			<artifactId>arquillian-test-impl-base</artifactId>
+			<version>${arquillian.test.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.arquillian.protocol</groupId>
+			<artifactId>arquillian-protocol-servlet</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -721,8 +765,8 @@
 				<!-- Test: Embedded Jetty -->
 				<dependency>
 					<groupId>org.jboss.arquillian.container</groupId>
-					<artifactId>arquillian-jetty-embedded-9</artifactId>
-					<scope>test</scope>
+					<artifactId>arquillian-jetty-embedded-11</artifactId>
+					<version>${arquillian.jetty.embedded.11.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.jetty</groupId>

jans-auth-server/server/profiles/default/config-oxauth-sql.properties

@@ -0,0 +1,21 @@
+# SQL
+config.sql.db.schema.name=jansdb
+config.sql.connection.uri=jdbc:mysql://localhost:3306/jansdb
+config.sql.connection.driver-property.serverTimezone=UTC-0400
+config.sql.auth.userName=jans
+config.sql.auth.userPassword=YA5FRc7dQO5kDz9wfME57w==
+
+# Password hash method
+config.sql.password.encryption.method=SSHA-256
+
+# Connection pool size
+config.sql.connection.pool.max-total=40
+config.sql.connection.pool.max-idle=15
+config.sql.connection.pool.min-idle=5
+
+# Max time needed to create connection pool in milliseconds
+config.sql.connection.pool.create-max-wait-time-millis=20000
+# Max wait 20 seconds
+config.sql.connection.pool.max-wait-time-millis=20000
+# Allow to evict connection in pool after 30 minutes
+config.sql.connection.pool.min-evictable-idle-time-millis=1800000

jans-auth-server/server/profiles/default/config-oxauth.properties

@@ -15,6 +15,7 @@ config.ldap.useSSL=true
 config.generic.configurationEntryDN=ou=jans-auth,ou=configuration,o=jans
 config.generic.createLdapConfigurationEntryIfNotExist=true
 config.generic.certsDir=conf
+config.generic.confDir=
 
 # Expiration time
 config.client.authorization-code-lifetime=60

jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java

@@ -122,7 +122,7 @@ public class ConfigurationFactory {
     private static final String DIR = BASE_DIR + File.separator + "conf" + File.separator;
 
     private static final String BASE_PROPERTIES_FILE = DIR + BASE_PROPERTIES_FILE_NAME;
-    private static final String LDAP_PROPERTIES_FILE = DIR + LDAP_PROPERTIES_FILE_NAME;
+    private static final String APP_PROPERTIES_FILE = DIR + LDAP_PROPERTIES_FILE_NAME;
 
     private static final String CONFIG_FILE_NAME = "jans-config.json";
     private static final String ERRORS_FILE_NAME = "jans-errors.json";
@@ -158,9 +158,11 @@ public class ConfigurationFactory {
 
     @PostConstruct
     public void init() {
+        log.info("Initializing ConfigurationFactory ...");
         this.isActive = new AtomicBoolean(true);
         try {
-            this.persistenceConfiguration = persistanceFactoryService.loadPersistenceConfiguration(LDAP_PROPERTIES_FILE);
+            log.info("---------PATH to file configuration: {}", APP_PROPERTIES_FILE);
+            this.persistenceConfiguration = persistanceFactoryService.loadPersistenceConfiguration(APP_PROPERTIES_FILE);
             loadBaseConfiguration();
 
             String confDir = confDir();
@@ -238,7 +240,7 @@ public void reloadConfigurationTimerEvent(@Observes @Scheduled ConfigurationEven
 
     private void reloadConfiguration() {
         // Reload LDAP configuration if needed
-        PersistenceConfiguration newPersistenceConfiguration = persistanceFactoryService.loadPersistenceConfiguration(LDAP_PROPERTIES_FILE);
+        PersistenceConfiguration newPersistenceConfiguration = persistanceFactoryService.loadPersistenceConfiguration(APP_PROPERTIES_FILE);
 
         if (newPersistenceConfiguration != null &&
                 (!StringHelper.equalsIgnoreCase(this.persistenceConfiguration.getFileName(), newPersistenceConfiguration.getFileName()) ||

jans-auth-server/server/src/main/java/io/jans/as/server/service/AppInitializer.java

@@ -55,9 +55,6 @@
 import io.jans.util.StringHelper;
 import io.jans.util.security.StringEncrypter;
 import io.jans.util.security.StringEncrypter.EncryptionException;
-import org.jboss.weld.util.reflection.ParameterizedTypeImpl;
-import org.slf4j.Logger;
-
 import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.BeforeDestroyed;
@@ -70,6 +67,9 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.servlet.ServletContext;
+import org.jboss.weld.util.reflection.ParameterizedTypeImpl;
+import org.slf4j.Logger;
+
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
@@ -244,6 +244,7 @@ public void applicationInitialized(@Observes @Initialized(ApplicationScoped.clas
         // Notify plugins about finish application initialization
         eventApplicationInitialized.select(ApplicationInitialized.Literal.APPLICATION)
                 .fire(new ApplicationInitializedEvent());
+
     }
 
     protected void initSchedulerService() {