fix syncope

sitewhere · Jun 2, 2020 · 6a63db8 · 6a63db8
1 parent 2671c4d
commit 6a63db8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,13 +38,13 @@ ext['solr.version'] = '6.4.0'
 ext['siddhi.version'] = '3.1.2'
 
 apply plugin: 'distribution'
-    
+
 allprojects {
     group = 'com.sitewhere'
 	version = '2.2.0'
-	
+
     repositories {
-        maven { url "http://repo.maven.apache.org/maven2" }
+        maven { url "https://repo.maven.apache.org/maven2" }
         maven { url 'http://maven.restlet.org' }
         maven { url "https://jitpack.io" }
         maven { url "http://oss.jfrog.org/artifactory/oss-release-local/" }
@@ -58,13 +58,13 @@ allprojects {
 
 subprojects {
 	apply plugin: 'eclipse'
-	
+
 	apply plugin: "com.github.hierynomus.license"
 	license {
 		header rootProject.file('HEADER')
     	include "**/*.java"
 	}
-	
+
     // Use Spring dependency management.
  	apply plugin: 'io.spring.dependency-management'
 	dependencyManagement {
@@ -75,13 +75,13 @@ subprojects {
 
 	// Use Docker plugin to allow for creating/pushing an image.
 	apply plugin: 'com.bmuschko.docker-remote-api'
-	
+
 	// Allow Docker settings to be overridden by build environment.
 	if (System.getenv("DOCKER_REGISTRY_URL") != null) registryUrl = System.getenv("DOCKER_REGISTRY_URL")
 	if (System.getenv("DOCKER_REGISTRY_USERNAME") != null) registryUsername = System.getenv("DOCKER_REGISTRY_USERNAME")
 	if (System.getenv("DOCKER_REGISTRY_PASSWORD") != null) registryPassword = System.getenv("DOCKER_REGISTRY_PASSWORD")
 	if (System.getenv("DOCKER_REGISTRY_EMAIL") != null) registryEmail = System.getenv("DOCKER_REGISTRY_EMAIL")
-	
+
 	docker {
 	    url = (System.getenv("DOCKER_HOST") != null) ? System.getenv("DOCKER_HOST") : dockerProtocol + '://' + dockerHostname + ':' + dockerPort
 	    registryCredentials {
@@ -91,12 +91,12 @@ subprojects {
 	        email = registryEmail
 	    }
 	}
- 	
+
  	// Choose Java settings.
     apply plugin: 'java'
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
-    
+
     // Common dependencies used for all projects.
     dependencies {
         testCompile group: 'junit', name: 'junit'

diff --git a/...nagement/src/main/java/com/sitewhere/instance/user/persistence/SyncopeUserManagement.java b/...nagement/src/main/java/com/sitewhere/instance/user/persistence/SyncopeUserManagement.java
@@ -181,7 +181,7 @@ public void start(ILifecycleProgressMonitor monitor) throws SiteWhereException {
 
     /**
      * Get or create Syncope application for SiteWhere.
-     * 
+     *
      * @throws SiteWhereException
      */
     protected ApplicationTO getOrCreateSiteWhereApplication() throws SiteWhereException {
@@ -361,7 +361,7 @@ public IUser getUserByUsername(String username) throws SiteWhereException {
 
     /**
      * Convert Syncope user to SiteWhere user.
-     * 
+     *
      * @param user
      * @return
      * @throws SiteWhereException
@@ -465,7 +465,7 @@ public IGrantedAuthority createGrantedAuthority(IGrantedAuthorityCreateRequest r
 
     /**
      * Create a Syncope privilege from an SiteWhere authority.
-     * 
+     *
      * @param authority
      * @return
      * @throws SiteWhereException
@@ -626,18 +626,18 @@ protected CountDownLatch getSyncopeAvailable() {
     }
 
     protected ApplicationService getApplicationService() {
-	return applicationService;
+	return client.getService(ApplicationService.class);
     }
 
     protected UserService getUserService() {
-	return userService;
+	return client.getService(UserService.class);
     }
 
     protected SchemaService getSchemaService() {
-	return schemaService;
+	return client.getService(SchemaService.class);
     }
 
     protected AnyTypeClassService getAnyTypeClassService() {
-	return anyTypeClassService;
+	return client.getService(AnyTypeClassService.class);
     }
 }