From dbd1742a033d9ca7ecbad9411f6a4097cd2fc4fb Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Fri, 10 Jan 2025 12:45:31 -0500 Subject: [PATCH] Clean Up Broken Imports Imports when rebasing off of master got mis-mangled. --- .../vcell/field/FieldDataDBOperationResults.java | 1 - .../field/io/FieldDataFileOperationResults.java | 1 - .../field/io/FieldDataFileOperationSpec.java | 1 - .../client/LocalUserMetaDbServerMessaging.java | 1 - .../bootstrap/LocalVCellConnectionFactory.java | 15 --------------- 5 files changed, 19 deletions(-) diff --git a/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationResults.java b/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationResults.java index 6bee69fd19..22e11a9a3a 100644 --- a/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationResults.java +++ b/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationResults.java @@ -15,7 +15,6 @@ import java.util.stream.Collectors; import org.vcell.restclient.model.FieldDataReference; -import org.vcell.restclient.model.FieldDataReferences; import org.vcell.util.document.ExternalDataIdentifier; import org.vcell.util.document.KeyValue; import org.vcell.util.document.User; diff --git a/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationResults.java b/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationResults.java index 170455b25c..97f08fee18 100644 --- a/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationResults.java +++ b/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationResults.java @@ -11,7 +11,6 @@ package cbit.vcell.field.io; import cbit.vcell.simdata.DataIdentifier; -import org.vcell.restclient.model.FieldDataInfo; import org.vcell.restclient.model.FieldDataSaveResults; import org.vcell.restclient.model.FieldDataShape; import org.vcell.util.Extent; diff --git a/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationSpec.java b/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationSpec.java index dd6ee3ad09..461c570309 100644 --- a/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationSpec.java +++ b/vcell-core/src/main/java/cbit/vcell/field/io/FieldDataFileOperationSpec.java @@ -11,7 +11,6 @@ package cbit.vcell.field.io; import org.vcell.restclient.model.AnalyzedResultsFromFieldData; -import org.vcell.restclient.model.FieldDataInfo; import org.vcell.util.Extent; import org.vcell.util.ISize; import org.vcell.util.Origin; diff --git a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalUserMetaDbServerMessaging.java b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalUserMetaDbServerMessaging.java index 5914584c04..b890111c97 100644 --- a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalUserMetaDbServerMessaging.java +++ b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalUserMetaDbServerMessaging.java @@ -19,7 +19,6 @@ import org.apache.logging.log4j.Logger; import org.vcell.api.client.VCellApiClient; import org.vcell.restclient.model.FieldDataReference; -import org.vcell.restclient.model.FieldDataReferences; import org.vcell.util.BigString; import org.vcell.util.DataAccessException; import org.vcell.util.ObjectNotFoundException; diff --git a/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnectionFactory.java b/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnectionFactory.java index 8f441136d8..02dd510bca 100644 --- a/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnectionFactory.java +++ b/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnectionFactory.java @@ -11,13 +11,9 @@ package cbit.vcell.message.server.bootstrap; import cbit.vcell.export.server.ExportServiceImpl; -import cbit.vcell.message.server.bootstrap.client.LocalVCellConnectionMessaging; import cbit.vcell.message.server.dispatcher.SimulationDatabaseDirect; import cbit.vcell.modeldb.AdminDBTopLevel; -import cbit.vcell.modeldb.ApiAccessToken; -import cbit.vcell.modeldb.ApiClient; import cbit.vcell.modeldb.DatabaseServerImpl; -import cbit.vcell.resource.NativeLib; import cbit.vcell.resource.PropertyLoader; import cbit.vcell.server.Auth0ConnectionUtils; import cbit.vcell.server.ConnectionException; @@ -25,32 +21,21 @@ import cbit.vcell.server.VCellConnectionFactory; import cbit.vcell.simdata.Cachetable; import cbit.vcell.simdata.DataSetControllerImpl; -import com.nimbusds.oauth2.sdk.ParseException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.vcell.api.client.VCellApiClient; import org.vcell.db.ConnectionFactory; import org.vcell.db.DatabaseService; import org.vcell.db.KeyFactory; -import org.vcell.restclient.ApiException; -import org.vcell.restclient.model.AccesTokenRepresentationRecord; -import org.vcell.util.AuthenticationException; import org.vcell.util.DataAccessException; -import org.vcell.util.ObjectNotFoundException; -import org.vcell.util.document.KeyValue; -import org.vcell.util.document.User; import org.vcell.util.document.UserLoginInfo; import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URISyntaxException; import java.security.KeyManagementException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.sql.SQLException; -import java.util.Date; -import java.util.List; /** * This type was created in VisualAge.