chore: move jans-auth base configuration to jans-core-service

Signed-off-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>

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

@@ -7,7 +7,7 @@
 package io.jans.as.common.service.common;
 
 import io.jans.as.model.config.StaticConfiguration;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.model.SmtpConfiguration;
 import io.jans.orm.PersistenceEntryManagerFactory;
 import io.jans.orm.model.PersistenceConfiguration;

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

@@ -7,7 +7,7 @@
 package io.jans.as.common.service.common;
 
 import io.jans.as.model.config.StaticConfiguration;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.model.SmtpConfiguration;
 import io.jans.orm.PersistenceEntryManager;
 import io.jans.service.EncryptionService;

jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java

@@ -11,7 +11,7 @@
 import io.jans.as.model.common.IdType;
 import io.jans.as.model.config.BaseDnConfiguration;
 import io.jans.as.model.config.StaticConfiguration;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.model.JansAttribute;
 import io.jans.orm.PersistenceEntryManager;
 import io.jans.orm.model.base.DummyEntry;

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

@@ -21,8 +21,6 @@
 import io.jans.as.common.service.common.ApplicationFactory;
 import io.jans.as.model.common.FeatureFlagType;
 import io.jans.as.model.configuration.AppConfiguration;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
-import io.jans.as.persistence.model.configuration.IDPAuthConf;
 import io.jans.as.server.model.auth.AuthenticationMode;
 import io.jans.as.server.model.config.ConfigurationFactory;
 import io.jans.as.server.service.cdi.event.AuthConfigurationEvent;
@@ -34,6 +32,8 @@
 import io.jans.as.server.service.stat.StatService;
 import io.jans.as.server.service.stat.StatTimer;
 import io.jans.as.server.service.status.ldap.LdapStatusTimer;
+import io.jans.config.GluuConfiguration;
+import io.jans.config.IDPAuthConf;
 import io.jans.exception.ConfigurationException;
 import io.jans.model.AuthenticationScriptUsageType;
 import io.jans.model.SimpleProperty;

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

@@ -8,9 +8,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.jans.as.common.service.common.ConfigurationService;
-import io.jans.as.persistence.model.configuration.CustomProperty;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
-import io.jans.as.persistence.model.configuration.IDPAuthConf;
+import io.jans.config.CustomProperty;
+import io.jans.config.GluuConfiguration;
+import io.jans.config.IDPAuthConf;
 import io.jans.model.AuthenticationScriptUsageType;
 import io.jans.model.SimpleCustomProperty;
 import io.jans.model.config.CustomAuthenticationConfiguration;

jans-auth-server/server/src/test/java/io/jans/as/server/dev/duo/PythonToLdapString.java

@@ -7,8 +7,10 @@
 package io.jans.as.server.dev.duo;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.jans.as.persistence.model.configuration.CustomProperty;
-import io.jans.as.persistence.model.configuration.IDPAuthConf;
+
+import io.jans.config.CustomProperty;
+import io.jans.config.IDPAuthConf;
+
 import org.apache.commons.io.IOUtils;
 import org.testng.annotations.Test;
 

jans-casa/app/src/main/java/io/jans/casa/ui/vm/HomeViewModel.java

@@ -4,7 +4,7 @@
 import io.jans.casa.core.pojo.BrowserInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.zkoss.bind.annotation.AfterCompose;;
+import org.zkoss.bind.annotation.AfterCompose;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.bind.annotation.Init;

jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AcrsResource.java

@@ -6,7 +6,7 @@
 
 package io.jans.configapi.rest.resource.auth;
 
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.configapi.core.rest.ProtectedApi;
 import io.jans.configapi.rest.model.AuthenticationMethod;
 import io.jans.configapi.service.auth.ConfigurationService;

jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CacheConfigurationResource.java

@@ -10,7 +10,7 @@
 import com.github.fge.jsonpatch.JsonPatchException;
 
 import io.jans.as.common.service.common.ApplicationFactory;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.configapi.core.rest.ProtectedApi;
 import io.jans.configapi.service.auth.ConfigurationService;
 import io.jans.configapi.util.ApiAccessConstants;

jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/ConfigSmtpResource.java

@@ -7,7 +7,7 @@
 package io.jans.configapi.rest.resource.auth;
 
 import io.jans.as.common.service.common.ConfigurationService;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.configapi.core.rest.ProtectedApi;
 import io.jans.configapi.util.ApiAccessConstants;
 import io.jans.configapi.util.ApiConstants;

jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/MessageConfigurationResource.java

@@ -13,7 +13,7 @@
 import com.github.fge.jsonpatch.JsonPatchException;
 
 import io.jans.as.common.service.common.ApplicationFactory;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.configapi.core.rest.ProtectedApi;
 import io.jans.configapi.core.util.Jackson;
 import io.jans.configapi.service.auth.ConfigurationService;

jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ConfigurationService.java

@@ -9,7 +9,7 @@
 import io.jans.as.common.service.common.ApplicationFactory;
 import io.jans.as.model.config.Conf;
 import io.jans.as.model.configuration.AppConfiguration;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.configapi.configuration.ConfigurationFactory;
 import io.jans.configapi.model.status.StatsData;
 import io.jans.orm.PersistenceEntryManager;

