Relocate Remote Registration Service

virtualcell · Jan 16, 2025 · 0177b46 · 0177b46
1 parent d3b24bd
commit 0177b46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/vcell-client/src/main/java/org/vcell/dependency/client/VCellClientModule.java b/vcell-client/src/main/java/org/vcell/dependency/client/VCellClientModule.java
@@ -7,7 +7,7 @@
 import com.google.inject.name.Names;
 import org.vcell.DependencyConstants;
 import org.vcell.service.registration.RegistrationService;
-import org.vcell.service.registration.remote.RemoteRegistrationService;
+import org.vcell.util.network.RemoteRegistrationService;
 import org.vcell.util.document.ExternalDataIdentifier;
 import org.vcell.util.document.User;
 

diff --git a/...ion/remote/RemoteRegistrationService.java → ...il/network/RemoteRegistrationService.java b/...ion/remote/RemoteRegistrationService.java → ...il/network/RemoteRegistrationService.java
@@ -1,8 +1,9 @@
-package org.vcell.service.registration.remote;
+package org.vcell.util.network;
 
 import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException;
 import cbit.vcell.resource.PropertyLoader;
 import org.vcell.api.client.VCellApiClient;
+import org.vcell.api.utils.DTOOldAPI;
 import org.vcell.service.registration.RegistrationService;
 import org.vcell.util.DataAccessException;
 import org.vcell.util.UseridIDExistsException;
@@ -22,8 +23,8 @@ public RemoteRegistrationService() {
 	@Override
 	public UserInfo insertUserInfo(UserInfo newUserInfo, boolean bUpdate) throws RemoteProxyException, DataAccessException, UseridIDExistsException {
 		try (VCellApiClient apiClient = getvCellApiClient()){
-			org.vcell.api.common.UserInfo apiUserInfo = apiClient.insertUserInfo(newUserInfo.getApiUserInfo());
-			return UserInfo.fromApiUserInfo(apiUserInfo);
+			org.vcell.api.common.UserInfo apiUserInfo = apiClient.insertUserInfo(DTOOldAPI.getApiUserInfo(newUserInfo));
+			return DTOOldAPI.fromApiUserInfo(apiUserInfo);
 		} catch (IOException | NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
 			throw new RemoteProxyException("failed to insert user: "+e.getMessage(), e);
 		}