Skip to content

Commit

Permalink
chore(scim): move configuration to model module (#2343)
Browse files Browse the repository at this point in the history
* chore: move configuration classes to reusable module #1944

* docs: update docs #1944

* chore: remove code smells #1944
  • Loading branch information
jgomer2001 authored Sep 9, 2022
1 parent 57a1748 commit 7cdd0aa
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docs/developer/implementation-design/jans-scim.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This file is a placeholder.
This file is a placeholder
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
package io.jans.scim.model.conf;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

import io.jans.config.oxtrust.Configuration;

import java.io.Serializable;

import jakarta.enterprise.inject.Vetoed;


/**
* Janssen Project configuration
*
* @author Yuriy Movchan
* @version 0.1, 05/15/2013
*/
@Vetoed
@JsonIgnoreProperties(ignoreUnknown = true)
public class AppConfiguration implements Configuration, Serializable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*
* Copyright (c) 2020, Janssen Project
*/

package io.jans.scim.model.conf;

import io.jans.orm.annotation.AttributeName;
Expand Down Expand Up @@ -36,8 +35,8 @@ public String getDn() {
return dn;
}

public void setDn(String p_dn) {
dn = p_dn;
public void setDn(String dn) {
this.dn = dn;
}

public AppConfiguration getDynamicConf() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Janssen Project software is available under the Apache License (2004). See http://www.apache.org/licenses/ for full text.
*
* Copyright (c) 2020, Janssen Project
*/
package io.jans.scim.model.conf;

public interface Configuration { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package io.jans.scim.model.conf;

public enum ScimMode { OAUTH, BYPASS }
7 changes: 6 additions & 1 deletion jans-scim/service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@
</build>

<dependencies>
<!-- Gluu -->
<!-- Jans -->
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-scim-model</artifactId>
<version>${janssen.version}</version>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-model</artifactId>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*
* Copyright (c) 2020, Janssen Project
*/

package io.jans.scim.service;

import java.io.File;
Expand All @@ -17,17 +16,16 @@
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;

import org.apache.commons.lang.StringUtils;
import io.jans.exception.ConfigurationException;
import io.jans.as.model.config.BaseDnConfiguration;
import io.jans.as.model.config.StaticConfiguration;
import io.jans.scim.model.conf.AppConfiguration;
import io.jans.config.oxtrust.Configuration;
import io.jans.scim.model.conf.Conf;
import io.jans.scim.model.conf.Configuration;
import io.jans.orm.PersistenceEntryManager;
import io.jans.orm.exception.BasePersistenceException;
import io.jans.orm.model.PersistenceConfiguration;
import io.jans.orm.service.PersistanceFactoryService;
import io.jans.scim.model.conf.Conf;
import io.jans.service.cdi.async.Asynchronous;
import io.jans.service.cdi.event.BaseConfigurationReload;
import io.jans.service.cdi.event.ConfigurationEvent;
Expand All @@ -38,6 +36,8 @@
import io.jans.service.timer.schedule.TimerSchedule;
import io.jans.util.StringHelper;
import io.jans.util.properties.FileConfiguration;

import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;

/**
Expand Down

0 comments on commit 7cdd0aa

Please sign in to comment.