cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Refactored directory package to include API version

Browse Source
This commit is contained in:
Maxime Dor
2017-09-29 22:13:51 +02:00
parent f7984bd36e
commit 69ecef0155
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/kamax/mxisd/backend/ldap/LdapDirectoryProvider.java
View File

@@ -23,7 +23,7 @@ package io.kamax.mxisd.backend.ldap;
import io.kamax.mxisd.config.MatrixConfig;
import io.kamax.mxisd.config.ldap.LdapAttributeConfig;
import io.kamax.mxisd.config.ldap.LdapConfig;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
import io.kamax.mxisd.directory.IDirectoryProvider;
import io.kamax.mxisd.exception.InternalServerError;
import org.apache.directory.api.ldap.model.cursor.CursorException;

4
src/main/java/io/kamax/mxisd/backend/sql/SqlDirectoryProvider.java
View File

@@ -24,7 +24,7 @@ import io.kamax.matrix.MatrixID;
import io.kamax.mxisd.config.MatrixConfig;
import io.kamax.mxisd.config.sql.SqlConfig;
import io.kamax.mxisd.config.sql.SqlProviderConfig;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
import io.kamax.mxisd.directory.IDirectoryProvider;
import io.kamax.mxisd.exception.InternalServerError;
import org.apache.commons.lang.StringUtils;
@@ -37,7 +37,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Optional;
import static io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult.Result;
import static io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult.Result;
public abstract class SqlDirectoryProvider implements IDirectoryProvider {

6
src/main/java/io/kamax/mxisd/controller/directory/UserDirectoryController.java → src/main/java/io/kamax/mxisd/controller/directory/v1/UserDirectoryController.java
View File

@@ -18,11 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.controller.directory;
package io.kamax.mxisd.controller.directory.v1;
import com.google.gson.Gson;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchRequest;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchRequest;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
import io.kamax.mxisd.directory.DirectoryManager;
import io.kamax.mxisd.util.GsonParser;
import io.kamax.mxisd.util.GsonUtil;

2
src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchRequest.java → src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchRequest.java
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.controller.directory.io;
package io.kamax.mxisd.controller.directory.v1.io;
public class UserDirectorySearchRequest {

2
src/main/java/io/kamax/mxisd/controller/directory/io/UserDirectorySearchResult.java → src/main/java/io/kamax/mxisd/controller/directory/v1/io/UserDirectorySearchResult.java
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.controller.directory.io;
package io.kamax.mxisd.controller.directory.v1.io;
import java.util.ArrayList;
import java.util.List;

4
src/main/java/io/kamax/mxisd/directory/DirectoryManager.java
View File

@@ -22,8 +22,8 @@ package io.kamax.mxisd.directory;
import com.google.gson.Gson;
import io.kamax.matrix.MatrixErrorInfo;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchRequest;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchRequest;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
import io.kamax.mxisd.dns.ClientDnsOverwrite;
import io.kamax.mxisd.exception.InternalServerError;
import io.kamax.mxisd.exception.MatrixException;

2
src/main/java/io/kamax/mxisd/directory/IDirectoryProvider.java
View File

@@ -20,7 +20,7 @@
package io.kamax.mxisd.directory;
import io.kamax.mxisd.controller.directory.io.UserDirectorySearchResult;
import io.kamax.mxisd.controller.directory.v1.io.UserDirectorySearchResult;
public interface IDirectoryProvider {