From 5cb8b12b0550b13f597f1762ff66f5e1a87db9d3 Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Mon, 23 Dec 2024 08:39:29 -0500 Subject: [PATCH] Retrieve Field Data IDs and Shape Information With Rest Have the DB operation of retrieving all field data IDs of a user, and the shape information of a field data entry be done through the REST endpoints. --- python-restclient/.openapi-generator/FILES | 31 +- python-restclient/README.md | 10 +- python-restclient/docs/BioModelResourceApi.md | 2 +- python-restclient/docs/DataIdentifier.md | 34 + python-restclient/docs/Domain.md | 28 + .../docs/FieldDataFileOperationResults.md | 34 + python-restclient/docs/FieldDataInfo.md | 32 + .../docs/FieldDataReferenceInfo.md | 34 + python-restclient/docs/FieldDataReferences.md | 30 + .../docs/FieldDataResourceApi.md | 91 +- .../docs/SaveFieldDataFromFile.md | 35 + .../docs/SimulationResourceApi.md | 6 +- python-restclient/docs/UsersResourceApi.md | 12 +- .../test/test_data_identifier.py | 69 ++ python-restclient/test/test_domain.py | 53 + .../test_field_data_file_operation_results.py | 101 ++ .../test_field_data_file_operation_spec.py | 3 +- .../test/test_field_data_info.py | 68 ++ .../test/test_field_data_reference_info.py | 62 ++ .../test/test_field_data_references.py | 78 ++ .../test/test_field_data_resource_api.py | 10 +- .../test/test_save_field_data_from_file.py | 106 ++ python-restclient/vcell_client/__init__.py | 5 +- .../api/bio_model_resource_api.py | 12 +- .../api/field_data_resource_api.py | 310 +++++- .../api/simulation_resource_api.py | 36 +- .../vcell_client/api/users_resource_api.py | 48 +- .../vcell_client/models/__init__.py | 5 +- .../vcell_client/models/data_identifier.py | 114 +++ .../vcell_client/models/domain.py | 93 ++ .../field_data_file_operation_results.py | 138 +++ .../vcell_client/models/field_data_info.py | 122 +++ .../models/field_data_reference_info.py | 110 ++ .../models/field_data_references.py | 123 +++ .../models/save_field_data_from_file.py | 120 +++ tools/java-config.yaml | 2 + tools/openapi.yaml | 159 ++- .../field/FieldDataDBOperationResults.java | 24 +- .../vcell/field/FieldDataDBOperationSpec.java | 12 +- .../io/FieldDataFileOperationResults.java | 50 +- .../field/io/FieldDataFileOperationSpec.java | 2 +- .../main/java/cbit/vcell/math/Variable.java | 20 +- .../LocalDataSetControllerMessaging.java | 19 +- .../LocalUserMetaDbServerMessaging.java | 12 +- .../client/LocalVCellConnectionMessaging.java | 2 +- .../cbit/vcell/simdata/DataIdentifier.java | 11 +- .../restq/handlers/FieldData/FieldDataDB.java | 20 +- .../handlers/FieldData/FieldDataResource.java | 116 ++- vcell-restclient/.openapi-generator/FILES | 33 +- vcell-restclient/README.md | 15 +- vcell-restclient/api/openapi.yaml | 426 +++++--- vcell-restclient/docs/BioModelResourceApi.md | 4 +- vcell-restclient/docs/DataIdentifier.md | 19 + vcell-restclient/docs/Domain.md | 13 + vcell-restclient/docs/FieldDataInfo.md | 17 + vcell-restclient/docs/FieldDataReferences.md | 15 + vcell-restclient/docs/FieldDataResourceApi.md | 168 +++- .../docs/SimulationResourceApi.md | 12 +- vcell-restclient/docs/UsersResourceApi.md | 24 +- .../restclient/api/FieldDataResourceApi.java | 101 +- .../model/AccessTokenRepresentation.java | 294 ------ .../restclient/model/DataIdentifier.java | 368 +++++++ .../model/{Simulation.java => Domain.java} | 18 +- .../vcell/restclient/model/FieldDataInfo.java | 325 ++++++ .../restclient/model/FieldDataReferences.java | 265 +++++ .../restclient/model/IdentityProvider.java | 78 -- .../org/vcell/restclient/model/MapUser.java | 186 ---- .../model/OverrideRepresentation.java | 308 ------ .../model/SimulationExecutionStatus.java | 512 ---------- .../restclient/model/SimulationJobStatus.java | 949 ------------------ .../model/SimulationQueueEntryStatus.java | 329 ------ .../org/vcell/restclient/model/User1.java | 331 ------ .../vcell/restclient/model/UserIdentity.java | 260 ----- .../vcell/restclient/model/VCellServerID.java | 150 --- .../api/BioModelResourceApiTest.java | 85 -- .../api/FieldDataResourceApiTest.java | 11 +- .../restclient/api/HelloWorldApiTest.java | 12 +- .../api/PublicationResourceApiTest.java | 99 +- .../api/SimulationResourceApiTest.java | 27 +- .../restclient/api/UsersResourceApiTest.java | 174 +++- .../model/AccessTokenRepresentationTest.java | 80 -- .../vcell/restclient/model/BioModelTest.java | 14 +- .../restclient/model/BiomodelRefTest.java | 14 +- ...User1Test.java => DataIdentifierTest.java} | 59 +- .../{SimulationTest.java => DomainTest.java} | 12 +- ...tationTest.java => FieldDataInfoTest.java} | 47 +- ...Test.java => FieldDataReferencesTest.java} | 45 +- .../model/HelloWorldMessageTest.java | 13 +- .../model/IdentityProviderTest.java | 32 - .../vcell/restclient/model/MapUserTest.java | 56 -- .../restclient/model/MathmodelRefTest.java | 15 +- .../restclient/model/PublicationTest.java | 20 +- .../model/SimulationExecutionStatusTest.java | 130 --- .../model/SimulationJobStatusRecordTest.java | 6 +- .../model/SimulationJobStatusTest.java | 231 ----- .../model/SimulationQueueEntryStatusTest.java | 90 -- .../SimulationStatusPersistentRecordTest.java | 10 - .../restclient/model/StatusMessageTest.java | 2 +- .../model/UserIdentityJSONSafeTest.java | 8 + .../model/UserLoginInfoForMappingTest.java | 8 +- .../org/vcell/restclient/model/UserTest.java | 48 +- .../restclient/model/VCellServerIDTest.java | 48 - .../modules/openapi/.openapi-generator/FILES | 5 +- .../api/field-data-resource.service.ts | 80 +- .../field-data-resource.serviceInterface.ts | 15 +- .../modules/openapi/model/data-identifier.ts | 25 + .../app/core/modules/openapi/model/domain.ts | 17 + .../field-data-file-operation-results.ts | 29 + .../modules/openapi/model/field-data-info.ts | 25 + .../model/field-data-reference-info.ts | 24 + .../openapi/model/field-data-references.ts | 21 + .../app/core/modules/openapi/model/models.ts | 5 +- .../model/save-field-data-from-file.ts | 27 + 113 files changed, 4605 insertions(+), 4898 deletions(-) create mode 100644 python-restclient/docs/DataIdentifier.md create mode 100644 python-restclient/docs/Domain.md create mode 100644 python-restclient/docs/FieldDataFileOperationResults.md create mode 100644 python-restclient/docs/FieldDataInfo.md create mode 100644 python-restclient/docs/FieldDataReferenceInfo.md create mode 100644 python-restclient/docs/FieldDataReferences.md create mode 100644 python-restclient/docs/SaveFieldDataFromFile.md create mode 100644 python-restclient/test/test_data_identifier.py create mode 100644 python-restclient/test/test_domain.py create mode 100644 python-restclient/test/test_field_data_file_operation_results.py create mode 100644 python-restclient/test/test_field_data_info.py create mode 100644 python-restclient/test/test_field_data_reference_info.py create mode 100644 python-restclient/test/test_field_data_references.py create mode 100644 python-restclient/test/test_save_field_data_from_file.py create mode 100644 python-restclient/vcell_client/models/data_identifier.py create mode 100644 python-restclient/vcell_client/models/domain.py create mode 100644 python-restclient/vcell_client/models/field_data_file_operation_results.py create mode 100644 python-restclient/vcell_client/models/field_data_info.py create mode 100644 python-restclient/vcell_client/models/field_data_reference_info.py create mode 100644 python-restclient/vcell_client/models/field_data_references.py create mode 100644 python-restclient/vcell_client/models/save_field_data_from_file.py create mode 100644 vcell-restclient/docs/DataIdentifier.md create mode 100644 vcell-restclient/docs/Domain.md create mode 100644 vcell-restclient/docs/FieldDataInfo.md create mode 100644 vcell-restclient/docs/FieldDataReferences.md delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/AccessTokenRepresentation.java create mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/DataIdentifier.java rename vcell-restclient/src/main/java/org/vcell/restclient/model/{Simulation.java => Domain.java} (90%) create mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataInfo.java create mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataReferences.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/IdentityProvider.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/MapUser.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/OverrideRepresentation.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationExecutionStatus.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationJobStatus.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationQueueEntryStatus.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/User1.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/UserIdentity.java delete mode 100644 vcell-restclient/src/main/java/org/vcell/restclient/model/VCellServerID.java delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/AccessTokenRepresentationTest.java rename vcell-restclient/src/test/java/org/vcell/restclient/model/{User1Test.java => DataIdentifierTest.java} (50%) rename vcell-restclient/src/test/java/org/vcell/restclient/model/{SimulationTest.java => DomainTest.java} (79%) rename vcell-restclient/src/test/java/org/vcell/restclient/model/{OverrideRepresentationTest.java => FieldDataInfoTest.java} (52%) rename vcell-restclient/src/test/java/org/vcell/restclient/model/{UserIdentityTest.java => FieldDataReferencesTest.java} (50%) delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/IdentityProviderTest.java delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/MapUserTest.java delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationExecutionStatusTest.java delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusTest.java delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationQueueEntryStatusTest.java delete mode 100644 vcell-restclient/src/test/java/org/vcell/restclient/model/VCellServerIDTest.java create mode 100644 webapp-ng/src/app/core/modules/openapi/model/data-identifier.ts create mode 100644 webapp-ng/src/app/core/modules/openapi/model/domain.ts create mode 100644 webapp-ng/src/app/core/modules/openapi/model/field-data-file-operation-results.ts create mode 100644 webapp-ng/src/app/core/modules/openapi/model/field-data-info.ts create mode 100644 webapp-ng/src/app/core/modules/openapi/model/field-data-reference-info.ts create mode 100644 webapp-ng/src/app/core/modules/openapi/model/field-data-references.ts create mode 100644 webapp-ng/src/app/core/modules/openapi/model/save-field-data-from-file.ts diff --git a/python-restclient/.openapi-generator/FILES b/python-restclient/.openapi-generator/FILES index 0aec7584ab..e23e849145 100644 --- a/python-restclient/.openapi-generator/FILES +++ b/python-restclient/.openapi-generator/FILES @@ -10,13 +10,16 @@ docs/BioModelResourceApi.md docs/BiomodelRef.md docs/CartesianMesh.md docs/Coordinate.md +docs/DataIdentifier.md docs/DetailedState.md +docs/Domain.md docs/Extent.md docs/ExternalDataIdentifier.md docs/FieldDataDBOperationSpec.md -docs/FieldDataExternalDataIDs.md docs/FieldDataFileOperationSpec.md +docs/FieldDataInfo.md docs/FieldDataNoCopyConflict.md +docs/FieldDataReferences.md docs/FieldDataResourceApi.md docs/FieldDataSaveResults.md docs/GroupAccess.md @@ -55,27 +58,6 @@ docs/VersionableType.md docs/VersionableTypeVersion.md pyproject.toml test/__init__.py -test/test_analyzed_results_from_field_data.py -test/test_cartesian_mesh.py -test/test_coordinate.py -test/test_extent.py -test/test_external_data_identifier.py -test/test_field_data_db_operation_spec.py -test/test_field_data_external_data_ids.py -test/test_field_data_file_operation_spec.py -test/test_field_data_no_copy_conflict.py -test/test_field_data_resource_api.py -test/test_field_data_save_results.py -test/test_group_access.py -test/test_i_size.py -test/test_origin.py -test/test_ucd_info.py -test/test_variable_domain.py -test/test_variable_type.py -test/test_version.py -test/test_version_flag.py -test/test_versionable_type.py -test/test_versionable_type_version.py tox.ini vcell_client/__init__.py vcell_client/api/__init__.py @@ -98,13 +80,16 @@ vcell_client/models/bio_model.py vcell_client/models/biomodel_ref.py vcell_client/models/cartesian_mesh.py vcell_client/models/coordinate.py +vcell_client/models/data_identifier.py vcell_client/models/detailed_state.py +vcell_client/models/domain.py vcell_client/models/extent.py vcell_client/models/external_data_identifier.py vcell_client/models/field_data_db_operation_spec.py -vcell_client/models/field_data_external_data_ids.py vcell_client/models/field_data_file_operation_spec.py +vcell_client/models/field_data_info.py vcell_client/models/field_data_no_copy_conflict.py +vcell_client/models/field_data_references.py vcell_client/models/field_data_save_results.py vcell_client/models/group_access.py vcell_client/models/hello_world_message.py diff --git a/python-restclient/README.md b/python-restclient/README.md index 26963e5ea1..1c20a5588d 100644 --- a/python-restclient/README.md +++ b/python-restclient/README.md @@ -93,8 +93,9 @@ Class | Method | HTTP request | Description *FieldDataResourceApi* | [**create_new_field_data_from_file_already_analyzed**](docs/FieldDataResourceApi.md#create_new_field_data_from_file_already_analyzed) | **POST** /api/v1/fieldData/createFieldDataFromFileAlreadyAnalyzed | *FieldDataResourceApi* | [**create_new_field_data_from_simulation**](docs/FieldDataResourceApi.md#create_new_field_data_from_simulation) | **POST** /api/v1/fieldData/createFieldDataFromSimulation | Create new field data from a simulation. *FieldDataResourceApi* | [**delete_field_data**](docs/FieldDataResourceApi.md#delete_field_data) | **DELETE** /api/v1/fieldData | Delete the selected field data. -*FieldDataResourceApi* | [**generate_field_data_estimate**](docs/FieldDataResourceApi.md#generate_field_data_estimate) | **POST** /api/v1/fieldData/createFieldDataFromFile | -*FieldDataResourceApi* | [**get_all_field_data**](docs/FieldDataResourceApi.md#get_all_field_data) | **GET** /api/v1/fieldData | Get all of the field data for that user. +*FieldDataResourceApi* | [**generate_field_data_estimate**](docs/FieldDataResourceApi.md#generate_field_data_estimate) | **POST** /api/v1/fieldData/analyzeFieldDataFromFile | +*FieldDataResourceApi* | [**get_all_field_data_ids**](docs/FieldDataResourceApi.md#get_all_field_data_ids) | **GET** /api/v1/fieldData/IDs | Get all of the ids used to identify, and retrieve field data. +*FieldDataResourceApi* | [**get_field_data_from_id**](docs/FieldDataResourceApi.md#get_field_data_from_id) | **GET** /api/v1/fieldData | Get the field data from the selected field data ID. *HelloWorldApi* | [**get_hello_world**](docs/HelloWorldApi.md#get_hello_world) | **GET** /api/v1/helloworld | Get hello world message. *PublicationResourceApi* | [**create_publication**](docs/PublicationResourceApi.md#create_publication) | **POST** /api/v1/publications | Create publication *PublicationResourceApi* | [**delete_publication**](docs/PublicationResourceApi.md#delete_publication) | **DELETE** /api/v1/publications/{id} | Delete publication @@ -125,13 +126,16 @@ Class | Method | HTTP request | Description - [BiomodelRef](docs/BiomodelRef.md) - [CartesianMesh](docs/CartesianMesh.md) - [Coordinate](docs/Coordinate.md) + - [DataIdentifier](docs/DataIdentifier.md) - [DetailedState](docs/DetailedState.md) + - [Domain](docs/Domain.md) - [Extent](docs/Extent.md) - [ExternalDataIdentifier](docs/ExternalDataIdentifier.md) - [FieldDataDBOperationSpec](docs/FieldDataDBOperationSpec.md) - - [FieldDataExternalDataIDs](docs/FieldDataExternalDataIDs.md) - [FieldDataFileOperationSpec](docs/FieldDataFileOperationSpec.md) + - [FieldDataInfo](docs/FieldDataInfo.md) - [FieldDataNoCopyConflict](docs/FieldDataNoCopyConflict.md) + - [FieldDataReferences](docs/FieldDataReferences.md) - [FieldDataSaveResults](docs/FieldDataSaveResults.md) - [GroupAccess](docs/GroupAccess.md) - [HelloWorldMessage](docs/HelloWorldMessage.md) diff --git a/python-restclient/docs/BioModelResourceApi.md b/python-restclient/docs/BioModelResourceApi.md index 7fb0b2e4b9..3e3f9a9ee9 100644 --- a/python-restclient/docs/BioModelResourceApi.md +++ b/python-restclient/docs/BioModelResourceApi.md @@ -202,8 +202,8 @@ Name | Type | Description | Notes | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/python-restclient/docs/DataIdentifier.md b/python-restclient/docs/DataIdentifier.md new file mode 100644 index 0000000000..703055bd97 --- /dev/null +++ b/python-restclient/docs/DataIdentifier.md @@ -0,0 +1,34 @@ +# DataIdentifier + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | **str** | | [optional] +**display_name** | **str** | | [optional] +**variable_type** | [**VariableType**](VariableType.md) | | [optional] +**domain** | [**Domain**](Domain.md) | | [optional] +**b_function** | **bool** | | [optional] +**function** | **bool** | | [optional] +**visible** | **bool** | | [optional] + +## Example + +```python +from vcell_client.models.data_identifier import DataIdentifier + +# TODO update the JSON string below +json = "{}" +# create an instance of DataIdentifier from a JSON string +data_identifier_instance = DataIdentifier.from_json(json) +# print the JSON string representation of the object +print DataIdentifier.to_json() + +# convert the object into a dict +data_identifier_dict = data_identifier_instance.to_dict() +# create an instance of DataIdentifier from a dict +data_identifier_form_dict = data_identifier.from_dict(data_identifier_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/Domain.md b/python-restclient/docs/Domain.md new file mode 100644 index 0000000000..ddcfffc546 --- /dev/null +++ b/python-restclient/docs/Domain.md @@ -0,0 +1,28 @@ +# Domain + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | **str** | | [optional] + +## Example + +```python +from vcell_client.models.domain import Domain + +# TODO update the JSON string below +json = "{}" +# create an instance of Domain from a JSON string +domain_instance = Domain.from_json(json) +# print the JSON string representation of the object +print Domain.to_json() + +# convert the object into a dict +domain_dict = domain_instance.to_dict() +# create an instance of Domain from a dict +domain_form_dict = domain.from_dict(domain_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/FieldDataFileOperationResults.md b/python-restclient/docs/FieldDataFileOperationResults.md new file mode 100644 index 0000000000..52799c6fe2 --- /dev/null +++ b/python-restclient/docs/FieldDataFileOperationResults.md @@ -0,0 +1,34 @@ +# FieldDataFileOperationResults + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**data_identifier_arr** | [**List[DataIdentifier]**](DataIdentifier.md) | | [optional] +**external_data_identifier** | [**ExternalDataIdentifier**](ExternalDataIdentifier.md) | | [optional] +**i_size** | [**ISize**](ISize.md) | | [optional] +**origin** | [**Origin**](Origin.md) | | [optional] +**extent** | [**Extent**](Extent.md) | | [optional] +**times** | **List[float]** | | [optional] +**dependant_function_info** | [**List[FieldDataReferenceInfo]**](FieldDataReferenceInfo.md) | | [optional] + +## Example + +```python +from vcell_client.models.field_data_file_operation_results import FieldDataFileOperationResults + +# TODO update the JSON string below +json = "{}" +# create an instance of FieldDataFileOperationResults from a JSON string +field_data_file_operation_results_instance = FieldDataFileOperationResults.from_json(json) +# print the JSON string representation of the object +print FieldDataFileOperationResults.to_json() + +# convert the object into a dict +field_data_file_operation_results_dict = field_data_file_operation_results_instance.to_dict() +# create an instance of FieldDataFileOperationResults from a dict +field_data_file_operation_results_form_dict = field_data_file_operation_results.from_dict(field_data_file_operation_results_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/FieldDataInfo.md b/python-restclient/docs/FieldDataInfo.md new file mode 100644 index 0000000000..8f30ce2a0b --- /dev/null +++ b/python-restclient/docs/FieldDataInfo.md @@ -0,0 +1,32 @@ +# FieldDataInfo + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**extent** | [**Extent**](Extent.md) | | [optional] +**origin** | [**Origin**](Origin.md) | | [optional] +**isize** | [**ISize**](ISize.md) | | [optional] +**data_identifier** | [**List[DataIdentifier]**](DataIdentifier.md) | | [optional] +**times** | **List[float]** | | [optional] + +## Example + +```python +from vcell_client.models.field_data_info import FieldDataInfo + +# TODO update the JSON string below +json = "{}" +# create an instance of FieldDataInfo from a JSON string +field_data_info_instance = FieldDataInfo.from_json(json) +# print the JSON string representation of the object +print FieldDataInfo.to_json() + +# convert the object into a dict +field_data_info_dict = field_data_info_instance.to_dict() +# create an instance of FieldDataInfo from a dict +field_data_info_form_dict = field_data_info.from_dict(field_data_info_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/FieldDataReferenceInfo.md b/python-restclient/docs/FieldDataReferenceInfo.md new file mode 100644 index 0000000000..1cd60a9042 --- /dev/null +++ b/python-restclient/docs/FieldDataReferenceInfo.md @@ -0,0 +1,34 @@ +# FieldDataReferenceInfo + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**reference_source_type** | **str** | | [optional] +**reference_source_name** | **str** | | [optional] +**application_name** | **str** | | [optional] +**simulation_name** | **str** | | [optional] +**ref_source_version_date** | **str** | | [optional] +**func_names** | **List[str]** | | [optional] +**ref_source_version_key** | [**KeyValue**](KeyValue.md) | | [optional] + +## Example + +```python +from vcell_client.models.field_data_reference_info import FieldDataReferenceInfo + +# TODO update the JSON string below +json = "{}" +# create an instance of FieldDataReferenceInfo from a JSON string +field_data_reference_info_instance = FieldDataReferenceInfo.from_json(json) +# print the JSON string representation of the object +print FieldDataReferenceInfo.to_json() + +# convert the object into a dict +field_data_reference_info_dict = field_data_reference_info_instance.to_dict() +# create an instance of FieldDataReferenceInfo from a dict +field_data_reference_info_form_dict = field_data_reference_info.from_dict(field_data_reference_info_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/FieldDataReferences.md b/python-restclient/docs/FieldDataReferences.md new file mode 100644 index 0000000000..4d540b6cb4 --- /dev/null +++ b/python-restclient/docs/FieldDataReferences.md @@ -0,0 +1,30 @@ +# FieldDataReferences + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**external_data_identifiers** | [**List[ExternalDataIdentifier]**](ExternalDataIdentifier.md) | | [optional] +**external_data_annotations** | **List[str]** | | [optional] +**external_data_id_sim_refs** | **Dict[str, List[KeyValue]]** | | [optional] + +## Example + +```python +from vcell_client.models.field_data_references import FieldDataReferences + +# TODO update the JSON string below +json = "{}" +# create an instance of FieldDataReferences from a JSON string +field_data_references_instance = FieldDataReferences.from_json(json) +# print the JSON string representation of the object +print FieldDataReferences.to_json() + +# convert the object into a dict +field_data_references_dict = field_data_references_instance.to_dict() +# create an instance of FieldDataReferences from a dict +field_data_references_form_dict = field_data_references.from_dict(field_data_references_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/FieldDataResourceApi.md b/python-restclient/docs/FieldDataResourceApi.md index 4b49358464..6f6c8fbc14 100644 --- a/python-restclient/docs/FieldDataResourceApi.md +++ b/python-restclient/docs/FieldDataResourceApi.md @@ -8,8 +8,9 @@ Method | HTTP request | Description [**create_new_field_data_from_file_already_analyzed**](FieldDataResourceApi.md#create_new_field_data_from_file_already_analyzed) | **POST** /api/v1/fieldData/createFieldDataFromFileAlreadyAnalyzed | [**create_new_field_data_from_simulation**](FieldDataResourceApi.md#create_new_field_data_from_simulation) | **POST** /api/v1/fieldData/createFieldDataFromSimulation | Create new field data from a simulation. [**delete_field_data**](FieldDataResourceApi.md#delete_field_data) | **DELETE** /api/v1/fieldData | Delete the selected field data. -[**generate_field_data_estimate**](FieldDataResourceApi.md#generate_field_data_estimate) | **POST** /api/v1/fieldData/createFieldDataFromFile | -[**get_all_field_data**](FieldDataResourceApi.md#get_all_field_data) | **GET** /api/v1/fieldData | Get all of the field data for that user. +[**generate_field_data_estimate**](FieldDataResourceApi.md#generate_field_data_estimate) | **POST** /api/v1/fieldData/analyzeFieldDataFromFile | +[**get_all_field_data_ids**](FieldDataResourceApi.md#get_all_field_data_ids) | **GET** /api/v1/fieldData/IDs | Get all of the ids used to identify, and retrieve field data. +[**get_field_data_from_id**](FieldDataResourceApi.md#get_field_data_from_id) | **GET** /api/v1/fieldData | Get the field data from the selected field data ID. # **copy_field_data** @@ -337,10 +338,10 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **get_all_field_data** -> FieldDataExternalDataIDs get_all_field_data(field_data_db_operation_spec=field_data_db_operation_spec) +# **get_all_field_data_ids** +> FieldDataReferences get_all_field_data_ids() -Get all of the field data for that user. +Get all of the ids used to identify, and retrieve field data. ### Example @@ -348,8 +349,7 @@ Get all of the field data for that user. import time import os import vcell_client -from vcell_client.models.field_data_db_operation_spec import FieldDataDBOperationSpec -from vcell_client.models.field_data_external_data_ids import FieldDataExternalDataIDs +from vcell_client.models.field_data_references import FieldDataReferences from vcell_client.rest import ApiException from pprint import pprint @@ -364,15 +364,76 @@ configuration = vcell_client.Configuration( with vcell_client.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = vcell_client.FieldDataResourceApi(api_client) - field_data_db_operation_spec = vcell_client.FieldDataDBOperationSpec() # FieldDataDBOperationSpec | (optional) try: - # Get all of the field data for that user. - api_response = api_instance.get_all_field_data(field_data_db_operation_spec=field_data_db_operation_spec) - print("The response of FieldDataResourceApi->get_all_field_data:\n") + # Get all of the ids used to identify, and retrieve field data. + api_response = api_instance.get_all_field_data_ids() + print("The response of FieldDataResourceApi->get_all_field_data_ids:\n") pprint(api_response) except Exception as e: - print("Exception when calling FieldDataResourceApi->get_all_field_data: %s\n" % e) + print("Exception when calling FieldDataResourceApi->get_all_field_data_ids: %s\n" % e) +``` + + + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**FieldDataReferences**](FieldDataReferences.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | OK | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + +# **get_field_data_from_id** +> FieldDataInfo get_field_data_from_id(body=body) + +Get the field data from the selected field data ID. + +### Example + +```python +import time +import os +import vcell_client +from vcell_client.models.field_data_info import FieldDataInfo +from vcell_client.rest import ApiException +from pprint import pprint + +# Defining the host is optional and defaults to https://vcell-dev.cam.uchc.edu +# See configuration.py for a list of all supported configuration parameters. +configuration = vcell_client.Configuration( + host = "https://vcell-dev.cam.uchc.edu" +) + + +# Enter a context with an instance of the API client +with vcell_client.ApiClient(configuration) as api_client: + # Create an instance of the API class + api_instance = vcell_client.FieldDataResourceApi(api_client) + body = 'body_example' # str | (optional) + + try: + # Get the field data from the selected field data ID. + api_response = api_instance.get_field_data_from_id(body=body) + print("The response of FieldDataResourceApi->get_field_data_from_id:\n") + pprint(api_response) + except Exception as e: + print("Exception when calling FieldDataResourceApi->get_field_data_from_id: %s\n" % e) ``` @@ -381,11 +442,11 @@ with vcell_client.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **field_data_db_operation_spec** | [**FieldDataDBOperationSpec**](FieldDataDBOperationSpec.md)| | [optional] + **body** | **str**| | [optional] ### Return type -[**FieldDataExternalDataIDs**](FieldDataExternalDataIDs.md) +[**FieldDataInfo**](FieldDataInfo.md) ### Authorization @@ -393,7 +454,7 @@ No authorization required ### HTTP request headers - - **Content-Type**: application/json + - **Content-Type**: text/plain - **Accept**: application/json ### HTTP response details diff --git a/python-restclient/docs/SaveFieldDataFromFile.md b/python-restclient/docs/SaveFieldDataFromFile.md new file mode 100644 index 0000000000..f1562adfcb --- /dev/null +++ b/python-restclient/docs/SaveFieldDataFromFile.md @@ -0,0 +1,35 @@ +# SaveFieldDataFromFile + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**short_spec_data** | **List[List[List[int]]]** | | [optional] +**var_names** | **List[str]** | | [optional] +**times** | **List[float]** | | [optional] +**origin** | [**Origin**](Origin.md) | | [optional] +**extent** | [**Extent**](Extent.md) | | [optional] +**isize** | [**ISize**](ISize.md) | | [optional] +**annotation** | **str** | | [optional] +**name** | **str** | | [optional] + +## Example + +```python +from vcell_client.models.save_field_data_from_file import SaveFieldDataFromFile + +# TODO update the JSON string below +json = "{}" +# create an instance of SaveFieldDataFromFile from a JSON string +save_field_data_from_file_instance = SaveFieldDataFromFile.from_json(json) +# print the JSON string representation of the object +print SaveFieldDataFromFile.to_json() + +# convert the object into a dict +save_field_data_from_file_dict = save_field_data_from_file_instance.to_dict() +# create an instance of SaveFieldDataFromFile from a dict +save_field_data_from_file_form_dict = save_field_data_from_file.from_dict(save_field_data_from_file_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/python-restclient/docs/SimulationResourceApi.md b/python-restclient/docs/SimulationResourceApi.md index 6d8316759f..6ff98f6be7 100644 --- a/python-restclient/docs/SimulationResourceApi.md +++ b/python-restclient/docs/SimulationResourceApi.md @@ -79,8 +79,8 @@ Name | Type | Description | Notes | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -150,8 +150,8 @@ Name | Type | Description | Notes | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -221,8 +221,8 @@ Name | Type | Description | Notes | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/python-restclient/docs/UsersResourceApi.md b/python-restclient/docs/UsersResourceApi.md index 4260e1d68a..c43e72100f 100644 --- a/python-restclient/docs/UsersResourceApi.md +++ b/python-restclient/docs/UsersResourceApi.md @@ -208,8 +208,8 @@ This endpoint does not need any parameter. | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -275,8 +275,8 @@ This endpoint does not need any parameter. | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | Successful, returning the identity | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -406,8 +406,8 @@ void (empty response body) |-------------|-------------|------------------| **200** | Successful, returning the identity | - | **409** | VCell Identity not mapped, userid already exists | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -477,8 +477,8 @@ Name | Type | Description | Notes | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -611,8 +611,8 @@ void (empty response body) |-------------|-------------|------------------| **200** | magic link sent in email if appropriate | - | **400** | unable to process request | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) @@ -681,8 +681,8 @@ Name | Type | Description | Notes | Status code | Description | Response headers | |-------------|-------------|------------------| **200** | OK | - | -**401** | Not Authorized | - | **403** | Not Allowed | - | +**401** | Not Authorized | - | [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/python-restclient/test/test_data_identifier.py b/python-restclient/test/test_data_identifier.py new file mode 100644 index 0000000000..87851e6279 --- /dev/null +++ b/python-restclient/test/test_data_identifier.py @@ -0,0 +1,69 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.data_identifier import DataIdentifier + +class TestDataIdentifier(unittest.TestCase): + """DataIdentifier unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> DataIdentifier: + """Test DataIdentifier + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `DataIdentifier` + """ + model = DataIdentifier() + if include_optional: + return DataIdentifier( + name = '', + display_name = '', + variable_type = vcell_client.models.variable_type.VariableType( + type = 56, + variable_domain = 'VARIABLEDOMAIN_POSTPROCESSING', + name = '', + units = '', + label = '', + legacy_warn = True, + default_label = '', + default_units = '', + type_name = '', ), + domain = vcell_client.models.domain.Domain( + name = '', ), + b_function = True, + function = True, + visible = True + ) + else: + return DataIdentifier( + ) + """ + + def testDataIdentifier(self): + """Test DataIdentifier""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/test/test_domain.py b/python-restclient/test/test_domain.py new file mode 100644 index 0000000000..f5e6507dd1 --- /dev/null +++ b/python-restclient/test/test_domain.py @@ -0,0 +1,53 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.domain import Domain + +class TestDomain(unittest.TestCase): + """Domain unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> Domain: + """Test Domain + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `Domain` + """ + model = Domain() + if include_optional: + return Domain( + name = '' + ) + else: + return Domain( + ) + """ + + def testDomain(self): + """Test Domain""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/test/test_field_data_file_operation_results.py b/python-restclient/test/test_field_data_file_operation_results.py new file mode 100644 index 0000000000..70d9dbaad7 --- /dev/null +++ b/python-restclient/test/test_field_data_file_operation_results.py @@ -0,0 +1,101 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.field_data_file_operation_results import FieldDataFileOperationResults + +class TestFieldDataFileOperationResults(unittest.TestCase): + """FieldDataFileOperationResults unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> FieldDataFileOperationResults: + """Test FieldDataFileOperationResults + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `FieldDataFileOperationResults` + """ + model = FieldDataFileOperationResults() + if include_optional: + return FieldDataFileOperationResults( + data_identifier_arr = [ + vcell_client.models.data_identifier.DataIdentifier( + name = '', + display_name = '', + variable_type = vcell_client.models.variable_type.VariableType( + type = 56, + variable_domain = 'VARIABLEDOMAIN_POSTPROCESSING', + name = '', + units = '', + label = '', + legacy_warn = True, + default_label = '', + default_units = '', + type_name = '', ), + domain = vcell_client.models.domain.Domain( + name = '', ), + b_function = True, + function = True, + visible = True, ) + ], + i_size = vcell_client.models.i_size.ISize( + x = 56, + y = 56, + z = 56, + x_yz = 56, ), + origin = vcell_client.models.origin.Origin( + x = 1.337, + y = 1.337, + z = 1.337, ), + extent = vcell_client.models.extent.Extent( + x = 1.337, + y = 1.337, + z = 1.337, ), + times = [ + 1.337 + ], + dependant_function_info = [ + vcell_client.models.field_data_reference_info.FieldDataReferenceInfo( + reference_source_type = '', + reference_source_name = '', + application_name = '', + simulation_name = '', + ref_source_version_date = '', + func_names = [ + '' + ], + ref_source_version_key = vcell_client.models.key_value.KeyValue( + value = 1.337, ), ) + ] + ) + else: + return FieldDataFileOperationResults( + ) + """ + + def testFieldDataFileOperationResults(self): + """Test FieldDataFileOperationResults""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/test/test_field_data_file_operation_spec.py b/python-restclient/test/test_field_data_file_operation_spec.py index 6cc0716e98..058ba9b590 100644 --- a/python-restclient/test/test_field_data_file_operation_spec.py +++ b/python-restclient/test/test_field_data_file_operation_spec.py @@ -184,8 +184,7 @@ def make_instance(self, include_optional) -> FieldDataFileOperationSpec: i_d = vcell_client.models.key_value.KeyValue( value = 1.337, ), name = '', - test_account = True, ), - field_data_name = '' + test_account = True, ) ) else: return FieldDataFileOperationSpec( diff --git a/python-restclient/test/test_field_data_info.py b/python-restclient/test/test_field_data_info.py new file mode 100644 index 0000000000..54c81da783 --- /dev/null +++ b/python-restclient/test/test_field_data_info.py @@ -0,0 +1,68 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.field_data_info import FieldDataInfo + +class TestFieldDataInfo(unittest.TestCase): + """FieldDataInfo unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> FieldDataInfo: + """Test FieldDataInfo + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `FieldDataInfo` + """ + model = FieldDataInfo() + if include_optional: + return FieldDataInfo( + extent = vcell_client.models.extent.Extent( + x = 1.337, + y = 1.337, + z = 1.337, ), + origin = vcell_client.models.origin.Origin( + x = 1.337, + y = 1.337, + z = 1.337, ), + isize = vcell_client.models.i_size.ISize( + x = 56, + y = 56, + z = 56, + x_yz = 56, ), + times = [ + 1.337 + ] + ) + else: + return FieldDataInfo( + ) + """ + + def testFieldDataInfo(self): + """Test FieldDataInfo""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/test/test_field_data_reference_info.py b/python-restclient/test/test_field_data_reference_info.py new file mode 100644 index 0000000000..aca9a76da3 --- /dev/null +++ b/python-restclient/test/test_field_data_reference_info.py @@ -0,0 +1,62 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.field_data_reference_info import FieldDataReferenceInfo + +class TestFieldDataReferenceInfo(unittest.TestCase): + """FieldDataReferenceInfo unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> FieldDataReferenceInfo: + """Test FieldDataReferenceInfo + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `FieldDataReferenceInfo` + """ + model = FieldDataReferenceInfo() + if include_optional: + return FieldDataReferenceInfo( + reference_source_type = '', + reference_source_name = '', + application_name = '', + simulation_name = '', + ref_source_version_date = '', + func_names = [ + '' + ], + ref_source_version_key = vcell_client.models.key_value.KeyValue( + value = 1.337, ) + ) + else: + return FieldDataReferenceInfo( + ) + """ + + def testFieldDataReferenceInfo(self): + """Test FieldDataReferenceInfo""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/test/test_field_data_references.py b/python-restclient/test/test_field_data_references.py new file mode 100644 index 0000000000..9d3009a591 --- /dev/null +++ b/python-restclient/test/test_field_data_references.py @@ -0,0 +1,78 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.field_data_references import FieldDataReferences + +class TestFieldDataReferences(unittest.TestCase): + """FieldDataReferences unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> FieldDataReferences: + """Test FieldDataReferences + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `FieldDataReferences` + """ + model = FieldDataReferences() + if include_optional: + return FieldDataReferences( + external_data_identifiers = [ + vcell_client.models.external_data_identifier.ExternalDataIdentifier( + key = vcell_client.models.key_value.KeyValue( + value = 1.337, ), + owner = vcell_client.models.user.User( + user_name = '', + i_d = vcell_client.models.key_value.KeyValue( + value = 1.337, ), + name = '', + test_account = True, ), + name = '', + i_d = '', + job_index = 56, + simulation_key = , + parameter_scan_type = True, + data_key = , ) + ], + external_data_annotations = [ + '' + ], + external_data_id_sim_refs = { + 'key' : [ + vcell_client.models.key_value.KeyValue( + value = 1.337, ) + ] + } + ) + else: + return FieldDataReferences( + ) + """ + + def testFieldDataReferences(self): + """Test FieldDataReferences""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/test/test_field_data_resource_api.py b/python-restclient/test/test_field_data_resource_api.py index f74177f6ca..37d45bfae6 100644 --- a/python-restclient/test/test_field_data_resource_api.py +++ b/python-restclient/test/test_field_data_resource_api.py @@ -34,8 +34,8 @@ def test_copy_field_data(self) -> None: """ pass - def test_create_new_field_data_from_file_already_analyzed(self) -> None: - """Test case for create_new_field_data_from_file_already_analyzed + def test_create_new_field_data_file(self) -> None: + """Test case for create_new_field_data_file """ pass @@ -54,12 +54,6 @@ def test_delete_field_data(self) -> None: """ pass - def test_generate_field_data_estimate(self) -> None: - """Test case for generate_field_data_estimate - - """ - pass - def test_get_all_field_data(self) -> None: """Test case for get_all_field_data diff --git a/python-restclient/test/test_save_field_data_from_file.py b/python-restclient/test/test_save_field_data_from_file.py new file mode 100644 index 0000000000..c6e752dc36 --- /dev/null +++ b/python-restclient/test/test_save_field_data_from_file.py @@ -0,0 +1,106 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from vcell_client.models.save_field_data_from_file import SaveFieldDataFromFile + +class TestSaveFieldDataFromFile(unittest.TestCase): + """SaveFieldDataFromFile unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> SaveFieldDataFromFile: + """Test SaveFieldDataFromFile + include_option is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `SaveFieldDataFromFile` + """ + model = SaveFieldDataFromFile() + if include_optional: + return SaveFieldDataFromFile( + short_spec_data = [ + [ + [ + 56 + ] + ] + ], + spec_edi = vcell_client.models.external_data_identifier.ExternalDataIdentifier( + key = vcell_client.models.key_value.KeyValue( + value = 1.337, ), + owner = vcell_client.models.user.User( + user_name = '', + i_d = vcell_client.models.key_value.KeyValue( + value = 1.337, ), + name = '', + test_account = True, ), + name = '', + i_d = '', + job_index = 56, + simulation_key = , + parameter_scan_type = True, + data_key = , ), + var_names = [ + '' + ], + variable_types = [ + vcell_client.models.variable_type.VariableType( + type = 56, + variable_domain = 'VARIABLEDOMAIN_POSTPROCESSING', + name = '', + units = '', + label = '', + legacy_warn = True, + default_label = '', + default_units = '', + type_name = '', ) + ], + times = [ + 1.337 + ], + origin = vcell_client.models.origin.Origin( + x = 1.337, + y = 1.337, + z = 1.337, ), + extent = vcell_client.models.extent.Extent( + x = 1.337, + y = 1.337, + z = 1.337, ), + isize = vcell_client.models.i_size.ISize( + x = 56, + y = 56, + z = 56, + x_yz = 56, ), + annotation = '' + ) + else: + return SaveFieldDataFromFile( + ) + """ + + def testSaveFieldDataFromFile(self): + """Test SaveFieldDataFromFile""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python-restclient/vcell_client/__init__.py b/python-restclient/vcell_client/__init__.py index 1590d348a9..0daa8d7bc1 100644 --- a/python-restclient/vcell_client/__init__.py +++ b/python-restclient/vcell_client/__init__.py @@ -45,13 +45,16 @@ from vcell_client.models.biomodel_ref import BiomodelRef from vcell_client.models.cartesian_mesh import CartesianMesh from vcell_client.models.coordinate import Coordinate +from vcell_client.models.data_identifier import DataIdentifier from vcell_client.models.detailed_state import DetailedState +from vcell_client.models.domain import Domain from vcell_client.models.extent import Extent from vcell_client.models.external_data_identifier import ExternalDataIdentifier from vcell_client.models.field_data_db_operation_spec import FieldDataDBOperationSpec -from vcell_client.models.field_data_external_data_ids import FieldDataExternalDataIDs from vcell_client.models.field_data_file_operation_spec import FieldDataFileOperationSpec +from vcell_client.models.field_data_info import FieldDataInfo from vcell_client.models.field_data_no_copy_conflict import FieldDataNoCopyConflict +from vcell_client.models.field_data_references import FieldDataReferences from vcell_client.models.field_data_save_results import FieldDataSaveResults from vcell_client.models.group_access import GroupAccess from vcell_client.models.hello_world_message import HelloWorldMessage diff --git a/python-restclient/vcell_client/api/bio_model_resource_api.py b/python-restclient/vcell_client/api/bio_model_resource_api.py index c31ac2bb00..adbb65b599 100644 --- a/python-restclient/vcell_client/api/bio_model_resource_api.py +++ b/python-restclient/vcell_client/api/bio_model_resource_api.py @@ -612,8 +612,8 @@ def upload_bio_model( _response_types_map: Dict[str, Optional[str]] = { '200': "str", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -681,8 +681,8 @@ def upload_bio_model_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "str", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -750,8 +750,8 @@ def upload_bio_model_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "str", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( diff --git a/python-restclient/vcell_client/api/field_data_resource_api.py b/python-restclient/vcell_client/api/field_data_resource_api.py index 51e1de9eb8..a9dd790a0c 100644 --- a/python-restclient/vcell_client/api/field_data_resource_api.py +++ b/python-restclient/vcell_client/api/field_data_resource_api.py @@ -31,9 +31,10 @@ from vcell_client.models.analyzed_results_from_field_data import AnalyzedResultsFromFieldData from vcell_client.models.external_data_identifier import ExternalDataIdentifier from vcell_client.models.field_data_db_operation_spec import FieldDataDBOperationSpec -from vcell_client.models.field_data_external_data_ids import FieldDataExternalDataIDs from vcell_client.models.field_data_file_operation_spec import FieldDataFileOperationSpec +from vcell_client.models.field_data_info import FieldDataInfo from vcell_client.models.field_data_no_copy_conflict import FieldDataNoCopyConflict +from vcell_client.models.field_data_references import FieldDataReferences from vcell_client.models.field_data_save_results import FieldDataSaveResults from vcell_client.api_client import ApiClient @@ -1399,7 +1400,7 @@ def _generate_field_data_estimate_serialize( return self.api_client.param_serialize( method='POST', - resource_path='/api/v1/fieldData/createFieldDataFromFile', + resource_path='/api/v1/fieldData/analyzeFieldDataFromFile', path_params=_path_params, query_params=_query_params, header_params=_header_params, @@ -1416,9 +1417,8 @@ def _generate_field_data_estimate_serialize( @validate_call - def get_all_field_data( + def get_all_field_data_ids( self, - field_data_db_operation_spec: Optional[FieldDataDBOperationSpec] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -1431,12 +1431,10 @@ def get_all_field_data( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> FieldDataExternalDataIDs: - """Get all of the field data for that user. + ) -> FieldDataReferences: + """Get all of the ids used to identify, and retrieve field data. - :param field_data_db_operation_spec: - :type field_data_db_operation_spec: FieldDataDBOperationSpec :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1459,8 +1457,7 @@ def get_all_field_data( :return: Returns the result object. """ # noqa: E501 - _param = self._get_all_field_data_serialize( - field_data_db_operation_spec=field_data_db_operation_spec, + _param = self._get_all_field_data_ids_serialize( _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, @@ -1468,7 +1465,7 @@ def get_all_field_data( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "FieldDataExternalDataIDs" + '200': "FieldDataReferences" } response_data = self.api_client.call_api( @@ -1483,9 +1480,8 @@ def get_all_field_data( @validate_call - def get_all_field_data_with_http_info( + def get_all_field_data_ids_with_http_info( self, - field_data_db_operation_spec: Optional[FieldDataDBOperationSpec] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -1498,12 +1494,10 @@ def get_all_field_data_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[FieldDataExternalDataIDs]: - """Get all of the field data for that user. + ) -> ApiResponse[FieldDataReferences]: + """Get all of the ids used to identify, and retrieve field data. - :param field_data_db_operation_spec: - :type field_data_db_operation_spec: FieldDataDBOperationSpec :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1526,8 +1520,7 @@ def get_all_field_data_with_http_info( :return: Returns the result object. """ # noqa: E501 - _param = self._get_all_field_data_serialize( - field_data_db_operation_spec=field_data_db_operation_spec, + _param = self._get_all_field_data_ids_serialize( _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, @@ -1535,7 +1528,7 @@ def get_all_field_data_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "FieldDataExternalDataIDs" + '200': "FieldDataReferences" } response_data = self.api_client.call_api( @@ -1550,9 +1543,8 @@ def get_all_field_data_with_http_info( @validate_call - def get_all_field_data_without_preload_content( + def get_all_field_data_ids_without_preload_content( self, - field_data_db_operation_spec: Optional[FieldDataDBOperationSpec] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -1566,11 +1558,9 @@ def get_all_field_data_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Get all of the field data for that user. + """Get all of the ids used to identify, and retrieve field data. - :param field_data_db_operation_spec: - :type field_data_db_operation_spec: FieldDataDBOperationSpec :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1593,8 +1583,7 @@ def get_all_field_data_without_preload_content( :return: Returns the result object. """ # noqa: E501 - _param = self._get_all_field_data_serialize( - field_data_db_operation_spec=field_data_db_operation_spec, + _param = self._get_all_field_data_ids_serialize( _request_auth=_request_auth, _content_type=_content_type, _headers=_headers, @@ -1602,7 +1591,7 @@ def get_all_field_data_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "FieldDataExternalDataIDs" + '200': "FieldDataReferences" } response_data = self.api_client.call_api( @@ -1612,9 +1601,8 @@ def get_all_field_data_without_preload_content( return response_data.response - def _get_all_field_data_serialize( + def _get_all_field_data_ids_serialize( self, - field_data_db_operation_spec, _request_auth, _content_type, _headers, @@ -1639,8 +1627,264 @@ def _get_all_field_data_serialize( # process the header parameters # process the form parameters # process the body parameter - if field_data_db_operation_spec is not None: - _body_params = field_data_db_operation_spec + + + # set the HTTP header `Accept` + _header_params['Accept'] = self.api_client.select_header_accept( + [ + 'application/json' + ] + ) + + + # authentication setting + _auth_settings: List[str] = [ + ] + + return self.api_client.param_serialize( + method='GET', + resource_path='/api/v1/fieldData/IDs', + path_params=_path_params, + query_params=_query_params, + header_params=_header_params, + body=_body_params, + post_params=_form_params, + files=_files, + auth_settings=_auth_settings, + collection_formats=_collection_formats, + _host=_host, + _request_auth=_request_auth + ) + + + + + @validate_call + def get_field_data_from_id( + self, + body: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[ + Annotated[StrictFloat, Field(gt=0)], + Annotated[StrictFloat, Field(gt=0)] + ] + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> FieldDataInfo: + """Get the field data from the selected field data ID. + + + :param body: + :type body: str + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ # noqa: E501 + + _param = self._get_field_data_from_id_serialize( + body=body, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index + ) + + _response_types_map: Dict[str, Optional[str]] = { + '200': "FieldDataInfo" + + } + response_data = self.api_client.call_api( + *_param, + _request_timeout=_request_timeout + ) + response_data.read() + return self.api_client.response_deserialize( + response_data=response_data, + response_types_map=_response_types_map, + ).data + + + @validate_call + def get_field_data_from_id_with_http_info( + self, + body: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[ + Annotated[StrictFloat, Field(gt=0)], + Annotated[StrictFloat, Field(gt=0)] + ] + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> ApiResponse[FieldDataInfo]: + """Get the field data from the selected field data ID. + + + :param body: + :type body: str + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ # noqa: E501 + + _param = self._get_field_data_from_id_serialize( + body=body, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index + ) + + _response_types_map: Dict[str, Optional[str]] = { + '200': "FieldDataInfo" + + } + response_data = self.api_client.call_api( + *_param, + _request_timeout=_request_timeout + ) + response_data.read() + return self.api_client.response_deserialize( + response_data=response_data, + response_types_map=_response_types_map, + ) + + + @validate_call + def get_field_data_from_id_without_preload_content( + self, + body: Optional[StrictStr] = None, + _request_timeout: Union[ + None, + Annotated[StrictFloat, Field(gt=0)], + Tuple[ + Annotated[StrictFloat, Field(gt=0)], + Annotated[StrictFloat, Field(gt=0)] + ] + ] = None, + _request_auth: Optional[Dict[StrictStr, Any]] = None, + _content_type: Optional[StrictStr] = None, + _headers: Optional[Dict[StrictStr, Any]] = None, + _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, + ) -> RESTResponseType: + """Get the field data from the selected field data ID. + + + :param body: + :type body: str + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :type _request_timeout: int, tuple(int, int), optional + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the + authentication in the spec for a single request. + :type _request_auth: dict, optional + :param _content_type: force content-type for the request. + :type _content_type: str, Optional + :param _headers: set to override the headers for a single + request; this effectively ignores the headers + in the spec for a single request. + :type _headers: dict, optional + :param _host_index: set to override the host_index for a single + request; this effectively ignores the host_index + in the spec for a single request. + :type _host_index: int, optional + :return: Returns the result object. + """ # noqa: E501 + + _param = self._get_field_data_from_id_serialize( + body=body, + _request_auth=_request_auth, + _content_type=_content_type, + _headers=_headers, + _host_index=_host_index + ) + + _response_types_map: Dict[str, Optional[str]] = { + '200': "FieldDataInfo" + + } + response_data = self.api_client.call_api( + *_param, + _request_timeout=_request_timeout + ) + return response_data.response + + + def _get_field_data_from_id_serialize( + self, + body, + _request_auth, + _content_type, + _headers, + _host_index, + ) -> Tuple: + + _host = None + + _collection_formats: Dict[str, str] = { + + } + + _path_params: Dict[str, str] = {} + _query_params: List[Tuple[str, str]] = [] + _header_params: Dict[str, Optional[str]] = _headers or {} + _form_params: List[Tuple[str, str]] = [] + _files: Dict[str, str] = {} + _body_params: Optional[bytes] = None + + # process the path parameters + # process the query parameters + # process the header parameters + # process the form parameters + # process the body parameter + if body is not None: + _body_params = body # set the HTTP header `Accept` @@ -1657,7 +1901,7 @@ def _get_all_field_data_serialize( _default_content_type = ( self.api_client.select_header_content_type( [ - 'application/json' + 'text/plain' ] ) ) diff --git a/python-restclient/vcell_client/api/simulation_resource_api.py b/python-restclient/vcell_client/api/simulation_resource_api.py index 1d2f938779..0cc5e36691 100644 --- a/python-restclient/vcell_client/api/simulation_resource_api.py +++ b/python-restclient/vcell_client/api/simulation_resource_api.py @@ -111,8 +111,8 @@ def get_simulation_status( _response_types_map: Dict[str, Optional[str]] = { '200': "SimulationStatusPersistentRecord", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -188,8 +188,8 @@ def get_simulation_status_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "SimulationStatusPersistentRecord", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -265,8 +265,8 @@ def get_simulation_status_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "SimulationStatusPersistentRecord", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -402,8 +402,8 @@ def start_simulation( _response_types_map: Dict[str, Optional[str]] = { '200': "List[StatusMessage]", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -471,8 +471,8 @@ def start_simulation_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "List[StatusMessage]", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -540,8 +540,8 @@ def start_simulation_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "List[StatusMessage]", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -667,8 +667,8 @@ def stop_simulation( _response_types_map: Dict[str, Optional[str]] = { '200': "List[StatusMessage]", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -736,8 +736,8 @@ def stop_simulation_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "List[StatusMessage]", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -805,8 +805,8 @@ def stop_simulation_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "List[StatusMessage]", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( diff --git a/python-restclient/vcell_client/api/users_resource_api.py b/python-restclient/vcell_client/api/users_resource_api.py index 4cf7621633..77b2e2ff5f 100644 --- a/python-restclient/vcell_client/api/users_resource_api.py +++ b/python-restclient/vcell_client/api/users_resource_api.py @@ -597,8 +597,8 @@ def get_legacy_api_token( _response_types_map: Dict[str, Optional[str]] = { '200': "AccesTokenRepresentationRecord", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -662,8 +662,8 @@ def get_legacy_api_token_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "AccesTokenRepresentationRecord", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -727,8 +727,8 @@ def get_legacy_api_token_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "AccesTokenRepresentationRecord", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -847,8 +847,8 @@ def get_mapped_user( _response_types_map: Dict[str, Optional[str]] = { '200': "UserIdentityJSONSafe", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -912,8 +912,8 @@ def get_mapped_user_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "UserIdentityJSONSafe", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -977,8 +977,8 @@ def get_mapped_user_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "UserIdentityJSONSafe", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -1607,8 +1607,8 @@ def map_user( _response_types_map: Dict[str, Optional[str]] = { '200': "bool", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -1676,8 +1676,8 @@ def map_user_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "bool", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -1745,8 +1745,8 @@ def map_user_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "bool", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -2405,8 +2405,8 @@ def unmap_user( _response_types_map: Dict[str, Optional[str]] = { '200': "bool", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -2474,8 +2474,8 @@ def unmap_user_with_http_info( _response_types_map: Dict[str, Optional[str]] = { '200': "bool", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( @@ -2543,8 +2543,8 @@ def unmap_user_without_preload_content( _response_types_map: Dict[str, Optional[str]] = { '200': "bool", - '401': None, - '403': None + '403': None, + '401': None } response_data = self.api_client.call_api( diff --git a/python-restclient/vcell_client/models/__init__.py b/python-restclient/vcell_client/models/__init__.py index d7e25cae50..999a81c145 100644 --- a/python-restclient/vcell_client/models/__init__.py +++ b/python-restclient/vcell_client/models/__init__.py @@ -22,13 +22,16 @@ from vcell_client.models.biomodel_ref import BiomodelRef from vcell_client.models.cartesian_mesh import CartesianMesh from vcell_client.models.coordinate import Coordinate +from vcell_client.models.data_identifier import DataIdentifier from vcell_client.models.detailed_state import DetailedState +from vcell_client.models.domain import Domain from vcell_client.models.extent import Extent from vcell_client.models.external_data_identifier import ExternalDataIdentifier from vcell_client.models.field_data_db_operation_spec import FieldDataDBOperationSpec -from vcell_client.models.field_data_external_data_ids import FieldDataExternalDataIDs from vcell_client.models.field_data_file_operation_spec import FieldDataFileOperationSpec +from vcell_client.models.field_data_info import FieldDataInfo from vcell_client.models.field_data_no_copy_conflict import FieldDataNoCopyConflict +from vcell_client.models.field_data_references import FieldDataReferences from vcell_client.models.field_data_save_results import FieldDataSaveResults from vcell_client.models.group_access import GroupAccess from vcell_client.models.hello_world_message import HelloWorldMessage diff --git a/python-restclient/vcell_client/models/data_identifier.py b/python-restclient/vcell_client/models/data_identifier.py new file mode 100644 index 0000000000..c9eaf2fee3 --- /dev/null +++ b/python-restclient/vcell_client/models/data_identifier.py @@ -0,0 +1,114 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, StrictBool, StrictStr +from pydantic import Field +from vcell_client.models.domain import Domain +from vcell_client.models.variable_type import VariableType +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class DataIdentifier(BaseModel): + """ + DataIdentifier + """ # noqa: E501 + name: Optional[StrictStr] = None + display_name: Optional[StrictStr] = Field(default=None, alias="displayName") + variable_type: Optional[VariableType] = Field(default=None, alias="variableType") + domain: Optional[Domain] = None + b_function: Optional[StrictBool] = Field(default=None, alias="bFunction") + function: Optional[StrictBool] = None + visible: Optional[StrictBool] = None + __properties: ClassVar[List[str]] = ["name", "displayName", "variableType", "domain", "bFunction", "function", "visible"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of DataIdentifier from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + # override the default output from pydantic by calling `to_dict()` of variable_type + if self.variable_type: + _dict['variableType'] = self.variable_type.to_dict() + # override the default output from pydantic by calling `to_dict()` of domain + if self.domain: + _dict['domain'] = self.domain.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of DataIdentifier from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in DataIdentifier) in the input: " + _key) + + _obj = cls.model_validate({ + "name": obj.get("name"), + "displayName": obj.get("displayName"), + "variableType": VariableType.from_dict(obj.get("variableType")) if obj.get("variableType") is not None else None, + "domain": Domain.from_dict(obj.get("domain")) if obj.get("domain") is not None else None, + "bFunction": obj.get("bFunction"), + "function": obj.get("function"), + "visible": obj.get("visible") + }) + return _obj + + diff --git a/python-restclient/vcell_client/models/domain.py b/python-restclient/vcell_client/models/domain.py new file mode 100644 index 0000000000..6fe1a27aaa --- /dev/null +++ b/python-restclient/vcell_client/models/domain.py @@ -0,0 +1,93 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, StrictStr +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class Domain(BaseModel): + """ + Domain + """ # noqa: E501 + name: Optional[StrictStr] = None + __properties: ClassVar[List[str]] = ["name"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of Domain from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of Domain from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in Domain) in the input: " + _key) + + _obj = cls.model_validate({ + "name": obj.get("name") + }) + return _obj + + diff --git a/python-restclient/vcell_client/models/field_data_file_operation_results.py b/python-restclient/vcell_client/models/field_data_file_operation_results.py new file mode 100644 index 0000000000..c0395c993c --- /dev/null +++ b/python-restclient/vcell_client/models/field_data_file_operation_results.py @@ -0,0 +1,138 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional, Union +from pydantic import BaseModel, StrictFloat, StrictInt +from pydantic import Field +from vcell_client.models.data_identifier import DataIdentifier +from vcell_client.models.extent import Extent +from vcell_client.models.external_data_identifier import ExternalDataIdentifier +from vcell_client.models.field_data_reference_info import FieldDataReferenceInfo +from vcell_client.models.i_size import ISize +from vcell_client.models.origin import Origin +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class FieldDataFileOperationResults(BaseModel): + """ + FieldDataFileOperationResults + """ # noqa: E501 + data_identifier_arr: Optional[List[DataIdentifier]] = Field(default=None, alias="dataIdentifierArr") + external_data_identifier: Optional[ExternalDataIdentifier] = Field(default=None, alias="externalDataIdentifier") + i_size: Optional[ISize] = Field(default=None, alias="iSize") + origin: Optional[Origin] = None + extent: Optional[Extent] = None + times: Optional[List[Union[StrictFloat, StrictInt]]] = None + dependant_function_info: Optional[List[FieldDataReferenceInfo]] = Field(default=None, alias="dependantFunctionInfo") + __properties: ClassVar[List[str]] = ["dataIdentifierArr", "externalDataIdentifier", "iSize", "origin", "extent", "times", "dependantFunctionInfo"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of FieldDataFileOperationResults from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + # override the default output from pydantic by calling `to_dict()` of each item in data_identifier_arr (list) + _items = [] + if self.data_identifier_arr: + for _item in self.data_identifier_arr: + if _item: + _items.append(_item.to_dict()) + _dict['dataIdentifierArr'] = _items + # override the default output from pydantic by calling `to_dict()` of external_data_identifier + if self.external_data_identifier: + _dict['externalDataIdentifier'] = self.external_data_identifier.to_dict() + # override the default output from pydantic by calling `to_dict()` of i_size + if self.i_size: + _dict['iSize'] = self.i_size.to_dict() + # override the default output from pydantic by calling `to_dict()` of origin + if self.origin: + _dict['origin'] = self.origin.to_dict() + # override the default output from pydantic by calling `to_dict()` of extent + if self.extent: + _dict['extent'] = self.extent.to_dict() + # override the default output from pydantic by calling `to_dict()` of each item in dependant_function_info (list) + _items = [] + if self.dependant_function_info: + for _item in self.dependant_function_info: + if _item: + _items.append(_item.to_dict()) + _dict['dependantFunctionInfo'] = _items + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of FieldDataFileOperationResults from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in FieldDataFileOperationResults) in the input: " + _key) + + _obj = cls.model_validate({ + "dataIdentifierArr": [DataIdentifier.from_dict(_item) for _item in obj.get("dataIdentifierArr")] if obj.get("dataIdentifierArr") is not None else None, + "externalDataIdentifier": ExternalDataIdentifier.from_dict(obj.get("externalDataIdentifier")) if obj.get("externalDataIdentifier") is not None else None, + "iSize": ISize.from_dict(obj.get("iSize")) if obj.get("iSize") is not None else None, + "origin": Origin.from_dict(obj.get("origin")) if obj.get("origin") is not None else None, + "extent": Extent.from_dict(obj.get("extent")) if obj.get("extent") is not None else None, + "times": obj.get("times"), + "dependantFunctionInfo": [FieldDataReferenceInfo.from_dict(_item) for _item in obj.get("dependantFunctionInfo")] if obj.get("dependantFunctionInfo") is not None else None + }) + return _obj + + diff --git a/python-restclient/vcell_client/models/field_data_info.py b/python-restclient/vcell_client/models/field_data_info.py new file mode 100644 index 0000000000..ad26925cd3 --- /dev/null +++ b/python-restclient/vcell_client/models/field_data_info.py @@ -0,0 +1,122 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional, Union +from pydantic import BaseModel, StrictFloat, StrictInt +from pydantic import Field +from vcell_client.models.data_identifier import DataIdentifier +from vcell_client.models.extent import Extent +from vcell_client.models.i_size import ISize +from vcell_client.models.origin import Origin +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class FieldDataInfo(BaseModel): + """ + FieldDataInfo + """ # noqa: E501 + extent: Optional[Extent] = None + origin: Optional[Origin] = None + isize: Optional[ISize] = None + data_identifier: Optional[List[DataIdentifier]] = Field(default=None, alias="dataIdentifier") + times: Optional[List[Union[StrictFloat, StrictInt]]] = None + __properties: ClassVar[List[str]] = ["extent", "origin", "isize", "dataIdentifier", "times"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of FieldDataInfo from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + # override the default output from pydantic by calling `to_dict()` of extent + if self.extent: + _dict['extent'] = self.extent.to_dict() + # override the default output from pydantic by calling `to_dict()` of origin + if self.origin: + _dict['origin'] = self.origin.to_dict() + # override the default output from pydantic by calling `to_dict()` of isize + if self.isize: + _dict['isize'] = self.isize.to_dict() + # override the default output from pydantic by calling `to_dict()` of each item in data_identifier (list) + _items = [] + if self.data_identifier: + for _item in self.data_identifier: + if _item: + _items.append(_item.to_dict()) + _dict['dataIdentifier'] = _items + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of FieldDataInfo from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in FieldDataInfo) in the input: " + _key) + + _obj = cls.model_validate({ + "extent": Extent.from_dict(obj.get("extent")) if obj.get("extent") is not None else None, + "origin": Origin.from_dict(obj.get("origin")) if obj.get("origin") is not None else None, + "isize": ISize.from_dict(obj.get("isize")) if obj.get("isize") is not None else None, + "dataIdentifier": [DataIdentifier.from_dict(_item) for _item in obj.get("dataIdentifier")] if obj.get("dataIdentifier") is not None else None, + "times": obj.get("times") + }) + return _obj + + diff --git a/python-restclient/vcell_client/models/field_data_reference_info.py b/python-restclient/vcell_client/models/field_data_reference_info.py new file mode 100644 index 0000000000..098481c735 --- /dev/null +++ b/python-restclient/vcell_client/models/field_data_reference_info.py @@ -0,0 +1,110 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, StrictStr +from pydantic import Field +from vcell_client.models.key_value import KeyValue +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class FieldDataReferenceInfo(BaseModel): + """ + FieldDataReferenceInfo + """ # noqa: E501 + reference_source_type: Optional[StrictStr] = Field(default=None, alias="referenceSourceType") + reference_source_name: Optional[StrictStr] = Field(default=None, alias="referenceSourceName") + application_name: Optional[StrictStr] = Field(default=None, alias="applicationName") + simulation_name: Optional[StrictStr] = Field(default=None, alias="simulationName") + ref_source_version_date: Optional[StrictStr] = Field(default=None, alias="refSourceVersionDate") + func_names: Optional[List[StrictStr]] = Field(default=None, alias="funcNames") + ref_source_version_key: Optional[KeyValue] = Field(default=None, alias="refSourceVersionKey") + __properties: ClassVar[List[str]] = ["referenceSourceType", "referenceSourceName", "applicationName", "simulationName", "refSourceVersionDate", "funcNames", "refSourceVersionKey"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of FieldDataReferenceInfo from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + # override the default output from pydantic by calling `to_dict()` of ref_source_version_key + if self.ref_source_version_key: + _dict['refSourceVersionKey'] = self.ref_source_version_key.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of FieldDataReferenceInfo from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in FieldDataReferenceInfo) in the input: " + _key) + + _obj = cls.model_validate({ + "referenceSourceType": obj.get("referenceSourceType"), + "referenceSourceName": obj.get("referenceSourceName"), + "applicationName": obj.get("applicationName"), + "simulationName": obj.get("simulationName"), + "refSourceVersionDate": obj.get("refSourceVersionDate"), + "funcNames": obj.get("funcNames"), + "refSourceVersionKey": KeyValue.from_dict(obj.get("refSourceVersionKey")) if obj.get("refSourceVersionKey") is not None else None + }) + return _obj + + diff --git a/python-restclient/vcell_client/models/field_data_references.py b/python-restclient/vcell_client/models/field_data_references.py new file mode 100644 index 0000000000..5143fe7559 --- /dev/null +++ b/python-restclient/vcell_client/models/field_data_references.py @@ -0,0 +1,123 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional +from pydantic import BaseModel, StrictStr +from pydantic import Field +from vcell_client.models.external_data_identifier import ExternalDataIdentifier +from vcell_client.models.key_value import KeyValue +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class FieldDataReferences(BaseModel): + """ + FieldDataReferences + """ # noqa: E501 + external_data_identifiers: Optional[List[ExternalDataIdentifier]] = Field(default=None, alias="externalDataIdentifiers") + external_data_annotations: Optional[List[StrictStr]] = Field(default=None, alias="externalDataAnnotations") + external_data_id_sim_refs: Optional[Dict[str, List[KeyValue]]] = Field(default=None, alias="externalDataIDSimRefs") + __properties: ClassVar[List[str]] = ["externalDataIdentifiers", "externalDataAnnotations", "externalDataIDSimRefs"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of FieldDataReferences from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + # override the default output from pydantic by calling `to_dict()` of each item in external_data_identifiers (list) + _items = [] + if self.external_data_identifiers: + for _item in self.external_data_identifiers: + if _item: + _items.append(_item.to_dict()) + _dict['externalDataIdentifiers'] = _items + # override the default output from pydantic by calling `to_dict()` of each value in external_data_id_sim_refs (dict of array) + _field_dict_of_array = {} + if self.external_data_id_sim_refs: + for _key in self.external_data_id_sim_refs: + if self.external_data_id_sim_refs[_key] is not None: + _field_dict_of_array[_key] = [ + _item.to_dict() for _item in self.external_data_id_sim_refs[_key] + ] + _dict['externalDataIDSimRefs'] = _field_dict_of_array + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of FieldDataReferences from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in FieldDataReferences) in the input: " + _key) + + _obj = cls.model_validate({ + "externalDataIdentifiers": [ExternalDataIdentifier.from_dict(_item) for _item in obj.get("externalDataIdentifiers")] if obj.get("externalDataIdentifiers") is not None else None, + "externalDataAnnotations": obj.get("externalDataAnnotations"), + "externalDataIDSimRefs": dict( + (_k, + [KeyValue.from_dict(_item) for _item in _v] + if _v is not None + else None + ) + for _k, _v in obj.get("externalDataIDSimRefs").items() + ) + }) + return _obj + + diff --git a/python-restclient/vcell_client/models/save_field_data_from_file.py b/python-restclient/vcell_client/models/save_field_data_from_file.py new file mode 100644 index 0000000000..839d065eb6 --- /dev/null +++ b/python-restclient/vcell_client/models/save_field_data_from_file.py @@ -0,0 +1,120 @@ +# coding: utf-8 + +""" + VCell API + + VCell API + + The version of the OpenAPI document: 1.0.1 + Contact: vcell_support@uchc.com + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + + +from typing import Any, ClassVar, Dict, List, Optional, Union +from pydantic import BaseModel, StrictFloat, StrictInt, StrictStr +from pydantic import Field +from vcell_client.models.extent import Extent +from vcell_client.models.i_size import ISize +from vcell_client.models.origin import Origin +try: + from typing import Self +except ImportError: + from typing_extensions import Self + +class SaveFieldDataFromFile(BaseModel): + """ + SaveFieldDataFromFile + """ # noqa: E501 + short_spec_data: Optional[List[List[List[StrictInt]]]] = Field(default=None, alias="shortSpecData") + var_names: Optional[List[StrictStr]] = Field(default=None, alias="varNames") + times: Optional[List[Union[StrictFloat, StrictInt]]] = None + origin: Optional[Origin] = None + extent: Optional[Extent] = None + isize: Optional[ISize] = None + annotation: Optional[StrictStr] = None + name: Optional[StrictStr] = None + __properties: ClassVar[List[str]] = ["shortSpecData", "varNames", "times", "origin", "extent", "isize", "annotation", "name"] + + model_config = { + "populate_by_name": True, + "validate_assignment": True + } + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of SaveFieldDataFromFile from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + _dict = self.model_dump( + by_alias=True, + exclude={ + }, + exclude_none=True, + ) + # override the default output from pydantic by calling `to_dict()` of origin + if self.origin: + _dict['origin'] = self.origin.to_dict() + # override the default output from pydantic by calling `to_dict()` of extent + if self.extent: + _dict['extent'] = self.extent.to_dict() + # override the default output from pydantic by calling `to_dict()` of isize + if self.isize: + _dict['isize'] = self.isize.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Dict) -> Self: + """Create an instance of SaveFieldDataFromFile from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + # raise errors for additional fields in the input + for _key in obj.keys(): + if _key not in cls.__properties: + raise ValueError("Error due to additional fields (not defined in SaveFieldDataFromFile) in the input: " + _key) + + _obj = cls.model_validate({ + "shortSpecData": obj.get("shortSpecData"), + "varNames": obj.get("varNames"), + "times": obj.get("times"), + "origin": Origin.from_dict(obj.get("origin")) if obj.get("origin") is not None else None, + "extent": Extent.from_dict(obj.get("extent")) if obj.get("extent") is not None else None, + "isize": ISize.from_dict(obj.get("isize")) if obj.get("isize") is not None else None, + "annotation": obj.get("annotation"), + "name": obj.get("name") + }) + return _obj + + diff --git a/tools/java-config.yaml b/tools/java-config.yaml index bfc0085a6a..9bc21c9a49 100644 --- a/tools/java-config.yaml +++ b/tools/java-config.yaml @@ -54,3 +54,5 @@ additionalProperties: withAWSV4Signature: false # default withXml: false # default (whether to include support for application/xml content type and include XML annotations in the model) ... is this needed for VCML, SBML? +#importMappings: +# FieldDataFileOperationSpec: cbit.vcell.field.io.FieldDataFileOperationSpec diff --git a/tools/openapi.yaml b/tools/openapi.yaml index b75e9577a1..9abb8b14ac 100644 --- a/tools/openapi.yaml +++ b/tools/openapi.yaml @@ -42,10 +42,10 @@ paths: application/json: schema: $ref: '#/components/schemas/SimulationStatusPersistentRecord' - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -70,10 +70,10 @@ paths: type: array items: $ref: '#/components/schemas/StatusMessage' - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -98,10 +98,10 @@ paths: type: array items: $ref: '#/components/schemas/StatusMessage' - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -137,10 +137,10 @@ paths: text/plain: schema: type: string - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -183,20 +183,20 @@ paths: get: tags: - Field Data Resource - summary: Get all of the field data for that user. - operationId: getAllFieldData + summary: Get the field data from the selected field data ID. + operationId: getFieldDataFromID requestBody: content: - application/json: + text/plain: schema: - $ref: '#/components/schemas/FieldDataDBOperationSpec' + type: string responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/FieldDataExternalDataIDs' + $ref: '#/components/schemas/FieldDataInfo' delete: tags: - Field Data Resource @@ -210,25 +210,20 @@ paths: responses: "204": description: No Content - /api/v1/fieldData/copy: - post: + /api/v1/fieldData/IDs: + get: tags: - Field Data Resource - summary: Copy an existing field data entry. - operationId: copyFieldData - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/FieldDataDBOperationSpec' + summary: "Get all of the ids used to identify, and retrieve field data." + operationId: getAllFieldDataIDs responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/FieldDataNoCopyConflict' - /api/v1/fieldData/createFieldDataFromFile: + $ref: '#/components/schemas/FieldDataReferences' + /api/v1/fieldData/analyzeFieldDataFromFile: post: tags: - Field Data Resource @@ -245,6 +240,24 @@ paths: application/json: schema: $ref: '#/components/schemas/FieldDataFileOperationSpec' + /api/v1/fieldData/copy: + post: + tags: + - Field Data Resource + summary: Copy an existing field data entry. + operationId: copyFieldData + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FieldDataDBOperationSpec' + responses: + "200": + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/FieldDataNoCopyConflict' /api/v1/fieldData/createFieldDataFromFileAlreadyAnalyzed: post: tags: @@ -391,10 +404,10 @@ paths: application/json: schema: $ref: '#/components/schemas/AccesTokenRepresentationRecord' - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -453,10 +466,10 @@ paths: application/json: schema: type: boolean - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -473,10 +486,10 @@ paths: application/json: schema: $ref: '#/components/schemas/UserIdentityJSONSafe' - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -509,10 +522,10 @@ paths: description: "Successful, returning the identity" "409": description: "VCell Identity not mapped, userid already exists" - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -552,10 +565,10 @@ paths: description: magic link sent in email if appropriate "400": description: unable to process request - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -578,10 +591,10 @@ paths: application/json: schema: type: boolean - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -752,6 +765,23 @@ components: z: format: double type: number + DataIdentifier: + type: object + properties: + name: + type: string + displayName: + type: string + variableType: + $ref: '#/components/schemas/VariableType' + domain: + $ref: '#/components/schemas/Domain' + bFunction: + type: boolean + function: + type: boolean + visible: + type: boolean Date: format: date type: string @@ -809,6 +839,11 @@ components: - WORKEREVENT_FAILURE - JOB_FAILED type: string + Domain: + type: object + properties: + name: + type: string Extent: type: object properties: @@ -869,23 +904,6 @@ components: $ref: '#/components/schemas/VersionableTypeVersion' bIncludeSimRefs: type: boolean - FieldDataExternalDataIDs: - type: object - properties: - externalDataIdentifiers: - type: array - items: - $ref: '#/components/schemas/ExternalDataIdentifier' - externalDataAnnotations: - type: array - items: - type: string - externalDataIDSimRefs: - type: object - additionalProperties: - type: array - items: - $ref: '#/components/schemas/KeyValue' FieldDataFile: type: object properties: @@ -953,6 +971,24 @@ components: $ref: '#/components/schemas/User' fieldDataName: type: string + FieldDataInfo: + type: object + properties: + extent: + $ref: '#/components/schemas/Extent' + origin: + $ref: '#/components/schemas/Origin' + isize: + $ref: '#/components/schemas/ISize' + dataIdentifier: + type: array + items: + $ref: '#/components/schemas/DataIdentifier' + times: + type: array + items: + format: double + type: number FieldDataNoCopyConflict: type: object properties: @@ -964,6 +1000,23 @@ components: type: object additionalProperties: $ref: '#/components/schemas/KeyValue' + FieldDataReferences: + type: object + properties: + externalDataIdentifiers: + type: array + items: + $ref: '#/components/schemas/ExternalDataIdentifier' + externalDataAnnotations: + type: array + items: + type: string + externalDataIDSimRefs: + type: object + additionalProperties: + type: array + items: + $ref: '#/components/schemas/KeyValue' FieldDataSaveResults: type: object properties: 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 e3e2fb8a0a..34a11f6fa5 100644 --- a/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationResults.java +++ b/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationResults.java @@ -11,12 +11,13 @@ package cbit.vcell.field; import java.io.Serializable; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Vector; +import java.util.*; +import java.util.stream.Collectors; +import org.vcell.restclient.model.FieldDataReferences; import org.vcell.util.document.ExternalDataIdentifier; import org.vcell.util.document.KeyValue; +import org.vcell.util.document.User; public class FieldDataDBOperationResults implements Serializable { @@ -27,4 +28,21 @@ public class FieldDataDBOperationResults implements Serializable { public Hashtable oldNameNewIDHash; public Hashtable oldNameOldExtDataIDKeyHash; public HashMap> extdataIDAndSimRefH; + + + public static FieldDataDBOperationResults fieldDataReferencesToDBResults(FieldDataReferences dto, User user){ + FieldDataDBOperationResults fieldDataDBOperationResults = new FieldDataDBOperationResults(); + fieldDataDBOperationResults.extDataIDArr = dto.getExternalDataIdentifiers().stream().map(ExternalDataIdentifier::dtoToExternalDataIdentifier).toArray(ExternalDataIdentifier[]::new); + fieldDataDBOperationResults.extDataAnnotArr = dto.getExternalDataAnnotations().toArray(new String[0]); + fieldDataDBOperationResults.extdataIDAndSimRefH = new HashMap<>(); + if (dto.getExternalDataIDSimRefs() == null){ + return fieldDataDBOperationResults; + } + for (Map.Entry> entry : dto.getExternalDataIDSimRefs().entrySet()){ + fieldDataDBOperationResults.extdataIDAndSimRefH.put(new ExternalDataIdentifier(new KeyValue(entry.getKey()), user, ""), + entry.getValue().stream().map(KeyValue::dtoToKeyValue).collect(Collectors.toCollection(Vector::new))); + } + return fieldDataDBOperationResults; + } + } diff --git a/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationSpec.java b/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationSpec.java index 977641a823..78e27f6670 100644 --- a/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationSpec.java +++ b/vcell-core/src/main/java/cbit/vcell/field/FieldDataDBOperationSpec.java @@ -36,13 +36,15 @@ public class FieldDataDBOperationSpec implements Serializable { private FieldDataDBOperationSpec(){ } - + private static FieldDataDBOperationSpec createOwnedFieldDataDBOperationSpec(User owner){ FieldDataDBOperationSpec fieldDataDBOperationSpec = new FieldDataDBOperationSpec(); fieldDataDBOperationSpec.owner = owner; return fieldDataDBOperationSpec; } + + @Deprecated public static FieldDataDBOperationSpec createCopyNoConflictExtDataIDsSpec( User argOwner,String[] argSourceNames,VersionableTypeVersion argSourceOwner){ FieldDataDBOperationSpec fieldDataDBOperationSpec = @@ -52,12 +54,16 @@ public static FieldDataDBOperationSpec createCopyNoConflictExtDataIDsSpec( fieldDataDBOperationSpec.sourceOwner = argSourceOwner; return fieldDataDBOperationSpec; } + + @Deprecated public static FieldDataDBOperationSpec createGetExtDataIDsSpec(User owner){ FieldDataDBOperationSpec fieldDataDBOperationSpec = createOwnedFieldDataDBOperationSpec(owner); fieldDataDBOperationSpec.opType = fieldDataDBOperationSpec.FDDBOS_GETEXTDATAIDS; return fieldDataDBOperationSpec; } + + @Deprecated public static FieldDataDBOperationSpec createGetExtDataIDsSpecWithSimRefs(User owner){ FieldDataDBOperationSpec fieldDataDBOperationSpec = createOwnedFieldDataDBOperationSpec(owner); @@ -65,6 +71,8 @@ public static FieldDataDBOperationSpec createGetExtDataIDsSpecWithSimRefs(User o fieldDataDBOperationSpec.bIncludeSimRefs = true; return fieldDataDBOperationSpec; } + + @Deprecated public static FieldDataDBOperationSpec createSaveNewExtDataIDSpec( User owner,String newExtDataIDName,String newExtDataAnnot){ FieldDataDBOperationSpec fieldDataDBOperationSpec = @@ -74,6 +82,8 @@ public static FieldDataDBOperationSpec createSaveNewExtDataIDSpec( fieldDataDBOperationSpec.annotation = newExtDataAnnot; return fieldDataDBOperationSpec; } + + @Deprecated public static FieldDataDBOperationSpec createDeleteExtDataIDSpec(ExternalDataIdentifier deleteExtDataID){ FieldDataDBOperationSpec fieldDataDBOperationSpec = createOwnedFieldDataDBOperationSpec(deleteExtDataID.getOwner()); 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 810d394f5d..0940ecaa04 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 @@ -10,16 +10,15 @@ package cbit.vcell.field.io; -import org.vcell.restclient.model.FieldDataReferenceInfo; +import cbit.vcell.simdata.DataIdentifier; +import org.vcell.restclient.model.FieldDataInfo; +import org.vcell.restclient.model.FieldDataSaveResults; import org.vcell.util.Extent; import org.vcell.util.ISize; import org.vcell.util.Origin; import org.vcell.util.document.ExternalDataIdentifier; import org.vcell.util.document.KeyValue; - -import cbit.vcell.simdata.DataIdentifier; - -import java.util.Arrays; +import org.vcell.util.document.User; /** * Insert the type's description here. @@ -39,18 +38,6 @@ public static class FieldDataReferenceInfo{ public String refSourceVersionDate; public String[] funcNames; public KeyValue refSourceVersionKey; - - public static FieldDataReferenceInfo dtoToFielddataFileOperationResults(org.vcell.restclient.model.FieldDataReferenceInfo dto){ - FieldDataReferenceInfo fieldDataReferenceInfo = new FieldDataReferenceInfo(); - fieldDataReferenceInfo.referenceSourceType = dto.getReferenceSourceType(); - fieldDataReferenceInfo.referenceSourceName = dto.getReferenceSourceName(); - fieldDataReferenceInfo.simulationName = dto.getSimulationName(); - fieldDataReferenceInfo.applicationName = dto.getApplicationName(); - fieldDataReferenceInfo.refSourceVersionDate = dto.getRefSourceVersionDate(); - fieldDataReferenceInfo.funcNames = dto.getFuncNames().toArray(new String[0]); - fieldDataReferenceInfo.refSourceVersionKey = KeyValue.dtoToKeyValue(dto.getRefSourceVersionKey()); - return fieldDataReferenceInfo; - } }; @@ -61,20 +48,25 @@ public static FieldDataReferenceInfo dtoToFielddataFileOperationResults(org.vcel public Extent extent; public double[] times; public FieldDataFileOperationResults.FieldDataReferenceInfo[] dependantFunctionInfo; - - public static FieldDataFileOperationResults dtoToFieldDataFileOperationResults(org.vcell.restclient.model.FieldDataFileOperationResults dto){ - FieldDataFileOperationResults fieldDataFileOperationResults = new FieldDataFileOperationResults(); - fieldDataFileOperationResults.extent = Extent.dtoToExtent(dto.getExtent()); - fieldDataFileOperationResults.iSize = ISize.dtoToISize(dto.getiSize()); - fieldDataFileOperationResults.origin = Origin.dtoToOrigin(dto.getOrigin()); - fieldDataFileOperationResults.dataIdentifierArr = dto.getDataIdentifierArr().stream().map(DataIdentifier::dtoToDataIdentifier).toArray(DataIdentifier[]::new); - fieldDataFileOperationResults.times = dto.getTimes().stream().mapToDouble(Double::doubleValue).toArray(); - fieldDataFileOperationResults.dependantFunctionInfo = dto.getDependantFunctionInfo() == null ? null : dto.getDependantFunctionInfo().stream().map(FieldDataReferenceInfo::dtoToFielddataFileOperationResults).toArray(FieldDataReferenceInfo[]::new); - fieldDataFileOperationResults.externalDataIdentifier = ExternalDataIdentifier.dtoToExternalDataIdentifier(dto.getExternalDataIdentifier()); - return fieldDataFileOperationResults; - } public FieldDataFileOperationResults() { super(); } + + public static FieldDataFileOperationResults fieldDataInfoDTOToFileOperationResults(FieldDataInfo dto){ + FieldDataFileOperationResults results = new FieldDataFileOperationResults(); + results.extent = Extent.dtoToExtent(dto.getExtent()); + results.origin = Origin.dtoToOrigin(dto.getOrigin()); + results.iSize = ISize.dtoToISize(dto.getIsize()); + results.times = dto.getTimes().stream().mapToDouble(Double::doubleValue).toArray(); + results.dataIdentifierArr = dto.getDataIdentifier().stream().map(DataIdentifier::dtoToDataIdentifier).toArray(DataIdentifier[]::new); + return results; + } + + public static FieldDataFileOperationResults fieldDataSaveResultsDTOToFileOperationResults(FieldDataSaveResults dto, User owner){ + FieldDataFileOperationResults fieldDataFileOperationResults = new FieldDataFileOperationResults(); + fieldDataFileOperationResults.externalDataIdentifier = new ExternalDataIdentifier(new KeyValue(dto.getFieldDataID()), owner, dto.getFieldDataName()); + return fieldDataFileOperationResults; + } + } 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 9ae1569fac..dd6ee3ad09 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,7 @@ package cbit.vcell.field.io; import org.vcell.restclient.model.AnalyzedResultsFromFieldData; -import org.vcell.restclient.model.FieldDataFileOperationResults; +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/math/Variable.java b/vcell-core/src/main/java/cbit/vcell/math/Variable.java index 45d7e3f7d7..440b498a1f 100644 --- a/vcell-core/src/main/java/cbit/vcell/math/Variable.java +++ b/vcell-core/src/main/java/cbit/vcell/math/Variable.java @@ -10,9 +10,9 @@ package cbit.vcell.math; -import java.io.Serializable; -import java.util.StringTokenizer; - +import cbit.vcell.geometry.GeometryClass; +import cbit.vcell.parser.*; +import cbit.vcell.units.VCUnitDefinition; import org.vcell.restclient.model.Domain; import org.vcell.util.Compare; import org.vcell.util.EqualsUtil; @@ -20,14 +20,8 @@ import org.vcell.util.Matchable; import org.vcell.util.TokenMangler; -import cbit.vcell.geometry.GeometryClass; -import cbit.vcell.parser.Expression; -import cbit.vcell.parser.ExpressionBindingException; -import cbit.vcell.parser.ExpressionException; -import cbit.vcell.parser.NameScope; -import cbit.vcell.parser.SymbolTable; -import cbit.vcell.parser.SymbolTableEntry; -import cbit.vcell.units.VCUnitDefinition; +import java.io.Serializable; +import java.util.StringTokenizer; /** * This class was generated by a SmartGuide. * @@ -47,8 +41,9 @@ public static class Domain implements Matchable, Serializable { private String name = null; public static Domain dtoToDomain(org.vcell.restclient.model.Domain dto){ - return dto != null ? new Domain(dto.getName()) : null; + return new Domain(dto.getName()); } + public Domain(String argName){ String nameWithPeriodsMangled = argName.replace('.','_'); @@ -85,7 +80,6 @@ public String toString(){ /** * This method was created by a SmartGuide. - * @param name java.lang.String */ protected Variable (String argName, Domain argDomain ) { if (argName == null) { diff --git a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalDataSetControllerMessaging.java b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalDataSetControllerMessaging.java index 7716722725..f1ee34e147 100644 --- a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalDataSetControllerMessaging.java +++ b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalDataSetControllerMessaging.java @@ -16,9 +16,6 @@ import org.vcell.restclient.model.*; import org.vcell.solver.nfsim.NFSimMolecularConfigurations; import org.vcell.util.DataAccessException; -import org.vcell.util.Extent; -import org.vcell.util.ISize; -import org.vcell.util.Origin; import org.vcell.util.document.ExternalDataIdentifier; import org.vcell.util.document.KeyValue; import org.vcell.util.document.UserLoginInfo; @@ -44,12 +41,6 @@ import cbit.vcell.simdata.SpatialSelection; import cbit.vcell.solvers.CartesianMesh; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - /** * This interface was generated by a SmartGuide. * @@ -75,14 +66,14 @@ public FieldDataFileOperationResults fieldDataFileOperation(FieldDataFileOperati if (fieldDataFileOperationSpec.opType == FieldDataFileOperationSpec.FDOS_ADD){ AnalyzedResultsFromFieldData analyzedResultsFromFieldData = FieldDataFileOperationSpec.fieldDataSpecToAnalyzedResultsDTO(fieldDataFileOperationSpec); FieldDataSaveResults results = vCellApiClient.getFieldDataApi().createNewFieldDataFromFileAlreadyAnalyzed(analyzedResultsFromFieldData); - FieldDataFileOperationResults fieldDataFileOperationResults = new FieldDataFileOperationResults(); - fieldDataFileOperationResults.externalDataIdentifier = new ExternalDataIdentifier(new KeyValue(results.getFieldDataID()), fieldDataFileOperationSpec.owner, results.getFieldDataName()); - return fieldDataFileOperationResults; + return FieldDataFileOperationResults.fieldDataSaveResultsDTOToFileOperationResults(results, fieldDataFileOperationSpec.owner); } else if (fieldDataFileOperationSpec.opType == FieldDataFileOperationSpec.FDOS_DELETE) { vCellApiClient.getFieldDataApi().deleteFieldData(fieldDataFileOperationSpec.specEDI.getKey().toString()); return null; - } - else { + } else if (fieldDataFileOperationSpec.opType == FieldDataFileOperationSpec.FDOS_INFO) { + FieldDataInfo fieldDataInfo = vCellApiClient.getFieldDataApi().getFieldDataFromID(fieldDataFileOperationSpec.sourceSimDataKey.toString()); + return FieldDataFileOperationResults.fieldDataInfoDTOToFileOperationResults(fieldDataInfo); + } else { return dataServerProxy.fieldDataFileOperation(fieldDataFileOperationSpec); } } catch (DataAccessException e){ 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 22bc284c90..6b1f913d73 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 @@ -15,6 +15,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.vcell.api.client.VCellApiClient; +import org.vcell.restclient.model.FieldDataReferences; import org.vcell.util.BigString; import org.vcell.util.DataAccessException; import org.vcell.util.ObjectNotFoundException; @@ -44,13 +46,15 @@ */ public class LocalUserMetaDbServerMessaging implements UserMetaDbServer { private RpcDbServerProxy dbServerProxy = null; + private final VCellApiClient vCellApiClient; private static Logger lg = LogManager.getLogger(LocalUserMetaDbServerMessaging.class); /** * This method was created in VisualAge. */ -public LocalUserMetaDbServerMessaging(UserLoginInfo userLoginInfo, RpcSender rpcSender) { +public LocalUserMetaDbServerMessaging(UserLoginInfo userLoginInfo, RpcSender rpcSender, VCellApiClient vCellApiClient) { this.dbServerProxy = new RpcDbServerProxy(userLoginInfo, rpcSender); + this.vCellApiClient = vCellApiClient; } public TreeMap> getSpecialUsers() throws DataAccessException{ @@ -124,8 +128,12 @@ public FieldDataDBOperationResults fieldDataDBOperation(FieldDataDBOperationSpec if (lg.isTraceEnabled()) lg.trace("LocalUserMetaDbServerMessaging.fieldDataDBOperation(...)"); if (fieldDataDBOperationSpec.opType == FieldDataDBOperationSpec.FDDBOS_DELETE){ throw new RuntimeException("Can not call deletion on field data DB entry. Have to do both file, and DB deletion."); + } else if (fieldDataDBOperationSpec.opType == FieldDataDBOperationSpec.FDDBOS_GETEXTDATAIDS) { + FieldDataReferences fieldDataReferences = vCellApiClient.getFieldDataApi().getAllFieldDataIDs(); + return FieldDataDBOperationResults.fieldDataReferencesToDBResults(fieldDataReferences, fieldDataDBOperationSpec.owner); + } else{ + return dbServerProxy.fieldDataDBOperation(fieldDataDBOperationSpec); } - return dbServerProxy.fieldDataDBOperation(fieldDataDBOperationSpec); } catch (DataAccessException e) { lg.error(e.getMessage(),e); throw e; diff --git a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalVCellConnectionMessaging.java b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalVCellConnectionMessaging.java index d98a2584e2..47a9b47ab6 100644 --- a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalVCellConnectionMessaging.java +++ b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/LocalVCellConnectionMessaging.java @@ -78,7 +78,7 @@ public UserLoginInfo getUserLoginInfo() { public UserMetaDbServer getUserMetaDbServer() throws DataAccessException { if (lg.isTraceEnabled()) lg.trace("LocalVCellConnectionMessaging.getUserMetaDbServer(" + getUserLoginInfo().getUser() + ")"); if (userMetaDbServerMessaging == null) { - userMetaDbServerMessaging = new LocalUserMetaDbServerMessaging(getUserLoginInfo(), rpcSender); + userMetaDbServerMessaging = new LocalUserMetaDbServerMessaging(getUserLoginInfo(), rpcSender, vCellApiClient); } return userMetaDbServerMessaging; } diff --git a/vcell-core/src/main/java/cbit/vcell/simdata/DataIdentifier.java b/vcell-core/src/main/java/cbit/vcell/simdata/DataIdentifier.java index 099d776941..0145c24c7d 100644 --- a/vcell-core/src/main/java/cbit/vcell/simdata/DataIdentifier.java +++ b/vcell-core/src/main/java/cbit/vcell/simdata/DataIdentifier.java @@ -28,11 +28,6 @@ public class DataIdentifier implements java.io.Serializable { private Domain domain = null; private boolean bFunction = false; - public static DataIdentifier dtoToDataIdentifier(org.vcell.restclient.model.DataIdentifier dto) { - return new DataIdentifier(dto.getName(), VariableType.dtoToVariableType(dto.getVariableType()), - Domain.dtoToDomain(dto.getDomain()),dto.getbFunction() != null && dto.getbFunction(), dto.getDisplayName()); - } - /** * DataIdentifier constructor comment. @@ -46,6 +41,12 @@ public DataIdentifier(String argName, VariableType argVariableType, Domain argDo displayName = argDisplayName; } +public static DataIdentifier dtoToDataIdentifier(org.vcell.restclient.model.DataIdentifier dto){ + return new DataIdentifier(dto.getName(), VariableType.dtoToVariableType(dto.getVariableType()), + dto.getDomain() == null ? null : Domain.dtoToDomain(dto.getDomain()), + dto.getbFunction() == null ? false : dto.getbFunction(), dto.getDisplayName()); +} + /** * Insert the method's description here. diff --git a/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataDB.java b/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataDB.java index b331993a76..99efa94155 100644 --- a/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataDB.java +++ b/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataDB.java @@ -17,12 +17,16 @@ import org.apache.commons.io.IOUtils; import org.vcell.restq.db.AgroalConnectionFactory; import org.vcell.util.DataAccessException; +import org.vcell.util.ObjectNotFoundException; import org.vcell.util.document.ExternalDataIdentifier; import org.vcell.util.document.KeyValue; import org.vcell.util.document.User; import java.io.*; import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.Vector; import java.util.zip.DataFormatException; @ApplicationScoped @@ -41,8 +45,20 @@ public FieldDataDBOperationResults copyNoConflict(User user, FieldDataDBOperatio return databaseServer.fieldDataDBOperation(user, spec); } - public FieldDataDBOperationResults getAllFieldData(User user, FieldDataDBOperationSpec spec) throws SQLException, DataAccessException { - return databaseServer.fieldDataDBOperation(user, spec); + public FieldDataResource.FieldDataReferences getAllFieldDataIDs(User user) throws SQLException, DataAccessException { + FieldDataDBOperationResults results = databaseServer.fieldDataDBOperation(user, FieldDataDBOperationSpec.createGetExtDataIDsSpec(user)); + HashMap> extdataIDToSimRef = new HashMap<>(); + if (results.extdataIDAndSimRefH == null){ // there can be no simulation references, only file based field data + return new FieldDataResource.FieldDataReferences(results.extDataIDArr, results.extDataAnnotArr, extdataIDToSimRef); + } + for (Map.Entry> entry: results.extdataIDAndSimRefH.entrySet()){ + extdataIDToSimRef.put(entry.getKey().getKey().toString(), entry.getValue()); + } + return new FieldDataResource.FieldDataReferences(results.extDataIDArr, results.extDataAnnotArr, extdataIDToSimRef); + } + + public FieldDataFileOperationResults getFieldDataFromID(User user, String id, int jobParameter) throws ObjectNotFoundException { + return dataSetController.fieldDataFileOperation(FieldDataFileOperationSpec.createInfoFieldDataFileOperationSpec(new KeyValue(id), user, jobParameter)); } public FieldDataFileOperationSpec generateFieldDataFromFile(InputStream imageFile, String fileName) throws DataAccessException, ImageException, DataFormatException { diff --git a/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataResource.java b/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataResource.java index 8a49452d30..b16f4e4a27 100644 --- a/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataResource.java +++ b/vcell-rest/src/main/java/org/vcell/restq/handlers/FieldData/FieldDataResource.java @@ -5,6 +5,8 @@ import cbit.vcell.field.FieldDataDBOperationSpec; import cbit.vcell.field.io.FieldDataFileOperationResults; import cbit.vcell.field.io.FieldDataFileOperationSpec; +import cbit.vcell.math.VariableType; +import cbit.vcell.simdata.DataIdentifier; import io.quarkus.security.identity.SecurityIdentity; import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; @@ -28,6 +30,7 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Hashtable; +import java.util.Map; import java.util.Vector; import java.util.zip.DataFormatException; @@ -51,48 +54,56 @@ public FieldDataResource(FieldDataDB fieldDataDB, UserRestDB userRestDB){ @GET - @Operation(operationId = "getAllFieldData", summary = "Get all of the field data for that user.") - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - public FieldDataExternalDataIDs getAllFieldData(FieldDataDBOperationSpec fieldDataDBOperationSpec){ - FieldDataDBOperationResults results = null; + @Path("IDs") + @Operation(operationId = "getAllFieldDataIDs", summary = "Get all of the ids used to identify, and retrieve field data.") + public FieldDataReferences getAllFieldData(){ try { - results = fieldDataDB.getAllFieldData(userRestDB.getUserFromIdentity(securityIdentity), fieldDataDBOperationSpec); + return fieldDataDB.getAllFieldDataIDs(userRestDB.getUserFromIdentity(securityIdentity)); } catch (SQLException e) { - throw new WebApplicationException("Can't retrieve field data.", 500); + throw new WebApplicationException("Can't retrieve field data ID's.", 500); } catch (DataAccessException e) { throw new WebApplicationException(e.getMessage(), 500); } - return new FieldDataResource.FieldDataExternalDataIDs(results.extDataIDArr, results.extDataAnnotArr, results.extdataIDAndSimRefH); } - @POST - @Path("/createFieldDataFromSimulation") - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Operation(operationId = "createNewFieldDataFromSimulation", summary = "Create new field data from a simulation.") - public ExternalDataIdentifier submitNewFieldDataToDB(FieldDataDBOperationSpec fieldDataDBOperationSpec){ - FieldDataDBOperationResults results = null; + @GET + @Operation(operationId = "getFieldDataFromID", summary = "Get the field data from the selected field data ID.") + public FieldDataInfo getFieldDataFromID(String fieldDataID){ try { - results = fieldDataDB.saveNewFieldDataIntoDB(userRestDB.getUserFromIdentity(securityIdentity), fieldDataDBOperationSpec); + FieldDataFileOperationResults results = fieldDataDB.getFieldDataFromID(userRestDB.getUserFromIdentity(securityIdentity), fieldDataID, 0); + return new FieldDataInfo(results.extent, results.origin, results.iSize, results.dataIdentifierArr,results.times); } catch (DataAccessException e) { throw new WebApplicationException(e.getMessage(), 500); } - return results.extDataID; } - @POST - @Path("/createFieldDataFromFile") - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.MULTIPART_FORM_DATA) - @Operation(operationId = "generateFieldDataEstimate") - public FieldDataFileOperationSpec generateFieldDataEstimate(FieldDataFile fieldDataFile){ - try{ - return fieldDataDB.generateFieldDataFromFile(fieldDataFile.file, fieldDataFile.fileName); - } catch (ImageException | DataFormatException | DataAccessException e) { - throw new WebApplicationException("Can't create new field data file", 500); - } - } +// @POST +// @Path("/createFieldDataFromSimulation") +// @Produces(MediaType.APPLICATION_JSON) +// @Consumes(MediaType.APPLICATION_JSON) +// @Operation(operationId = "createNewFieldDataFromSimulation", summary = "Create new field data from a simulation.") +// public ExternalDataIdentifier submitNewFieldDataToDB(FieldDataDBOperationSpec fieldDataDBOperationSpec){ +// FieldDataDBOperationResults results = null; +// try { +// results = fieldDataDB.saveNewFieldDataIntoDB(userRestDB.getUserFromIdentity(securityIdentity), fieldDataDBOperationSpec); +// } catch (DataAccessException e) { +// throw new WebApplicationException(e.getMessage(), 500); +// } +// return results.extDataID; +// } + +// @POST +// @Path("/analyzeFieldDataFromFile") +// @Produces(MediaType.APPLICATION_JSON) +// @Consumes(MediaType.MULTIPART_FORM_DATA) +// @Operation(operationId = "generateFieldDataEstimate") +// public FieldDataFileOperationSpec generateFieldDataEstimate(FieldDataFile fieldDataFile){ +// try{ +// return fieldDataDB.generateFieldDataFromFile(fieldDataFile.file, fieldDataFile.fileName); +// } catch (ImageException | DataFormatException | DataAccessException e) { +// throw new WebApplicationException("Can't create new field data file", 500); +// } +// } @POST @Path("/createFieldDataFromFileAlreadyAnalyzed") @@ -111,20 +122,20 @@ public FieldDataSaveResults createNewFieldDataFromFile(AnalyzedResultsFromFieldD return fieldDataSaveResults; } - @POST - @Path("/copy") - @Produces(MediaType.APPLICATION_JSON) - @Consumes(MediaType.APPLICATION_JSON) - @Operation(operationId = "copyFieldData", summary = "Copy an existing field data entry.") - public FieldDataNoCopyConflict copyFieldData(FieldDataDBOperationSpec fieldDataDBOperationSpec){ - FieldDataDBOperationResults results = null; - try { - results = fieldDataDB.copyNoConflict(userRestDB.getUserFromIdentity(securityIdentity), fieldDataDBOperationSpec); - } catch (DataAccessException e) { - throw new WebApplicationException(e.getMessage(), 500); - } - return new FieldDataNoCopyConflict(results.oldNameNewIDHash, results.oldNameOldExtDataIDKeyHash); - } +// @POST +// @Path("/copy") +// @Produces(MediaType.APPLICATION_JSON) +// @Consumes(MediaType.APPLICATION_JSON) +// @Operation(operationId = "copyFieldData", summary = "Copy an existing field data entry.") +// public FieldDataNoCopyConflict copyFieldData(FieldDataDBOperationSpec fieldDataDBOperationSpec){ +// FieldDataDBOperationResults results = null; +// try { +// results = fieldDataDB.copyNoConflict(userRestDB.getUserFromIdentity(securityIdentity), fieldDataDBOperationSpec); +// } catch (DataAccessException e) { +// throw new WebApplicationException(e.getMessage(), 500); +// } +// return new FieldDataNoCopyConflict(results.oldNameNewIDHash, results.oldNameOldExtDataIDKeyHash); +// } @DELETE @Operation(operationId = "deleteFieldData", summary = "Delete the selected field data.") @@ -136,16 +147,31 @@ public void deleteFieldData(String fieldDataID){ } } + public record FieldDataInfo( + Extent extent, + Origin origin, + ISize isize, + DataIdentifier[] dataIdentifier, + double[] times + ){ } + + public record DataID( + String name, + String displayName, + VariableType variableType, + String domainName, + boolean bFunction + ){ } public record FieldDataNoCopyConflict( Hashtable oldNameNewIDHash, Hashtable oldNameOldExtDataIDKeyHash ) { } - public record FieldDataExternalDataIDs( + public record FieldDataReferences( ExternalDataIdentifier[] externalDataIdentifiers, String[] externalDataAnnotations, - HashMap> externalDataIDSimRefs + Map> externalDataIDSimRefs ) { } public record AnalyzedResultsFromFieldData( diff --git a/vcell-restclient/.openapi-generator/FILES b/vcell-restclient/.openapi-generator/FILES index 8704a537a4..76763f2910 100644 --- a/vcell-restclient/.openapi-generator/FILES +++ b/vcell-restclient/.openapi-generator/FILES @@ -10,13 +10,16 @@ docs/BioModelResourceApi.md docs/BiomodelRef.md docs/CartesianMesh.md docs/Coordinate.md +docs/DataIdentifier.md docs/DetailedState.md +docs/Domain.md docs/Extent.md docs/ExternalDataIdentifier.md docs/FieldDataDBOperationSpec.md -docs/FieldDataExternalDataIDs.md docs/FieldDataFileOperationSpec.md +docs/FieldDataInfo.md docs/FieldDataNoCopyConflict.md +docs/FieldDataReferences.md docs/FieldDataResourceApi.md docs/FieldDataSaveResults.md docs/GroupAccess.md @@ -78,13 +81,16 @@ src/main/java/org/vcell/restclient/model/BioModel.java src/main/java/org/vcell/restclient/model/BiomodelRef.java src/main/java/org/vcell/restclient/model/CartesianMesh.java src/main/java/org/vcell/restclient/model/Coordinate.java +src/main/java/org/vcell/restclient/model/DataIdentifier.java src/main/java/org/vcell/restclient/model/DetailedState.java +src/main/java/org/vcell/restclient/model/Domain.java src/main/java/org/vcell/restclient/model/Extent.java src/main/java/org/vcell/restclient/model/ExternalDataIdentifier.java src/main/java/org/vcell/restclient/model/FieldDataDBOperationSpec.java -src/main/java/org/vcell/restclient/model/FieldDataExternalDataIDs.java src/main/java/org/vcell/restclient/model/FieldDataFileOperationSpec.java +src/main/java/org/vcell/restclient/model/FieldDataInfo.java src/main/java/org/vcell/restclient/model/FieldDataNoCopyConflict.java +src/main/java/org/vcell/restclient/model/FieldDataReferences.java src/main/java/org/vcell/restclient/model/FieldDataSaveResults.java src/main/java/org/vcell/restclient/model/GroupAccess.java src/main/java/org/vcell/restclient/model/HelloWorldMessage.java @@ -116,24 +122,5 @@ src/main/java/org/vcell/restclient/model/Version.java src/main/java/org/vcell/restclient/model/VersionFlag.java src/main/java/org/vcell/restclient/model/VersionableType.java src/main/java/org/vcell/restclient/model/VersionableTypeVersion.java -src/test/java/org/vcell/restclient/api/FieldDataResourceApiTest.java -src/test/java/org/vcell/restclient/model/AnalyzedResultsFromFieldDataTest.java -src/test/java/org/vcell/restclient/model/CartesianMeshTest.java -src/test/java/org/vcell/restclient/model/CoordinateTest.java -src/test/java/org/vcell/restclient/model/ExtentTest.java -src/test/java/org/vcell/restclient/model/ExternalDataIdentifierTest.java -src/test/java/org/vcell/restclient/model/FieldDataDBOperationSpecTest.java -src/test/java/org/vcell/restclient/model/FieldDataExternalDataIDsTest.java -src/test/java/org/vcell/restclient/model/FieldDataFileOperationSpecTest.java -src/test/java/org/vcell/restclient/model/FieldDataNoCopyConflictTest.java -src/test/java/org/vcell/restclient/model/FieldDataSaveResultsTest.java -src/test/java/org/vcell/restclient/model/GroupAccessTest.java -src/test/java/org/vcell/restclient/model/ISizeTest.java -src/test/java/org/vcell/restclient/model/OriginTest.java -src/test/java/org/vcell/restclient/model/UCDInfoTest.java -src/test/java/org/vcell/restclient/model/VariableDomainTest.java -src/test/java/org/vcell/restclient/model/VariableTypeTest.java -src/test/java/org/vcell/restclient/model/VersionFlagTest.java -src/test/java/org/vcell/restclient/model/VersionTest.java -src/test/java/org/vcell/restclient/model/VersionableTypeTest.java -src/test/java/org/vcell/restclient/model/VersionableTypeVersionTest.java +src/test/java/org/vcell/restclient/model/DataIdentifierTest.java +src/test/java/org/vcell/restclient/model/DomainTest.java diff --git a/vcell-restclient/README.md b/vcell-restclient/README.md index 0dad233058..61d18b2541 100644 --- a/vcell-restclient/README.md +++ b/vcell-restclient/README.md @@ -121,10 +121,12 @@ Class | Method | HTTP request | Description *FieldDataResourceApi* | [**createNewFieldDataFromSimulationWithHttpInfo**](docs/FieldDataResourceApi.md#createNewFieldDataFromSimulationWithHttpInfo) | **POST** /api/v1/fieldData/createFieldDataFromSimulation | Create new field data from a simulation. *FieldDataResourceApi* | [**deleteFieldData**](docs/FieldDataResourceApi.md#deleteFieldData) | **DELETE** /api/v1/fieldData | Delete the selected field data. *FieldDataResourceApi* | [**deleteFieldDataWithHttpInfo**](docs/FieldDataResourceApi.md#deleteFieldDataWithHttpInfo) | **DELETE** /api/v1/fieldData | Delete the selected field data. -*FieldDataResourceApi* | [**generateFieldDataEstimate**](docs/FieldDataResourceApi.md#generateFieldDataEstimate) | **POST** /api/v1/fieldData/createFieldDataFromFile | -*FieldDataResourceApi* | [**generateFieldDataEstimateWithHttpInfo**](docs/FieldDataResourceApi.md#generateFieldDataEstimateWithHttpInfo) | **POST** /api/v1/fieldData/createFieldDataFromFile | -*FieldDataResourceApi* | [**getAllFieldData**](docs/FieldDataResourceApi.md#getAllFieldData) | **GET** /api/v1/fieldData | Get all of the field data for that user. -*FieldDataResourceApi* | [**getAllFieldDataWithHttpInfo**](docs/FieldDataResourceApi.md#getAllFieldDataWithHttpInfo) | **GET** /api/v1/fieldData | Get all of the field data for that user. +*FieldDataResourceApi* | [**generateFieldDataEstimate**](docs/FieldDataResourceApi.md#generateFieldDataEstimate) | **POST** /api/v1/fieldData/analyzeFieldDataFromFile | +*FieldDataResourceApi* | [**generateFieldDataEstimateWithHttpInfo**](docs/FieldDataResourceApi.md#generateFieldDataEstimateWithHttpInfo) | **POST** /api/v1/fieldData/analyzeFieldDataFromFile | +*FieldDataResourceApi* | [**getAllFieldDataIDs**](docs/FieldDataResourceApi.md#getAllFieldDataIDs) | **GET** /api/v1/fieldData/IDs | Get all of the ids used to identify, and retrieve field data. +*FieldDataResourceApi* | [**getAllFieldDataIDsWithHttpInfo**](docs/FieldDataResourceApi.md#getAllFieldDataIDsWithHttpInfo) | **GET** /api/v1/fieldData/IDs | Get all of the ids used to identify, and retrieve field data. +*FieldDataResourceApi* | [**getFieldDataFromID**](docs/FieldDataResourceApi.md#getFieldDataFromID) | **GET** /api/v1/fieldData | Get the field data from the selected field data ID. +*FieldDataResourceApi* | [**getFieldDataFromIDWithHttpInfo**](docs/FieldDataResourceApi.md#getFieldDataFromIDWithHttpInfo) | **GET** /api/v1/fieldData | Get the field data from the selected field data ID. *HelloWorldApi* | [**getHelloWorld**](docs/HelloWorldApi.md#getHelloWorld) | **GET** /api/v1/helloworld | Get hello world message. *HelloWorldApi* | [**getHelloWorldWithHttpInfo**](docs/HelloWorldApi.md#getHelloWorldWithHttpInfo) | **GET** /api/v1/helloworld | Get hello world message. *PublicationResourceApi* | [**createPublication**](docs/PublicationResourceApi.md#createPublication) | **POST** /api/v1/publications | Create publication @@ -174,13 +176,16 @@ Class | Method | HTTP request | Description - [BiomodelRef](docs/BiomodelRef.md) - [CartesianMesh](docs/CartesianMesh.md) - [Coordinate](docs/Coordinate.md) + - [DataIdentifier](docs/DataIdentifier.md) - [DetailedState](docs/DetailedState.md) + - [Domain](docs/Domain.md) - [Extent](docs/Extent.md) - [ExternalDataIdentifier](docs/ExternalDataIdentifier.md) - [FieldDataDBOperationSpec](docs/FieldDataDBOperationSpec.md) - - [FieldDataExternalDataIDs](docs/FieldDataExternalDataIDs.md) - [FieldDataFileOperationSpec](docs/FieldDataFileOperationSpec.md) + - [FieldDataInfo](docs/FieldDataInfo.md) - [FieldDataNoCopyConflict](docs/FieldDataNoCopyConflict.md) + - [FieldDataReferences](docs/FieldDataReferences.md) - [FieldDataSaveResults](docs/FieldDataSaveResults.md) - [GroupAccess](docs/GroupAccess.md) - [HelloWorldMessage](docs/HelloWorldMessage.md) diff --git a/vcell-restclient/api/openapi.yaml b/vcell-restclient/api/openapi.yaml index 5ca89f34f3..42d466a7f5 100644 --- a/vcell-restclient/api/openapi.yaml +++ b/vcell-restclient/api/openapi.yaml @@ -46,10 +46,10 @@ paths: schema: $ref: '#/components/schemas/SimulationStatusPersistentRecord' description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -77,10 +77,10 @@ paths: $ref: '#/components/schemas/StatusMessage' type: array description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -108,10 +108,10 @@ paths: $ref: '#/components/schemas/StatusMessage' type: array description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -149,10 +149,10 @@ paths: schema: type: string description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -219,45 +219,39 @@ paths: x-content-type: text/plain x-accepts: application/json get: - operationId: getAllFieldData + operationId: getFieldDataFromID requestBody: content: - application/json: + text/plain: schema: - $ref: '#/components/schemas/FieldDataDBOperationSpec' + type: string responses: "200": content: application/json: schema: - $ref: '#/components/schemas/FieldDataExternalDataIDs' + $ref: '#/components/schemas/FieldDataInfo' description: OK - summary: Get all of the field data for that user. + summary: Get the field data from the selected field data ID. tags: - Field Data Resource - x-content-type: application/json + x-content-type: text/plain x-accepts: application/json - /api/v1/fieldData/copy: - post: - operationId: copyFieldData - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/FieldDataDBOperationSpec' + /api/v1/fieldData/IDs: + get: + operationId: getAllFieldDataIDs responses: "200": content: application/json: schema: - $ref: '#/components/schemas/FieldDataNoCopyConflict' + $ref: '#/components/schemas/FieldDataReferences' description: OK - summary: Copy an existing field data entry. + summary: "Get all of the ids used to identify, and retrieve field data." tags: - Field Data Resource - x-content-type: application/json x-accepts: application/json - /api/v1/fieldData/createFieldDataFromFile: + /api/v1/fieldData/analyzeFieldDataFromFile: post: operationId: generateFieldDataEstimate requestBody: @@ -276,6 +270,26 @@ paths: - Field Data Resource x-content-type: multipart/form-data x-accepts: application/json + /api/v1/fieldData/copy: + post: + operationId: copyFieldData + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FieldDataDBOperationSpec' + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/FieldDataNoCopyConflict' + description: OK + summary: Copy an existing field data entry. + tags: + - Field Data Resource + x-content-type: application/json + x-accepts: application/json /api/v1/fieldData/createFieldDataFromFileAlreadyAnalyzed: post: operationId: createNewFieldDataFromFileAlreadyAnalyzed @@ -435,10 +449,10 @@ paths: schema: $ref: '#/components/schemas/AccesTokenRepresentationRecord' description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -503,10 +517,10 @@ paths: schema: type: boolean description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -525,10 +539,10 @@ paths: schema: $ref: '#/components/schemas/UserIdentityJSONSafe' description: "Successful, returning the identity" - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -563,10 +577,10 @@ paths: description: "Successful, returning the identity" "409": description: "VCell Identity not mapped, userid already exists" - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -618,10 +632,10 @@ paths: description: magic link sent in email if appropriate "400": description: unable to process request - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -647,10 +661,10 @@ paths: schema: type: boolean description: OK - "401": - description: Not Authorized "403": description: Not Allowed + "401": + description: Not Authorized security: - openId: - user @@ -684,22 +698,22 @@ components: AnalyzedResultsFromFieldData: example: extent: - x: 6.704019297950036 - "y": 3.353193347011243 - z: 3.0937452626664474 + x: 0.8008281904610115 + "y": 6.027456183070403 + z: 1.4658129805029452 annotation: annotation times: - 6.027456183070403 - 6.027456183070403 origin: - x: 6.778324963048013 - "y": 6.878052220127876 - z: 5.944895607614016 + x: 5.962133916683182 + "y": 5.637376656633329 + z: 2.3021358869347655 isize: - x: 9 - xYZ: 9 - "y": 6 - z: 8 + x: 7 + xYZ: 2 + "y": 9 + z: 3 name: name varNames: - varNames @@ -829,10 +843,10 @@ components: CartesianMesh: example: iSize: - x: 9 - xYZ: 9 - "y": 6 - z: 8 + x: 7 + xYZ: 2 + "y": 9 + z: 3 chomboMesh: true uCDInfo: numPointsXYZ: 7 @@ -914,7 +928,7 @@ components: outputFields: - "" - "" - sizeX: 6 + sizeX: 9 membraneRegionMapSubvolumesInOut: key: "" numVolumeRegions: 9 @@ -924,8 +938,8 @@ components: compressedBytes: "" volumeRegionMapSubvolume: key: 7 - sizeY: 3 - sizeZ: 6 + sizeY: 6 + sizeZ: 8 properties: compressedBytes: format: binary @@ -990,6 +1004,41 @@ components: format: double type: number type: object + DataIdentifier: + example: + variableType: + defaultUnits: defaultUnits + name: name + typeName: typeName + defaultLabel: defaultLabel + units: units + label: label + type: 4 + variableDomain: null + legacyWarn: true + visible: true + displayName: displayName + bFunction: true + domain: + name: name + function: true + name: name + properties: + name: + type: string + displayName: + type: string + variableType: + $ref: '#/components/schemas/VariableType' + domain: + $ref: '#/components/schemas/Domain' + bFunction: + type: boolean + function: + type: boolean + visible: + type: boolean + type: object Date: example: 2022-03-10 format: date @@ -1047,11 +1096,18 @@ components: - WORKEREVENT_FAILURE - JOB_FAILED type: string + Domain: + example: + name: name + properties: + name: + type: string + type: object Extent: example: - x: 6.704019297950036 - "y": 3.353193347011243 - z: 3.0937452626664474 + x: 0.8008281904610115 + "y": 6.027456183070403 + z: 1.4658129805029452 properties: x: format: double @@ -1224,68 +1280,6 @@ components: bIncludeSimRefs: type: boolean type: object - FieldDataExternalDataIDs: - example: - externalDataIdentifiers: - - owner: - testAccount: true - name: name - iD: - value: 0.8008281904610115 - userName: userName - key: - value: 0.8008281904610115 - dataKey: - value: 0.8008281904610115 - simulationKey: - value: 0.8008281904610115 - jobIndex: 0 - name: name - iD: iD - key: - value: 0.8008281904610115 - parameterScanType: true - - owner: - testAccount: true - name: name - iD: - value: 0.8008281904610115 - userName: userName - key: - value: 0.8008281904610115 - dataKey: - value: 0.8008281904610115 - simulationKey: - value: 0.8008281904610115 - jobIndex: 0 - name: name - iD: iD - key: - value: 0.8008281904610115 - parameterScanType: true - externalDataAnnotations: - - externalDataAnnotations - - externalDataAnnotations - externalDataIDSimRefs: - key: - - value: 0.8008281904610115 - - value: 0.8008281904610115 - properties: - externalDataIdentifiers: - items: - $ref: '#/components/schemas/ExternalDataIdentifier' - type: array - externalDataAnnotations: - items: - type: string - type: array - externalDataIDSimRefs: - additionalProperties: - items: - $ref: '#/components/schemas/KeyValue' - type: array - type: object - type: object FieldDataFile: properties: file: @@ -1305,9 +1299,9 @@ components: key: value: 0.8008281904610115 extent: - x: 6.704019297950036 - "y": 3.353193347011243 - z: 3.0937452626664474 + x: 0.8008281904610115 + "y": 6.027456183070403 + z: 1.4658129805029452 annotation: annotation variableTypes: - defaultUnits: defaultUnits @@ -1316,7 +1310,7 @@ components: defaultLabel: defaultLabel units: units label: label - type: 1 + type: 4 variableDomain: null legacyWarn: true - defaultUnits: defaultUnits @@ -1325,7 +1319,7 @@ components: defaultLabel: defaultLabel units: units label: label - type: 1 + type: 4 variableDomain: null legacyWarn: true doubleSpecData: @@ -1358,9 +1352,9 @@ components: value: 0.8008281904610115 parameterScanType: true origin: - x: 6.778324963048013 - "y": 6.878052220127876 - z: 5.944895607614016 + x: 5.962133916683182 + "y": 5.637376656633329 + z: 2.3021358869347655 varNames: - varNames - varNames @@ -1381,24 +1375,24 @@ components: - 6 - - 6 - 6 - sourceSimParamScanJobIndex: 7 + sourceSimParamScanJobIndex: 6 times: - - 2.8841621266687802 - - 2.8841621266687802 + - 9.018348186070783 + - 9.018348186070783 fieldDataName: fieldDataName sourceSimDataKey: value: 0.8008281904610115 isize: - x: 9 - xYZ: 9 - "y": 6 - z: 8 + x: 7 + xYZ: 2 + "y": 9 + z: 3 cartesianMesh: iSize: - x: 9 - xYZ: 9 - "y": 6 - z: 8 + x: 7 + xYZ: 2 + "y": 9 + z: 3 chomboMesh: true uCDInfo: numPointsXYZ: 7 @@ -1480,7 +1474,7 @@ components: outputFields: - "" - "" - sizeX: 6 + sizeX: 9 membraneRegionMapSubvolumesInOut: key: "" numVolumeRegions: 9 @@ -1490,8 +1484,8 @@ components: compressedBytes: "" volumeRegionMapSubvolume: key: 7 - sizeY: 3 - sizeZ: 6 + sizeY: 6 + sizeZ: 8 properties: opType: format: int32 @@ -1550,6 +1544,76 @@ components: fieldDataName: type: string type: object + FieldDataInfo: + example: + extent: + x: 0.8008281904610115 + "y": 6.027456183070403 + z: 1.4658129805029452 + times: + - 7.386281948385884 + - 7.386281948385884 + origin: + x: 5.962133916683182 + "y": 5.637376656633329 + z: 2.3021358869347655 + isize: + x: 7 + xYZ: 2 + "y": 9 + z: 3 + dataIdentifier: + - variableType: + defaultUnits: defaultUnits + name: name + typeName: typeName + defaultLabel: defaultLabel + units: units + label: label + type: 4 + variableDomain: null + legacyWarn: true + visible: true + displayName: displayName + bFunction: true + domain: + name: name + function: true + name: name + - variableType: + defaultUnits: defaultUnits + name: name + typeName: typeName + defaultLabel: defaultLabel + units: units + label: label + type: 4 + variableDomain: null + legacyWarn: true + visible: true + displayName: displayName + bFunction: true + domain: + name: name + function: true + name: name + properties: + extent: + $ref: '#/components/schemas/Extent' + origin: + $ref: '#/components/schemas/Origin' + isize: + $ref: '#/components/schemas/ISize' + dataIdentifier: + items: + $ref: '#/components/schemas/DataIdentifier' + type: array + times: + items: + format: double + type: number + type: array + type: object FieldDataNoCopyConflict: example: oldNameOldExtDataIDKeyHash: @@ -1585,6 +1649,68 @@ components: $ref: '#/components/schemas/KeyValue' type: object type: object + FieldDataReferences: + example: + externalDataIdentifiers: + - owner: + testAccount: true + name: name + iD: + value: 0.8008281904610115 + userName: userName + key: + value: 0.8008281904610115 + dataKey: + value: 0.8008281904610115 + simulationKey: + value: 0.8008281904610115 + jobIndex: 0 + name: name + iD: iD + key: + value: 0.8008281904610115 + parameterScanType: true + - owner: + testAccount: true + name: name + iD: + value: 0.8008281904610115 + userName: userName + key: + value: 0.8008281904610115 + dataKey: + value: 0.8008281904610115 + simulationKey: + value: 0.8008281904610115 + jobIndex: 0 + name: name + iD: iD + key: + value: 0.8008281904610115 + parameterScanType: true + externalDataAnnotations: + - externalDataAnnotations + - externalDataAnnotations + externalDataIDSimRefs: + key: + - value: 0.8008281904610115 + - value: 0.8008281904610115 + properties: + externalDataIdentifiers: + items: + $ref: '#/components/schemas/ExternalDataIdentifier' + type: array + externalDataAnnotations: + items: + type: string + type: array + externalDataIDSimRefs: + additionalProperties: + items: + $ref: '#/components/schemas/KeyValue' + type: array + type: object + type: object FieldDataSaveResults: example: fieldDataName: fieldDataName @@ -1628,10 +1754,10 @@ components: type: object ISize: example: - x: 9 - xYZ: 9 - "y": 6 - z: 8 + x: 7 + xYZ: 2 + "y": 9 + z: 3 properties: x: format: int32 @@ -1709,9 +1835,9 @@ components: type: object Origin: example: - x: 6.778324963048013 - "y": 6.878052220127876 - z: 5.944895607614016 + x: 5.962133916683182 + "y": 5.637376656633329 + z: 2.3021358869347655 properties: x: format: double @@ -2285,7 +2411,7 @@ components: defaultLabel: defaultLabel units: units label: label - type: 1 + type: 4 variableDomain: null legacyWarn: true properties: diff --git a/vcell-restclient/docs/BioModelResourceApi.md b/vcell-restclient/docs/BioModelResourceApi.md index b2569706e5..c8041e9297 100644 --- a/vcell-restclient/docs/BioModelResourceApi.md +++ b/vcell-restclient/docs/BioModelResourceApi.md @@ -337,8 +337,8 @@ public class Example { | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## uploadBioModelWithHttpInfo @@ -407,6 +407,6 @@ ApiResponse<**String**> | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | diff --git a/vcell-restclient/docs/DataIdentifier.md b/vcell-restclient/docs/DataIdentifier.md new file mode 100644 index 0000000000..05492fc09f --- /dev/null +++ b/vcell-restclient/docs/DataIdentifier.md @@ -0,0 +1,19 @@ + + +# DataIdentifier + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | +|**displayName** | **String** | | [optional] | +|**variableType** | [**VariableType**](VariableType.md) | | [optional] | +|**domain** | [**Domain**](Domain.md) | | [optional] | +|**bFunction** | **Boolean** | | [optional] | +|**function** | **Boolean** | | [optional] | +|**visible** | **Boolean** | | [optional] | + + + diff --git a/vcell-restclient/docs/Domain.md b/vcell-restclient/docs/Domain.md new file mode 100644 index 0000000000..6c23698b2f --- /dev/null +++ b/vcell-restclient/docs/Domain.md @@ -0,0 +1,13 @@ + + +# Domain + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/vcell-restclient/docs/FieldDataInfo.md b/vcell-restclient/docs/FieldDataInfo.md new file mode 100644 index 0000000000..33a2c58321 --- /dev/null +++ b/vcell-restclient/docs/FieldDataInfo.md @@ -0,0 +1,17 @@ + + +# FieldDataInfo + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**extent** | [**Extent**](Extent.md) | | [optional] | +|**origin** | [**Origin**](Origin.md) | | [optional] | +|**isize** | [**ISize**](ISize.md) | | [optional] | +|**dataIdentifier** | [**List<DataIdentifier>**](DataIdentifier.md) | | [optional] | +|**times** | **List<Double>** | | [optional] | + + + diff --git a/vcell-restclient/docs/FieldDataReferences.md b/vcell-restclient/docs/FieldDataReferences.md new file mode 100644 index 0000000000..31b2267473 --- /dev/null +++ b/vcell-restclient/docs/FieldDataReferences.md @@ -0,0 +1,15 @@ + + +# FieldDataReferences + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**externalDataIdentifiers** | [**List<ExternalDataIdentifier>**](ExternalDataIdentifier.md) | | [optional] | +|**externalDataAnnotations** | **List<String>** | | [optional] | +|**externalDataIDSimRefs** | **Map<String, List<KeyValue>>** | | [optional] | + + + diff --git a/vcell-restclient/docs/FieldDataResourceApi.md b/vcell-restclient/docs/FieldDataResourceApi.md index 5c94f60a88..494855dbce 100644 --- a/vcell-restclient/docs/FieldDataResourceApi.md +++ b/vcell-restclient/docs/FieldDataResourceApi.md @@ -12,10 +12,12 @@ All URIs are relative to *https://vcell-dev.cam.uchc.edu* | [**createNewFieldDataFromSimulationWithHttpInfo**](FieldDataResourceApi.md#createNewFieldDataFromSimulationWithHttpInfo) | **POST** /api/v1/fieldData/createFieldDataFromSimulation | Create new field data from a simulation. | | [**deleteFieldData**](FieldDataResourceApi.md#deleteFieldData) | **DELETE** /api/v1/fieldData | Delete the selected field data. | | [**deleteFieldDataWithHttpInfo**](FieldDataResourceApi.md#deleteFieldDataWithHttpInfo) | **DELETE** /api/v1/fieldData | Delete the selected field data. | -| [**generateFieldDataEstimate**](FieldDataResourceApi.md#generateFieldDataEstimate) | **POST** /api/v1/fieldData/createFieldDataFromFile | | -| [**generateFieldDataEstimateWithHttpInfo**](FieldDataResourceApi.md#generateFieldDataEstimateWithHttpInfo) | **POST** /api/v1/fieldData/createFieldDataFromFile | | -| [**getAllFieldData**](FieldDataResourceApi.md#getAllFieldData) | **GET** /api/v1/fieldData | Get all of the field data for that user. | -| [**getAllFieldDataWithHttpInfo**](FieldDataResourceApi.md#getAllFieldDataWithHttpInfo) | **GET** /api/v1/fieldData | Get all of the field data for that user. | +| [**generateFieldDataEstimate**](FieldDataResourceApi.md#generateFieldDataEstimate) | **POST** /api/v1/fieldData/analyzeFieldDataFromFile | | +| [**generateFieldDataEstimateWithHttpInfo**](FieldDataResourceApi.md#generateFieldDataEstimateWithHttpInfo) | **POST** /api/v1/fieldData/analyzeFieldDataFromFile | | +| [**getAllFieldDataIDs**](FieldDataResourceApi.md#getAllFieldDataIDs) | **GET** /api/v1/fieldData/IDs | Get all of the ids used to identify, and retrieve field data. | +| [**getAllFieldDataIDsWithHttpInfo**](FieldDataResourceApi.md#getAllFieldDataIDsWithHttpInfo) | **GET** /api/v1/fieldData/IDs | Get all of the ids used to identify, and retrieve field data. | +| [**getFieldDataFromID**](FieldDataResourceApi.md#getFieldDataFromID) | **GET** /api/v1/fieldData | Get the field data from the selected field data ID. | +| [**getFieldDataFromIDWithHttpInfo**](FieldDataResourceApi.md#getFieldDataFromIDWithHttpInfo) | **GET** /api/v1/fieldData | Get the field data from the selected field data ID. | @@ -671,11 +673,11 @@ No authorization required | **200** | OK | - | -## getAllFieldData +## getAllFieldDataIDs -> FieldDataExternalDataIDs getAllFieldData(fieldDataDBOperationSpec) +> FieldDataReferences getAllFieldDataIDs() -Get all of the field data for that user. +Get all of the ids used to identify, and retrieve field data. ### Example @@ -693,12 +695,134 @@ public class Example { defaultClient.setBasePath("https://vcell-dev.cam.uchc.edu"); FieldDataResourceApi apiInstance = new FieldDataResourceApi(defaultClient); - FieldDataDBOperationSpec fieldDataDBOperationSpec = new FieldDataDBOperationSpec(); // FieldDataDBOperationSpec | try { - FieldDataExternalDataIDs result = apiInstance.getAllFieldData(fieldDataDBOperationSpec); + FieldDataReferences result = apiInstance.getAllFieldDataIDs(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FieldDataResourceApi#getAllFieldDataIDs"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +[**FieldDataReferences**](FieldDataReferences.md) + + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | OK | - | + +## getAllFieldDataIDsWithHttpInfo + +> ApiResponse getAllFieldDataIDs getAllFieldDataIDsWithHttpInfo() + +Get all of the ids used to identify, and retrieve field data. + +### Example + +```java +// Import classes: +import org.vcell.restclient.ApiClient; +import org.vcell.restclient.ApiException; +import org.vcell.restclient.ApiResponse; +import org.vcell.restclient.Configuration; +import org.vcell.restclient.models.*; +import org.vcell.restclient.api.FieldDataResourceApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("https://vcell-dev.cam.uchc.edu"); + + FieldDataResourceApi apiInstance = new FieldDataResourceApi(defaultClient); + try { + ApiResponse response = apiInstance.getAllFieldDataIDsWithHttpInfo(); + System.out.println("Status code: " + response.getStatusCode()); + System.out.println("Response headers: " + response.getHeaders()); + System.out.println("Response body: " + response.getData()); + } catch (ApiException e) { + System.err.println("Exception when calling FieldDataResourceApi#getAllFieldDataIDs"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Response headers: " + e.getResponseHeaders()); + System.err.println("Reason: " + e.getResponseBody()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +ApiResponse<[**FieldDataReferences**](FieldDataReferences.md)> + + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | OK | - | + + +## getFieldDataFromID + +> FieldDataInfo getFieldDataFromID(body) + +Get the field data from the selected field data ID. + +### Example + +```java +// Import classes: +import org.vcell.restclient.ApiClient; +import org.vcell.restclient.ApiException; +import org.vcell.restclient.Configuration; +import org.vcell.restclient.models.*; +import org.vcell.restclient.api.FieldDataResourceApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("https://vcell-dev.cam.uchc.edu"); + + FieldDataResourceApi apiInstance = new FieldDataResourceApi(defaultClient); + String body = "body_example"; // String | + try { + FieldDataInfo result = apiInstance.getFieldDataFromID(body); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling FieldDataResourceApi#getAllFieldData"); + System.err.println("Exception when calling FieldDataResourceApi#getFieldDataFromID"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -713,11 +837,11 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **fieldDataDBOperationSpec** | [**FieldDataDBOperationSpec**](FieldDataDBOperationSpec.md)| | [optional] | +| **body** | **String**| | [optional] | ### Return type -[**FieldDataExternalDataIDs**](FieldDataExternalDataIDs.md) +[**FieldDataInfo**](FieldDataInfo.md) ### Authorization @@ -726,7 +850,7 @@ No authorization required ### HTTP request headers -- **Content-Type**: application/json +- **Content-Type**: text/plain - **Accept**: application/json ### HTTP response details @@ -734,11 +858,11 @@ No authorization required |-------------|-------------|------------------| | **200** | OK | - | -## getAllFieldDataWithHttpInfo +## getFieldDataFromIDWithHttpInfo -> ApiResponse getAllFieldData getAllFieldDataWithHttpInfo(fieldDataDBOperationSpec) +> ApiResponse getFieldDataFromID getFieldDataFromIDWithHttpInfo(body) -Get all of the field data for that user. +Get the field data from the selected field data ID. ### Example @@ -757,14 +881,14 @@ public class Example { defaultClient.setBasePath("https://vcell-dev.cam.uchc.edu"); FieldDataResourceApi apiInstance = new FieldDataResourceApi(defaultClient); - FieldDataDBOperationSpec fieldDataDBOperationSpec = new FieldDataDBOperationSpec(); // FieldDataDBOperationSpec | + String body = "body_example"; // String | try { - ApiResponse response = apiInstance.getAllFieldDataWithHttpInfo(fieldDataDBOperationSpec); + ApiResponse response = apiInstance.getFieldDataFromIDWithHttpInfo(body); System.out.println("Status code: " + response.getStatusCode()); System.out.println("Response headers: " + response.getHeaders()); System.out.println("Response body: " + response.getData()); } catch (ApiException e) { - System.err.println("Exception when calling FieldDataResourceApi#getAllFieldData"); + System.err.println("Exception when calling FieldDataResourceApi#getFieldDataFromID"); System.err.println("Status code: " + e.getCode()); System.err.println("Response headers: " + e.getResponseHeaders()); System.err.println("Reason: " + e.getResponseBody()); @@ -779,11 +903,11 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **fieldDataDBOperationSpec** | [**FieldDataDBOperationSpec**](FieldDataDBOperationSpec.md)| | [optional] | +| **body** | **String**| | [optional] | ### Return type -ApiResponse<[**FieldDataExternalDataIDs**](FieldDataExternalDataIDs.md)> +ApiResponse<[**FieldDataInfo**](FieldDataInfo.md)> ### Authorization @@ -792,7 +916,7 @@ No authorization required ### HTTP request headers -- **Content-Type**: application/json +- **Content-Type**: text/plain - **Accept**: application/json ### HTTP response details diff --git a/vcell-restclient/docs/SimulationResourceApi.md b/vcell-restclient/docs/SimulationResourceApi.md index 1b3a3c3c5e..934d319186 100644 --- a/vcell-restclient/docs/SimulationResourceApi.md +++ b/vcell-restclient/docs/SimulationResourceApi.md @@ -81,8 +81,8 @@ public class Example { | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## getSimulationStatusWithHttpInfo @@ -155,8 +155,8 @@ ApiResponse<[**SimulationStatusPersistentRecord**](SimulationStatusPersistentRec | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## startSimulation @@ -223,8 +223,8 @@ public class Example { | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## startSimulationWithHttpInfo @@ -293,8 +293,8 @@ ApiResponse<[**List<StatusMessage>**](StatusMessage.md)> | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## stopSimulation @@ -361,8 +361,8 @@ public class Example { | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## stopSimulationWithHttpInfo @@ -431,6 +431,6 @@ ApiResponse<[**List<StatusMessage>**](StatusMessage.md)> | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | diff --git a/vcell-restclient/docs/UsersResourceApi.md b/vcell-restclient/docs/UsersResourceApi.md index 831c4b98c6..d265979677 100644 --- a/vcell-restclient/docs/UsersResourceApi.md +++ b/vcell-restclient/docs/UsersResourceApi.md @@ -347,8 +347,8 @@ This endpoint does not need any parameter. | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## getLegacyApiTokenWithHttpInfo @@ -413,8 +413,8 @@ ApiResponse<[**AccesTokenRepresentationRecord**](AccesTokenRepresentationRecord. | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## getMappedUser @@ -477,8 +477,8 @@ This endpoint does not need any parameter. | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | Successful, returning the identity | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## getMappedUserWithHttpInfo @@ -543,8 +543,8 @@ ApiResponse<[**UserIdentityJSONSafe**](UserIdentityJSONSafe.md)> | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | Successful, returning the identity | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## getMe @@ -733,8 +733,8 @@ null (empty response body) |-------------|-------------|------------------| | **200** | Successful, returning the identity | - | | **409** | VCell Identity not mapped, userid already exists | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## mapNewUserWithHttpInfo @@ -803,8 +803,8 @@ ApiResponse |-------------|-------------|------------------| | **200** | Successful, returning the identity | - | | **409** | VCell Identity not mapped, userid already exists | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## mapUser @@ -871,8 +871,8 @@ public class Example { | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## mapUserWithHttpInfo @@ -941,8 +941,8 @@ ApiResponse<**Boolean**> | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## processMagicLink @@ -1141,8 +1141,8 @@ null (empty response body) |-------------|-------------|------------------| | **200** | magic link sent in email if appropriate | - | | **400** | unable to process request | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## requestRecoveryEmailWithHttpInfo @@ -1213,8 +1213,8 @@ ApiResponse |-------------|-------------|------------------| | **200** | magic link sent in email if appropriate | - | | **400** | unable to process request | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## unmapUser @@ -1281,8 +1281,8 @@ public class Example { | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | ## unmapUserWithHttpInfo @@ -1351,6 +1351,6 @@ ApiResponse<**Boolean**> | Status code | Description | Response headers | |-------------|-------------|------------------| | **200** | OK | - | -| **401** | Not Authorized | - | | **403** | Not Allowed | - | +| **401** | Not Authorized | - | diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/api/FieldDataResourceApi.java b/vcell-restclient/src/main/java/org/vcell/restclient/api/FieldDataResourceApi.java index dce0628f5d..10a6c6b4e5 100644 --- a/vcell-restclient/src/main/java/org/vcell/restclient/api/FieldDataResourceApi.java +++ b/vcell-restclient/src/main/java/org/vcell/restclient/api/FieldDataResourceApi.java @@ -20,9 +20,10 @@ import org.vcell.restclient.model.AnalyzedResultsFromFieldData; import org.vcell.restclient.model.ExternalDataIdentifier; import org.vcell.restclient.model.FieldDataDBOperationSpec; -import org.vcell.restclient.model.FieldDataExternalDataIDs; import org.vcell.restclient.model.FieldDataFileOperationSpec; +import org.vcell.restclient.model.FieldDataInfo; import org.vcell.restclient.model.FieldDataNoCopyConflict; +import org.vcell.restclient.model.FieldDataReferences; import org.vcell.restclient.model.FieldDataSaveResults; import java.io.File; @@ -438,7 +439,7 @@ private HttpRequest.Builder generateFieldDataEstimateRequestBuilder(File _file, HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder(); - String localVarPath = "/api/v1/fieldData/createFieldDataFromFile"; + String localVarPath = "/api/v1/fieldData/analyzeFieldDataFromFile"; localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); @@ -488,26 +489,24 @@ private HttpRequest.Builder generateFieldDataEstimateRequestBuilder(File _file, return localVarRequestBuilder; } /** - * Get all of the field data for that user. + * Get all of the ids used to identify, and retrieve field data. * - * @param fieldDataDBOperationSpec (optional) - * @return FieldDataExternalDataIDs + * @return FieldDataReferences * @throws ApiException if fails to make API call */ - public FieldDataExternalDataIDs getAllFieldData(FieldDataDBOperationSpec fieldDataDBOperationSpec) throws ApiException { - ApiResponse localVarResponse = getAllFieldDataWithHttpInfo(fieldDataDBOperationSpec); + public FieldDataReferences getAllFieldDataIDs() throws ApiException { + ApiResponse localVarResponse = getAllFieldDataIDsWithHttpInfo(); return localVarResponse.getData(); } /** - * Get all of the field data for that user. + * Get all of the ids used to identify, and retrieve field data. * - * @param fieldDataDBOperationSpec (optional) - * @return ApiResponse<FieldDataExternalDataIDs> + * @return ApiResponse<FieldDataReferences> * @throws ApiException if fails to make API call */ - public ApiResponse getAllFieldDataWithHttpInfo(FieldDataDBOperationSpec fieldDataDBOperationSpec) throws ApiException { - HttpRequest.Builder localVarRequestBuilder = getAllFieldDataRequestBuilder(fieldDataDBOperationSpec); + public ApiResponse getAllFieldDataIDsWithHttpInfo() throws ApiException { + HttpRequest.Builder localVarRequestBuilder = getAllFieldDataIDsRequestBuilder(); try { HttpResponse localVarResponse = memberVarHttpClient.send( localVarRequestBuilder.build(), @@ -517,12 +516,12 @@ public ApiResponse getAllFieldDataWithHttpInfo(FieldDa } try { if (localVarResponse.statusCode()/ 100 != 2) { - throw getApiException("getAllFieldData", localVarResponse); + throw getApiException("getAllFieldDataIDs", localVarResponse); } - return new ApiResponse( + return new ApiResponse( localVarResponse.statusCode(), localVarResponse.headers().map(), - localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream ); } finally { } @@ -535,23 +534,85 @@ public ApiResponse getAllFieldDataWithHttpInfo(FieldDa } } - private HttpRequest.Builder getAllFieldDataRequestBuilder(FieldDataDBOperationSpec fieldDataDBOperationSpec) throws ApiException { + private HttpRequest.Builder getAllFieldDataIDsRequestBuilder() throws ApiException { HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder(); - String localVarPath = "/api/v1/fieldData"; + String localVarPath = "/api/v1/fieldData/IDs"; localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); - localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Accept", "application/json"); + localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); + if (memberVarReadTimeout != null) { + localVarRequestBuilder.timeout(memberVarReadTimeout); + } + if (memberVarInterceptor != null) { + memberVarInterceptor.accept(localVarRequestBuilder); + } + return localVarRequestBuilder; + } + /** + * Get the field data from the selected field data ID. + * + * @param body (optional) + * @return FieldDataInfo + * @throws ApiException if fails to make API call + */ + public FieldDataInfo getFieldDataFromID(String body) throws ApiException { + ApiResponse localVarResponse = getFieldDataFromIDWithHttpInfo(body); + return localVarResponse.getData(); + } + + /** + * Get the field data from the selected field data ID. + * + * @param body (optional) + * @return ApiResponse<FieldDataInfo> + * @throws ApiException if fails to make API call + */ + public ApiResponse getFieldDataFromIDWithHttpInfo(String body) throws ApiException { + HttpRequest.Builder localVarRequestBuilder = getFieldDataFromIDRequestBuilder(body); try { - byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(fieldDataDBOperationSpec); - localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody)); + HttpResponse localVarResponse = memberVarHttpClient.send( + localVarRequestBuilder.build(), + HttpResponse.BodyHandlers.ofInputStream()); + if (memberVarResponseInterceptor != null) { + memberVarResponseInterceptor.accept(localVarResponse); + } + try { + if (localVarResponse.statusCode()/ 100 != 2) { + throw getApiException("getFieldDataFromID", localVarResponse); + } + return new ApiResponse( + localVarResponse.statusCode(), + localVarResponse.headers().map(), + localVarResponse.body() == null ? null : memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference() {}) // closes the InputStream + ); + } finally { + } } catch (IOException e) { throw new ApiException(e); } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new ApiException(e); + } + } + + private HttpRequest.Builder getFieldDataFromIDRequestBuilder(String body) throws ApiException { + + HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder(); + + String localVarPath = "/api/v1/fieldData"; + + localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); + + localVarRequestBuilder.header("Content-Type", "text/plain"); + localVarRequestBuilder.header("Accept", "application/json"); + + localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.ofString(body)); if (memberVarReadTimeout != null) { localVarRequestBuilder.timeout(memberVarReadTimeout); } diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/AccessTokenRepresentation.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/AccessTokenRepresentation.java deleted file mode 100644 index 8df8742129..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/AccessTokenRepresentation.java +++ /dev/null @@ -1,294 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * AccessTokenRepresentation - */ -@JsonPropertyOrder({ - AccessTokenRepresentation.JSON_PROPERTY_TOKEN, - AccessTokenRepresentation.JSON_PROPERTY_CREATION_DATE_SECONDS, - AccessTokenRepresentation.JSON_PROPERTY_EXPIRE_DATE_SECONDS, - AccessTokenRepresentation.JSON_PROPERTY_USER_ID, - AccessTokenRepresentation.JSON_PROPERTY_USER_KEY -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class AccessTokenRepresentation { - public static final String JSON_PROPERTY_TOKEN = "token"; - private String token; - - public static final String JSON_PROPERTY_CREATION_DATE_SECONDS = "creationDateSeconds"; - private Long creationDateSeconds; - - public static final String JSON_PROPERTY_EXPIRE_DATE_SECONDS = "expireDateSeconds"; - private Long expireDateSeconds; - - public static final String JSON_PROPERTY_USER_ID = "userId"; - private String userId; - - public static final String JSON_PROPERTY_USER_KEY = "userKey"; - private String userKey; - - public AccessTokenRepresentation() { - } - - public AccessTokenRepresentation token(String token) { - this.token = token; - return this; - } - - /** - * Get token - * @return token - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_TOKEN) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getToken() { - return token; - } - - - @JsonProperty(JSON_PROPERTY_TOKEN) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setToken(String token) { - this.token = token; - } - - - public AccessTokenRepresentation creationDateSeconds(Long creationDateSeconds) { - this.creationDateSeconds = creationDateSeconds; - return this; - } - - /** - * Get creationDateSeconds - * @return creationDateSeconds - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_CREATION_DATE_SECONDS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Long getCreationDateSeconds() { - return creationDateSeconds; - } - - - @JsonProperty(JSON_PROPERTY_CREATION_DATE_SECONDS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setCreationDateSeconds(Long creationDateSeconds) { - this.creationDateSeconds = creationDateSeconds; - } - - - public AccessTokenRepresentation expireDateSeconds(Long expireDateSeconds) { - this.expireDateSeconds = expireDateSeconds; - return this; - } - - /** - * Get expireDateSeconds - * @return expireDateSeconds - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_EXPIRE_DATE_SECONDS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Long getExpireDateSeconds() { - return expireDateSeconds; - } - - - @JsonProperty(JSON_PROPERTY_EXPIRE_DATE_SECONDS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setExpireDateSeconds(Long expireDateSeconds) { - this.expireDateSeconds = expireDateSeconds; - } - - - public AccessTokenRepresentation userId(String userId) { - this.userId = userId; - return this; - } - - /** - * Get userId - * @return userId - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_USER_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getUserId() { - return userId; - } - - - @JsonProperty(JSON_PROPERTY_USER_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUserId(String userId) { - this.userId = userId; - } - - - public AccessTokenRepresentation userKey(String userKey) { - this.userKey = userKey; - return this; - } - - /** - * Get userKey - * @return userKey - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_USER_KEY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getUserKey() { - return userKey; - } - - - @JsonProperty(JSON_PROPERTY_USER_KEY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUserKey(String userKey) { - this.userKey = userKey; - } - - - /** - * Return true if this AccessTokenRepresentation object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AccessTokenRepresentation accessTokenRepresentation = (AccessTokenRepresentation) o; - return Objects.equals(this.token, accessTokenRepresentation.token) && - Objects.equals(this.creationDateSeconds, accessTokenRepresentation.creationDateSeconds) && - Objects.equals(this.expireDateSeconds, accessTokenRepresentation.expireDateSeconds) && - Objects.equals(this.userId, accessTokenRepresentation.userId) && - Objects.equals(this.userKey, accessTokenRepresentation.userKey); - } - - @Override - public int hashCode() { - return Objects.hash(token, creationDateSeconds, expireDateSeconds, userId, userKey); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AccessTokenRepresentation {\n"); - sb.append(" token: ").append(toIndentedString(token)).append("\n"); - sb.append(" creationDateSeconds: ").append(toIndentedString(creationDateSeconds)).append("\n"); - sb.append(" expireDateSeconds: ").append(toIndentedString(expireDateSeconds)).append("\n"); - sb.append(" userId: ").append(toIndentedString(userId)).append("\n"); - sb.append(" userKey: ").append(toIndentedString(userKey)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `token` to the URL query string - if (getToken() != null) { - joiner.add(String.format("%stoken%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `creationDateSeconds` to the URL query string - if (getCreationDateSeconds() != null) { - joiner.add(String.format("%screationDateSeconds%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getCreationDateSeconds()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `expireDateSeconds` to the URL query string - if (getExpireDateSeconds() != null) { - joiner.add(String.format("%sexpireDateSeconds%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getExpireDateSeconds()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `userId` to the URL query string - if (getUserId() != null) { - joiner.add(String.format("%suserId%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getUserId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `userKey` to the URL query string - if (getUserKey() != null) { - joiner.add(String.format("%suserKey%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getUserKey()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/DataIdentifier.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/DataIdentifier.java new file mode 100644 index 0000000000..15e202a03d --- /dev/null +++ b/vcell-restclient/src/main/java/org/vcell/restclient/model/DataIdentifier.java @@ -0,0 +1,368 @@ +/* + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.vcell.restclient.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Arrays; +import org.vcell.restclient.model.Domain; +import org.vcell.restclient.model.VariableType; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * DataIdentifier + */ +@JsonPropertyOrder({ + DataIdentifier.JSON_PROPERTY_NAME, + DataIdentifier.JSON_PROPERTY_DISPLAY_NAME, + DataIdentifier.JSON_PROPERTY_VARIABLE_TYPE, + DataIdentifier.JSON_PROPERTY_DOMAIN, + DataIdentifier.JSON_PROPERTY_B_FUNCTION, + DataIdentifier.JSON_PROPERTY_FUNCTION, + DataIdentifier.JSON_PROPERTY_VISIBLE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class DataIdentifier { + public static final String JSON_PROPERTY_NAME = "name"; + private String name; + + public static final String JSON_PROPERTY_DISPLAY_NAME = "displayName"; + private String displayName; + + public static final String JSON_PROPERTY_VARIABLE_TYPE = "variableType"; + private VariableType variableType; + + public static final String JSON_PROPERTY_DOMAIN = "domain"; + private Domain domain; + + public static final String JSON_PROPERTY_B_FUNCTION = "bFunction"; + private Boolean bFunction; + + public static final String JSON_PROPERTY_FUNCTION = "function"; + private Boolean function; + + public static final String JSON_PROPERTY_VISIBLE = "visible"; + private Boolean visible; + + public DataIdentifier() { + } + + public DataIdentifier name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(String name) { + this.name = name; + } + + + public DataIdentifier displayName(String displayName) { + this.displayName = displayName; + return this; + } + + /** + * Get displayName + * @return displayName + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DISPLAY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getDisplayName() { + return displayName; + } + + + @JsonProperty(JSON_PROPERTY_DISPLAY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + + public DataIdentifier variableType(VariableType variableType) { + this.variableType = variableType; + return this; + } + + /** + * Get variableType + * @return variableType + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_VARIABLE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public VariableType getVariableType() { + return variableType; + } + + + @JsonProperty(JSON_PROPERTY_VARIABLE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setVariableType(VariableType variableType) { + this.variableType = variableType; + } + + + public DataIdentifier domain(Domain domain) { + this.domain = domain; + return this; + } + + /** + * Get domain + * @return domain + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DOMAIN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Domain getDomain() { + return domain; + } + + + @JsonProperty(JSON_PROPERTY_DOMAIN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDomain(Domain domain) { + this.domain = domain; + } + + + public DataIdentifier bFunction(Boolean bFunction) { + this.bFunction = bFunction; + return this; + } + + /** + * Get bFunction + * @return bFunction + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_B_FUNCTION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Boolean getbFunction() { + return bFunction; + } + + + @JsonProperty(JSON_PROPERTY_B_FUNCTION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setbFunction(Boolean bFunction) { + this.bFunction = bFunction; + } + + + public DataIdentifier function(Boolean function) { + this.function = function; + return this; + } + + /** + * Get function + * @return function + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FUNCTION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Boolean getFunction() { + return function; + } + + + @JsonProperty(JSON_PROPERTY_FUNCTION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFunction(Boolean function) { + this.function = function; + } + + + public DataIdentifier visible(Boolean visible) { + this.visible = visible; + return this; + } + + /** + * Get visible + * @return visible + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_VISIBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Boolean getVisible() { + return visible; + } + + + @JsonProperty(JSON_PROPERTY_VISIBLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setVisible(Boolean visible) { + this.visible = visible; + } + + + /** + * Return true if this DataIdentifier object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DataIdentifier dataIdentifier = (DataIdentifier) o; + return Objects.equals(this.name, dataIdentifier.name) && + Objects.equals(this.displayName, dataIdentifier.displayName) && + Objects.equals(this.variableType, dataIdentifier.variableType) && + Objects.equals(this.domain, dataIdentifier.domain) && + Objects.equals(this.bFunction, dataIdentifier.bFunction) && + Objects.equals(this.function, dataIdentifier.function) && + Objects.equals(this.visible, dataIdentifier.visible); + } + + @Override + public int hashCode() { + return Objects.hash(name, displayName, variableType, domain, bFunction, function, visible); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class DataIdentifier {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); + sb.append(" variableType: ").append(toIndentedString(variableType)).append("\n"); + sb.append(" domain: ").append(toIndentedString(domain)).append("\n"); + sb.append(" bFunction: ").append(toIndentedString(bFunction)).append("\n"); + sb.append(" function: ").append(toIndentedString(function)).append("\n"); + sb.append(" visible: ").append(toIndentedString(visible)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `name` to the URL query string + if (getName() != null) { + joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + // add `displayName` to the URL query string + if (getDisplayName() != null) { + joiner.add(String.format("%sdisplayName%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDisplayName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + // add `variableType` to the URL query string + if (getVariableType() != null) { + joiner.add(getVariableType().toUrlQueryString(prefix + "variableType" + suffix)); + } + + // add `domain` to the URL query string + if (getDomain() != null) { + joiner.add(getDomain().toUrlQueryString(prefix + "domain" + suffix)); + } + + // add `bFunction` to the URL query string + if (getbFunction() != null) { + joiner.add(String.format("%sbFunction%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getbFunction()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + // add `function` to the URL query string + if (getFunction() != null) { + joiner.add(String.format("%sfunction%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFunction()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + // add `visible` to the URL query string + if (getVisible() != null) { + joiner.add(String.format("%svisible%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getVisible()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + return joiner.toString(); + } +} + diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/Simulation.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/Domain.java similarity index 90% rename from vcell-restclient/src/main/java/org/vcell/restclient/model/Simulation.java rename to vcell-restclient/src/main/java/org/vcell/restclient/model/Domain.java index 473dbe6f09..33b401f2d6 100644 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/Simulation.java +++ b/vcell-restclient/src/main/java/org/vcell/restclient/model/Domain.java @@ -29,20 +29,20 @@ /** - * Simulation + * Domain */ @JsonPropertyOrder({ - Simulation.JSON_PROPERTY_NAME + Domain.JSON_PROPERTY_NAME }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class Simulation { +public class Domain { public static final String JSON_PROPERTY_NAME = "name"; private String name; - public Simulation() { + public Domain() { } - public Simulation name(String name) { + public Domain name(String name) { this.name = name; return this; } @@ -68,7 +68,7 @@ public void setName(String name) { /** - * Return true if this Simulation object is equal to o. + * Return true if this Domain object is equal to o. */ @Override public boolean equals(Object o) { @@ -78,8 +78,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - Simulation simulation = (Simulation) o; - return Objects.equals(this.name, simulation.name); + Domain domain = (Domain) o; + return Objects.equals(this.name, domain.name); } @Override @@ -90,7 +90,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class Simulation {\n"); + sb.append("class Domain {\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataInfo.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataInfo.java new file mode 100644 index 0000000000..e8b0c3e39a --- /dev/null +++ b/vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataInfo.java @@ -0,0 +1,325 @@ +/* + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.vcell.restclient.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.vcell.restclient.model.DataIdentifier; +import org.vcell.restclient.model.Extent; +import org.vcell.restclient.model.ISize; +import org.vcell.restclient.model.Origin; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * FieldDataInfo + */ +@JsonPropertyOrder({ + FieldDataInfo.JSON_PROPERTY_EXTENT, + FieldDataInfo.JSON_PROPERTY_ORIGIN, + FieldDataInfo.JSON_PROPERTY_ISIZE, + FieldDataInfo.JSON_PROPERTY_DATA_IDENTIFIER, + FieldDataInfo.JSON_PROPERTY_TIMES +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class FieldDataInfo { + public static final String JSON_PROPERTY_EXTENT = "extent"; + private Extent extent; + + public static final String JSON_PROPERTY_ORIGIN = "origin"; + private Origin origin; + + public static final String JSON_PROPERTY_ISIZE = "isize"; + private ISize isize; + + public static final String JSON_PROPERTY_DATA_IDENTIFIER = "dataIdentifier"; + private List dataIdentifier; + + public static final String JSON_PROPERTY_TIMES = "times"; + private List times; + + public FieldDataInfo() { + } + + public FieldDataInfo extent(Extent extent) { + this.extent = extent; + return this; + } + + /** + * Get extent + * @return extent + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EXTENT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Extent getExtent() { + return extent; + } + + + @JsonProperty(JSON_PROPERTY_EXTENT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setExtent(Extent extent) { + this.extent = extent; + } + + + public FieldDataInfo origin(Origin origin) { + this.origin = origin; + return this; + } + + /** + * Get origin + * @return origin + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORIGIN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Origin getOrigin() { + return origin; + } + + + @JsonProperty(JSON_PROPERTY_ORIGIN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrigin(Origin origin) { + this.origin = origin; + } + + + public FieldDataInfo isize(ISize isize) { + this.isize = isize; + return this; + } + + /** + * Get isize + * @return isize + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ISIZE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public ISize getIsize() { + return isize; + } + + + @JsonProperty(JSON_PROPERTY_ISIZE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIsize(ISize isize) { + this.isize = isize; + } + + + public FieldDataInfo dataIdentifier(List dataIdentifier) { + this.dataIdentifier = dataIdentifier; + return this; + } + + public FieldDataInfo addDataIdentifierItem(DataIdentifier dataIdentifierItem) { + if (this.dataIdentifier == null) { + this.dataIdentifier = new ArrayList<>(); + } + this.dataIdentifier.add(dataIdentifierItem); + return this; + } + + /** + * Get dataIdentifier + * @return dataIdentifier + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DATA_IDENTIFIER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getDataIdentifier() { + return dataIdentifier; + } + + + @JsonProperty(JSON_PROPERTY_DATA_IDENTIFIER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDataIdentifier(List dataIdentifier) { + this.dataIdentifier = dataIdentifier; + } + + + public FieldDataInfo times(List times) { + this.times = times; + return this; + } + + public FieldDataInfo addTimesItem(Double timesItem) { + if (this.times == null) { + this.times = new ArrayList<>(); + } + this.times.add(timesItem); + return this; + } + + /** + * Get times + * @return times + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_TIMES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getTimes() { + return times; + } + + + @JsonProperty(JSON_PROPERTY_TIMES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimes(List times) { + this.times = times; + } + + + /** + * Return true if this FieldDataInfo object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FieldDataInfo fieldDataInfo = (FieldDataInfo) o; + return Objects.equals(this.extent, fieldDataInfo.extent) && + Objects.equals(this.origin, fieldDataInfo.origin) && + Objects.equals(this.isize, fieldDataInfo.isize) && + Objects.equals(this.dataIdentifier, fieldDataInfo.dataIdentifier) && + Objects.equals(this.times, fieldDataInfo.times); + } + + @Override + public int hashCode() { + return Objects.hash(extent, origin, isize, dataIdentifier, times); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FieldDataInfo {\n"); + sb.append(" extent: ").append(toIndentedString(extent)).append("\n"); + sb.append(" origin: ").append(toIndentedString(origin)).append("\n"); + sb.append(" isize: ").append(toIndentedString(isize)).append("\n"); + sb.append(" dataIdentifier: ").append(toIndentedString(dataIdentifier)).append("\n"); + sb.append(" times: ").append(toIndentedString(times)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `extent` to the URL query string + if (getExtent() != null) { + joiner.add(getExtent().toUrlQueryString(prefix + "extent" + suffix)); + } + + // add `origin` to the URL query string + if (getOrigin() != null) { + joiner.add(getOrigin().toUrlQueryString(prefix + "origin" + suffix)); + } + + // add `isize` to the URL query string + if (getIsize() != null) { + joiner.add(getIsize().toUrlQueryString(prefix + "isize" + suffix)); + } + + // add `dataIdentifier` to the URL query string + if (getDataIdentifier() != null) { + for (int i = 0; i < getDataIdentifier().size(); i++) { + if (getDataIdentifier().get(i) != null) { + joiner.add(getDataIdentifier().get(i).toUrlQueryString(String.format("%sdataIdentifier%s%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); + } + } + } + + // add `times` to the URL query string + if (getTimes() != null) { + for (int i = 0; i < getTimes().size(); i++) { + joiner.add(String.format("%stimes%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getTimes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + return joiner.toString(); + } +} + diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataReferences.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataReferences.java new file mode 100644 index 0000000000..57f2df6b54 --- /dev/null +++ b/vcell-restclient/src/main/java/org/vcell/restclient/model/FieldDataReferences.java @@ -0,0 +1,265 @@ +/* + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.vcell.restclient.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.vcell.restclient.model.ExternalDataIdentifier; +import org.vcell.restclient.model.KeyValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * FieldDataReferences + */ +@JsonPropertyOrder({ + FieldDataReferences.JSON_PROPERTY_EXTERNAL_DATA_IDENTIFIERS, + FieldDataReferences.JSON_PROPERTY_EXTERNAL_DATA_ANNOTATIONS, + FieldDataReferences.JSON_PROPERTY_EXTERNAL_DATA_I_D_SIM_REFS +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class FieldDataReferences { + public static final String JSON_PROPERTY_EXTERNAL_DATA_IDENTIFIERS = "externalDataIdentifiers"; + private List externalDataIdentifiers; + + public static final String JSON_PROPERTY_EXTERNAL_DATA_ANNOTATIONS = "externalDataAnnotations"; + private List externalDataAnnotations; + + public static final String JSON_PROPERTY_EXTERNAL_DATA_I_D_SIM_REFS = "externalDataIDSimRefs"; + private Map> externalDataIDSimRefs = new HashMap<>(); + + public FieldDataReferences() { + } + + public FieldDataReferences externalDataIdentifiers(List externalDataIdentifiers) { + this.externalDataIdentifiers = externalDataIdentifiers; + return this; + } + + public FieldDataReferences addExternalDataIdentifiersItem(ExternalDataIdentifier externalDataIdentifiersItem) { + if (this.externalDataIdentifiers == null) { + this.externalDataIdentifiers = new ArrayList<>(); + } + this.externalDataIdentifiers.add(externalDataIdentifiersItem); + return this; + } + + /** + * Get externalDataIdentifiers + * @return externalDataIdentifiers + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EXTERNAL_DATA_IDENTIFIERS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getExternalDataIdentifiers() { + return externalDataIdentifiers; + } + + + @JsonProperty(JSON_PROPERTY_EXTERNAL_DATA_IDENTIFIERS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setExternalDataIdentifiers(List externalDataIdentifiers) { + this.externalDataIdentifiers = externalDataIdentifiers; + } + + + public FieldDataReferences externalDataAnnotations(List externalDataAnnotations) { + this.externalDataAnnotations = externalDataAnnotations; + return this; + } + + public FieldDataReferences addExternalDataAnnotationsItem(String externalDataAnnotationsItem) { + if (this.externalDataAnnotations == null) { + this.externalDataAnnotations = new ArrayList<>(); + } + this.externalDataAnnotations.add(externalDataAnnotationsItem); + return this; + } + + /** + * Get externalDataAnnotations + * @return externalDataAnnotations + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EXTERNAL_DATA_ANNOTATIONS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getExternalDataAnnotations() { + return externalDataAnnotations; + } + + + @JsonProperty(JSON_PROPERTY_EXTERNAL_DATA_ANNOTATIONS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setExternalDataAnnotations(List externalDataAnnotations) { + this.externalDataAnnotations = externalDataAnnotations; + } + + + public FieldDataReferences externalDataIDSimRefs(Map> externalDataIDSimRefs) { + this.externalDataIDSimRefs = externalDataIDSimRefs; + return this; + } + + public FieldDataReferences putExternalDataIDSimRefsItem(String key, List externalDataIDSimRefsItem) { + if (this.externalDataIDSimRefs == null) { + this.externalDataIDSimRefs = new HashMap<>(); + } + this.externalDataIDSimRefs.put(key, externalDataIDSimRefsItem); + return this; + } + + /** + * Get externalDataIDSimRefs + * @return externalDataIDSimRefs + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EXTERNAL_DATA_I_D_SIM_REFS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getExternalDataIDSimRefs() { + return externalDataIDSimRefs; + } + + + @JsonProperty(JSON_PROPERTY_EXTERNAL_DATA_I_D_SIM_REFS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setExternalDataIDSimRefs(Map> externalDataIDSimRefs) { + this.externalDataIDSimRefs = externalDataIDSimRefs; + } + + + /** + * Return true if this FieldDataReferences object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FieldDataReferences fieldDataReferences = (FieldDataReferences) o; + return Objects.equals(this.externalDataIdentifiers, fieldDataReferences.externalDataIdentifiers) && + Objects.equals(this.externalDataAnnotations, fieldDataReferences.externalDataAnnotations) && + Objects.equals(this.externalDataIDSimRefs, fieldDataReferences.externalDataIDSimRefs); + } + + @Override + public int hashCode() { + return Objects.hash(externalDataIdentifiers, externalDataAnnotations, externalDataIDSimRefs); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FieldDataReferences {\n"); + sb.append(" externalDataIdentifiers: ").append(toIndentedString(externalDataIdentifiers)).append("\n"); + sb.append(" externalDataAnnotations: ").append(toIndentedString(externalDataAnnotations)).append("\n"); + sb.append(" externalDataIDSimRefs: ").append(toIndentedString(externalDataIDSimRefs)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `externalDataIdentifiers` to the URL query string + if (getExternalDataIdentifiers() != null) { + for (int i = 0; i < getExternalDataIdentifiers().size(); i++) { + if (getExternalDataIdentifiers().get(i) != null) { + joiner.add(getExternalDataIdentifiers().get(i).toUrlQueryString(String.format("%sexternalDataIdentifiers%s%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); + } + } + } + + // add `externalDataAnnotations` to the URL query string + if (getExternalDataAnnotations() != null) { + for (int i = 0; i < getExternalDataAnnotations().size(); i++) { + joiner.add(String.format("%sexternalDataAnnotations%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getExternalDataAnnotations().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + // add `externalDataIDSimRefs` to the URL query string + if (getExternalDataIDSimRefs() != null) { + for (String _key : getExternalDataIDSimRefs().keySet()) { + joiner.add(String.format("%sexternalDataIDSimRefs%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), + getExternalDataIDSimRefs().get(_key), URLEncoder.encode(String.valueOf(getExternalDataIDSimRefs().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + return joiner.toString(); + } +} + diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/IdentityProvider.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/IdentityProvider.java deleted file mode 100644 index e22e4c2e08..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/IdentityProvider.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Gets or Sets IdentityProvider - */ -public enum IdentityProvider { - - AUTH0("AUTH0"), - - KEYCLOAK("KEYCLOAK"); - - private String value; - - IdentityProvider(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static IdentityProvider fromValue(String value) { - for (IdentityProvider b : IdentityProvider.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - if (prefix == null) { - prefix = ""; - } - - return String.format("%s=%s", prefix, this.toString()); - } - -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/MapUser.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/MapUser.java deleted file mode 100644 index 688ba68195..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/MapUser.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * MapUser - */ -@JsonPropertyOrder({ - MapUser.JSON_PROPERTY_USER_I_D, - MapUser.JSON_PROPERTY_PASSWORD -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class MapUser { - public static final String JSON_PROPERTY_USER_I_D = "userID"; - private String userID; - - public static final String JSON_PROPERTY_PASSWORD = "password"; - private String password; - - public MapUser() { - } - - public MapUser userID(String userID) { - this.userID = userID; - return this; - } - - /** - * Get userID - * @return userID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_USER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getUserID() { - return userID; - } - - - @JsonProperty(JSON_PROPERTY_USER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUserID(String userID) { - this.userID = userID; - } - - - public MapUser password(String password) { - this.password = password; - return this; - } - - /** - * Get password - * @return password - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_PASSWORD) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getPassword() { - return password; - } - - - @JsonProperty(JSON_PROPERTY_PASSWORD) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setPassword(String password) { - this.password = password; - } - - - /** - * Return true if this MapUser object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MapUser mapUser = (MapUser) o; - return Objects.equals(this.userID, mapUser.userID) && - Objects.equals(this.password, mapUser.password); - } - - @Override - public int hashCode() { - return Objects.hash(userID, password); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MapUser {\n"); - sb.append(" userID: ").append(toIndentedString(userID)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `userID` to the URL query string - if (getUserID() != null) { - joiner.add(String.format("%suserID%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getUserID()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `password` to the URL query string - if (getPassword() != null) { - joiner.add(String.format("%spassword%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/OverrideRepresentation.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/OverrideRepresentation.java deleted file mode 100644 index ba4cf37c01..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/OverrideRepresentation.java +++ /dev/null @@ -1,308 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * OverrideRepresentation - */ -@JsonPropertyOrder({ - OverrideRepresentation.JSON_PROPERTY_NAME, - OverrideRepresentation.JSON_PROPERTY_TYPE, - OverrideRepresentation.JSON_PROPERTY_EXPRESSION, - OverrideRepresentation.JSON_PROPERTY_VALUES, - OverrideRepresentation.JSON_PROPERTY_CARDINALITY -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class OverrideRepresentation { - public static final String JSON_PROPERTY_NAME = "name"; - private String name; - - public static final String JSON_PROPERTY_TYPE = "type"; - private String type; - - public static final String JSON_PROPERTY_EXPRESSION = "expression"; - private String expression; - - public static final String JSON_PROPERTY_VALUES = "values"; - private List values; - - public static final String JSON_PROPERTY_CARDINALITY = "cardinality"; - private Integer cardinality; - - public OverrideRepresentation() { - } - - public OverrideRepresentation name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getName() { - return name; - } - - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setName(String name) { - this.name = name; - } - - - public OverrideRepresentation type(String type) { - this.type = type; - return this; - } - - /** - * Get type - * @return type - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_TYPE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getType() { - return type; - } - - - @JsonProperty(JSON_PROPERTY_TYPE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setType(String type) { - this.type = type; - } - - - public OverrideRepresentation expression(String expression) { - this.expression = expression; - return this; - } - - /** - * Get expression - * @return expression - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_EXPRESSION) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getExpression() { - return expression; - } - - - @JsonProperty(JSON_PROPERTY_EXPRESSION) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setExpression(String expression) { - this.expression = expression; - } - - - public OverrideRepresentation values(List values) { - this.values = values; - return this; - } - - public OverrideRepresentation addValuesItem(String valuesItem) { - if (this.values == null) { - this.values = new ArrayList<>(); - } - this.values.add(valuesItem); - return this; - } - - /** - * Get values - * @return values - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_VALUES) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public List getValues() { - return values; - } - - - @JsonProperty(JSON_PROPERTY_VALUES) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setValues(List values) { - this.values = values; - } - - - public OverrideRepresentation cardinality(Integer cardinality) { - this.cardinality = cardinality; - return this; - } - - /** - * Get cardinality - * @return cardinality - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_CARDINALITY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getCardinality() { - return cardinality; - } - - - @JsonProperty(JSON_PROPERTY_CARDINALITY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setCardinality(Integer cardinality) { - this.cardinality = cardinality; - } - - - /** - * Return true if this OverrideRepresentation object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - OverrideRepresentation overrideRepresentation = (OverrideRepresentation) o; - return Objects.equals(this.name, overrideRepresentation.name) && - Objects.equals(this.type, overrideRepresentation.type) && - Objects.equals(this.expression, overrideRepresentation.expression) && - Objects.equals(this.values, overrideRepresentation.values) && - Objects.equals(this.cardinality, overrideRepresentation.cardinality); - } - - @Override - public int hashCode() { - return Objects.hash(name, type, expression, values, cardinality); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OverrideRepresentation {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" expression: ").append(toIndentedString(expression)).append("\n"); - sb.append(" values: ").append(toIndentedString(values)).append("\n"); - sb.append(" cardinality: ").append(toIndentedString(cardinality)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `name` to the URL query string - if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `type` to the URL query string - if (getType() != null) { - joiner.add(String.format("%stype%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `expression` to the URL query string - if (getExpression() != null) { - joiner.add(String.format("%sexpression%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getExpression()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `values` to the URL query string - if (getValues() != null) { - for (int i = 0; i < getValues().size(); i++) { - joiner.add(String.format("%svalues%s%s=%s", prefix, suffix, - "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(getValues().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - } - - // add `cardinality` to the URL query string - if (getCardinality() != null) { - joiner.add(String.format("%scardinality%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getCardinality()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationExecutionStatus.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationExecutionStatus.java deleted file mode 100644 index 6954adb7df..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationExecutionStatus.java +++ /dev/null @@ -1,512 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; -import java.util.Arrays; -import org.vcell.restclient.model.HtcJobID; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * SimulationExecutionStatus - */ -@JsonPropertyOrder({ - SimulationExecutionStatus.JSON_PROPERTY_FIELD_START_DATE, - SimulationExecutionStatus.JSON_PROPERTY_FIELD_LATEST_UPDATE_DATE, - SimulationExecutionStatus.JSON_PROPERTY_FIELD_END_DATE, - SimulationExecutionStatus.JSON_PROPERTY_FIELD_COMPUTE_HOST, - SimulationExecutionStatus.JSON_PROPERTY_FIELD_HAS_DATA, - SimulationExecutionStatus.JSON_PROPERTY_FIELD_HTC_JOB_I_D, - SimulationExecutionStatus.JSON_PROPERTY_COMPUTE_HOST, - SimulationExecutionStatus.JSON_PROPERTY_END_DATE, - SimulationExecutionStatus.JSON_PROPERTY_LATEST_UPDATE_DATE, - SimulationExecutionStatus.JSON_PROPERTY_START_DATE, - SimulationExecutionStatus.JSON_PROPERTY_HTC_JOB_I_D -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class SimulationExecutionStatus { - public static final String JSON_PROPERTY_FIELD_START_DATE = "fieldStartDate"; - private LocalDate fieldStartDate; - - public static final String JSON_PROPERTY_FIELD_LATEST_UPDATE_DATE = "fieldLatestUpdateDate"; - private LocalDate fieldLatestUpdateDate; - - public static final String JSON_PROPERTY_FIELD_END_DATE = "fieldEndDate"; - private LocalDate fieldEndDate; - - public static final String JSON_PROPERTY_FIELD_COMPUTE_HOST = "fieldComputeHost"; - private String fieldComputeHost; - - public static final String JSON_PROPERTY_FIELD_HAS_DATA = "fieldHasData"; - private Boolean fieldHasData; - - public static final String JSON_PROPERTY_FIELD_HTC_JOB_I_D = "fieldHtcJobID"; - private HtcJobID fieldHtcJobID; - - public static final String JSON_PROPERTY_COMPUTE_HOST = "computeHost"; - private String computeHost; - - public static final String JSON_PROPERTY_END_DATE = "endDate"; - private LocalDate endDate; - - public static final String JSON_PROPERTY_LATEST_UPDATE_DATE = "latestUpdateDate"; - private LocalDate latestUpdateDate; - - public static final String JSON_PROPERTY_START_DATE = "startDate"; - private LocalDate startDate; - - public static final String JSON_PROPERTY_HTC_JOB_I_D = "htcJobID"; - private HtcJobID htcJobID; - - public SimulationExecutionStatus() { - } - - public SimulationExecutionStatus fieldStartDate(LocalDate fieldStartDate) { - this.fieldStartDate = fieldStartDate; - return this; - } - - /** - * Get fieldStartDate - * @return fieldStartDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_START_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getFieldStartDate() { - return fieldStartDate; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_START_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldStartDate(LocalDate fieldStartDate) { - this.fieldStartDate = fieldStartDate; - } - - - public SimulationExecutionStatus fieldLatestUpdateDate(LocalDate fieldLatestUpdateDate) { - this.fieldLatestUpdateDate = fieldLatestUpdateDate; - return this; - } - - /** - * Get fieldLatestUpdateDate - * @return fieldLatestUpdateDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_LATEST_UPDATE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getFieldLatestUpdateDate() { - return fieldLatestUpdateDate; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_LATEST_UPDATE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldLatestUpdateDate(LocalDate fieldLatestUpdateDate) { - this.fieldLatestUpdateDate = fieldLatestUpdateDate; - } - - - public SimulationExecutionStatus fieldEndDate(LocalDate fieldEndDate) { - this.fieldEndDate = fieldEndDate; - return this; - } - - /** - * Get fieldEndDate - * @return fieldEndDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_END_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getFieldEndDate() { - return fieldEndDate; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_END_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldEndDate(LocalDate fieldEndDate) { - this.fieldEndDate = fieldEndDate; - } - - - public SimulationExecutionStatus fieldComputeHost(String fieldComputeHost) { - this.fieldComputeHost = fieldComputeHost; - return this; - } - - /** - * Get fieldComputeHost - * @return fieldComputeHost - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_COMPUTE_HOST) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getFieldComputeHost() { - return fieldComputeHost; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_COMPUTE_HOST) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldComputeHost(String fieldComputeHost) { - this.fieldComputeHost = fieldComputeHost; - } - - - public SimulationExecutionStatus fieldHasData(Boolean fieldHasData) { - this.fieldHasData = fieldHasData; - return this; - } - - /** - * Get fieldHasData - * @return fieldHasData - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_HAS_DATA) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Boolean getFieldHasData() { - return fieldHasData; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_HAS_DATA) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldHasData(Boolean fieldHasData) { - this.fieldHasData = fieldHasData; - } - - - public SimulationExecutionStatus fieldHtcJobID(HtcJobID fieldHtcJobID) { - this.fieldHtcJobID = fieldHtcJobID; - return this; - } - - /** - * Get fieldHtcJobID - * @return fieldHtcJobID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_HTC_JOB_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public HtcJobID getFieldHtcJobID() { - return fieldHtcJobID; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_HTC_JOB_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldHtcJobID(HtcJobID fieldHtcJobID) { - this.fieldHtcJobID = fieldHtcJobID; - } - - - public SimulationExecutionStatus computeHost(String computeHost) { - this.computeHost = computeHost; - return this; - } - - /** - * Get computeHost - * @return computeHost - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_COMPUTE_HOST) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getComputeHost() { - return computeHost; - } - - - @JsonProperty(JSON_PROPERTY_COMPUTE_HOST) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setComputeHost(String computeHost) { - this.computeHost = computeHost; - } - - - public SimulationExecutionStatus endDate(LocalDate endDate) { - this.endDate = endDate; - return this; - } - - /** - * Get endDate - * @return endDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_END_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getEndDate() { - return endDate; - } - - - @JsonProperty(JSON_PROPERTY_END_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEndDate(LocalDate endDate) { - this.endDate = endDate; - } - - - public SimulationExecutionStatus latestUpdateDate(LocalDate latestUpdateDate) { - this.latestUpdateDate = latestUpdateDate; - return this; - } - - /** - * Get latestUpdateDate - * @return latestUpdateDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_LATEST_UPDATE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getLatestUpdateDate() { - return latestUpdateDate; - } - - - @JsonProperty(JSON_PROPERTY_LATEST_UPDATE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setLatestUpdateDate(LocalDate latestUpdateDate) { - this.latestUpdateDate = latestUpdateDate; - } - - - public SimulationExecutionStatus startDate(LocalDate startDate) { - this.startDate = startDate; - return this; - } - - /** - * Get startDate - * @return startDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_START_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getStartDate() { - return startDate; - } - - - @JsonProperty(JSON_PROPERTY_START_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setStartDate(LocalDate startDate) { - this.startDate = startDate; - } - - - public SimulationExecutionStatus htcJobID(HtcJobID htcJobID) { - this.htcJobID = htcJobID; - return this; - } - - /** - * Get htcJobID - * @return htcJobID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_HTC_JOB_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public HtcJobID getHtcJobID() { - return htcJobID; - } - - - @JsonProperty(JSON_PROPERTY_HTC_JOB_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setHtcJobID(HtcJobID htcJobID) { - this.htcJobID = htcJobID; - } - - - /** - * Return true if this SimulationExecutionStatus object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SimulationExecutionStatus simulationExecutionStatus = (SimulationExecutionStatus) o; - return Objects.equals(this.fieldStartDate, simulationExecutionStatus.fieldStartDate) && - Objects.equals(this.fieldLatestUpdateDate, simulationExecutionStatus.fieldLatestUpdateDate) && - Objects.equals(this.fieldEndDate, simulationExecutionStatus.fieldEndDate) && - Objects.equals(this.fieldComputeHost, simulationExecutionStatus.fieldComputeHost) && - Objects.equals(this.fieldHasData, simulationExecutionStatus.fieldHasData) && - Objects.equals(this.fieldHtcJobID, simulationExecutionStatus.fieldHtcJobID) && - Objects.equals(this.computeHost, simulationExecutionStatus.computeHost) && - Objects.equals(this.endDate, simulationExecutionStatus.endDate) && - Objects.equals(this.latestUpdateDate, simulationExecutionStatus.latestUpdateDate) && - Objects.equals(this.startDate, simulationExecutionStatus.startDate) && - Objects.equals(this.htcJobID, simulationExecutionStatus.htcJobID); - } - - @Override - public int hashCode() { - return Objects.hash(fieldStartDate, fieldLatestUpdateDate, fieldEndDate, fieldComputeHost, fieldHasData, fieldHtcJobID, computeHost, endDate, latestUpdateDate, startDate, htcJobID); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SimulationExecutionStatus {\n"); - sb.append(" fieldStartDate: ").append(toIndentedString(fieldStartDate)).append("\n"); - sb.append(" fieldLatestUpdateDate: ").append(toIndentedString(fieldLatestUpdateDate)).append("\n"); - sb.append(" fieldEndDate: ").append(toIndentedString(fieldEndDate)).append("\n"); - sb.append(" fieldComputeHost: ").append(toIndentedString(fieldComputeHost)).append("\n"); - sb.append(" fieldHasData: ").append(toIndentedString(fieldHasData)).append("\n"); - sb.append(" fieldHtcJobID: ").append(toIndentedString(fieldHtcJobID)).append("\n"); - sb.append(" computeHost: ").append(toIndentedString(computeHost)).append("\n"); - sb.append(" endDate: ").append(toIndentedString(endDate)).append("\n"); - sb.append(" latestUpdateDate: ").append(toIndentedString(latestUpdateDate)).append("\n"); - sb.append(" startDate: ").append(toIndentedString(startDate)).append("\n"); - sb.append(" htcJobID: ").append(toIndentedString(htcJobID)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `fieldStartDate` to the URL query string - if (getFieldStartDate() != null) { - joiner.add(String.format("%sfieldStartDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldStartDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldLatestUpdateDate` to the URL query string - if (getFieldLatestUpdateDate() != null) { - joiner.add(String.format("%sfieldLatestUpdateDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldLatestUpdateDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldEndDate` to the URL query string - if (getFieldEndDate() != null) { - joiner.add(String.format("%sfieldEndDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldEndDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldComputeHost` to the URL query string - if (getFieldComputeHost() != null) { - joiner.add(String.format("%sfieldComputeHost%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldComputeHost()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldHasData` to the URL query string - if (getFieldHasData() != null) { - joiner.add(String.format("%sfieldHasData%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldHasData()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldHtcJobID` to the URL query string - if (getFieldHtcJobID() != null) { - joiner.add(getFieldHtcJobID().toUrlQueryString(prefix + "fieldHtcJobID" + suffix)); - } - - // add `computeHost` to the URL query string - if (getComputeHost() != null) { - joiner.add(String.format("%scomputeHost%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getComputeHost()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `endDate` to the URL query string - if (getEndDate() != null) { - joiner.add(String.format("%sendDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getEndDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `latestUpdateDate` to the URL query string - if (getLatestUpdateDate() != null) { - joiner.add(String.format("%slatestUpdateDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getLatestUpdateDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `startDate` to the URL query string - if (getStartDate() != null) { - joiner.add(String.format("%sstartDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStartDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `htcJobID` to the URL query string - if (getHtcJobID() != null) { - joiner.add(getHtcJobID().toUrlQueryString(prefix + "htcJobID" + suffix)); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationJobStatus.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationJobStatus.java deleted file mode 100644 index 7866d29e1c..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationJobStatus.java +++ /dev/null @@ -1,949 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; -import java.util.Arrays; -import org.vcell.restclient.model.SchedulerStatus; -import org.vcell.restclient.model.SimulationExecutionStatus; -import org.vcell.restclient.model.SimulationMessage; -import org.vcell.restclient.model.SimulationQueueEntryStatus; -import org.vcell.restclient.model.VCSimulationIdentifier; -import org.vcell.restclient.model.VCellServerID; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * SimulationJobStatus - */ -@JsonPropertyOrder({ - SimulationJobStatus.JSON_PROPERTY_FIELD_TIME_DATE_STAMP, - SimulationJobStatus.JSON_PROPERTY_FIELD_V_C_SIM_I_D, - SimulationJobStatus.JSON_PROPERTY_FIELD_SUBMIT_DATE, - SimulationJobStatus.JSON_PROPERTY_FIELD_SCHEDULER_STATUS, - SimulationJobStatus.JSON_PROPERTY_FIELD_TASK_I_D, - SimulationJobStatus.JSON_PROPERTY_FIELD_SIMULATION_MESSAGE, - SimulationJobStatus.JSON_PROPERTY_FIELD_SERVER_I_D, - SimulationJobStatus.JSON_PROPERTY_FIELD_JOB_INDEX, - SimulationJobStatus.JSON_PROPERTY_FIELD_SIMULATION_QUEUE_ENTRY_STATUS, - SimulationJobStatus.JSON_PROPERTY_FIELD_SIMULATION_EXECUTION_STATUS, - SimulationJobStatus.JSON_PROPERTY_COMPUTE_HOST, - SimulationJobStatus.JSON_PROPERTY_END_DATE, - SimulationJobStatus.JSON_PROPERTY_JOB_INDEX, - SimulationJobStatus.JSON_PROPERTY_SCHEDULER_STATUS, - SimulationJobStatus.JSON_PROPERTY_SERVER_I_D, - SimulationJobStatus.JSON_PROPERTY_SIMULATION_EXECUTION_STATUS, - SimulationJobStatus.JSON_PROPERTY_SIMULATION_QUEUE_ENTRY_STATUS, - SimulationJobStatus.JSON_PROPERTY_START_DATE, - SimulationJobStatus.JSON_PROPERTY_SIMULATION_MESSAGE, - SimulationJobStatus.JSON_PROPERTY_SUBMIT_DATE, - SimulationJobStatus.JSON_PROPERTY_TASK_I_D, - SimulationJobStatus.JSON_PROPERTY_TIME_DATE_STAMP, - SimulationJobStatus.JSON_PROPERTY_V_C_SIMULATION_IDENTIFIER -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class SimulationJobStatus { - public static final String JSON_PROPERTY_FIELD_TIME_DATE_STAMP = "fieldTimeDateStamp"; - private LocalDate fieldTimeDateStamp; - - public static final String JSON_PROPERTY_FIELD_V_C_SIM_I_D = "fieldVCSimID"; - private VCSimulationIdentifier fieldVCSimID; - - public static final String JSON_PROPERTY_FIELD_SUBMIT_DATE = "fieldSubmitDate"; - private LocalDate fieldSubmitDate; - - public static final String JSON_PROPERTY_FIELD_SCHEDULER_STATUS = "fieldSchedulerStatus"; - private SchedulerStatus fieldSchedulerStatus; - - public static final String JSON_PROPERTY_FIELD_TASK_I_D = "fieldTaskID"; - private Integer fieldTaskID; - - public static final String JSON_PROPERTY_FIELD_SIMULATION_MESSAGE = "fieldSimulationMessage"; - private SimulationMessage fieldSimulationMessage; - - public static final String JSON_PROPERTY_FIELD_SERVER_I_D = "fieldServerID"; - private VCellServerID fieldServerID; - - public static final String JSON_PROPERTY_FIELD_JOB_INDEX = "fieldJobIndex"; - private Integer fieldJobIndex; - - public static final String JSON_PROPERTY_FIELD_SIMULATION_QUEUE_ENTRY_STATUS = "fieldSimulationQueueEntryStatus"; - private SimulationQueueEntryStatus fieldSimulationQueueEntryStatus; - - public static final String JSON_PROPERTY_FIELD_SIMULATION_EXECUTION_STATUS = "fieldSimulationExecutionStatus"; - private SimulationExecutionStatus fieldSimulationExecutionStatus; - - public static final String JSON_PROPERTY_COMPUTE_HOST = "computeHost"; - private String computeHost; - - public static final String JSON_PROPERTY_END_DATE = "endDate"; - private LocalDate endDate; - - public static final String JSON_PROPERTY_JOB_INDEX = "jobIndex"; - private Integer jobIndex; - - public static final String JSON_PROPERTY_SCHEDULER_STATUS = "schedulerStatus"; - private SchedulerStatus schedulerStatus; - - public static final String JSON_PROPERTY_SERVER_I_D = "serverID"; - private VCellServerID serverID; - - public static final String JSON_PROPERTY_SIMULATION_EXECUTION_STATUS = "simulationExecutionStatus"; - private SimulationExecutionStatus simulationExecutionStatus; - - public static final String JSON_PROPERTY_SIMULATION_QUEUE_ENTRY_STATUS = "simulationQueueEntryStatus"; - private SimulationQueueEntryStatus simulationQueueEntryStatus; - - public static final String JSON_PROPERTY_START_DATE = "startDate"; - private LocalDate startDate; - - public static final String JSON_PROPERTY_SIMULATION_MESSAGE = "simulationMessage"; - private SimulationMessage simulationMessage; - - public static final String JSON_PROPERTY_SUBMIT_DATE = "submitDate"; - private LocalDate submitDate; - - public static final String JSON_PROPERTY_TASK_I_D = "taskID"; - private Integer taskID; - - public static final String JSON_PROPERTY_TIME_DATE_STAMP = "timeDateStamp"; - private LocalDate timeDateStamp; - - public static final String JSON_PROPERTY_V_C_SIMULATION_IDENTIFIER = "vCSimulationIdentifier"; - private VCSimulationIdentifier vCSimulationIdentifier; - - public SimulationJobStatus() { - } - - public SimulationJobStatus fieldTimeDateStamp(LocalDate fieldTimeDateStamp) { - this.fieldTimeDateStamp = fieldTimeDateStamp; - return this; - } - - /** - * Get fieldTimeDateStamp - * @return fieldTimeDateStamp - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_TIME_DATE_STAMP) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getFieldTimeDateStamp() { - return fieldTimeDateStamp; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_TIME_DATE_STAMP) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldTimeDateStamp(LocalDate fieldTimeDateStamp) { - this.fieldTimeDateStamp = fieldTimeDateStamp; - } - - - public SimulationJobStatus fieldVCSimID(VCSimulationIdentifier fieldVCSimID) { - this.fieldVCSimID = fieldVCSimID; - return this; - } - - /** - * Get fieldVCSimID - * @return fieldVCSimID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_V_C_SIM_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public VCSimulationIdentifier getFieldVCSimID() { - return fieldVCSimID; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_V_C_SIM_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldVCSimID(VCSimulationIdentifier fieldVCSimID) { - this.fieldVCSimID = fieldVCSimID; - } - - - public SimulationJobStatus fieldSubmitDate(LocalDate fieldSubmitDate) { - this.fieldSubmitDate = fieldSubmitDate; - return this; - } - - /** - * Get fieldSubmitDate - * @return fieldSubmitDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_SUBMIT_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getFieldSubmitDate() { - return fieldSubmitDate; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_SUBMIT_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldSubmitDate(LocalDate fieldSubmitDate) { - this.fieldSubmitDate = fieldSubmitDate; - } - - - public SimulationJobStatus fieldSchedulerStatus(SchedulerStatus fieldSchedulerStatus) { - this.fieldSchedulerStatus = fieldSchedulerStatus; - return this; - } - - /** - * Get fieldSchedulerStatus - * @return fieldSchedulerStatus - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_SCHEDULER_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SchedulerStatus getFieldSchedulerStatus() { - return fieldSchedulerStatus; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_SCHEDULER_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldSchedulerStatus(SchedulerStatus fieldSchedulerStatus) { - this.fieldSchedulerStatus = fieldSchedulerStatus; - } - - - public SimulationJobStatus fieldTaskID(Integer fieldTaskID) { - this.fieldTaskID = fieldTaskID; - return this; - } - - /** - * Get fieldTaskID - * @return fieldTaskID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_TASK_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getFieldTaskID() { - return fieldTaskID; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_TASK_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldTaskID(Integer fieldTaskID) { - this.fieldTaskID = fieldTaskID; - } - - - public SimulationJobStatus fieldSimulationMessage(SimulationMessage fieldSimulationMessage) { - this.fieldSimulationMessage = fieldSimulationMessage; - return this; - } - - /** - * Get fieldSimulationMessage - * @return fieldSimulationMessage - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_SIMULATION_MESSAGE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationMessage getFieldSimulationMessage() { - return fieldSimulationMessage; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_SIMULATION_MESSAGE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldSimulationMessage(SimulationMessage fieldSimulationMessage) { - this.fieldSimulationMessage = fieldSimulationMessage; - } - - - public SimulationJobStatus fieldServerID(VCellServerID fieldServerID) { - this.fieldServerID = fieldServerID; - return this; - } - - /** - * Get fieldServerID - * @return fieldServerID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_SERVER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public VCellServerID getFieldServerID() { - return fieldServerID; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_SERVER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldServerID(VCellServerID fieldServerID) { - this.fieldServerID = fieldServerID; - } - - - public SimulationJobStatus fieldJobIndex(Integer fieldJobIndex) { - this.fieldJobIndex = fieldJobIndex; - return this; - } - - /** - * Get fieldJobIndex - * @return fieldJobIndex - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_JOB_INDEX) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getFieldJobIndex() { - return fieldJobIndex; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_JOB_INDEX) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldJobIndex(Integer fieldJobIndex) { - this.fieldJobIndex = fieldJobIndex; - } - - - public SimulationJobStatus fieldSimulationQueueEntryStatus(SimulationQueueEntryStatus fieldSimulationQueueEntryStatus) { - this.fieldSimulationQueueEntryStatus = fieldSimulationQueueEntryStatus; - return this; - } - - /** - * Get fieldSimulationQueueEntryStatus - * @return fieldSimulationQueueEntryStatus - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_SIMULATION_QUEUE_ENTRY_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationQueueEntryStatus getFieldSimulationQueueEntryStatus() { - return fieldSimulationQueueEntryStatus; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_SIMULATION_QUEUE_ENTRY_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldSimulationQueueEntryStatus(SimulationQueueEntryStatus fieldSimulationQueueEntryStatus) { - this.fieldSimulationQueueEntryStatus = fieldSimulationQueueEntryStatus; - } - - - public SimulationJobStatus fieldSimulationExecutionStatus(SimulationExecutionStatus fieldSimulationExecutionStatus) { - this.fieldSimulationExecutionStatus = fieldSimulationExecutionStatus; - return this; - } - - /** - * Get fieldSimulationExecutionStatus - * @return fieldSimulationExecutionStatus - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_SIMULATION_EXECUTION_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationExecutionStatus getFieldSimulationExecutionStatus() { - return fieldSimulationExecutionStatus; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_SIMULATION_EXECUTION_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldSimulationExecutionStatus(SimulationExecutionStatus fieldSimulationExecutionStatus) { - this.fieldSimulationExecutionStatus = fieldSimulationExecutionStatus; - } - - - public SimulationJobStatus computeHost(String computeHost) { - this.computeHost = computeHost; - return this; - } - - /** - * Get computeHost - * @return computeHost - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_COMPUTE_HOST) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getComputeHost() { - return computeHost; - } - - - @JsonProperty(JSON_PROPERTY_COMPUTE_HOST) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setComputeHost(String computeHost) { - this.computeHost = computeHost; - } - - - public SimulationJobStatus endDate(LocalDate endDate) { - this.endDate = endDate; - return this; - } - - /** - * Get endDate - * @return endDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_END_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getEndDate() { - return endDate; - } - - - @JsonProperty(JSON_PROPERTY_END_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEndDate(LocalDate endDate) { - this.endDate = endDate; - } - - - public SimulationJobStatus jobIndex(Integer jobIndex) { - this.jobIndex = jobIndex; - return this; - } - - /** - * Get jobIndex - * @return jobIndex - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_JOB_INDEX) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getJobIndex() { - return jobIndex; - } - - - @JsonProperty(JSON_PROPERTY_JOB_INDEX) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setJobIndex(Integer jobIndex) { - this.jobIndex = jobIndex; - } - - - public SimulationJobStatus schedulerStatus(SchedulerStatus schedulerStatus) { - this.schedulerStatus = schedulerStatus; - return this; - } - - /** - * Get schedulerStatus - * @return schedulerStatus - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SCHEDULER_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SchedulerStatus getSchedulerStatus() { - return schedulerStatus; - } - - - @JsonProperty(JSON_PROPERTY_SCHEDULER_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSchedulerStatus(SchedulerStatus schedulerStatus) { - this.schedulerStatus = schedulerStatus; - } - - - public SimulationJobStatus serverID(VCellServerID serverID) { - this.serverID = serverID; - return this; - } - - /** - * Get serverID - * @return serverID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SERVER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public VCellServerID getServerID() { - return serverID; - } - - - @JsonProperty(JSON_PROPERTY_SERVER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setServerID(VCellServerID serverID) { - this.serverID = serverID; - } - - - public SimulationJobStatus simulationExecutionStatus(SimulationExecutionStatus simulationExecutionStatus) { - this.simulationExecutionStatus = simulationExecutionStatus; - return this; - } - - /** - * Get simulationExecutionStatus - * @return simulationExecutionStatus - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SIMULATION_EXECUTION_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationExecutionStatus getSimulationExecutionStatus() { - return simulationExecutionStatus; - } - - - @JsonProperty(JSON_PROPERTY_SIMULATION_EXECUTION_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSimulationExecutionStatus(SimulationExecutionStatus simulationExecutionStatus) { - this.simulationExecutionStatus = simulationExecutionStatus; - } - - - public SimulationJobStatus simulationQueueEntryStatus(SimulationQueueEntryStatus simulationQueueEntryStatus) { - this.simulationQueueEntryStatus = simulationQueueEntryStatus; - return this; - } - - /** - * Get simulationQueueEntryStatus - * @return simulationQueueEntryStatus - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SIMULATION_QUEUE_ENTRY_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationQueueEntryStatus getSimulationQueueEntryStatus() { - return simulationQueueEntryStatus; - } - - - @JsonProperty(JSON_PROPERTY_SIMULATION_QUEUE_ENTRY_STATUS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSimulationQueueEntryStatus(SimulationQueueEntryStatus simulationQueueEntryStatus) { - this.simulationQueueEntryStatus = simulationQueueEntryStatus; - } - - - public SimulationJobStatus startDate(LocalDate startDate) { - this.startDate = startDate; - return this; - } - - /** - * Get startDate - * @return startDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_START_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getStartDate() { - return startDate; - } - - - @JsonProperty(JSON_PROPERTY_START_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setStartDate(LocalDate startDate) { - this.startDate = startDate; - } - - - public SimulationJobStatus simulationMessage(SimulationMessage simulationMessage) { - this.simulationMessage = simulationMessage; - return this; - } - - /** - * Get simulationMessage - * @return simulationMessage - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SIMULATION_MESSAGE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationMessage getSimulationMessage() { - return simulationMessage; - } - - - @JsonProperty(JSON_PROPERTY_SIMULATION_MESSAGE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSimulationMessage(SimulationMessage simulationMessage) { - this.simulationMessage = simulationMessage; - } - - - public SimulationJobStatus submitDate(LocalDate submitDate) { - this.submitDate = submitDate; - return this; - } - - /** - * Get submitDate - * @return submitDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SUBMIT_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getSubmitDate() { - return submitDate; - } - - - @JsonProperty(JSON_PROPERTY_SUBMIT_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSubmitDate(LocalDate submitDate) { - this.submitDate = submitDate; - } - - - public SimulationJobStatus taskID(Integer taskID) { - this.taskID = taskID; - return this; - } - - /** - * Get taskID - * @return taskID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_TASK_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getTaskID() { - return taskID; - } - - - @JsonProperty(JSON_PROPERTY_TASK_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTaskID(Integer taskID) { - this.taskID = taskID; - } - - - public SimulationJobStatus timeDateStamp(LocalDate timeDateStamp) { - this.timeDateStamp = timeDateStamp; - return this; - } - - /** - * Get timeDateStamp - * @return timeDateStamp - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_TIME_DATE_STAMP) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getTimeDateStamp() { - return timeDateStamp; - } - - - @JsonProperty(JSON_PROPERTY_TIME_DATE_STAMP) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTimeDateStamp(LocalDate timeDateStamp) { - this.timeDateStamp = timeDateStamp; - } - - - public SimulationJobStatus vCSimulationIdentifier(VCSimulationIdentifier vCSimulationIdentifier) { - this.vCSimulationIdentifier = vCSimulationIdentifier; - return this; - } - - /** - * Get vCSimulationIdentifier - * @return vCSimulationIdentifier - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_V_C_SIMULATION_IDENTIFIER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public VCSimulationIdentifier getvCSimulationIdentifier() { - return vCSimulationIdentifier; - } - - - @JsonProperty(JSON_PROPERTY_V_C_SIMULATION_IDENTIFIER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setvCSimulationIdentifier(VCSimulationIdentifier vCSimulationIdentifier) { - this.vCSimulationIdentifier = vCSimulationIdentifier; - } - - - /** - * Return true if this SimulationJobStatus object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SimulationJobStatus simulationJobStatus = (SimulationJobStatus) o; - return Objects.equals(this.fieldTimeDateStamp, simulationJobStatus.fieldTimeDateStamp) && - Objects.equals(this.fieldVCSimID, simulationJobStatus.fieldVCSimID) && - Objects.equals(this.fieldSubmitDate, simulationJobStatus.fieldSubmitDate) && - Objects.equals(this.fieldSchedulerStatus, simulationJobStatus.fieldSchedulerStatus) && - Objects.equals(this.fieldTaskID, simulationJobStatus.fieldTaskID) && - Objects.equals(this.fieldSimulationMessage, simulationJobStatus.fieldSimulationMessage) && - Objects.equals(this.fieldServerID, simulationJobStatus.fieldServerID) && - Objects.equals(this.fieldJobIndex, simulationJobStatus.fieldJobIndex) && - Objects.equals(this.fieldSimulationQueueEntryStatus, simulationJobStatus.fieldSimulationQueueEntryStatus) && - Objects.equals(this.fieldSimulationExecutionStatus, simulationJobStatus.fieldSimulationExecutionStatus) && - Objects.equals(this.computeHost, simulationJobStatus.computeHost) && - Objects.equals(this.endDate, simulationJobStatus.endDate) && - Objects.equals(this.jobIndex, simulationJobStatus.jobIndex) && - Objects.equals(this.schedulerStatus, simulationJobStatus.schedulerStatus) && - Objects.equals(this.serverID, simulationJobStatus.serverID) && - Objects.equals(this.simulationExecutionStatus, simulationJobStatus.simulationExecutionStatus) && - Objects.equals(this.simulationQueueEntryStatus, simulationJobStatus.simulationQueueEntryStatus) && - Objects.equals(this.startDate, simulationJobStatus.startDate) && - Objects.equals(this.simulationMessage, simulationJobStatus.simulationMessage) && - Objects.equals(this.submitDate, simulationJobStatus.submitDate) && - Objects.equals(this.taskID, simulationJobStatus.taskID) && - Objects.equals(this.timeDateStamp, simulationJobStatus.timeDateStamp) && - Objects.equals(this.vCSimulationIdentifier, simulationJobStatus.vCSimulationIdentifier); - } - - @Override - public int hashCode() { - return Objects.hash(fieldTimeDateStamp, fieldVCSimID, fieldSubmitDate, fieldSchedulerStatus, fieldTaskID, fieldSimulationMessage, fieldServerID, fieldJobIndex, fieldSimulationQueueEntryStatus, fieldSimulationExecutionStatus, computeHost, endDate, jobIndex, schedulerStatus, serverID, simulationExecutionStatus, simulationQueueEntryStatus, startDate, simulationMessage, submitDate, taskID, timeDateStamp, vCSimulationIdentifier); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SimulationJobStatus {\n"); - sb.append(" fieldTimeDateStamp: ").append(toIndentedString(fieldTimeDateStamp)).append("\n"); - sb.append(" fieldVCSimID: ").append(toIndentedString(fieldVCSimID)).append("\n"); - sb.append(" fieldSubmitDate: ").append(toIndentedString(fieldSubmitDate)).append("\n"); - sb.append(" fieldSchedulerStatus: ").append(toIndentedString(fieldSchedulerStatus)).append("\n"); - sb.append(" fieldTaskID: ").append(toIndentedString(fieldTaskID)).append("\n"); - sb.append(" fieldSimulationMessage: ").append(toIndentedString(fieldSimulationMessage)).append("\n"); - sb.append(" fieldServerID: ").append(toIndentedString(fieldServerID)).append("\n"); - sb.append(" fieldJobIndex: ").append(toIndentedString(fieldJobIndex)).append("\n"); - sb.append(" fieldSimulationQueueEntryStatus: ").append(toIndentedString(fieldSimulationQueueEntryStatus)).append("\n"); - sb.append(" fieldSimulationExecutionStatus: ").append(toIndentedString(fieldSimulationExecutionStatus)).append("\n"); - sb.append(" computeHost: ").append(toIndentedString(computeHost)).append("\n"); - sb.append(" endDate: ").append(toIndentedString(endDate)).append("\n"); - sb.append(" jobIndex: ").append(toIndentedString(jobIndex)).append("\n"); - sb.append(" schedulerStatus: ").append(toIndentedString(schedulerStatus)).append("\n"); - sb.append(" serverID: ").append(toIndentedString(serverID)).append("\n"); - sb.append(" simulationExecutionStatus: ").append(toIndentedString(simulationExecutionStatus)).append("\n"); - sb.append(" simulationQueueEntryStatus: ").append(toIndentedString(simulationQueueEntryStatus)).append("\n"); - sb.append(" startDate: ").append(toIndentedString(startDate)).append("\n"); - sb.append(" simulationMessage: ").append(toIndentedString(simulationMessage)).append("\n"); - sb.append(" submitDate: ").append(toIndentedString(submitDate)).append("\n"); - sb.append(" taskID: ").append(toIndentedString(taskID)).append("\n"); - sb.append(" timeDateStamp: ").append(toIndentedString(timeDateStamp)).append("\n"); - sb.append(" vCSimulationIdentifier: ").append(toIndentedString(vCSimulationIdentifier)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `fieldTimeDateStamp` to the URL query string - if (getFieldTimeDateStamp() != null) { - joiner.add(String.format("%sfieldTimeDateStamp%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldTimeDateStamp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldVCSimID` to the URL query string - if (getFieldVCSimID() != null) { - joiner.add(getFieldVCSimID().toUrlQueryString(prefix + "fieldVCSimID" + suffix)); - } - - // add `fieldSubmitDate` to the URL query string - if (getFieldSubmitDate() != null) { - joiner.add(String.format("%sfieldSubmitDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldSubmitDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldSchedulerStatus` to the URL query string - if (getFieldSchedulerStatus() != null) { - joiner.add(String.format("%sfieldSchedulerStatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldSchedulerStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldTaskID` to the URL query string - if (getFieldTaskID() != null) { - joiner.add(String.format("%sfieldTaskID%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldTaskID()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldSimulationMessage` to the URL query string - if (getFieldSimulationMessage() != null) { - joiner.add(getFieldSimulationMessage().toUrlQueryString(prefix + "fieldSimulationMessage" + suffix)); - } - - // add `fieldServerID` to the URL query string - if (getFieldServerID() != null) { - joiner.add(getFieldServerID().toUrlQueryString(prefix + "fieldServerID" + suffix)); - } - - // add `fieldJobIndex` to the URL query string - if (getFieldJobIndex() != null) { - joiner.add(String.format("%sfieldJobIndex%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldJobIndex()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldSimulationQueueEntryStatus` to the URL query string - if (getFieldSimulationQueueEntryStatus() != null) { - joiner.add(getFieldSimulationQueueEntryStatus().toUrlQueryString(prefix + "fieldSimulationQueueEntryStatus" + suffix)); - } - - // add `fieldSimulationExecutionStatus` to the URL query string - if (getFieldSimulationExecutionStatus() != null) { - joiner.add(getFieldSimulationExecutionStatus().toUrlQueryString(prefix + "fieldSimulationExecutionStatus" + suffix)); - } - - // add `computeHost` to the URL query string - if (getComputeHost() != null) { - joiner.add(String.format("%scomputeHost%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getComputeHost()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `endDate` to the URL query string - if (getEndDate() != null) { - joiner.add(String.format("%sendDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getEndDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `jobIndex` to the URL query string - if (getJobIndex() != null) { - joiner.add(String.format("%sjobIndex%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getJobIndex()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `schedulerStatus` to the URL query string - if (getSchedulerStatus() != null) { - joiner.add(String.format("%sschedulerStatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSchedulerStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `serverID` to the URL query string - if (getServerID() != null) { - joiner.add(getServerID().toUrlQueryString(prefix + "serverID" + suffix)); - } - - // add `simulationExecutionStatus` to the URL query string - if (getSimulationExecutionStatus() != null) { - joiner.add(getSimulationExecutionStatus().toUrlQueryString(prefix + "simulationExecutionStatus" + suffix)); - } - - // add `simulationQueueEntryStatus` to the URL query string - if (getSimulationQueueEntryStatus() != null) { - joiner.add(getSimulationQueueEntryStatus().toUrlQueryString(prefix + "simulationQueueEntryStatus" + suffix)); - } - - // add `startDate` to the URL query string - if (getStartDate() != null) { - joiner.add(String.format("%sstartDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStartDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `simulationMessage` to the URL query string - if (getSimulationMessage() != null) { - joiner.add(getSimulationMessage().toUrlQueryString(prefix + "simulationMessage" + suffix)); - } - - // add `submitDate` to the URL query string - if (getSubmitDate() != null) { - joiner.add(String.format("%ssubmitDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSubmitDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `taskID` to the URL query string - if (getTaskID() != null) { - joiner.add(String.format("%staskID%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getTaskID()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `timeDateStamp` to the URL query string - if (getTimeDateStamp() != null) { - joiner.add(String.format("%stimeDateStamp%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getTimeDateStamp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `vCSimulationIdentifier` to the URL query string - if (getvCSimulationIdentifier() != null) { - joiner.add(getvCSimulationIdentifier().toUrlQueryString(prefix + "vCSimulationIdentifier" + suffix)); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationQueueEntryStatus.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationQueueEntryStatus.java deleted file mode 100644 index d6080ab8b1..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/SimulationQueueEntryStatus.java +++ /dev/null @@ -1,329 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; - -import com.fasterxml.jackson.annotation.*; - -import java.time.LocalDate; -import java.util.Arrays; -import org.vcell.restclient.model.SimulationQueueID; - - -/** - * SimulationQueueEntryStatus - */ -@JsonPropertyOrder({ - SimulationQueueEntryStatus.JSON_PROPERTY_FIELD_QUEUE_PRIORITY, - SimulationQueueEntryStatus.JSON_PROPERTY_FIELD_QUEUE_DATE, - SimulationQueueEntryStatus.JSON_PROPERTY_FIELD_QUEUE_I_D, - SimulationQueueEntryStatus.JSON_PROPERTY_QUEUE_DATE, - SimulationQueueEntryStatus.JSON_PROPERTY_QUEUE_I_D, - SimulationQueueEntryStatus.JSON_PROPERTY_QUEUE_PRIORITY -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class SimulationQueueEntryStatus { - public static final String JSON_PROPERTY_FIELD_QUEUE_PRIORITY = "fieldQueuePriority"; - private Integer fieldQueuePriority; - - public static final String JSON_PROPERTY_FIELD_QUEUE_DATE = "fieldQueueDate"; - private LocalDate fieldQueueDate; - - public static final String JSON_PROPERTY_FIELD_QUEUE_I_D = "fieldQueueID"; - private SimulationQueueID fieldQueueID; - - public static final String JSON_PROPERTY_QUEUE_DATE = "queueDate"; - private LocalDate queueDate; - - public static final String JSON_PROPERTY_QUEUE_I_D = "queueID"; - private SimulationQueueID queueID; - - public static final String JSON_PROPERTY_QUEUE_PRIORITY = "queuePriority"; - private Integer queuePriority; - - public SimulationQueueEntryStatus() { - } - - public SimulationQueueEntryStatus fieldQueuePriority(Integer fieldQueuePriority) { - this.fieldQueuePriority = fieldQueuePriority; - return this; - } - - /** - * Get fieldQueuePriority - * @return fieldQueuePriority - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_QUEUE_PRIORITY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getFieldQueuePriority() { - return fieldQueuePriority; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_QUEUE_PRIORITY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldQueuePriority(Integer fieldQueuePriority) { - this.fieldQueuePriority = fieldQueuePriority; - } - - - public SimulationQueueEntryStatus fieldQueueDate(LocalDate fieldQueueDate) { - this.fieldQueueDate = fieldQueueDate; - return this; - } - - /** - * Get fieldQueueDate - * @return fieldQueueDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_QUEUE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getFieldQueueDate() { - return fieldQueueDate; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_QUEUE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldQueueDate(LocalDate fieldQueueDate) { - this.fieldQueueDate = fieldQueueDate; - } - - - public SimulationQueueEntryStatus fieldQueueID(SimulationQueueID fieldQueueID) { - this.fieldQueueID = fieldQueueID; - return this; - } - - /** - * Get fieldQueueID - * @return fieldQueueID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_FIELD_QUEUE_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationQueueID getFieldQueueID() { - return fieldQueueID; - } - - - @JsonProperty(JSON_PROPERTY_FIELD_QUEUE_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFieldQueueID(SimulationQueueID fieldQueueID) { - this.fieldQueueID = fieldQueueID; - } - - - public SimulationQueueEntryStatus queueDate(LocalDate queueDate) { - this.queueDate = queueDate; - return this; - } - - /** - * Get queueDate - * @return queueDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_QUEUE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public LocalDate getQueueDate() { - return queueDate; - } - - - @JsonProperty(JSON_PROPERTY_QUEUE_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setQueueDate(LocalDate queueDate) { - this.queueDate = queueDate; - } - - - public SimulationQueueEntryStatus queueID(SimulationQueueID queueID) { - this.queueID = queueID; - return this; - } - - /** - * Get queueID - * @return queueID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_QUEUE_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SimulationQueueID getQueueID() { - return queueID; - } - - - @JsonProperty(JSON_PROPERTY_QUEUE_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setQueueID(SimulationQueueID queueID) { - this.queueID = queueID; - } - - - public SimulationQueueEntryStatus queuePriority(Integer queuePriority) { - this.queuePriority = queuePriority; - return this; - } - - /** - * Get queuePriority - * @return queuePriority - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_QUEUE_PRIORITY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Integer getQueuePriority() { - return queuePriority; - } - - - @JsonProperty(JSON_PROPERTY_QUEUE_PRIORITY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setQueuePriority(Integer queuePriority) { - this.queuePriority = queuePriority; - } - - - /** - * Return true if this SimulationQueueEntryStatus object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SimulationQueueEntryStatus simulationQueueEntryStatus = (SimulationQueueEntryStatus) o; - return Objects.equals(this.fieldQueuePriority, simulationQueueEntryStatus.fieldQueuePriority) && - Objects.equals(this.fieldQueueDate, simulationQueueEntryStatus.fieldQueueDate) && - Objects.equals(this.fieldQueueID, simulationQueueEntryStatus.fieldQueueID) && - Objects.equals(this.queueDate, simulationQueueEntryStatus.queueDate) && - Objects.equals(this.queueID, simulationQueueEntryStatus.queueID) && - Objects.equals(this.queuePriority, simulationQueueEntryStatus.queuePriority); - } - - @Override - public int hashCode() { - return Objects.hash(fieldQueuePriority, fieldQueueDate, fieldQueueID, queueDate, queueID, queuePriority); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class SimulationQueueEntryStatus {\n"); - sb.append(" fieldQueuePriority: ").append(toIndentedString(fieldQueuePriority)).append("\n"); - sb.append(" fieldQueueDate: ").append(toIndentedString(fieldQueueDate)).append("\n"); - sb.append(" fieldQueueID: ").append(toIndentedString(fieldQueueID)).append("\n"); - sb.append(" queueDate: ").append(toIndentedString(queueDate)).append("\n"); - sb.append(" queueID: ").append(toIndentedString(queueID)).append("\n"); - sb.append(" queuePriority: ").append(toIndentedString(queuePriority)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `fieldQueuePriority` to the URL query string - if (getFieldQueuePriority() != null) { - joiner.add(String.format("%sfieldQueuePriority%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldQueuePriority()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldQueueDate` to the URL query string - if (getFieldQueueDate() != null) { - joiner.add(String.format("%sfieldQueueDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldQueueDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `fieldQueueID` to the URL query string - if (getFieldQueueID() != null) { - joiner.add(String.format("%sfieldQueueID%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFieldQueueID()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `queueDate` to the URL query string - if (getQueueDate() != null) { - joiner.add(String.format("%squeueDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getQueueDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `queueID` to the URL query string - if (getQueueID() != null) { - joiner.add(String.format("%squeueID%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getQueueID()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `queuePriority` to the URL query string - if (getQueuePriority() != null) { - joiner.add(String.format("%squeuePriority%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getQueuePriority()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/User1.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/User1.java deleted file mode 100644 index fd2239ad46..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/User1.java +++ /dev/null @@ -1,331 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import org.vcell.restclient.model.KeyValue; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * User1 - */ -@JsonPropertyOrder({ - User1.JSON_PROPERTY_USER_NAME, - User1.JSON_PROPERTY_KEY, - User1.JSON_PROPERTY_I_D, - User1.JSON_PROPERTY_NAME, - User1.JSON_PROPERTY_PUBLISHER, - User1.JSON_PROPERTY_TEST_ACCOUNT -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class User1 { - public static final String JSON_PROPERTY_USER_NAME = "userName"; - private String userName; - - public static final String JSON_PROPERTY_KEY = "key"; - private KeyValue key; - - public static final String JSON_PROPERTY_I_D = "iD"; - private KeyValue iD; - - public static final String JSON_PROPERTY_NAME = "name"; - private String name; - - public static final String JSON_PROPERTY_PUBLISHER = "publisher"; - private Boolean publisher; - - public static final String JSON_PROPERTY_TEST_ACCOUNT = "testAccount"; - private Boolean testAccount; - - public User1() { - } - - public User1 userName(String userName) { - this.userName = userName; - return this; - } - - /** - * Get userName - * @return userName - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_USER_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getUserName() { - return userName; - } - - - @JsonProperty(JSON_PROPERTY_USER_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUserName(String userName) { - this.userName = userName; - } - - - public User1 key(KeyValue key) { - this.key = key; - return this; - } - - /** - * Get key - * @return key - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_KEY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public KeyValue getKey() { - return key; - } - - - @JsonProperty(JSON_PROPERTY_KEY) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setKey(KeyValue key) { - this.key = key; - } - - - public User1 iD(KeyValue iD) { - this.iD = iD; - return this; - } - - /** - * Get iD - * @return iD - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public KeyValue getiD() { - return iD; - } - - - @JsonProperty(JSON_PROPERTY_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setiD(KeyValue iD) { - this.iD = iD; - } - - - public User1 name(String name) { - this.name = name; - return this; - } - - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getName() { - return name; - } - - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setName(String name) { - this.name = name; - } - - - public User1 publisher(Boolean publisher) { - this.publisher = publisher; - return this; - } - - /** - * Get publisher - * @return publisher - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_PUBLISHER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Boolean getPublisher() { - return publisher; - } - - - @JsonProperty(JSON_PROPERTY_PUBLISHER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setPublisher(Boolean publisher) { - this.publisher = publisher; - } - - - public User1 testAccount(Boolean testAccount) { - this.testAccount = testAccount; - return this; - } - - /** - * Get testAccount - * @return testAccount - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_TEST_ACCOUNT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public Boolean getTestAccount() { - return testAccount; - } - - - @JsonProperty(JSON_PROPERTY_TEST_ACCOUNT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTestAccount(Boolean testAccount) { - this.testAccount = testAccount; - } - - - /** - * Return true if this User1 object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - User1 user1 = (User1) o; - return Objects.equals(this.userName, user1.userName) && - Objects.equals(this.key, user1.key) && - Objects.equals(this.iD, user1.iD) && - Objects.equals(this.name, user1.name) && - Objects.equals(this.publisher, user1.publisher) && - Objects.equals(this.testAccount, user1.testAccount); - } - - @Override - public int hashCode() { - return Objects.hash(userName, key, iD, name, publisher, testAccount); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User1 {\n"); - sb.append(" userName: ").append(toIndentedString(userName)).append("\n"); - sb.append(" key: ").append(toIndentedString(key)).append("\n"); - sb.append(" iD: ").append(toIndentedString(iD)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" publisher: ").append(toIndentedString(publisher)).append("\n"); - sb.append(" testAccount: ").append(toIndentedString(testAccount)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `userName` to the URL query string - if (getUserName() != null) { - joiner.add(String.format("%suserName%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getUserName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `key` to the URL query string - if (getKey() != null) { - joiner.add(getKey().toUrlQueryString(prefix + "key" + suffix)); - } - - // add `iD` to the URL query string - if (getiD() != null) { - joiner.add(getiD().toUrlQueryString(prefix + "iD" + suffix)); - } - - // add `name` to the URL query string - if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `publisher` to the URL query string - if (getPublisher() != null) { - joiner.add(String.format("%spublisher%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getPublisher()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `testAccount` to the URL query string - if (getTestAccount() != null) { - joiner.add(String.format("%stestAccount%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getTestAccount()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/UserIdentity.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/UserIdentity.java deleted file mode 100644 index 70675867da..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/UserIdentity.java +++ /dev/null @@ -1,260 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.math.BigDecimal; -import java.time.OffsetDateTime; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * UserIdentity - */ -@JsonPropertyOrder({ - UserIdentity.JSON_PROPERTY_ID, - UserIdentity.JSON_PROPERTY_USER_NAME, - UserIdentity.JSON_PROPERTY_SUBJECT, - UserIdentity.JSON_PROPERTY_INSERT_DATE -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class UserIdentity { - public static final String JSON_PROPERTY_ID = "id"; - private BigDecimal id; - - public static final String JSON_PROPERTY_USER_NAME = "userName"; - private String userName; - - public static final String JSON_PROPERTY_SUBJECT = "subject"; - private String subject; - - public static final String JSON_PROPERTY_INSERT_DATE = "insertDate"; - private OffsetDateTime insertDate; - - public UserIdentity() { - } - - public UserIdentity id(BigDecimal id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public BigDecimal getId() { - return id; - } - - - @JsonProperty(JSON_PROPERTY_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setId(BigDecimal id) { - this.id = id; - } - - - public UserIdentity userName(String userName) { - this.userName = userName; - return this; - } - - /** - * Get userName - * @return userName - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_USER_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getUserName() { - return userName; - } - - - @JsonProperty(JSON_PROPERTY_USER_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUserName(String userName) { - this.userName = userName; - } - - - public UserIdentity subject(String subject) { - this.subject = subject; - return this; - } - - /** - * Get subject - * @return subject - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SUBJECT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getSubject() { - return subject; - } - - - @JsonProperty(JSON_PROPERTY_SUBJECT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSubject(String subject) { - this.subject = subject; - } - - - public UserIdentity insertDate(OffsetDateTime insertDate) { - this.insertDate = insertDate; - return this; - } - - /** - * Get insertDate - * @return insertDate - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_INSERT_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public OffsetDateTime getInsertDate() { - return insertDate; - } - - - @JsonProperty(JSON_PROPERTY_INSERT_DATE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setInsertDate(OffsetDateTime insertDate) { - this.insertDate = insertDate; - } - - - /** - * Return true if this UserIdentity object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - UserIdentity userIdentity = (UserIdentity) o; - return Objects.equals(this.id, userIdentity.id) && - Objects.equals(this.userName, userIdentity.userName) && - Objects.equals(this.subject, userIdentity.subject) && - Objects.equals(this.insertDate, userIdentity.insertDate); - } - - @Override - public int hashCode() { - return Objects.hash(id, userName, subject, insertDate); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class UserIdentity {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" userName: ").append(toIndentedString(userName)).append("\n"); - sb.append(" subject: ").append(toIndentedString(subject)).append("\n"); - sb.append(" insertDate: ").append(toIndentedString(insertDate)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `id` to the URL query string - if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `userName` to the URL query string - if (getUserName() != null) { - joiner.add(String.format("%suserName%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getUserName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `subject` to the URL query string - if (getSubject() != null) { - joiner.add(String.format("%ssubject%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSubject()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - // add `insertDate` to the URL query string - if (getInsertDate() != null) { - joiner.add(String.format("%sinsertDate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getInsertDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/main/java/org/vcell/restclient/model/VCellServerID.java b/vcell-restclient/src/main/java/org/vcell/restclient/model/VCellServerID.java deleted file mode 100644 index 994933ad5f..0000000000 --- a/vcell-restclient/src/main/java/org/vcell/restclient/model/VCellServerID.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.StringJoiner; -import java.util.Objects; -import java.util.Map; -import java.util.HashMap; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - -/** - * VCellServerID - */ -@JsonPropertyOrder({ - VCellServerID.JSON_PROPERTY_SERVER_I_D -}) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class VCellServerID { - public static final String JSON_PROPERTY_SERVER_I_D = "serverID"; - private String serverID; - - public VCellServerID() { - } - - public VCellServerID serverID(String serverID) { - this.serverID = serverID; - return this; - } - - /** - * Get serverID - * @return serverID - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SERVER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public String getServerID() { - return serverID; - } - - - @JsonProperty(JSON_PROPERTY_SERVER_I_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setServerID(String serverID) { - this.serverID = serverID; - } - - - /** - * Return true if this VCellServerID object is equal to o. - */ - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - VCellServerID vcellServerID = (VCellServerID) o; - return Objects.equals(this.serverID, vcellServerID.serverID); - } - - @Override - public int hashCode() { - return Objects.hash(serverID); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class VCellServerID {\n"); - sb.append(" serverID: ").append(toIndentedString(serverID)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - /** - * Convert the instance into URL query string. - * - * @return URL query string - */ - public String toUrlQueryString() { - return toUrlQueryString(null); - } - - /** - * Convert the instance into URL query string. - * - * @param prefix prefix of the query string - * @return URL query string - */ - public String toUrlQueryString(String prefix) { - String suffix = ""; - String containerSuffix = ""; - String containerPrefix = ""; - if (prefix == null) { - // style=form, explode=true, e.g. /pet?name=cat&type=manx - prefix = ""; - } else { - // deepObject style e.g. /pet?id[name]=cat&id[type]=manx - prefix = prefix + "["; - suffix = "]"; - containerSuffix = "]"; - containerPrefix = "["; - } - - StringJoiner joiner = new StringJoiner("&"); - - // add `serverID` to the URL query string - if (getServerID() != null) { - joiner.add(String.format("%sserverID%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getServerID()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); - } - - return joiner.toString(); - } -} - diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/api/BioModelResourceApiTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/api/BioModelResourceApiTest.java index 82f73ca1ef..8832c66cf7 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/api/BioModelResourceApiTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/api/BioModelResourceApiTest.java @@ -51,91 +51,6 @@ public void deleteBioModelTest() throws ApiException { // TODO: test validations } - /** - * Get the BioModel in BNGL format. - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getBioModelBNGLTest() throws ApiException { - String bioModelID = null; - - //api.getBioModelBNGL(bioModelID); - - // TODO: test validations - } - - /** - * Get the BioModels diagram. - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getBioModelDIAGRAMTest() throws ApiException { - String bioModelID = null; - - //api.getBioModelDIAGRAM(bioModelID); - - // TODO: test validations - } - - /** - * Get the BioModel in OMEX format. - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getBioModelOMEXTest() throws ApiException { - String bioModelID = null; - - //api.getBioModelOMEX(bioModelID); - - // TODO: test validations - } - - /** - * Get the BioModel in SBML format. - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getBioModelSBMLTest() throws ApiException { - String bioModelID = null; - - //api.getBioModelSBML(bioModelID); - - // TODO: test validations - } - - /** - * Get the BioModel in VCML format. - * - * - * - * @throws ApiException - * if the Api call fails - */ - @Test - public void getBioModelVCMLTest() throws ApiException { - String bioModelID = null; - - //api.getBioModelVCML(bioModelID); - - // TODO: test validations - } - /** * Get BioModel information in JSON format by ID. * diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/api/FieldDataResourceApiTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/api/FieldDataResourceApiTest.java index 3fc3df6777..b041d8312d 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/api/FieldDataResourceApiTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/api/FieldDataResourceApiTest.java @@ -17,9 +17,9 @@ import org.vcell.restclient.model.AnalyzedResultsFromFieldData; import org.vcell.restclient.model.ExternalDataIdentifier; import org.vcell.restclient.model.FieldDataDBOperationSpec; -import org.vcell.restclient.model.FieldDataExternalDataIDs; import org.vcell.restclient.model.FieldDataFileOperationSpec; import org.vcell.restclient.model.FieldDataNoCopyConflict; +import org.vcell.restclient.model.FieldDataReferences; import org.vcell.restclient.model.FieldDataSaveResults; import java.io.File; import org.junit.Test; @@ -128,7 +128,7 @@ public void generateFieldDataEstimateTest() throws ApiException { } /** - * Get all of the field data for that user. + * Get all of the ids used to identify, and retrieve field data. * * * @@ -136,10 +136,9 @@ public void generateFieldDataEstimateTest() throws ApiException { * if the Api call fails */ @Test - public void getAllFieldDataTest() throws ApiException { - FieldDataDBOperationSpec fieldDataDBOperationSpec = null; - FieldDataExternalDataIDs response = - api.getAllFieldData(fieldDataDBOperationSpec); + public void getAllFieldDataIDsTest() throws ApiException { + FieldDataReferences response = + api.getAllFieldDataIDs(); // TODO: test validations } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/api/HelloWorldApiTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/api/HelloWorldApiTest.java index 8725544ee8..7ed84545ad 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/api/HelloWorldApiTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/api/HelloWorldApiTest.java @@ -1,5 +1,5 @@ /* - * VCell API (test) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,14 +13,22 @@ package org.vcell.restclient.api; -import org.junit.jupiter.api.Test; import org.vcell.restclient.ApiException; import org.vcell.restclient.model.HelloWorldMessage; +import org.junit.Test; +import org.junit.Ignore; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * API tests for HelloWorldApi */ +@Ignore public class HelloWorldApiTest { private final HelloWorldApi api = new HelloWorldApi(); diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/api/PublicationResourceApiTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/api/PublicationResourceApiTest.java index ef2ce4713b..66d276eaa2 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/api/PublicationResourceApiTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/api/PublicationResourceApiTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,54 +13,109 @@ package org.vcell.restclient.api; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.vcell.restclient.ApiException; import org.vcell.restclient.model.Publication; +import org.junit.Test; +import org.junit.Ignore; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; /** * API tests for PublicationResourceApi */ -@Disabled -@Tag("Fast") +@Ignore public class PublicationResourceApiTest { private final PublicationResourceApi api = new PublicationResourceApi(); + /** + * Create publication + * + * + * + * @throws ApiException + * if the Api call fails + */ @Test - public void getPublicationByIdTest() throws ApiException { - Long key = null; - api.getPublicationById(key); + public void createPublicationTest() throws ApiException { + Publication publication = null; + Long response = + api.createPublication(publication); // TODO: test validations } + /** + * Delete publication + * + * + * + * @throws ApiException + * if the Api call fails + */ @Test - public void getPublicationsTest() throws ApiException { - List response = api.getPublications(); + public void deletePublicationTest() throws ApiException { + Long id = null; + + api.deletePublication(id); // TODO: test validations } - + + /** + * Get publication by ID + * + * + * + * @throws ApiException + * if the Api call fails + */ @Test - public void addPublicationTest() throws ApiException { - Publication publication = null; - api.createPublication(publication); - + public void getPublicationByIdTest() throws ApiException { + Long id = null; + Publication response = + api.getPublicationById(id); + // TODO: test validations } - + + /** + * Get all publications + * + * + * + * @throws ApiException + * if the Api call fails + */ @Test - public void deletePublicationTest() throws ApiException { - Long publication_key = null; - api.deletePublication(publication_key); - + public void getPublicationsTest() throws ApiException { + List response = + api.getPublications(); + // TODO: test validations } - + + /** + * Create publication + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void updatePublicationTest() throws ApiException { + Publication publication = null; + Publication response = + api.updatePublication(publication); + + // TODO: test validations + } + } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/api/SimulationResourceApiTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/api/SimulationResourceApiTest.java index ded45fa88d..90388c0d70 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/api/SimulationResourceApiTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/api/SimulationResourceApiTest.java @@ -14,7 +14,8 @@ package org.vcell.restclient.api; import org.vcell.restclient.ApiException; -import org.vcell.restclient.model.OverrideRepresentation; +import org.vcell.restclient.model.SimulationStatusPersistentRecord; +import org.vcell.restclient.model.StatusMessage; import org.junit.Test; import org.junit.Ignore; @@ -32,6 +33,26 @@ public class SimulationResourceApiTest { private final SimulationResourceApi api = new SimulationResourceApi(); + + + /** + * Get the status of simulation running + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void getSimulationStatusTest() throws ApiException { + String simID = null; + String bioModelID = null; + String mathModelID = null; + SimulationStatusPersistentRecord response = + api.getSimulationStatus(simID, bioModelID, mathModelID); + + // TODO: test validations + } /** * Start a simulation. @@ -44,7 +65,7 @@ public class SimulationResourceApiTest { @Test public void startSimulationTest() throws ApiException { String simID = null; - + List response = api.startSimulation(simID); // TODO: test validations @@ -61,7 +82,7 @@ public void startSimulationTest() throws ApiException { @Test public void stopSimulationTest() throws ApiException { String simID = null; - + List response = api.stopSimulation(simID); // TODO: test validations diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/api/UsersResourceApiTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/api/UsersResourceApiTest.java index b0cbe52a66..d1d4d11fed 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/api/UsersResourceApiTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/api/UsersResourceApiTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,27 +13,99 @@ package org.vcell.restclient.api; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.vcell.restclient.ApiException; +import org.vcell.restclient.model.AccesTokenRepresentationRecord; import org.vcell.restclient.model.Identity; -import org.vcell.restclient.model.User; +import org.vcell.restclient.model.UserIdentityJSONSafe; +import org.vcell.restclient.model.UserLoginInfoForMapping; +import org.vcell.restclient.model.UserRegistrationInfo; +import org.junit.Test; +import org.junit.Ignore; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * API tests for UsersResourceApi */ -@Disabled -@Tag("Fast") +@Ignore public class UsersResourceApiTest { private final UsersResourceApi api = new UsersResourceApi(); /** + * The end user has forgotten the legacy password they used for VCell, so they will be emailed it. + * * * + * @throws ApiException + * if the Api call fails + */ + @Test + public void forgotLegacyPasswordTest() throws ApiException { + String userID = null; + + api.forgotLegacyPassword(userID); + + // TODO: test validations + } + + /** + * Method to get legacy tokens for guest users + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void getGuestLegacyApiTokenTest() throws ApiException { + AccesTokenRepresentationRecord response = + api.getGuestLegacyApiToken(); + + // TODO: test validations + } + + /** + * Get token for legacy API + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void getLegacyApiTokenTest() throws ApiException { + AccesTokenRepresentationRecord response = + api.getLegacyApiToken(); + + // TODO: test validations + } + + /** + * Get mapped VCell identity + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void getMappedUserTest() throws ApiException { + UserIdentityJSONSafe response = + api.getMappedUser(); + + // TODO: test validations + } + + /** + * Get current user + * * * * @throws ApiException @@ -41,10 +113,96 @@ public class UsersResourceApiTest { */ @Test public void getMeTest() throws ApiException { - Identity response = + Identity response = api.getMe(); // TODO: test validations } + /** + * create vcell user + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void mapNewUserTest() throws ApiException { + UserRegistrationInfo userRegistrationInfo = null; + + api.mapNewUser(userRegistrationInfo); + + // TODO: test validations + } + + /** + * map vcell user + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void mapUserTest() throws ApiException { + UserLoginInfoForMapping userLoginInfoForMapping = null; + Boolean response = + api.mapUser(userLoginInfoForMapping); + + // TODO: test validations + } + + /** + * Process the magic link and map the user + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void processMagicLinkTest() throws ApiException { + String magic = null; + + api.processMagicLink(magic); + + // TODO: test validations + } + + /** + * request a recovery email to link a VCell account. + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void requestRecoveryEmailTest() throws ApiException { + String email = null; + String userID = null; + + api.requestRecoveryEmail(email, userID); + + // TODO: test validations + } + + /** + * remove vcell identity mapping + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void unmapUserTest() throws ApiException { + String userName = null; + Boolean response = + api.unmapUser(userName); + + // TODO: test validations + } + } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/AccessTokenRepresentationTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/AccessTokenRepresentationTest.java deleted file mode 100644 index b22fba0f2a..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/AccessTokenRepresentationTest.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for AccessTokenRepresentation - */ -public class AccessTokenRepresentationTest { - private final AccessTokenRepresentation model = new AccessTokenRepresentation(); - - /** - * Model tests for AccessTokenRepresentation - */ - @Test - public void testAccessTokenRepresentation() { - // TODO: test AccessTokenRepresentation - } - - /** - * Test the property 'token' - */ - @Test - public void tokenTest() { - // TODO: test token - } - - /** - * Test the property 'creationDateSeconds' - */ - @Test - public void creationDateSecondsTest() { - // TODO: test creationDateSeconds - } - - /** - * Test the property 'expireDateSeconds' - */ - @Test - public void expireDateSecondsTest() { - // TODO: test expireDateSeconds - } - - /** - * Test the property 'userId' - */ - @Test - public void userIdTest() { - // TODO: test userId - } - - /** - * Test the property 'userKey' - */ - @Test - public void userKeyTest() { - // TODO: test userKey - } - -} diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/BioModelTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/BioModelTest.java index 3994c6e3b8..a0e5785a84 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/BioModelTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/BioModelTest.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.vcell.restclient.model.Simulation; +import org.vcell.restclient.model.KeyValue; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -97,11 +97,11 @@ public void branchIDTest() { } /** - * Test the property 'modelKey' + * Test the property 'physModelKey' */ @Test - public void modelKeyTest() { - // TODO: test modelKey + public void physModelKeyTest() { + // TODO: test physModelKey } /** @@ -121,11 +121,11 @@ public void ownerKeyTest() { } /** - * Test the property 'simulations' + * Test the property 'simulationKeyList' */ @Test - public void simulationsTest() { - // TODO: test simulations + public void simulationKeyListTest() { + // TODO: test simulationKeyList } /** diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/BiomodelRefTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/BiomodelRefTest.java index d447601abd..c39b85be8d 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/BiomodelRefTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/BiomodelRefTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,13 +13,19 @@ package org.vcell.restclient.model; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Arrays; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; /** * Model tests for BiomodelRef */ -@Tag("Fast") public class BiomodelRefTest { private final BiomodelRef model = new BiomodelRef(); diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/User1Test.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/DataIdentifierTest.java similarity index 50% rename from vcell-restclient/src/test/java/org/vcell/restclient/model/User1Test.java rename to vcell-restclient/src/test/java/org/vcell/restclient/model/DataIdentifierTest.java index d25d8a58e1..502c54e3a0 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/User1Test.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/DataIdentifierTest.java @@ -19,71 +19,80 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; -import org.vcell.restclient.model.KeyValue; +import org.vcell.restclient.model.Domain; +import org.vcell.restclient.model.VariableType; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; /** - * Model tests for User1 + * Model tests for DataIdentifier */ -public class User1Test { - private final User1 model = new User1(); +public class DataIdentifierTest { + private final DataIdentifier model = new DataIdentifier(); /** - * Model tests for User1 + * Model tests for DataIdentifier */ @Test - public void testUser1() { - // TODO: test User1 + public void testDataIdentifier() { + // TODO: test DataIdentifier } /** - * Test the property 'userName' + * Test the property 'name' */ @Test - public void userNameTest() { - // TODO: test userName + public void nameTest() { + // TODO: test name } /** - * Test the property 'key' + * Test the property 'displayName' */ @Test - public void keyTest() { - // TODO: test key + public void displayNameTest() { + // TODO: test displayName } /** - * Test the property 'iD' + * Test the property 'variableType' */ @Test - public void iDTest() { - // TODO: test iD + public void variableTypeTest() { + // TODO: test variableType } /** - * Test the property 'name' + * Test the property 'domain' */ @Test - public void nameTest() { - // TODO: test name + public void domainTest() { + // TODO: test domain + } + + /** + * Test the property 'bFunction' + */ + @Test + public void bFunctionTest() { + // TODO: test bFunction } /** - * Test the property 'publisher' + * Test the property 'function' */ @Test - public void publisherTest() { - // TODO: test publisher + public void functionTest() { + // TODO: test function } /** - * Test the property 'testAccount' + * Test the property 'visible' */ @Test - public void testAccountTest() { - // TODO: test testAccount + public void visibleTest() { + // TODO: test visible } } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/DomainTest.java similarity index 79% rename from vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationTest.java rename to vcell-restclient/src/test/java/org/vcell/restclient/model/DomainTest.java index d9533db481..d661e5e75d 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/DomainTest.java @@ -24,17 +24,17 @@ import org.junit.Test; /** - * Model tests for Simulation + * Model tests for Domain */ -public class SimulationTest { - private final Simulation model = new Simulation(); +public class DomainTest { + private final Domain model = new Domain(); /** - * Model tests for Simulation + * Model tests for Domain */ @Test - public void testSimulation() { - // TODO: test Simulation + public void testDomain() { + // TODO: test Domain } /** diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/OverrideRepresentationTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/FieldDataInfoTest.java similarity index 52% rename from vcell-restclient/src/test/java/org/vcell/restclient/model/OverrideRepresentationTest.java rename to vcell-restclient/src/test/java/org/vcell/restclient/model/FieldDataInfoTest.java index 848aea36ce..9b861abde9 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/OverrideRepresentationTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/FieldDataInfoTest.java @@ -21,62 +21,57 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.vcell.restclient.model.Extent; +import org.vcell.restclient.model.ISize; +import org.vcell.restclient.model.Origin; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; /** - * Model tests for OverrideRepresentation + * Model tests for FieldDataInfo */ -public class OverrideRepresentationTest { - private final OverrideRepresentation model = new OverrideRepresentation(); +public class FieldDataInfoTest { + private final FieldDataInfo model = new FieldDataInfo(); /** - * Model tests for OverrideRepresentation + * Model tests for FieldDataInfo */ @Test - public void testOverrideRepresentation() { - // TODO: test OverrideRepresentation + public void testFieldDataInfo() { + // TODO: test FieldDataInfo } /** - * Test the property 'name' + * Test the property 'extent' */ @Test - public void nameTest() { - // TODO: test name + public void extentTest() { + // TODO: test extent } /** - * Test the property 'type' + * Test the property 'origin' */ @Test - public void typeTest() { - // TODO: test type + public void originTest() { + // TODO: test origin } /** - * Test the property 'expression' + * Test the property 'isize' */ @Test - public void expressionTest() { - // TODO: test expression + public void isizeTest() { + // TODO: test isize } /** - * Test the property 'values' + * Test the property 'times' */ @Test - public void valuesTest() { - // TODO: test values - } - - /** - * Test the property 'cardinality' - */ - @Test - public void cardinalityTest() { - // TODO: test cardinality + public void timesTest() { + // TODO: test times } } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/FieldDataReferencesTest.java similarity index 50% rename from vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityTest.java rename to vcell-restclient/src/test/java/org/vcell/restclient/model/FieldDataReferencesTest.java index d8414e43ab..8468e879f5 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/FieldDataReferencesTest.java @@ -18,58 +18,53 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.vcell.restclient.model.ExternalDataIdentifier; import org.vcell.restclient.model.KeyValue; -import org.vcell.restclient.model.User1; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; /** - * Model tests for UserIdentity + * Model tests for FieldDataReferences */ -public class UserIdentityTest { - private final UserIdentity model = new UserIdentity(); +public class FieldDataReferencesTest { + private final FieldDataReferences model = new FieldDataReferences(); /** - * Model tests for UserIdentity + * Model tests for FieldDataReferences */ @Test - public void testUserIdentity() { - // TODO: test UserIdentity + public void testFieldDataReferences() { + // TODO: test FieldDataReferences } /** - * Test the property 'id' + * Test the property 'externalDataIdentifiers' */ @Test - public void idTest() { - // TODO: test id + public void externalDataIdentifiersTest() { + // TODO: test externalDataIdentifiers } /** - * Test the property 'user' + * Test the property 'externalDataAnnotations' */ @Test - public void userTest() { - // TODO: test user + public void externalDataAnnotationsTest() { + // TODO: test externalDataAnnotations } /** - * Test the property 'subject' + * Test the property 'externalDataIDSimRefs' */ @Test - public void subjectTest() { - // TODO: test subject - } - - /** - * Test the property 'insertDate' - */ - @Test - public void insertDateTest() { - // TODO: test insertDate + public void externalDataIDSimRefsTest() { + // TODO: test externalDataIDSimRefs } } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/HelloWorldMessageTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/HelloWorldMessageTest.java index 8f86d6de29..ddcc1343fe 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/HelloWorldMessageTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/HelloWorldMessageTest.java @@ -1,5 +1,5 @@ /* - * VCell API (test) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,7 +13,16 @@ package org.vcell.restclient.model; -import org.junit.jupiter.api.Test; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Arrays; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + /** * Model tests for HelloWorldMessage */ diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/IdentityProviderTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/IdentityProviderTest.java deleted file mode 100644 index 81d8f7cdcd..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/IdentityProviderTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for IdentityProvider - */ -public class IdentityProviderTest { - /** - * Model tests for IdentityProvider - */ - @Test - public void testIdentityProvider() { - // TODO: test IdentityProvider - } - -} diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/MapUserTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/MapUserTest.java deleted file mode 100644 index f4345accf8..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/MapUserTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * VCell API (development) - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for MapUser - */ -public class MapUserTest { - private final MapUser model = new MapUser(); - - /** - * Model tests for MapUser - */ - @Test - public void testMapUser() { - // TODO: test MapUser - } - - /** - * Test the property 'userID' - */ - @Test - public void userIDTest() { - // TODO: test userID - } - - /** - * Test the property 'password' - */ - @Test - public void passwordTest() { - // TODO: test password - } - -} diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/MathmodelRefTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/MathmodelRefTest.java index d64918e60f..7a2507b3da 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/MathmodelRefTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/MathmodelRefTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,14 +13,19 @@ package org.vcell.restclient.model; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Arrays; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; /** * Model tests for MathmodelRef */ -@Tag("Fast") public class MathmodelRefTest { private final MathmodelRef model = new MathmodelRef(); diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/PublicationTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/PublicationTest.java index d79dd2bdd0..c1d0641c15 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/PublicationTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/PublicationTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,14 +13,24 @@ package org.vcell.restclient.model; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.vcell.restclient.model.BiomodelRef; +import org.vcell.restclient.model.MathmodelRef; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; /** * Model tests for Publication */ -@Tag("Fast") public class PublicationTest { private final Publication model = new Publication(); diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationExecutionStatusTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationExecutionStatusTest.java deleted file mode 100644 index dbd1c21ce8..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationExecutionStatusTest.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; -import java.util.Arrays; -import org.vcell.restclient.model.HtcJobID; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for SimulationExecutionStatus - */ -public class SimulationExecutionStatusTest { - private final SimulationExecutionStatus model = new SimulationExecutionStatus(); - - /** - * Model tests for SimulationExecutionStatus - */ - @Test - public void testSimulationExecutionStatus() { - // TODO: test SimulationExecutionStatus - } - - /** - * Test the property 'fieldStartDate' - */ - @Test - public void fieldStartDateTest() { - // TODO: test fieldStartDate - } - - /** - * Test the property 'fieldLatestUpdateDate' - */ - @Test - public void fieldLatestUpdateDateTest() { - // TODO: test fieldLatestUpdateDate - } - - /** - * Test the property 'fieldEndDate' - */ - @Test - public void fieldEndDateTest() { - // TODO: test fieldEndDate - } - - /** - * Test the property 'fieldComputeHost' - */ - @Test - public void fieldComputeHostTest() { - // TODO: test fieldComputeHost - } - - /** - * Test the property 'fieldHasData' - */ - @Test - public void fieldHasDataTest() { - // TODO: test fieldHasData - } - - /** - * Test the property 'fieldHtcJobID' - */ - @Test - public void fieldHtcJobIDTest() { - // TODO: test fieldHtcJobID - } - - /** - * Test the property 'computeHost' - */ - @Test - public void computeHostTest() { - // TODO: test computeHost - } - - /** - * Test the property 'endDate' - */ - @Test - public void endDateTest() { - // TODO: test endDate - } - - /** - * Test the property 'latestUpdateDate' - */ - @Test - public void latestUpdateDateTest() { - // TODO: test latestUpdateDate - } - - /** - * Test the property 'startDate' - */ - @Test - public void startDateTest() { - // TODO: test startDate - } - - /** - * Test the property 'htcJobID' - */ - @Test - public void htcJobIDTest() { - // TODO: test htcJobID - } - -} diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusRecordTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusRecordTest.java index cbcc48b0a8..df84352f49 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusRecordTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusRecordTest.java @@ -18,12 +18,12 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; +import java.time.OffsetDateTime; import java.util.Arrays; import org.vcell.restclient.model.SchedulerStatus; -import org.vcell.restclient.model.SimulationExecutionStatus; +import org.vcell.restclient.model.SimulationExecutionStatusRecord; import org.vcell.restclient.model.SimulationMessage; -import org.vcell.restclient.model.SimulationQueueEntryStatus; +import org.vcell.restclient.model.SimulationQueueEntryStatusRecord; import org.vcell.restclient.model.VCSimulationIdentifier; import org.junit.Assert; import org.junit.Ignore; diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusTest.java deleted file mode 100644 index 4fe456fe92..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationJobStatusTest.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; -import java.util.Arrays; -import org.vcell.restclient.model.SchedulerStatus; -import org.vcell.restclient.model.SimulationExecutionStatus; -import org.vcell.restclient.model.SimulationMessage; -import org.vcell.restclient.model.SimulationQueueEntryStatus; -import org.vcell.restclient.model.VCSimulationIdentifier; -import org.vcell.restclient.model.VCellServerID; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for SimulationJobStatus - */ -public class SimulationJobStatusTest { - private final SimulationJobStatus model = new SimulationJobStatus(); - - /** - * Model tests for SimulationJobStatus - */ - @Test - public void testSimulationJobStatus() { - // TODO: test SimulationJobStatus - } - - /** - * Test the property 'fieldTimeDateStamp' - */ - @Test - public void fieldTimeDateStampTest() { - // TODO: test fieldTimeDateStamp - } - - /** - * Test the property 'fieldVCSimID' - */ - @Test - public void fieldVCSimIDTest() { - // TODO: test fieldVCSimID - } - - /** - * Test the property 'fieldSubmitDate' - */ - @Test - public void fieldSubmitDateTest() { - // TODO: test fieldSubmitDate - } - - /** - * Test the property 'fieldSchedulerStatus' - */ - @Test - public void fieldSchedulerStatusTest() { - // TODO: test fieldSchedulerStatus - } - - /** - * Test the property 'fieldTaskID' - */ - @Test - public void fieldTaskIDTest() { - // TODO: test fieldTaskID - } - - /** - * Test the property 'fieldSimulationMessage' - */ - @Test - public void fieldSimulationMessageTest() { - // TODO: test fieldSimulationMessage - } - - /** - * Test the property 'fieldServerID' - */ - @Test - public void fieldServerIDTest() { - // TODO: test fieldServerID - } - - /** - * Test the property 'fieldJobIndex' - */ - @Test - public void fieldJobIndexTest() { - // TODO: test fieldJobIndex - } - - /** - * Test the property 'fieldSimulationQueueEntryStatus' - */ - @Test - public void fieldSimulationQueueEntryStatusTest() { - // TODO: test fieldSimulationQueueEntryStatus - } - - /** - * Test the property 'fieldSimulationExecutionStatus' - */ - @Test - public void fieldSimulationExecutionStatusTest() { - // TODO: test fieldSimulationExecutionStatus - } - - /** - * Test the property 'computeHost' - */ - @Test - public void computeHostTest() { - // TODO: test computeHost - } - - /** - * Test the property 'endDate' - */ - @Test - public void endDateTest() { - // TODO: test endDate - } - - /** - * Test the property 'jobIndex' - */ - @Test - public void jobIndexTest() { - // TODO: test jobIndex - } - - /** - * Test the property 'schedulerStatus' - */ - @Test - public void schedulerStatusTest() { - // TODO: test schedulerStatus - } - - /** - * Test the property 'serverID' - */ - @Test - public void serverIDTest() { - // TODO: test serverID - } - - /** - * Test the property 'simulationExecutionStatus' - */ - @Test - public void simulationExecutionStatusTest() { - // TODO: test simulationExecutionStatus - } - - /** - * Test the property 'simulationQueueEntryStatus' - */ - @Test - public void simulationQueueEntryStatusTest() { - // TODO: test simulationQueueEntryStatus - } - - /** - * Test the property 'startDate' - */ - @Test - public void startDateTest() { - // TODO: test startDate - } - - /** - * Test the property 'simulationMessage' - */ - @Test - public void simulationMessageTest() { - // TODO: test simulationMessage - } - - /** - * Test the property 'submitDate' - */ - @Test - public void submitDateTest() { - // TODO: test submitDate - } - - /** - * Test the property 'taskID' - */ - @Test - public void taskIDTest() { - // TODO: test taskID - } - - /** - * Test the property 'timeDateStamp' - */ - @Test - public void timeDateStampTest() { - // TODO: test timeDateStamp - } - - /** - * Test the property 'vCSimulationIdentifier' - */ - @Test - public void vCSimulationIdentifierTest() { - // TODO: test vCSimulationIdentifier - } - -} diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationQueueEntryStatusTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationQueueEntryStatusTest.java deleted file mode 100644 index ec0f091914..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationQueueEntryStatusTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.time.LocalDate; -import java.util.Arrays; -import org.vcell.restclient.model.SimulationQueueID; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for SimulationQueueEntryStatus - */ -public class SimulationQueueEntryStatusTest { - private final SimulationQueueEntryStatus model = new SimulationQueueEntryStatus(); - - /** - * Model tests for SimulationQueueEntryStatus - */ - @Test - public void testSimulationQueueEntryStatus() { - // TODO: test SimulationQueueEntryStatus - } - - /** - * Test the property 'fieldQueuePriority' - */ - @Test - public void fieldQueuePriorityTest() { - // TODO: test fieldQueuePriority - } - - /** - * Test the property 'fieldQueueDate' - */ - @Test - public void fieldQueueDateTest() { - // TODO: test fieldQueueDate - } - - /** - * Test the property 'fieldQueueID' - */ - @Test - public void fieldQueueIDTest() { - // TODO: test fieldQueueID - } - - /** - * Test the property 'queueDate' - */ - @Test - public void queueDateTest() { - // TODO: test queueDate - } - - /** - * Test the property 'queueID' - */ - @Test - public void queueIDTest() { - // TODO: test queueID - } - - /** - * Test the property 'queuePriority' - */ - @Test - public void queuePriorityTest() { - // TODO: test queuePriority - } - -} diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationStatusPersistentRecordTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationStatusPersistentRecordTest.java index 4d6028633a..b8fe9ffc87 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationStatusPersistentRecordTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/SimulationStatusPersistentRecordTest.java @@ -19,8 +19,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import org.vcell.restclient.model.Status; import org.junit.Assert; import org.junit.Ignore; @@ -48,14 +46,6 @@ public void statusTest() { // TODO: test status } - /** - * Test the property 'progressHash' - */ - @Test - public void progressHashTest() { - // TODO: test progressHash - } - /** * Test the property 'details' */ diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/StatusMessageTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/StatusMessageTest.java index bfc18974a8..0e52b4f297 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/StatusMessageTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/StatusMessageTest.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; -import org.vcell.restclient.model.SimulationJobStatus; +import org.vcell.restclient.model.SimulationJobStatusRecord; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityJSONSafeTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityJSONSafeTest.java index 1002084cfd..15131fa3e7 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityJSONSafeTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/UserIdentityJSONSafeTest.java @@ -38,6 +38,14 @@ public void testUserIdentityJSONSafe() { // TODO: test UserIdentityJSONSafe } + /** + * Test the property 'mapped' + */ + @Test + public void mappedTest() { + // TODO: test mapped + } + /** * Test the property 'userName' */ diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserLoginInfoForMappingTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/UserLoginInfoForMappingTest.java index 9446b139ff..938e723802 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserLoginInfoForMappingTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/UserLoginInfoForMappingTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -46,11 +46,11 @@ public void userIDTest() { } /** - * Test the property 'digestedPassword' + * Test the property 'password' */ @Test - public void digestedPasswordTest() { - // TODO: test digestedPassword + public void passwordTest() { + // TODO: test password } } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/UserTest.java index 10de75e90d..6d92662ce2 100644 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/UserTest.java +++ b/vcell-restclient/src/test/java/org/vcell/restclient/model/UserTest.java @@ -1,5 +1,5 @@ /* - * VCell API (development) + * VCell API * VCell API * * The version of the OpenAPI document: 1.0.1 @@ -13,14 +13,20 @@ package org.vcell.restclient.model; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Arrays; +import org.vcell.restclient.model.KeyValue; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; /** * Model tests for User */ -@Tag("Fast") public class UserTest { private final User model = new User(); @@ -40,4 +46,36 @@ public void userNameTest() { // TODO: test userName } + /** + * Test the property 'key' + */ + @Test + public void keyTest() { + // TODO: test key + } + + /** + * Test the property 'iD' + */ + @Test + public void iDTest() { + // TODO: test iD + } + + /** + * Test the property 'name' + */ + @Test + public void nameTest() { + // TODO: test name + } + + /** + * Test the property 'testAccount' + */ + @Test + public void testAccountTest() { + // TODO: test testAccount + } + } diff --git a/vcell-restclient/src/test/java/org/vcell/restclient/model/VCellServerIDTest.java b/vcell-restclient/src/test/java/org/vcell/restclient/model/VCellServerIDTest.java deleted file mode 100644 index e842989964..0000000000 --- a/vcell-restclient/src/test/java/org/vcell/restclient/model/VCellServerIDTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * VCell API - * VCell API - * - * The version of the OpenAPI document: 1.0.1 - * Contact: vcell_support@uchc.com - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - - -package org.vcell.restclient.model; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.JsonValue; -import java.util.Arrays; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Model tests for VCellServerID - */ -public class VCellServerIDTest { - private final VCellServerID model = new VCellServerID(); - - /** - * Model tests for VCellServerID - */ - @Test - public void testVCellServerID() { - // TODO: test VCellServerID - } - - /** - * Test the property 'serverID' - */ - @Test - public void serverIDTest() { - // TODO: test serverID - } - -} diff --git a/webapp-ng/src/app/core/modules/openapi/.openapi-generator/FILES b/webapp-ng/src/app/core/modules/openapi/.openapi-generator/FILES index e1463b70d4..0411468fd2 100644 --- a/webapp-ng/src/app/core/modules/openapi/.openapi-generator/FILES +++ b/webapp-ng/src/app/core/modules/openapi/.openapi-generator/FILES @@ -27,13 +27,16 @@ model/bio-model.ts model/biomodel-ref.ts model/cartesian-mesh.ts model/coordinate.ts +model/data-identifier.ts model/detailed-state.ts +model/domain.ts model/extent.ts model/external-data-identifier.ts model/field-data-db-operation-spec.ts -model/field-data-external-data-ids.ts model/field-data-file-operation-spec.ts +model/field-data-info.ts model/field-data-no-copy-conflict.ts +model/field-data-references.ts model/field-data-save-results.ts model/group-access.ts model/hello-world-message.ts diff --git a/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.service.ts b/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.service.ts index 901da8fa6c..86a4ee3c99 100644 --- a/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.service.ts +++ b/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.service.ts @@ -25,12 +25,14 @@ import { ExternalDataIdentifier } from '../model/external-data-identifier'; // @ts-ignore import { FieldDataDBOperationSpec } from '../model/field-data-db-operation-spec'; // @ts-ignore -import { FieldDataExternalDataIDs } from '../model/field-data-external-data-ids'; -// @ts-ignore import { FieldDataFileOperationSpec } from '../model/field-data-file-operation-spec'; // @ts-ignore +import { FieldDataInfo } from '../model/field-data-info'; +// @ts-ignore import { FieldDataNoCopyConflict } from '../model/field-data-no-copy-conflict'; // @ts-ignore +import { FieldDataReferences } from '../model/field-data-references'; +// @ts-ignore import { FieldDataSaveResults } from '../model/field-data-save-results'; // @ts-ignore @@ -444,7 +446,7 @@ export class FieldDataResourceService implements FieldDataResourceServiceInterfa } } - let localVarPath = `/api/v1/fieldData/createFieldDataFromFile`; + let localVarPath = `/api/v1/fieldData/analyzeFieldDataFromFile`; return this.httpClient.request('post', `${this.configuration.basePath}${localVarPath}`, { context: localVarHttpContext, @@ -459,15 +461,69 @@ export class FieldDataResourceService implements FieldDataResourceServiceInterfa } /** - * Get all of the field data for that user. - * @param fieldDataDBOperationSpec + * Get all of the ids used to identify, and retrieve field data. + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public getAllFieldDataIDs(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable; + public getAllFieldDataIDs(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable>; + public getAllFieldDataIDs(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable>; + public getAllFieldDataIDs(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable { + + let localVarHeaders = this.defaultHeaders; + + let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept; + if (localVarHttpHeaderAcceptSelected === undefined) { + // to determine the Accept header + const httpHeaderAccepts: string[] = [ + 'application/json' + ]; + localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts); + } + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); + } + + let localVarHttpContext: HttpContext | undefined = options && options.context; + if (localVarHttpContext === undefined) { + localVarHttpContext = new HttpContext(); + } + + + let responseType_: 'text' | 'json' | 'blob' = 'json'; + if (localVarHttpHeaderAcceptSelected) { + if (localVarHttpHeaderAcceptSelected.startsWith('text')) { + responseType_ = 'text'; + } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { + responseType_ = 'json'; + } else { + responseType_ = 'blob'; + } + } + + let localVarPath = `/api/v1/fieldData/IDs`; + return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, + { + context: localVarHttpContext, + responseType: responseType_, + withCredentials: this.configuration.withCredentials, + headers: localVarHeaders, + observe: observe, + reportProgress: reportProgress + } + ); + } + + /** + * Get the field data from the selected field data ID. + * @param body * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getAllFieldData(fieldDataDBOperationSpec?: FieldDataDBOperationSpec, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable; - public getAllFieldData(fieldDataDBOperationSpec?: FieldDataDBOperationSpec, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable>; - public getAllFieldData(fieldDataDBOperationSpec?: FieldDataDBOperationSpec, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable>; - public getAllFieldData(fieldDataDBOperationSpec?: FieldDataDBOperationSpec, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable { + public getFieldDataFromID(body?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable; + public getFieldDataFromID(body?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable>; + public getFieldDataFromID(body?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable>; + public getFieldDataFromID(body?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable { let localVarHeaders = this.defaultHeaders; @@ -491,7 +547,7 @@ export class FieldDataResourceService implements FieldDataResourceServiceInterfa // to determine the Content-Type header const consumes: string[] = [ - 'application/json' + 'text/plain' ]; const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes); if (httpContentTypeSelected !== undefined) { @@ -510,10 +566,10 @@ export class FieldDataResourceService implements FieldDataResourceServiceInterfa } let localVarPath = `/api/v1/fieldData`; - return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, + return this.httpClient.request('get', `${this.configuration.basePath}${localVarPath}`, { context: localVarHttpContext, - body: fieldDataDBOperationSpec, + body: body, responseType: responseType_, withCredentials: this.configuration.withCredentials, headers: localVarHeaders, diff --git a/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.serviceInterface.ts b/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.serviceInterface.ts index b43e07663f..10e8d4734c 100644 --- a/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.serviceInterface.ts +++ b/webapp-ng/src/app/core/modules/openapi/api/field-data-resource.serviceInterface.ts @@ -16,9 +16,10 @@ import { Observable } from 'rxjs'; import { AnalyzedResultsFromFieldData } from '../model/models'; import { ExternalDataIdentifier } from '../model/models'; import { FieldDataDBOperationSpec } from '../model/models'; -import { FieldDataExternalDataIDs } from '../model/models'; import { FieldDataFileOperationSpec } from '../model/models'; +import { FieldDataInfo } from '../model/models'; import { FieldDataNoCopyConflict } from '../model/models'; +import { FieldDataReferences } from '../model/models'; import { FieldDataSaveResults } from '../model/models'; @@ -67,10 +68,16 @@ export interface FieldDataResourceServiceInterface { generateFieldDataEstimate(file?: Blob, fileName?: string, extraHttpRequestParams?: any): Observable; /** - * Get all of the field data for that user. + * Get all of the ids used to identify, and retrieve field data. * - * @param fieldDataDBOperationSpec */ - getAllFieldData(fieldDataDBOperationSpec?: FieldDataDBOperationSpec, extraHttpRequestParams?: any): Observable; + getAllFieldDataIDs(extraHttpRequestParams?: any): Observable; + + /** + * Get the field data from the selected field data ID. + * + * @param body + */ + getFieldDataFromID(body?: string, extraHttpRequestParams?: any): Observable; } diff --git a/webapp-ng/src/app/core/modules/openapi/model/data-identifier.ts b/webapp-ng/src/app/core/modules/openapi/model/data-identifier.ts new file mode 100644 index 0000000000..f800f3169a --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/data-identifier.ts @@ -0,0 +1,25 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +import { VariableType } from './variable-type'; +import { Domain } from './domain'; + + +export interface DataIdentifier { + name?: string; + displayName?: string; + variableType?: VariableType; + domain?: Domain; + bFunction?: boolean; + _function?: boolean; + visible?: boolean; +} + diff --git a/webapp-ng/src/app/core/modules/openapi/model/domain.ts b/webapp-ng/src/app/core/modules/openapi/model/domain.ts new file mode 100644 index 0000000000..e2aafb28e5 --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/domain.ts @@ -0,0 +1,17 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +export interface Domain { + name?: string; +} + diff --git a/webapp-ng/src/app/core/modules/openapi/model/field-data-file-operation-results.ts b/webapp-ng/src/app/core/modules/openapi/model/field-data-file-operation-results.ts new file mode 100644 index 0000000000..976e4bfd83 --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/field-data-file-operation-results.ts @@ -0,0 +1,29 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +import { FieldDataReferenceInfo } from './field-data-reference-info'; +import { Origin } from './origin'; +import { DataIdentifier } from './data-identifier'; +import { Extent } from './extent'; +import { ISize } from './i-size'; +import { ExternalDataIdentifier } from './external-data-identifier'; + + +export interface FieldDataFileOperationResults { + dataIdentifierArr?: Array; + externalDataIdentifier?: ExternalDataIdentifier; + iSize?: ISize; + origin?: Origin; + extent?: Extent; + times?: Array; + dependantFunctionInfo?: Array; +} + diff --git a/webapp-ng/src/app/core/modules/openapi/model/field-data-info.ts b/webapp-ng/src/app/core/modules/openapi/model/field-data-info.ts new file mode 100644 index 0000000000..25ace3c17f --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/field-data-info.ts @@ -0,0 +1,25 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +import { Origin } from './origin'; +import { DataIdentifier } from './data-identifier'; +import { Extent } from './extent'; +import { ISize } from './i-size'; + + +export interface FieldDataInfo { + extent?: Extent; + origin?: Origin; + isize?: ISize; + dataIdentifier?: Array; + times?: Array; +} + diff --git a/webapp-ng/src/app/core/modules/openapi/model/field-data-reference-info.ts b/webapp-ng/src/app/core/modules/openapi/model/field-data-reference-info.ts new file mode 100644 index 0000000000..22e40b3ca2 --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/field-data-reference-info.ts @@ -0,0 +1,24 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +import { KeyValue } from './key-value'; + + +export interface FieldDataReferenceInfo { + referenceSourceType?: string; + referenceSourceName?: string; + applicationName?: string; + simulationName?: string; + refSourceVersionDate?: string; + funcNames?: Array; + refSourceVersionKey?: KeyValue; +} + diff --git a/webapp-ng/src/app/core/modules/openapi/model/field-data-references.ts b/webapp-ng/src/app/core/modules/openapi/model/field-data-references.ts new file mode 100644 index 0000000000..58acf5cfa4 --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/field-data-references.ts @@ -0,0 +1,21 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +import { KeyValue } from './key-value'; +import { ExternalDataIdentifier } from './external-data-identifier'; + + +export interface FieldDataReferences { + externalDataIdentifiers?: Array; + externalDataAnnotations?: Array; + externalDataIDSimRefs?: { [key: string]: Array; }; +} + diff --git a/webapp-ng/src/app/core/modules/openapi/model/models.ts b/webapp-ng/src/app/core/modules/openapi/model/models.ts index 72b948e2c2..24482e7a15 100644 --- a/webapp-ng/src/app/core/modules/openapi/model/models.ts +++ b/webapp-ng/src/app/core/modules/openapi/model/models.ts @@ -5,13 +5,16 @@ export * from './bio-model'; export * from './biomodel-ref'; export * from './cartesian-mesh'; export * from './coordinate'; +export * from './data-identifier'; export * from './detailed-state'; +export * from './domain'; export * from './extent'; export * from './external-data-identifier'; export * from './field-data-db-operation-spec'; -export * from './field-data-external-data-ids'; export * from './field-data-file-operation-spec'; +export * from './field-data-info'; export * from './field-data-no-copy-conflict'; +export * from './field-data-references'; export * from './field-data-save-results'; export * from './group-access'; export * from './hello-world-message'; diff --git a/webapp-ng/src/app/core/modules/openapi/model/save-field-data-from-file.ts b/webapp-ng/src/app/core/modules/openapi/model/save-field-data-from-file.ts new file mode 100644 index 0000000000..5b2dd937cb --- /dev/null +++ b/webapp-ng/src/app/core/modules/openapi/model/save-field-data-from-file.ts @@ -0,0 +1,27 @@ +/** + * VCell API + * VCell API + * + * The version of the OpenAPI document: 1.0.1 + * Contact: vcell_support@uchc.com + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +import { Origin } from './origin'; +import { Extent } from './extent'; +import { ISize } from './i-size'; + + +export interface SaveFieldDataFromFile { + shortSpecData?: Array>>; + varNames?: Array; + times?: Array; + origin?: Origin; + extent?: Extent; + isize?: ISize; + annotation?: string; + name?: string; +} +