jans-config-api/server/src/main/java/io/jans/configapi/service/auth/CouchbaseConfService.java

@@ -8,8 +8,9 @@
 
 import com.github.fge.jackson.JacksonUtils;
 import com.google.common.collect.Lists;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
-import io.jans.as.persistence.model.configuration.IDPAuthConf;
+
+import io.jans.config.GluuConfiguration;
+import io.jans.config.IDPAuthConf;
 import io.jans.orm.couchbase.model.CouchbaseConnectionConfiguration;
 import io.jans.service.EncryptionService;
 import io.jans.util.security.StringEncrypter;

jans-config-api/server/src/main/java/io/jans/configapi/service/auth/LdapConfigurationService.java

@@ -9,8 +9,9 @@
 import com.github.fge.jackson.JacksonUtils;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
-import io.jans.as.persistence.model.configuration.IDPAuthConf;
+
+import io.jans.config.GluuConfiguration;
+import io.jans.config.IDPAuthConf;
 import io.jans.model.ldap.GluuLdapConfiguration;
 import io.jans.service.EncryptionService;
 import io.jans.util.security.StringEncrypter;

jans-config-api/server/src/main/java/io/jans/configapi/service/auth/SqlConfService.java

@@ -2,8 +2,9 @@
 
 import com.github.fge.jackson.JacksonUtils;
 import com.google.common.collect.Lists;
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
-import io.jans.as.persistence.model.configuration.IDPAuthConf;
+
+import io.jans.config.GluuConfiguration;
+import io.jans.config.IDPAuthConf;
 import io.jans.orm.sql.model.SqlConnectionConfiguration;
 import io.jans.service.EncryptionService;
 import io.jans.util.security.StringEncrypter;

jans-core/service/pom.xml

@@ -70,6 +70,14 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>jans-core-cache</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jans-core-message</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jans-core-document-store</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>jans-core-script</artifactId>

jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/configuration/CustomProperty.java → jans-core/service/src/main/java/io/jans/config/CustomProperty.java

@@ -4,15 +4,16 @@
  * Copyright (c) 2020, Janssen Project
  */
 
-package io.jans.as.persistence.model.configuration;
+package io.jans.config;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlElementWrapper;
 import jakarta.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Custom Attributes

jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/configuration/GluuConfiguration.java → jans-core/service/src/main/java/io/jans/config/GluuConfiguration.java

@@ -4,7 +4,10 @@
  * Copyright (c) 2020, Janssen Project
  */
 
-package io.jans.as.persistence.model.configuration;
+package io.jans.config;
+
+import java.io.Serializable;
+import java.util.List;
 
 import io.jans.model.SmtpConfiguration;
 import io.jans.orm.annotation.AttributeName;
@@ -16,9 +19,6 @@
 import io.jans.service.document.store.conf.DocumentStoreConfiguration;
 import io.jans.service.message.model.config.MessageConfiguration;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * Gluu Configuration
  *

jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/configuration/IDPAuthConf.java → jans-core/service/src/main/java/io/jans/config/IDPAuthConf.java

@@ -4,22 +4,25 @@
  * Copyright (c) 2020, Janssen Project
  */
 
-package io.jans.as.persistence.model.configuration;
+package io.jans.config;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.jans.as.model.util.Util;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+
 import io.jans.model.ldap.GluuLdapConfiguration;
 import io.jans.orm.couchbase.model.CouchbaseConnectionConfiguration;
 import io.jans.orm.sql.model.SqlConnectionConfiguration;
-
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * oxIDPAuthConf
@@ -123,10 +126,19 @@ public SqlConnectionConfiguration asSqlConfiguration() {
         return read(SqlConnectionConfiguration.class);
     }
 
+    public static ObjectMapper createJsonMapper() {
+        final AnnotationIntrospector jackson = new JacksonAnnotationIntrospector();
+
+        final ObjectMapper mapper = new ObjectMapper();
+        mapper.getDeserializationConfig().with(jackson);
+        mapper.getSerializationConfig().with(jackson);
+        return mapper;
+    }
+
     private <T> T read(Class<T> clazz) {
         try {
             if (config != null) {
-                return Util.createJsonMapper().treeToValue(config, clazz);
+                return createJsonMapper().treeToValue(config, clazz);
             }
         } catch (JsonProcessingException e) {
             // ignore

jans-lock/server/src/main/java/io/jans/lock/server/service/ConfigurationService.java

@@ -8,7 +8,7 @@
 
 import org.slf4j.Logger;
 
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.lock.model.config.StaticConfiguration;
 import io.jans.model.SmtpConfiguration;
 import io.jans.orm.PersistenceEntryManager;

jans-lock/server/src/main/java/io/jans/lock/service/config/ApplicationFactory.java

@@ -9,7 +9,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 
-import io.jans.as.persistence.model.configuration.GluuConfiguration;
+import io.jans.config.GluuConfiguration;
 import io.jans.lock.model.config.StaticConfiguration;
 import io.jans.lock.server.service.ConfigurationService;
 import io.jans.model.SmtpConfiguration;