From 05a51ad87a70c6d9ec94c332d48f84beb029d283 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 8 Apr 2025 20:48:26 +0200 Subject: [PATCH] [FEAT] move in the correct domain org.kar -> org.atriasoft --- sample/archidata/basic/WebLauncher.java | 24 ++++---- sample/archidata/basic/WebLauncherLocal.java | 6 +- .../archidata/basic/api/MyModelResource.java | 18 +++--- .../basic/migration/Initialization.java | 2 +- sample/archidata/basic/model/MyModel.java | 6 +- .../archidata/UpdateJwtPublicKey.java | 6 +- .../archidata/annotation/AnnotationTools.java | 18 +++--- .../annotation/CreationTimestamp.java | 2 +- .../archidata/annotation/DataDeleted.java | 2 +- .../archidata/annotation/DataIfNotExists.java | 2 +- .../archidata/annotation/DataJson.java | 2 +- .../archidata/annotation/DataNotRead.java | 2 +- .../archidata/annotation/UpdateTimestamp.java | 2 +- .../SQLTableExternalForeinKeyAsList.java | 2 +- .../apiGenerator/ApiAccessLimitation.java | 2 +- .../annotation/apiGenerator/ApiAsyncType.java | 2 +- .../apiGenerator/ApiGenerationMode.java | 2 +- .../apiGenerator/ApiInputOptional.java | 2 +- .../annotation/apiGenerator/ApiNotNull.java | 2 +- .../apiGenerator/ApiTypeScriptProgress.java | 2 +- .../annotation/checker/CheckForeignKey.java | 2 +- .../checker/CheckForeignKeyValidator.java | 4 +- .../archidata/annotation/checker/Checker.java | 4 +- .../checker/CollectionItemNotNull.java | 2 +- .../CollectionItemNotNullValidator.java | 2 +- .../checker/CollectionItemUnique.java | 2 +- .../CollectionItemUniqueValidator.java | 2 +- .../checker/CollectionNotEmpty.java | 2 +- .../checker/CollectionNotEmptyValidator.java | 2 +- .../annotation/checker/ReadOnlyField.java | 2 +- .../checker/ReadOnlyFieldValidator.java | 2 +- .../archidata/annotation/method/ARCHIVE.java | 2 +- .../archidata/annotation/method/RESTORE.java | 2 +- .../annotation/security/PermitTokenInURI.java | 2 +- .../archidata/api/DataResource.java | 20 +++---- .../archidata/api/FrontGeneric.java | 2 +- .../archidata/api/MediaStreamer.java | 2 +- .../archidata/api/ProxyResource.java | 2 +- .../archidata/api/openApiResource.java | 2 +- .../archidata/backup/BackupEngine.java | 2 +- .../ConstraintViolationExceptionCatcher.java | 2 +- .../archidata/catcher/ExceptionCatcher.java | 2 +- .../catcher/FailExceptionCatcher.java | 4 +- .../archidata/catcher/GenericCatcher.java | 2 +- .../catcher/InputExceptionCatcher.java | 4 +- .../catcher/JacksonExceptionCatcher.java | 2 +- .../catcher/QueryParamExceptionCatcher.java | 2 +- .../archidata/catcher/RestErrorResponse.java | 4 +- .../archidata/catcher/RestInputError.java | 2 +- .../catcher/SystemExceptionCatcher.java | 4 +- .../WebApplicationExceptionCatcher.java | 2 +- .../archidata/checker/CheckJPA.java | 32 +++++------ .../Jakarta/DateParamConverterProvider.java | 4 +- .../OffsetDateTimeParamConverterProvider.java | 4 +- .../converter/jackson/DateDeserializer.java | 6 +- .../converter/jackson/DateSerializer.java | 6 +- .../converter/jackson/JacksonModules.java | 2 +- .../jackson/ObjectIdDeserializer.java | 4 +- .../converter/jackson/ObjectIdSerializer.java | 4 +- .../jackson/OffsetDateTimeDeserializer.java | 6 +- .../jackson/OffsetDateTimeSerializer.java | 6 +- .../converter/morphia/SqlTimestampCodec.java | 2 +- .../archidata/dataAccess/CountInOut.java | 2 +- .../archidata/dataAccess/DBAccess.java | 32 +++++------ .../archidata/dataAccess/DBAccessMorphia.java | 36 ++++++------ .../archidata/dataAccess/DBAccessSQL.java | 50 ++++++++--------- .../archidata/dataAccess/DataAccess.java | 8 +-- .../archidata/dataAccess/DataExport.java | 22 ++++---- .../archidata/dataAccess/DataFactory.java | 20 +++---- .../archidata/dataAccess/Foreign.java | 2 +- .../archidata/dataAccess/LazyGetter.java | 2 +- .../archidata/dataAccess/QueryAnd.java | 2 +- .../archidata/dataAccess/QueryCondition.java | 2 +- .../archidata/dataAccess/QueryInList.java | 2 +- .../archidata/dataAccess/QueryItem.java | 2 +- .../archidata/dataAccess/QueryNoInList.java | 2 +- .../archidata/dataAccess/QueryNotNull.java | 2 +- .../archidata/dataAccess/QueryNull.java | 2 +- .../archidata/dataAccess/QueryOptions.java | 10 ++-- .../archidata/dataAccess/QueryOr.java | 2 +- .../archidata/dataAccess/RetreiveFromDB.java | 2 +- .../addOnMongo/AddOnManyToMany.java | 34 +++++------ .../dataAccess/addOnMongo/AddOnManyToOne.java | 14 ++--- .../dataAccess/addOnMongo/AddOnOneToMany.java | 16 +++--- .../addOnMongo/DataAccessAddOn.java | 8 +-- .../dataAccess/addOnSQL/AddOnDataJson.java | 32 +++++------ .../dataAccess/addOnSQL/AddOnManyToMany.java | 38 ++++++------- .../dataAccess/addOnSQL/AddOnManyToOne.java | 20 +++---- .../dataAccess/addOnSQL/AddOnOneToMany.java | 24 ++++---- .../dataAccess/addOnSQL/DataAccessAddOn.java | 10 ++-- .../addOnSQL/model/LinkTableGeneric.java | 4 +- .../addOnSQL/model/TableCoversGeneric.java | 4 +- .../dataAccess/exportTools/README.md | 0 .../dataAccess/exportTools/TableQuery.java | 2 +- .../exportTools/TableQueryTypes.java | 2 +- .../options/AccessDeletedItems.java | 2 +- .../dataAccess/options/CheckFunction.java | 2 +- .../options/CheckFunctionInterface.java | 8 +-- .../dataAccess/options/CheckFunctionVoid.java | 6 +- .../dataAccess/options/Condition.java | 10 ++-- .../dataAccess/options/ConditionChecker.java | 4 +- .../dataAccess/options/CreateDropTable.java | 2 +- .../dataAccess/options/DBInterfaceRoot.java | 4 +- .../dataAccess/options/FilterValue.java | 2 +- .../archidata/dataAccess/options/GroupBy.java | 4 +- .../archidata/dataAccess/options/Limit.java | 6 +- .../options/OptionRenameColumn.java | 2 +- .../dataAccess/options/OptionSpecifyType.java | 2 +- .../archidata/dataAccess/options/OrderBy.java | 6 +- .../dataAccess/options/OrderItem.java | 2 +- .../dataAccess/options/OverrideTableName.java | 4 +- .../dataAccess/options/QueryOption.java | 3 + .../dataAccess/options/ReadAllColumn.java | 2 +- .../dataAccess/options/TransmitKey.java | 2 +- .../archidata/db/DbConfig.java | 8 +-- .../{kar => atriasoft}/archidata/db/DbIo.java | 2 +- .../archidata/db/DbIoFactory.java | 4 +- .../archidata/db/DbIoMorphia.java | 4 +- .../archidata/db/DbIoSql.java | 2 +- .../exception/DataAccessException.java | 2 +- .../archidata/exception/FailException.java | 4 +- .../archidata/exception/InputException.java | 2 +- .../exception/NotFoundException.java | 2 +- .../exception/RESTErrorResponseException.java | 4 +- .../archidata/exception/SystemException.java | 2 +- .../exception/UnAuthorizedException.java | 2 +- .../archidata/externalRestApi/AnalyzeApi.java | 8 +-- .../externalRestApi/DotGenerateApi.java | 16 +++--- .../externalRestApi/PythonGenerateApi.java | 2 +- .../externalRestApi/TsGenerateApi.java | 16 +++--- .../externalRestApi/dot/DotApiGeneration.java | 20 +++---- .../externalRestApi/dot/DotClassElement.java | 14 ++--- .../dot/DotClassElementGroup.java | 4 +- .../externalRestApi/model/ApiGroupModel.java | 2 +- .../externalRestApi/model/ApiModel.java | 4 +- .../externalRestApi/model/ApiTool.java | 12 ++-- .../externalRestApi/model/ClassEnumModel.java | 6 +- .../externalRestApi/model/ClassListModel.java | 2 +- .../externalRestApi/model/ClassMapModel.java | 2 +- .../externalRestApi/model/ClassModel.java | 6 +- .../model/ClassObjectModel.java | 14 ++--- .../externalRestApi/model/ModelGroup.java | 2 +- .../model/RestTypeRequest.java | 2 +- .../typescript/TsApiGeneration.java | 24 ++++---- .../typescript/TsClassElement.java | 14 ++--- .../typescript/TsClassElementGroup.java | 4 +- .../filter/AuthenticationFilter.java | 12 ++-- .../archidata/filter/CORSFilter.java | 2 +- .../archidata/filter/GenericContext.java | 4 +- .../archidata/filter/MySecurityContext.java | 4 +- .../archidata/filter/OptionFilter.java | 2 +- .../archidata/filter/PartRight.java | 2 +- .../archidata/filter/RightSafeCaster.java | 2 +- .../archidata/migration/AsyncCall.java | 7 +++ .../archidata/migration/MigrationEngine.java | 16 +++--- .../migration/MigrationException.java | 2 +- .../migration/MigrationInterface.java | 6 +- .../archidata/migration/MigrationSqlStep.java | 12 ++-- .../archidata/migration/model/Migration.java | 8 +-- .../archidata/migration/model/Migration1.java | 6 +- .../archidata/model/Data.java | 6 +- .../archidata/model/GenericData.java | 10 ++-- .../model/GenericDataSoftDelete.java | 12 ++-- .../archidata/model/GenericTiming.java | 14 ++--- .../archidata/model/GenericToken.java | 4 +- .../archidata/model/GetToken.java | 2 +- .../archidata/model/OIDGenericData.java | 10 ++-- .../model/OIDGenericDataSoftDelete.java | 12 ++-- .../archidata/model/Token.java | 2 +- .../archidata/model/UUIDGenericData.java | 10 ++-- .../model/UUIDGenericDataSoftDelete.java | 12 ++-- .../archidata/model/User.java | 8 +-- .../archidata/model/UserByToken.java | 4 +- .../archidata/model/token/JwtHeader.java | 2 +- .../archidata/model/token/JwtPayload.java | 2 +- .../archidata/model/token/JwtToken.java | 2 +- .../archidata/tools/AnnotationCreator.java | 4 +- .../archidata/tools/ConfigBaseVariable.java | 2 +- .../archidata/tools/ContextGenericTools.java | 4 +- .../archidata/tools/DataTools.java | 30 +++++----- .../archidata/tools/DateTools.java | 2 +- .../archidata/tools/JWTWrapper.java | 4 +- .../archidata/tools/ListTools.java | 2 +- .../archidata/tools/PublicKey.java | 2 +- .../archidata/tools/RESTApi.java | 4 +- .../archidata/tools/RESTApiRequest.java | 4 +- .../archidata/tools/StringTools.java | 2 +- .../archidata/tools/UuidUtils.java | 4 +- .../dataAccess/options/QueryOption.java | 3 - .../kar/archidata/migration/AsyncCall.java | 7 --- .../archidata/ConfigureDb.java | 56 +++++++++---------- .../archidata/StepwiseExtension.java | 2 +- .../archidata/apiExtern/Common.java | 5 +- .../archidata/apiExtern/TestAPI.java | 12 ++-- .../apiExtern/TestAuthenticationFilter.java | 10 ++-- .../archidata/apiExtern/TestTime.java | 16 +++--- .../archidata/apiExtern/TestTimeParsing.java | 6 +- .../archidata/apiExtern/WebLauncher.java | 32 +++++------ .../archidata/apiExtern/WebLauncherTest.java | 4 +- .../apiExtern/model/DataForJSR310.java | 2 +- .../apiExtern/model/DataForJSR310String.java | 2 +- .../archidata/apiExtern/model/DataTimes.java | 2 +- .../apiExtern/model/SimpleArchiveTable.java | 4 +- .../apiExtern/resource/TestResource.java | 12 ++-- .../resource/TestResourceSample.java | 12 ++-- .../apiExtern/resource/TimeResource.java | 6 +- .../checker/TestJPACheckerDecimalMax.java | 8 +-- .../checker/TestJPACheckerDecimalMin.java | 8 +-- .../checker/TestJPACheckerEMail.java | 8 +-- .../archidata/checker/TestJPACheckerMax.java | 8 +-- .../archidata/checker/TestJPACheckerMin.java | 8 +-- .../checker/TestJPACheckerPattern.java | 8 +-- .../archidata/checker/TestJPACheckerSize.java | 8 +-- .../archidata/checker/model/JpaBaseModel.java | 4 +- .../archidata/dataAccess/TestDataJson.java | 12 ++-- .../archidata/dataAccess/TestJPAChecker.java | 14 ++--- .../archidata/dataAccess/TestJson.java | 14 ++--- .../archidata/dataAccess/TestListJson.java | 16 +++--- .../dataAccess/TestManyToManyLong.java | 18 +++--- .../dataAccess/TestManyToManyOID.java | 18 +++--- .../dataAccess/TestManyToManyUUID.java | 18 +++--- .../dataAccess/TestManyToOneLong.java | 20 +++---- .../dataAccess/TestManyToOneOID.java | 16 +++--- .../dataAccess/TestManyToOneUUID.java | 18 +++--- .../dataAccess/TestOneToManyLong.java | 16 +++--- .../dataAccess/TestOneToManyOID.java | 16 +++--- .../dataAccess/TestOneToManyUUID.java | 18 +++--- .../archidata/dataAccess/TestRawQuery.java | 12 ++-- .../archidata/dataAccess/TestSimpleTable.java | 14 ++--- .../dataAccess/TestSimpleTableSoftDelete.java | 16 +++--- .../archidata/dataAccess/TestTypeEnum1.java | 14 ++--- .../archidata/dataAccess/TestTypeEnum2.java | 14 ++--- .../archidata/dataAccess/TestTypes.java | 12 ++-- .../dataAccess/model/DataInJson.java | 4 +- .../dataAccess/model/DataJsonList.java | 6 +- .../dataAccess/model/DataWithSubJson.java | 8 +-- .../dataAccess/model/Enum1ForTest.java | 2 +- .../dataAccess/model/Enum2ForTest.java | 2 +- .../dataAccess/model/SerializeAsJson.java | 14 +++++ .../dataAccess/model/SerializeListAsJson.java | 6 +- .../model/SerializeListAsJsonObjectId.java | 6 +- .../dataAccess/model/SimpleTable.java | 4 +- .../model/SimpleTableSoftDelete.java | 4 +- .../model/TypeManyToManyLongRemote.java | 4 +- .../model/TypeManyToManyLongRoot.java | 4 +- .../model/TypeManyToManyLongRootExpand.java | 4 +- .../model/TypeManyToManyOIDRemote.java | 4 +- .../model/TypeManyToManyOIDRoot.java | 4 +- .../model/TypeManyToManyOIDRootExpand.java | 4 +- .../model/TypeManyToOneLongRemote.java | 4 +- .../model/TypeManyToOneLongRoot.java | 4 +- .../model/TypeManyToOneLongRootExpand.java | 4 +- .../model/TypeManyToOneOIDRemote.java | 4 +- .../model/TypeManyToOneOIDRoot.java | 4 +- .../model/TypeManyToOneOIDRootExpand.java | 4 +- .../model/TypeManyToOneUUIDRemote.java | 4 +- .../model/TypeManyToOneUUIDRoot.java | 4 +- .../model/TypeManyToOneUUIDRootExpand.java | 4 +- .../model/TypeOneToManyLongRemote.java | 4 +- .../model/TypeOneToManyLongRoot.java | 4 +- .../model/TypeOneToManyLongRootExpand.java | 2 +- .../model/TypeOneToManyOIDRemote.java | 4 +- .../model/TypeOneToManyOIDRoot.java | 4 +- .../model/TypeOneToManyOIDRootExpand.java | 4 +- .../model/TypeOneToManyUUIDRemote.java | 4 +- .../model/TypeOneToManyUUIDRoot.java | 4 +- .../model/TypeOneToManyUUIDRootExpand.java | 4 +- .../dataAccess/model/TypesEnum1.java | 2 +- .../dataAccess/model/TypesEnum2.java | 2 +- .../dataAccess/model/TypesTable.java | 2 +- .../externalRestApi/TestAnalyzeApiName.java | 6 +- .../TestAnalyzeApiParameterType.java | 14 ++--- .../externalRestApi/TestAnalyzeApiPath.java | 6 +- .../externalRestApi/TestAnalyzeApiReturn.java | 14 ++--- .../externalRestApi/TestAnalyzeModel.java | 8 +-- .../hybernateValidator/TestValidator.java | 18 +++--- .../hybernateValidator/WebLauncher.java | 22 ++++---- .../hybernateValidator/WebLauncherTest.java | 4 +- .../model/ValidatorModel.java | 4 +- .../model/ValidatorSubModel.java | 2 +- .../resource/TestResourceValidator.java | 6 +- .../migration/InitializationCurrent.java | 6 +- .../migration/InitializationFirst.java | 6 +- .../archidata/migration/Migration1.java | 4 +- .../archidata/migration/Migration2.java | 4 +- .../archidata/migration/MigrationFail.java | 6 +- .../migration/TestMigrationFail.java | 14 ++--- .../migration/TestMigrationFirstInit.java | 14 ++--- .../TestMigrationFirstInitWithMigration.java | 14 ++--- .../migration/model/TypesMigration1.java | 2 +- .../migration/model/TypesMigration2.java | 2 +- .../TypesMigrationInitialisationCurrent.java | 2 +- .../TypesMigrationInitialisationFirst.java | 2 +- .../dataAccess/model/SerializeAsJson.java | 14 ----- 294 files changed, 1063 insertions(+), 1066 deletions(-) rename src/org/{kar => atriasoft}/archidata/UpdateJwtPublicKey.java (87%) rename src/org/{kar => atriasoft}/archidata/annotation/AnnotationTools.java (96%) rename src/org/{kar => atriasoft}/archidata/annotation/CreationTimestamp.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/DataDeleted.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/DataIfNotExists.java (85%) rename src/org/{kar => atriasoft}/archidata/annotation/DataJson.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/DataNotRead.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/UpdateTimestamp.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java (84%) rename src/org/{kar => atriasoft}/archidata/annotation/apiGenerator/ApiAccessLimitation.java (91%) rename src/org/{kar => atriasoft}/archidata/annotation/apiGenerator/ApiAsyncType.java (90%) rename src/org/{kar => atriasoft}/archidata/annotation/apiGenerator/ApiGenerationMode.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/apiGenerator/ApiInputOptional.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/apiGenerator/ApiNotNull.java (96%) rename src/org/{kar => atriasoft}/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java (97%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CheckForeignKey.java (93%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CheckForeignKeyValidator.java (90%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/Checker.java (93%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CollectionItemNotNull.java (92%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CollectionItemNotNullValidator.java (94%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CollectionItemUnique.java (92%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CollectionItemUniqueValidator.java (93%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CollectionNotEmpty.java (91%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/CollectionNotEmptyValidator.java (92%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/ReadOnlyField.java (91%) rename src/org/{kar => atriasoft}/archidata/annotation/checker/ReadOnlyFieldValidator.java (89%) rename src/org/{kar => atriasoft}/archidata/annotation/method/ARCHIVE.java (89%) rename src/org/{kar => atriasoft}/archidata/annotation/method/RESTORE.java (89%) rename src/org/{kar => atriasoft}/archidata/annotation/security/PermitTokenInURI.java (85%) rename src/org/{kar => atriasoft}/archidata/api/DataResource.java (97%) rename src/org/{kar => atriasoft}/archidata/api/FrontGeneric.java (99%) rename src/org/{kar => atriasoft}/archidata/api/MediaStreamer.java (97%) rename src/org/{kar => atriasoft}/archidata/api/ProxyResource.java (97%) rename src/org/{kar => atriasoft}/archidata/api/openApiResource.java (96%) rename src/org/{kar => atriasoft}/archidata/backup/BackupEngine.java (92%) rename src/org/{kar => atriasoft}/archidata/catcher/ConstraintViolationExceptionCatcher.java (97%) rename src/org/{kar => atriasoft}/archidata/catcher/ExceptionCatcher.java (95%) rename src/org/{kar => atriasoft}/archidata/catcher/FailExceptionCatcher.java (90%) rename src/org/{kar => atriasoft}/archidata/catcher/GenericCatcher.java (94%) rename src/org/{kar => atriasoft}/archidata/catcher/InputExceptionCatcher.java (93%) rename src/org/{kar => atriasoft}/archidata/catcher/JacksonExceptionCatcher.java (97%) rename src/org/{kar => atriasoft}/archidata/catcher/QueryParamExceptionCatcher.java (97%) rename src/org/{kar => atriasoft}/archidata/catcher/RestErrorResponse.java (94%) rename src/org/{kar => atriasoft}/archidata/catcher/RestInputError.java (97%) rename src/org/{kar => atriasoft}/archidata/catcher/SystemExceptionCatcher.java (89%) rename src/org/{kar => atriasoft}/archidata/catcher/WebApplicationExceptionCatcher.java (95%) rename src/org/{kar => atriasoft}/archidata/checker/CheckJPA.java (96%) rename src/org/{kar => atriasoft}/archidata/converter/Jakarta/DateParamConverterProvider.java (92%) rename src/org/{kar => atriasoft}/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java (92%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/DateDeserializer.java (83%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/DateSerializer.java (82%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/JacksonModules.java (93%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/ObjectIdDeserializer.java (89%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/ObjectIdSerializer.java (90%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/OffsetDateTimeDeserializer.java (84%) rename src/org/{kar => atriasoft}/archidata/converter/jackson/OffsetDateTimeSerializer.java (83%) rename src/org/{kar => atriasoft}/archidata/converter/morphia/SqlTimestampCodec.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/CountInOut.java (91%) rename src/org/{kar => atriasoft}/archidata/dataAccess/DBAccess.java (93%) rename src/org/{kar => atriasoft}/archidata/dataAccess/DBAccessMorphia.java (96%) rename src/org/{kar => atriasoft}/archidata/dataAccess/DBAccessSQL.java (97%) rename src/org/{kar => atriasoft}/archidata/dataAccess/DataAccess.java (97%) rename src/org/{kar => atriasoft}/archidata/dataAccess/DataExport.java (95%) rename src/org/{kar => atriasoft}/archidata/dataAccess/DataFactory.java (96%) rename src/org/{kar => atriasoft}/archidata/dataAccess/Foreign.java (86%) rename src/org/{kar => atriasoft}/archidata/dataAccess/LazyGetter.java (61%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryAnd.java (97%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryCondition.java (97%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryInList.java (97%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryItem.java (90%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryNoInList.java (80%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryNotNull.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryNull.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryOptions.java (83%) rename src/org/{kar => atriasoft}/archidata/dataAccess/QueryOr.java (96%) rename src/org/{kar => atriasoft}/archidata/dataAccess/RetreiveFromDB.java (74%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnMongo/AddOnManyToMany.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnMongo/AddOnManyToOne.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnMongo/AddOnOneToMany.java (92%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnMongo/DataAccessAddOn.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/AddOnDataJson.java (90%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/AddOnManyToMany.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/AddOnManyToOne.java (95%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/AddOnOneToMany.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/DataAccessAddOn.java (94%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java (81%) rename src/org/{kar => atriasoft}/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java (75%) rename src/org/{kar => atriasoft}/archidata/dataAccess/exportTools/README.md (100%) rename src/org/{kar => atriasoft}/archidata/dataAccess/exportTools/TableQuery.java (83%) rename src/org/{kar => atriasoft}/archidata/dataAccess/exportTools/TableQueryTypes.java (87%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/AccessDeletedItems.java (74%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/CheckFunction.java (87%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/CheckFunctionInterface.java (81%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/CheckFunctionVoid.java (70%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/Condition.java (90%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/ConditionChecker.java (80%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/CreateDropTable.java (77%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/DBInterfaceRoot.java (62%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/FilterValue.java (90%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/GroupBy.java (88%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/Limit.java (76%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/OptionRenameColumn.java (83%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/OptionSpecifyType.java (90%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/OrderBy.java (86%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/OrderItem.java (81%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/OverrideTableName.java (75%) create mode 100644 src/org/atriasoft/archidata/dataAccess/options/QueryOption.java rename src/org/{kar => atriasoft}/archidata/dataAccess/options/ReadAllColumn.java (77%) rename src/org/{kar => atriasoft}/archidata/dataAccess/options/TransmitKey.java (84%) rename src/org/{kar => atriasoft}/archidata/db/DbConfig.java (95%) rename src/org/{kar => atriasoft}/archidata/db/DbIo.java (98%) rename src/org/{kar => atriasoft}/archidata/db/DbIoFactory.java (93%) rename src/org/{kar => atriasoft}/archidata/db/DbIoMorphia.java (96%) rename src/org/{kar => atriasoft}/archidata/db/DbIoSql.java (97%) rename src/org/{kar => atriasoft}/archidata/exception/DataAccessException.java (80%) rename src/org/{kar => atriasoft}/archidata/exception/FailException.java (90%) rename src/org/{kar => atriasoft}/archidata/exception/InputException.java (92%) rename src/org/{kar => atriasoft}/archidata/exception/NotFoundException.java (85%) rename src/org/{kar => atriasoft}/archidata/exception/RESTErrorResponseException.java (92%) rename src/org/{kar => atriasoft}/archidata/exception/SystemException.java (90%) rename src/org/{kar => atriasoft}/archidata/exception/UnAuthorizedException.java (85%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/AnalyzeApi.java (90%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/DotGenerateApi.java (93%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/PythonGenerateApi.java (66%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/TsGenerateApi.java (94%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/dot/DotApiGeneration.java (94%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/dot/DotClassElement.java (96%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/dot/DotClassElementGroup.java (80%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ApiGroupModel.java (97%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ApiModel.java (98%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ApiTool.java (95%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ClassEnumModel.java (90%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ClassListModel.java (95%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ClassMapModel.java (96%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ClassModel.java (93%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ClassObjectModel.java (95%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/ModelGroup.java (95%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/model/RestTypeRequest.java (59%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/typescript/TsApiGeneration.java (95%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/typescript/TsClassElement.java (97%) rename src/org/{kar => atriasoft}/archidata/externalRestApi/typescript/TsClassElementGroup.java (79%) rename src/org/{kar => atriasoft}/archidata/filter/AuthenticationFilter.java (97%) rename src/org/{kar => atriasoft}/archidata/filter/CORSFilter.java (96%) rename src/org/{kar => atriasoft}/archidata/filter/GenericContext.java (83%) rename src/org/{kar => atriasoft}/archidata/filter/MySecurityContext.java (97%) rename src/org/{kar => atriasoft}/archidata/filter/OptionFilter.java (96%) rename src/org/{kar => atriasoft}/archidata/filter/PartRight.java (96%) rename src/org/{kar => atriasoft}/archidata/filter/RightSafeCaster.java (98%) create mode 100644 src/org/atriasoft/archidata/migration/AsyncCall.java rename src/org/{kar => atriasoft}/archidata/migration/MigrationEngine.java (97%) rename src/org/{kar => atriasoft}/archidata/migration/MigrationException.java (81%) rename src/org/{kar => atriasoft}/archidata/migration/MigrationInterface.java (85%) rename src/org/{kar => atriasoft}/archidata/migration/MigrationSqlStep.java (94%) rename src/org/{kar => atriasoft}/archidata/migration/model/Migration.java (85%) rename src/org/{kar => atriasoft}/archidata/migration/model/Migration1.java (85%) rename src/org/{kar => atriasoft}/archidata/model/Data.java (83%) rename src/org/{kar => atriasoft}/archidata/model/GenericData.java (64%) rename src/org/{kar => atriasoft}/archidata/model/GenericDataSoftDelete.java (58%) rename src/org/{kar => atriasoft}/archidata/model/GenericTiming.java (71%) rename src/org/{kar => atriasoft}/archidata/model/GenericToken.java (87%) rename src/org/{kar => atriasoft}/archidata/model/GetToken.java (88%) rename src/org/{kar => atriasoft}/archidata/model/OIDGenericData.java (63%) rename src/org/{kar => atriasoft}/archidata/model/OIDGenericDataSoftDelete.java (59%) rename src/org/{kar => atriasoft}/archidata/model/Token.java (96%) rename src/org/{kar => atriasoft}/archidata/model/UUIDGenericData.java (64%) rename src/org/{kar => atriasoft}/archidata/model/UUIDGenericDataSoftDelete.java (59%) rename src/org/{kar => atriasoft}/archidata/model/User.java (90%) rename src/org/{kar => atriasoft}/archidata/model/UserByToken.java (95%) rename src/org/{kar => atriasoft}/archidata/model/token/JwtHeader.java (82%) rename src/org/{kar => atriasoft}/archidata/model/token/JwtPayload.java (92%) rename src/org/{kar => atriasoft}/archidata/model/token/JwtToken.java (83%) rename src/org/{kar => atriasoft}/archidata/tools/AnnotationCreator.java (94%) rename src/org/{kar => atriasoft}/archidata/tools/ConfigBaseVariable.java (98%) rename src/org/{kar => atriasoft}/archidata/tools/ContextGenericTools.java (92%) rename src/org/{kar => atriasoft}/archidata/tools/DataTools.java (94%) rename src/org/{kar => atriasoft}/archidata/tools/DateTools.java (99%) rename src/org/{kar => atriasoft}/archidata/tools/JWTWrapper.java (99%) rename src/org/{kar => atriasoft}/archidata/tools/ListTools.java (93%) rename src/org/{kar => atriasoft}/archidata/tools/PublicKey.java (73%) rename src/org/{kar => atriasoft}/archidata/tools/RESTApi.java (99%) rename src/org/{kar => atriasoft}/archidata/tools/RESTApiRequest.java (99%) rename src/org/{kar => atriasoft}/archidata/tools/StringTools.java (91%) rename src/org/{kar => atriasoft}/archidata/tools/UuidUtils.java (95%) delete mode 100644 src/org/kar/archidata/dataAccess/options/QueryOption.java delete mode 100644 src/org/kar/archidata/migration/AsyncCall.java rename test/src/test/{kar => atriasoft}/archidata/ConfigureDb.java (70%) rename test/src/test/{kar => atriasoft}/archidata/StepwiseExtension.java (98%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/Common.java (92%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/TestAPI.java (90%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/TestAuthenticationFilter.java (80%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/TestTime.java (93%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/TestTimeParsing.java (98%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/WebLauncher.java (87%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/WebLauncherTest.java (84%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/model/DataForJSR310.java (92%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/model/DataForJSR310String.java (90%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/model/DataTimes.java (87%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/model/SimpleArchiveTable.java (72%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/resource/TestResource.java (89%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/resource/TestResourceSample.java (85%) rename test/src/test/{kar => atriasoft}/archidata/apiExtern/resource/TimeResource.java (94%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerDecimalMax.java (97%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerDecimalMin.java (97%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerEMail.java (78%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerMax.java (95%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerMin.java (95%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerPattern.java (74%) rename test/src/test/{kar => atriasoft}/archidata/checker/TestJPACheckerSize.java (73%) rename test/src/test/{kar => atriasoft}/archidata/checker/model/JpaBaseModel.java (97%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestDataJson.java (76%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestJPAChecker.java (80%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestJson.java (84%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestListJson.java (95%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestManyToManyLong.java (92%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestManyToManyOID.java (92%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestManyToManyUUID.java (92%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestManyToOneLong.java (87%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestManyToOneOID.java (89%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestManyToOneUUID.java (88%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestOneToManyLong.java (92%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestOneToManyOID.java (92%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestOneToManyUUID.java (91%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestRawQuery.java (90%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestSimpleTable.java (93%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestSimpleTableSoftDelete.java (94%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestTypeEnum1.java (83%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestTypeEnum2.java (89%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/TestTypes.java (98%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/DataInJson.java (80%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/DataJsonList.java (56%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/DataWithSubJson.java (60%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/Enum1ForTest.java (66%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/Enum2ForTest.java (80%) create mode 100644 test/src/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/SerializeListAsJson.java (52%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/SerializeListAsJsonObjectId.java (57%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/SimpleTable.java (63%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/SimpleTableSoftDelete.java (63%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToManyLongRemote.java (78%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToManyLongRoot.java (77%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java (83%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToManyOIDRemote.java (79%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToManyOIDRoot.java (78%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java (82%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneLongRemote.java (71%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneLongRoot.java (82%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java (87%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneOIDRemote.java (56%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneOIDRoot.java (77%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java (83%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java (56%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java (76%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java (83%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyLongRemote.java (75%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyLongRoot.java (75%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java (93%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyOIDRemote.java (77%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyOIDRoot.java (79%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java (83%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java (76%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java (79%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java (83%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypesEnum1.java (88%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypesEnum2.java (88%) rename test/src/test/{kar => atriasoft}/archidata/dataAccess/model/TypesTable.java (94%) rename test/src/test/{kar => atriasoft}/archidata/externalRestApi/TestAnalyzeApiName.java (85%) rename test/src/test/{kar => atriasoft}/archidata/externalRestApi/TestAnalyzeApiParameterType.java (91%) rename test/src/test/{kar => atriasoft}/archidata/externalRestApi/TestAnalyzeApiPath.java (93%) rename test/src/test/{kar => atriasoft}/archidata/externalRestApi/TestAnalyzeApiReturn.java (97%) rename test/src/test/{kar => atriasoft}/archidata/externalRestApi/TestAnalyzeModel.java (82%) rename test/src/test/{kar => atriasoft}/archidata/hybernateValidator/TestValidator.java (87%) rename test/src/test/{kar => atriasoft}/archidata/hybernateValidator/WebLauncher.java (89%) rename test/src/test/{kar => atriasoft}/archidata/hybernateValidator/WebLauncherTest.java (82%) rename test/src/test/{kar => atriasoft}/archidata/hybernateValidator/model/ValidatorModel.java (71%) rename test/src/test/{kar => atriasoft}/archidata/hybernateValidator/model/ValidatorSubModel.java (66%) rename test/src/test/{kar => atriasoft}/archidata/hybernateValidator/resource/TestResourceValidator.java (79%) rename test/src/test/{kar => atriasoft}/archidata/migration/InitializationCurrent.java (67%) rename test/src/test/{kar => atriasoft}/archidata/migration/InitializationFirst.java (67%) rename test/src/test/{kar => atriasoft}/archidata/migration/Migration1.java (76%) rename test/src/test/{kar => atriasoft}/archidata/migration/Migration2.java (77%) rename test/src/test/{kar => atriasoft}/archidata/migration/MigrationFail.java (69%) rename test/src/test/{kar => atriasoft}/archidata/migration/TestMigrationFail.java (82%) rename test/src/test/{kar => atriasoft}/archidata/migration/TestMigrationFirstInit.java (89%) rename test/src/test/{kar => atriasoft}/archidata/migration/TestMigrationFirstInitWithMigration.java (87%) rename test/src/test/{kar => atriasoft}/archidata/migration/model/TypesMigration1.java (89%) rename test/src/test/{kar => atriasoft}/archidata/migration/model/TypesMigration2.java (89%) rename test/src/test/{kar => atriasoft}/archidata/migration/model/TypesMigrationInitialisationCurrent.java (89%) rename test/src/test/{kar => atriasoft}/archidata/migration/model/TypesMigrationInitialisationFirst.java (89%) delete mode 100644 test/src/test/kar/archidata/dataAccess/model/SerializeAsJson.java diff --git a/sample/archidata/basic/WebLauncher.java b/sample/archidata/basic/WebLauncher.java index b28e82c..f835e2e 100755 --- a/sample/archidata/basic/WebLauncher.java +++ b/sample/archidata/basic/WebLauncher.java @@ -7,18 +7,18 @@ import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.glassfish.jersey.server.ResourceConfig; -import org.kar.archidata.GlobalConfiguration; -import org.kar.archidata.UpdateJwtPublicKey; -import org.kar.archidata.api.DataResource; -import org.kar.archidata.catcher.ExceptionCatcher; -import org.kar.archidata.catcher.FailExceptionCatcher; -import org.kar.archidata.catcher.InputExceptionCatcher; -import org.kar.archidata.catcher.SystemExceptionCatcher; -import org.kar.archidata.db.DBConfig; -import org.kar.archidata.filter.CORSFilter; -import org.kar.archidata.filter.OptionFilter; -import org.kar.archidata.migration.MigrationEngine; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.GlobalConfiguration; +import org.atriasoft.archidata.UpdateJwtPublicKey; +import org.atriasoft.archidata.api.DataResource; +import org.atriasoft.archidata.catcher.ExceptionCatcher; +import org.atriasoft.archidata.catcher.FailExceptionCatcher; +import org.atriasoft.archidata.catcher.InputExceptionCatcher; +import org.atriasoft.archidata.catcher.SystemExceptionCatcher; +import org.atriasoft.archidata.db.DBConfig; +import org.atriasoft.archidata.filter.CORSFilter; +import org.atriasoft.archidata.filter.OptionFilter; +import org.atriasoft.archidata.migration.MigrationEngine; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import sample.archidata.basic.api.Front; import sample.archidata.basic.api.HealthCheck; import sample.archidata.basic.api.MediaResource; diff --git a/sample/archidata/basic/WebLauncherLocal.java b/sample/archidata/basic/WebLauncherLocal.java index 4f97232..5e59a2a 100755 --- a/sample/archidata/basic/WebLauncherLocal.java +++ b/sample/archidata/basic/WebLauncherLocal.java @@ -3,9 +3,9 @@ package sample.archidata.basic; import java.util.List; -import org.kar.archidata.api.DataResource; -import org.kar.archidata.dataAccess.DataFactoryTsApi; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.api.DataResource; +import org.atriasoft.archidata.dataAccess.DataFactoryTsApi; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sample/archidata/basic/api/MyModelResource.java b/sample/archidata/basic/api/MyModelResource.java index 3dd050b..6fbfadb 100644 --- a/sample/archidata/basic/api/MyModelResource.java +++ b/sample/archidata/basic/api/MyModelResource.java @@ -8,15 +8,15 @@ import java.util.UUID; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; -import org.kar.archidata.annotation.AsyncType; -import org.kar.archidata.annotation.TypeScriptProgress; -import org.kar.archidata.api.DataResource; -import org.kar.archidata.dataAccess.DataAccess; -import org.kar.archidata.dataAccess.addOn.AddOnDataJson; -import org.kar.archidata.exception.FailException; -import org.kar.archidata.exception.InputException; -import org.kar.archidata.model.Data; -import org.kar.archidata.tools.DataTools; +import org.atriasoft.archidata.annotation.AsyncType; +import org.atriasoft.archidata.annotation.TypeScriptProgress; +import org.atriasoft.archidata.api.DataResource; +import org.atriasoft.archidata.dataAccess.DataAccess; +import org.atriasoft.archidata.dataAccess.addOn.AddOnDataJson; +import org.atriasoft.archidata.exception.FailException; +import org.atriasoft.archidata.exception.InputException; +import org.atriasoft.archidata.model.Data; +import org.atriasoft.archidata.tools.DataTools; import sample.archidata.basic.model.MyModel; import sample.archidata.basic.model.Season; import sample.archidata.basic.model.Series; diff --git a/sample/archidata/basic/migration/Initialization.java b/sample/archidata/basic/migration/Initialization.java index 8b5a71e..63bf18c 100644 --- a/sample/archidata/basic/migration/Initialization.java +++ b/sample/archidata/basic/migration/Initialization.java @@ -2,7 +2,7 @@ package sample.archidata.basic.migration; import java.util.List; -import org.kar.archidata.migration.MigrationSqlStep; +import org.atriasoft.archidata.migration.MigrationSqlStep; import sample.archidata.basic.model.MyModel; public class Initialization extends MigrationSqlStep { diff --git a/sample/archidata/basic/model/MyModel.java b/sample/archidata/basic/model/MyModel.java index 420d7d2..0a79df9 100644 --- a/sample/archidata/basic/model/MyModel.java +++ b/sample/archidata/basic/model/MyModel.java @@ -3,9 +3,9 @@ package sample.archidata.basic.model; import java.util.List; import java.util.UUID; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.Data; -import org.kar.archidata.model.GenericDataSoftDelete; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.model.Data; +import org.atriasoft.archidata.model.GenericDataSoftDelete; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/UpdateJwtPublicKey.java b/src/org/atriasoft/archidata/UpdateJwtPublicKey.java similarity index 87% rename from src/org/kar/archidata/UpdateJwtPublicKey.java rename to src/org/atriasoft/archidata/UpdateJwtPublicKey.java index 3bcb02e..ef6a216 100644 --- a/src/org/kar/archidata/UpdateJwtPublicKey.java +++ b/src/org/atriasoft/archidata/UpdateJwtPublicKey.java @@ -1,7 +1,7 @@ -package org.kar.archidata; +package org.atriasoft.archidata; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.JWTWrapper; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.JWTWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/annotation/AnnotationTools.java b/src/org/atriasoft/archidata/annotation/AnnotationTools.java similarity index 96% rename from src/org/kar/archidata/annotation/AnnotationTools.java rename to src/org/atriasoft/archidata/annotation/AnnotationTools.java index 41f8fa8..4b633f1 100644 --- a/src/org/kar/archidata/annotation/AnnotationTools.java +++ b/src/org/atriasoft/archidata/annotation/AnnotationTools.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -6,14 +6,14 @@ import java.lang.reflect.Parameter; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.annotation.checker.Checker; -import org.kar.archidata.annotation.checker.CollectionItemNotNull; -import org.kar.archidata.annotation.checker.CollectionItemUnique; -import org.kar.archidata.annotation.checker.CollectionNotEmpty; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.options.OptionRenameColumn; -import org.kar.archidata.dataAccess.options.OverrideTableName; -import org.kar.archidata.exception.DataAccessException; +import org.atriasoft.archidata.annotation.checker.Checker; +import org.atriasoft.archidata.annotation.checker.CollectionItemNotNull; +import org.atriasoft.archidata.annotation.checker.CollectionItemUnique; +import org.atriasoft.archidata.annotation.checker.CollectionNotEmpty; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.options.OptionRenameColumn; +import org.atriasoft.archidata.dataAccess.options.OverrideTableName; +import org.atriasoft.archidata.exception.DataAccessException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/annotation/CreationTimestamp.java b/src/org/atriasoft/archidata/annotation/CreationTimestamp.java similarity index 97% rename from src/org/kar/archidata/annotation/CreationTimestamp.java rename to src/org/atriasoft/archidata/annotation/CreationTimestamp.java index a805078..ac6190d 100644 --- a/src/org/kar/archidata/annotation/CreationTimestamp.java +++ b/src/org/atriasoft/archidata/annotation/CreationTimestamp.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/DataDeleted.java b/src/org/atriasoft/archidata/annotation/DataDeleted.java similarity index 97% rename from src/org/kar/archidata/annotation/DataDeleted.java rename to src/org/atriasoft/archidata/annotation/DataDeleted.java index a5248d1..d7f7b81 100644 --- a/src/org/kar/archidata/annotation/DataDeleted.java +++ b/src/org/atriasoft/archidata/annotation/DataDeleted.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/DataIfNotExists.java b/src/org/atriasoft/archidata/annotation/DataIfNotExists.java similarity index 85% rename from src/org/kar/archidata/annotation/DataIfNotExists.java rename to src/org/atriasoft/archidata/annotation/DataIfNotExists.java index 6095b58..12e08dc 100644 --- a/src/org/kar/archidata/annotation/DataIfNotExists.java +++ b/src/org/atriasoft/archidata/annotation/DataIfNotExists.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/DataJson.java b/src/org/atriasoft/archidata/annotation/DataJson.java similarity index 97% rename from src/org/kar/archidata/annotation/DataJson.java rename to src/org/atriasoft/archidata/annotation/DataJson.java index 5bb5c28..987035e 100644 --- a/src/org/kar/archidata/annotation/DataJson.java +++ b/src/org/atriasoft/archidata/annotation/DataJson.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/DataNotRead.java b/src/org/atriasoft/archidata/annotation/DataNotRead.java similarity index 97% rename from src/org/kar/archidata/annotation/DataNotRead.java rename to src/org/atriasoft/archidata/annotation/DataNotRead.java index d4ab107..3b21ba9 100644 --- a/src/org/kar/archidata/annotation/DataNotRead.java +++ b/src/org/atriasoft/archidata/annotation/DataNotRead.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/UpdateTimestamp.java b/src/org/atriasoft/archidata/annotation/UpdateTimestamp.java similarity index 97% rename from src/org/kar/archidata/annotation/UpdateTimestamp.java rename to src/org/atriasoft/archidata/annotation/UpdateTimestamp.java index 3a1993f..2ae09ce 100644 --- a/src/org/kar/archidata/annotation/UpdateTimestamp.java +++ b/src/org/atriasoft/archidata/annotation/UpdateTimestamp.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation; +package org.atriasoft.archidata.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java b/src/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java similarity index 84% rename from src/org/kar/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java rename to src/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java index 5170c3e..995dd42 100644 --- a/src/org/kar/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java +++ b/src/org/atriasoft/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.addOn; +package org.atriasoft.archidata.annotation.addOn; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/apiGenerator/ApiAccessLimitation.java b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java similarity index 91% rename from src/org/kar/archidata/annotation/apiGenerator/ApiAccessLimitation.java rename to src/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java index d99871a..0b9c7a4 100644 --- a/src/org/kar/archidata/annotation/apiGenerator/ApiAccessLimitation.java +++ b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiAccessLimitation.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.apiGenerator; +package org.atriasoft.archidata.annotation.apiGenerator; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/org/kar/archidata/annotation/apiGenerator/ApiAsyncType.java b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java similarity index 90% rename from src/org/kar/archidata/annotation/apiGenerator/ApiAsyncType.java rename to src/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java index aecc816..178438e 100644 --- a/src/org/kar/archidata/annotation/apiGenerator/ApiAsyncType.java +++ b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiAsyncType.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.apiGenerator; +package org.atriasoft.archidata.annotation.apiGenerator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/apiGenerator/ApiGenerationMode.java b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java similarity index 97% rename from src/org/kar/archidata/annotation/apiGenerator/ApiGenerationMode.java rename to src/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java index 7af2878..9c5e6d5 100644 --- a/src/org/kar/archidata/annotation/apiGenerator/ApiGenerationMode.java +++ b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiGenerationMode.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.apiGenerator; +package org.atriasoft.archidata.annotation.apiGenerator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/apiGenerator/ApiInputOptional.java b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java similarity index 97% rename from src/org/kar/archidata/annotation/apiGenerator/ApiInputOptional.java rename to src/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java index 6e3b6bd..e95bbc3 100644 --- a/src/org/kar/archidata/annotation/apiGenerator/ApiInputOptional.java +++ b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiInputOptional.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.apiGenerator; +package org.atriasoft.archidata.annotation.apiGenerator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/apiGenerator/ApiNotNull.java b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java similarity index 96% rename from src/org/kar/archidata/annotation/apiGenerator/ApiNotNull.java rename to src/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java index 3915ceb..70f8ca8 100644 --- a/src/org/kar/archidata/annotation/apiGenerator/ApiNotNull.java +++ b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiNotNull.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.apiGenerator; +package org.atriasoft.archidata.annotation.apiGenerator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java similarity index 97% rename from src/org/kar/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java rename to src/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java index 4ae3c11..a1dbedc 100644 --- a/src/org/kar/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java +++ b/src/org/atriasoft/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.apiGenerator; +package org.atriasoft.archidata.annotation.apiGenerator; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/checker/CheckForeignKey.java b/src/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java similarity index 93% rename from src/org/kar/archidata/annotation/checker/CheckForeignKey.java rename to src/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java index 79cc9b8..d08aa10 100644 --- a/src/org/kar/archidata/annotation/checker/CheckForeignKey.java +++ b/src/org/atriasoft/archidata/annotation/checker/CheckForeignKey.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/checker/CheckForeignKeyValidator.java b/src/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java similarity index 90% rename from src/org/kar/archidata/annotation/checker/CheckForeignKeyValidator.java rename to src/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java index de9146b..318374b 100644 --- a/src/org/kar/archidata/annotation/checker/CheckForeignKeyValidator.java +++ b/src/org/atriasoft/archidata/annotation/checker/CheckForeignKeyValidator.java @@ -1,6 +1,6 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; -import org.kar.archidata.dataAccess.DataAccess; +import org.atriasoft.archidata.dataAccess.DataAccess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/annotation/checker/Checker.java b/src/org/atriasoft/archidata/annotation/checker/Checker.java similarity index 93% rename from src/org/kar/archidata/annotation/checker/Checker.java rename to src/org/atriasoft/archidata/annotation/checker/Checker.java index a50cd8e..04c9413 100644 --- a/src/org/kar/archidata/annotation/checker/Checker.java +++ b/src/org/atriasoft/archidata/annotation/checker/Checker.java @@ -1,11 +1,11 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.kar.archidata.dataAccess.options.CheckFunctionInterface; +import org.atriasoft.archidata.dataAccess.options.CheckFunctionInterface; /** * The Checker annotation is used to specify a checker class that automatically diff --git a/src/org/kar/archidata/annotation/checker/CollectionItemNotNull.java b/src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java similarity index 92% rename from src/org/kar/archidata/annotation/checker/CollectionItemNotNull.java rename to src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java index bf2589c..b1700e2 100644 --- a/src/org/kar/archidata/annotation/checker/CollectionItemNotNull.java +++ b/src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNull.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/checker/CollectionItemNotNullValidator.java b/src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java similarity index 94% rename from src/org/kar/archidata/annotation/checker/CollectionItemNotNullValidator.java rename to src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java index a6fe8b3..df52279 100644 --- a/src/org/kar/archidata/annotation/checker/CollectionItemNotNullValidator.java +++ b/src/org/atriasoft/archidata/annotation/checker/CollectionItemNotNullValidator.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.util.Collection; diff --git a/src/org/kar/archidata/annotation/checker/CollectionItemUnique.java b/src/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java similarity index 92% rename from src/org/kar/archidata/annotation/checker/CollectionItemUnique.java rename to src/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java index 7a4c5de..838db31 100644 --- a/src/org/kar/archidata/annotation/checker/CollectionItemUnique.java +++ b/src/org/atriasoft/archidata/annotation/checker/CollectionItemUnique.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/checker/CollectionItemUniqueValidator.java b/src/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java similarity index 93% rename from src/org/kar/archidata/annotation/checker/CollectionItemUniqueValidator.java rename to src/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java index a93701a..fb8a1c6 100644 --- a/src/org/kar/archidata/annotation/checker/CollectionItemUniqueValidator.java +++ b/src/org/atriasoft/archidata/annotation/checker/CollectionItemUniqueValidator.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.util.Collection; import java.util.HashSet; diff --git a/src/org/kar/archidata/annotation/checker/CollectionNotEmpty.java b/src/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java similarity index 91% rename from src/org/kar/archidata/annotation/checker/CollectionNotEmpty.java rename to src/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java index 85dc039..cca781f 100644 --- a/src/org/kar/archidata/annotation/checker/CollectionNotEmpty.java +++ b/src/org/atriasoft/archidata/annotation/checker/CollectionNotEmpty.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/checker/CollectionNotEmptyValidator.java b/src/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java similarity index 92% rename from src/org/kar/archidata/annotation/checker/CollectionNotEmptyValidator.java rename to src/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java index a55d359..712b00b 100644 --- a/src/org/kar/archidata/annotation/checker/CollectionNotEmptyValidator.java +++ b/src/org/atriasoft/archidata/annotation/checker/CollectionNotEmptyValidator.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.util.Collection; diff --git a/src/org/kar/archidata/annotation/checker/ReadOnlyField.java b/src/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java similarity index 91% rename from src/org/kar/archidata/annotation/checker/ReadOnlyField.java rename to src/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java index d935496..2cb6450 100644 --- a/src/org/kar/archidata/annotation/checker/ReadOnlyField.java +++ b/src/org/atriasoft/archidata/annotation/checker/ReadOnlyField.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/checker/ReadOnlyFieldValidator.java b/src/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java similarity index 89% rename from src/org/kar/archidata/annotation/checker/ReadOnlyFieldValidator.java rename to src/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java index b86ce12..be603ab 100644 --- a/src/org/kar/archidata/annotation/checker/ReadOnlyFieldValidator.java +++ b/src/org/atriasoft/archidata/annotation/checker/ReadOnlyFieldValidator.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.checker; +package org.atriasoft.archidata.annotation.checker; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/org/kar/archidata/annotation/method/ARCHIVE.java b/src/org/atriasoft/archidata/annotation/method/ARCHIVE.java similarity index 89% rename from src/org/kar/archidata/annotation/method/ARCHIVE.java rename to src/org/atriasoft/archidata/annotation/method/ARCHIVE.java index 3f71730..c9078c3 100644 --- a/src/org/kar/archidata/annotation/method/ARCHIVE.java +++ b/src/org/atriasoft/archidata/annotation/method/ARCHIVE.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.method; +package org.atriasoft.archidata.annotation.method; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/method/RESTORE.java b/src/org/atriasoft/archidata/annotation/method/RESTORE.java similarity index 89% rename from src/org/kar/archidata/annotation/method/RESTORE.java rename to src/org/atriasoft/archidata/annotation/method/RESTORE.java index 57924a9..b9650e1 100644 --- a/src/org/kar/archidata/annotation/method/RESTORE.java +++ b/src/org/atriasoft/archidata/annotation/method/RESTORE.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.method; +package org.atriasoft.archidata.annotation.method; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/org/kar/archidata/annotation/security/PermitTokenInURI.java b/src/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java similarity index 85% rename from src/org/kar/archidata/annotation/security/PermitTokenInURI.java rename to src/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java index 62f43d8..e0bbe36 100644 --- a/src/org/kar/archidata/annotation/security/PermitTokenInURI.java +++ b/src/org/atriasoft/archidata/annotation/security/PermitTokenInURI.java @@ -1,4 +1,4 @@ -package org.kar.archidata.annotation.security; +package org.atriasoft.archidata.annotation.security; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/org/kar/archidata/api/DataResource.java b/src/org/atriasoft/archidata/api/DataResource.java similarity index 97% rename from src/org/kar/archidata/api/DataResource.java rename to src/org/atriasoft/archidata/api/DataResource.java index 20cfc7f..b625744 100644 --- a/src/org/kar/archidata/api/DataResource.java +++ b/src/org/atriasoft/archidata/api/DataResource.java @@ -1,4 +1,4 @@ -package org.kar.archidata.api; +package org.atriasoft.archidata.api; import java.awt.Graphics2D; import java.awt.image.BufferedImage; @@ -21,18 +21,18 @@ import java.util.UUID; import javax.imageio.ImageIO; +import org.atriasoft.archidata.annotation.apiGenerator.ApiInputOptional; +import org.atriasoft.archidata.annotation.security.PermitTokenInURI; +import org.atriasoft.archidata.dataAccess.DataAccess; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.exception.FailException; +import org.atriasoft.archidata.filter.GenericContext; +import org.atriasoft.archidata.model.Data; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.bson.types.ObjectId; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; -import org.kar.archidata.annotation.apiGenerator.ApiInputOptional; -import org.kar.archidata.annotation.security.PermitTokenInURI; -import org.kar.archidata.dataAccess.DataAccess; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.exception.FailException; -import org.kar.archidata.filter.GenericContext; -import org.kar.archidata.model.Data; -import org.kar.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/api/FrontGeneric.java b/src/org/atriasoft/archidata/api/FrontGeneric.java similarity index 99% rename from src/org/kar/archidata/api/FrontGeneric.java rename to src/org/atriasoft/archidata/api/FrontGeneric.java index 7f4c7a8..f4b10f7 100644 --- a/src/org/kar/archidata/api/FrontGeneric.java +++ b/src/org/atriasoft/archidata/api/FrontGeneric.java @@ -1,4 +1,4 @@ -package org.kar.archidata.api; +package org.atriasoft.archidata.api; import java.io.File; import java.util.List; diff --git a/src/org/kar/archidata/api/MediaStreamer.java b/src/org/atriasoft/archidata/api/MediaStreamer.java similarity index 97% rename from src/org/kar/archidata/api/MediaStreamer.java rename to src/org/atriasoft/archidata/api/MediaStreamer.java index f57e23a..4f8cfe1 100644 --- a/src/org/kar/archidata/api/MediaStreamer.java +++ b/src/org/atriasoft/archidata/api/MediaStreamer.java @@ -1,4 +1,4 @@ -package org.kar.archidata.api; +package org.atriasoft.archidata.api; import java.io.IOException; import java.io.OutputStream; diff --git a/src/org/kar/archidata/api/ProxyResource.java b/src/org/atriasoft/archidata/api/ProxyResource.java similarity index 97% rename from src/org/kar/archidata/api/ProxyResource.java rename to src/org/atriasoft/archidata/api/ProxyResource.java index dead541..45e5263 100644 --- a/src/org/kar/archidata/api/ProxyResource.java +++ b/src/org/atriasoft/archidata/api/ProxyResource.java @@ -1,4 +1,4 @@ -package org.kar.archidata.api; +package org.atriasoft.archidata.api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/api/openApiResource.java b/src/org/atriasoft/archidata/api/openApiResource.java similarity index 96% rename from src/org/kar/archidata/api/openApiResource.java rename to src/org/atriasoft/archidata/api/openApiResource.java index 4de2866..4e38489 100644 --- a/src/org/kar/archidata/api/openApiResource.java +++ b/src/org/atriasoft/archidata/api/openApiResource.java @@ -1,4 +1,4 @@ -package org.kar.archidata.api; +package org.atriasoft.archidata.api; import io.swagger.v3.jaxrs2.integration.resources.BaseOpenApiResource; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/org/kar/archidata/backup/BackupEngine.java b/src/org/atriasoft/archidata/backup/BackupEngine.java similarity index 92% rename from src/org/kar/archidata/backup/BackupEngine.java rename to src/org/atriasoft/archidata/backup/BackupEngine.java index bc9f49f..84fca5b 100644 --- a/src/org/kar/archidata/backup/BackupEngine.java +++ b/src/org/atriasoft/archidata/backup/BackupEngine.java @@ -1,4 +1,4 @@ -package org.kar.archidata.backup; +package org.atriasoft.archidata.backup; import java.util.ArrayList; import java.util.List; diff --git a/src/org/kar/archidata/catcher/ConstraintViolationExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java similarity index 97% rename from src/org/kar/archidata/catcher/ConstraintViolationExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java index 2978a70..a8b70d9 100644 --- a/src/org/kar/archidata/catcher/ConstraintViolationExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/ConstraintViolationExceptionCatcher.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import java.time.Instant; import java.util.ArrayList; diff --git a/src/org/kar/archidata/catcher/ExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/ExceptionCatcher.java similarity index 95% rename from src/org/kar/archidata/catcher/ExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/ExceptionCatcher.java index 91529ee..a16ee7a 100644 --- a/src/org/kar/archidata/catcher/ExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/ExceptionCatcher.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/catcher/FailExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/FailExceptionCatcher.java similarity index 90% rename from src/org/kar/archidata/catcher/FailExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/FailExceptionCatcher.java index 8aba13c..5ad91bc 100644 --- a/src/org/kar/archidata/catcher/FailExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/FailExceptionCatcher.java @@ -1,6 +1,6 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; -import org.kar.archidata.exception.FailException; +import org.atriasoft.archidata.exception.FailException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/catcher/GenericCatcher.java b/src/org/atriasoft/archidata/catcher/GenericCatcher.java similarity index 94% rename from src/org/kar/archidata/catcher/GenericCatcher.java rename to src/org/atriasoft/archidata/catcher/GenericCatcher.java index af664b1..fef3749 100644 --- a/src/org/kar/archidata/catcher/GenericCatcher.java +++ b/src/org/atriasoft/archidata/catcher/GenericCatcher.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import org.glassfish.jersey.server.ResourceConfig; diff --git a/src/org/kar/archidata/catcher/InputExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/InputExceptionCatcher.java similarity index 93% rename from src/org/kar/archidata/catcher/InputExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/InputExceptionCatcher.java index d0d2407..4875ded 100644 --- a/src/org/kar/archidata/catcher/InputExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/InputExceptionCatcher.java @@ -1,6 +1,6 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; -import org.kar.archidata.exception.InputException; +import org.atriasoft.archidata.exception.InputException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/catcher/JacksonExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java similarity index 97% rename from src/org/kar/archidata/catcher/JacksonExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java index 30e283f..e0e5d0c 100644 --- a/src/org/kar/archidata/catcher/JacksonExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/JacksonExceptionCatcher.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/catcher/QueryParamExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java similarity index 97% rename from src/org/kar/archidata/catcher/QueryParamExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java index 34a38f7..d774631 100644 --- a/src/org/kar/archidata/catcher/QueryParamExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/QueryParamExceptionCatcher.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import java.time.Instant; import java.util.ArrayList; diff --git a/src/org/kar/archidata/catcher/RestErrorResponse.java b/src/org/atriasoft/archidata/catcher/RestErrorResponse.java similarity index 94% rename from src/org/kar/archidata/catcher/RestErrorResponse.java rename to src/org/atriasoft/archidata/catcher/RestErrorResponse.java index 22db030..0c32c73 100644 --- a/src/org/kar/archidata/catcher/RestErrorResponse.java +++ b/src/org/atriasoft/archidata/catcher/RestErrorResponse.java @@ -1,10 +1,10 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import java.time.Instant; import java.util.List; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/catcher/RestInputError.java b/src/org/atriasoft/archidata/catcher/RestInputError.java similarity index 97% rename from src/org/kar/archidata/catcher/RestInputError.java rename to src/org/atriasoft/archidata/catcher/RestInputError.java index 4921345..54d29fc 100644 --- a/src/org/kar/archidata/catcher/RestInputError.java +++ b/src/org/atriasoft/archidata/catcher/RestInputError.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/org/kar/archidata/catcher/SystemExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java similarity index 89% rename from src/org/kar/archidata/catcher/SystemExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java index 3d82f1e..758bf6a 100644 --- a/src/org/kar/archidata/catcher/SystemExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/SystemExceptionCatcher.java @@ -1,6 +1,6 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; -import org.kar.archidata.exception.SystemException; +import org.atriasoft.archidata.exception.SystemException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/catcher/WebApplicationExceptionCatcher.java b/src/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java similarity index 95% rename from src/org/kar/archidata/catcher/WebApplicationExceptionCatcher.java rename to src/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java index 7b052ca..88b289c 100644 --- a/src/org/kar/archidata/catcher/WebApplicationExceptionCatcher.java +++ b/src/org/atriasoft/archidata/catcher/WebApplicationExceptionCatcher.java @@ -1,4 +1,4 @@ -package org.kar.archidata.catcher; +package org.atriasoft.archidata.catcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/checker/CheckJPA.java b/src/org/atriasoft/archidata/checker/CheckJPA.java similarity index 96% rename from src/org/kar/archidata/checker/CheckJPA.java rename to src/org/atriasoft/archidata/checker/CheckJPA.java index b246648..36de30c 100644 --- a/src/org/kar/archidata/checker/CheckJPA.java +++ b/src/org/atriasoft/archidata/checker/CheckJPA.java @@ -1,4 +1,4 @@ -package org.kar.archidata.checker; +package org.atriasoft.archidata.checker; import java.lang.reflect.Field; import java.sql.Timestamp; @@ -14,21 +14,21 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.checker.CheckForeignKey; -import org.kar.archidata.annotation.checker.Checker; -import org.kar.archidata.annotation.checker.CollectionItemNotNull; -import org.kar.archidata.annotation.checker.CollectionItemUnique; -import org.kar.archidata.annotation.checker.CollectionNotEmpty; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.options.CheckFunctionInterface; -import org.kar.archidata.dataAccess.options.CheckFunctionVoid; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.ConditionChecker; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.exception.InputException; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.checker.CheckForeignKey; +import org.atriasoft.archidata.annotation.checker.Checker; +import org.atriasoft.archidata.annotation.checker.CollectionItemNotNull; +import org.atriasoft.archidata.annotation.checker.CollectionItemUnique; +import org.atriasoft.archidata.annotation.checker.CollectionNotEmpty; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.options.CheckFunctionInterface; +import org.atriasoft.archidata.dataAccess.options.CheckFunctionVoid; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.ConditionChecker; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.exception.InputException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/converter/Jakarta/DateParamConverterProvider.java b/src/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java similarity index 92% rename from src/org/kar/archidata/converter/Jakarta/DateParamConverterProvider.java rename to src/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java index c9493ae..4bf56a6 100644 --- a/src/org/kar/archidata/converter/Jakarta/DateParamConverterProvider.java +++ b/src/org/atriasoft/archidata/converter/Jakarta/DateParamConverterProvider.java @@ -1,11 +1,11 @@ -package org.kar.archidata.converter.Jakarta; +package org.atriasoft.archidata.converter.Jakarta; import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Date; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import jakarta.annotation.Priority; import jakarta.ws.rs.ext.ParamConverter; diff --git a/src/org/kar/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java b/src/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java similarity index 92% rename from src/org/kar/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java rename to src/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java index fe1a4cc..5ec8683 100644 --- a/src/org/kar/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java +++ b/src/org/atriasoft/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java @@ -1,11 +1,11 @@ -package org.kar.archidata.converter.Jakarta; +package org.atriasoft.archidata.converter.Jakarta; import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.time.OffsetDateTime; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import jakarta.ws.rs.ext.ParamConverter; import jakarta.ws.rs.ext.ParamConverterProvider; diff --git a/src/org/kar/archidata/converter/jackson/DateDeserializer.java b/src/org/atriasoft/archidata/converter/jackson/DateDeserializer.java similarity index 83% rename from src/org/kar/archidata/converter/jackson/DateDeserializer.java rename to src/org/atriasoft/archidata/converter/jackson/DateDeserializer.java index 04c0167..2460824 100644 --- a/src/org/kar/archidata/converter/jackson/DateDeserializer.java +++ b/src/org/atriasoft/archidata/converter/jackson/DateDeserializer.java @@ -1,9 +1,9 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.io.IOException; import java.util.Date; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -16,4 +16,4 @@ public class DateDeserializer extends JsonDeserializer { final Date ret = DateTools.parseDate(value); return ret; } -} \ No newline at end of file +} diff --git a/src/org/kar/archidata/converter/jackson/DateSerializer.java b/src/org/atriasoft/archidata/converter/jackson/DateSerializer.java similarity index 82% rename from src/org/kar/archidata/converter/jackson/DateSerializer.java rename to src/org/atriasoft/archidata/converter/jackson/DateSerializer.java index 40b5005..1e361ae 100644 --- a/src/org/kar/archidata/converter/jackson/DateSerializer.java +++ b/src/org/atriasoft/archidata/converter/jackson/DateSerializer.java @@ -1,9 +1,9 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.io.IOException; import java.util.Date; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; @@ -15,4 +15,4 @@ public class DateSerializer extends JsonSerializer { throws IOException { gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value)); } -} \ No newline at end of file +} diff --git a/src/org/kar/archidata/converter/jackson/JacksonModules.java b/src/org/atriasoft/archidata/converter/jackson/JacksonModules.java similarity index 93% rename from src/org/kar/archidata/converter/jackson/JacksonModules.java rename to src/org/atriasoft/archidata/converter/jackson/JacksonModules.java index abda4fc..9fc6694 100644 --- a/src/org/kar/archidata/converter/jackson/JacksonModules.java +++ b/src/org/atriasoft/archidata/converter/jackson/JacksonModules.java @@ -1,4 +1,4 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.time.OffsetDateTime; import java.util.Date; diff --git a/src/org/kar/archidata/converter/jackson/ObjectIdDeserializer.java b/src/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java similarity index 89% rename from src/org/kar/archidata/converter/jackson/ObjectIdDeserializer.java rename to src/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java index eeef78e..ec0dcf7 100644 --- a/src/org/kar/archidata/converter/jackson/ObjectIdDeserializer.java +++ b/src/org/atriasoft/archidata/converter/jackson/ObjectIdDeserializer.java @@ -1,4 +1,4 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.io.IOException; @@ -13,4 +13,4 @@ public class ObjectIdDeserializer extends JsonDeserializer { public ObjectId deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException { return new ObjectId(p.getValueAsString()); } -} \ No newline at end of file +} diff --git a/src/org/kar/archidata/converter/jackson/ObjectIdSerializer.java b/src/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java similarity index 90% rename from src/org/kar/archidata/converter/jackson/ObjectIdSerializer.java rename to src/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java index c3e22aa..e784b10 100644 --- a/src/org/kar/archidata/converter/jackson/ObjectIdSerializer.java +++ b/src/org/atriasoft/archidata/converter/jackson/ObjectIdSerializer.java @@ -1,4 +1,4 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.io.IOException; @@ -14,4 +14,4 @@ public class ObjectIdSerializer extends JsonSerializer { throws IOException { gen.writeString(value.toHexString()); } -} \ No newline at end of file +} diff --git a/src/org/kar/archidata/converter/jackson/OffsetDateTimeDeserializer.java b/src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java similarity index 84% rename from src/org/kar/archidata/converter/jackson/OffsetDateTimeDeserializer.java rename to src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java index bc9e86c..9bc8fda 100644 --- a/src/org/kar/archidata/converter/jackson/OffsetDateTimeDeserializer.java +++ b/src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeDeserializer.java @@ -1,9 +1,9 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.io.IOException; import java.time.OffsetDateTime; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -16,4 +16,4 @@ public class OffsetDateTimeDeserializer extends JsonDeserializer final OffsetDateTime ret = DateTools.parseOffsetDateTime(value); return ret; } -} \ No newline at end of file +} diff --git a/src/org/kar/archidata/converter/jackson/OffsetDateTimeSerializer.java b/src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java similarity index 83% rename from src/org/kar/archidata/converter/jackson/OffsetDateTimeSerializer.java rename to src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java index b2252f6..bc0c377 100644 --- a/src/org/kar/archidata/converter/jackson/OffsetDateTimeSerializer.java +++ b/src/org/atriasoft/archidata/converter/jackson/OffsetDateTimeSerializer.java @@ -1,9 +1,9 @@ -package org.kar.archidata.converter.jackson; +package org.atriasoft.archidata.converter.jackson; import java.io.IOException; import java.time.OffsetDateTime; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; @@ -15,4 +15,4 @@ public class OffsetDateTimeSerializer extends JsonSerializer { throws IOException { gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value)); } -} \ No newline at end of file +} diff --git a/src/org/kar/archidata/converter/morphia/SqlTimestampCodec.java b/src/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java similarity index 94% rename from src/org/kar/archidata/converter/morphia/SqlTimestampCodec.java rename to src/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java index e45e364..5cfd21f 100644 --- a/src/org/kar/archidata/converter/morphia/SqlTimestampCodec.java +++ b/src/org/atriasoft/archidata/converter/morphia/SqlTimestampCodec.java @@ -1,4 +1,4 @@ -package org.kar.archidata.converter.morphia; +package org.atriasoft.archidata.converter.morphia; import java.sql.Timestamp; diff --git a/src/org/kar/archidata/dataAccess/CountInOut.java b/src/org/atriasoft/archidata/dataAccess/CountInOut.java similarity index 91% rename from src/org/kar/archidata/dataAccess/CountInOut.java rename to src/org/atriasoft/archidata/dataAccess/CountInOut.java index 50fb529..5fec18a 100644 --- a/src/org/kar/archidata/dataAccess/CountInOut.java +++ b/src/org/atriasoft/archidata/dataAccess/CountInOut.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; /** Java does not permit to set return data (eg: integer) in the function parameter. This class permit to update a value as in/out function parameters. */ public class CountInOut { diff --git a/src/org/kar/archidata/dataAccess/DBAccess.java b/src/org/atriasoft/archidata/dataAccess/DBAccess.java similarity index 93% rename from src/org/kar/archidata/dataAccess/DBAccess.java rename to src/org/atriasoft/archidata/dataAccess/DBAccess.java index 853126e..fe5d904 100644 --- a/src/org/kar/archidata/dataAccess/DBAccess.java +++ b/src/org/atriasoft/archidata/dataAccess/DBAccess.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.io.Closeable; import java.io.IOException; @@ -6,21 +6,21 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.FilterValue; -import org.kar.archidata.dataAccess.options.Limit; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.dataAccess.options.QueryOption; -import org.kar.archidata.dataAccess.options.TransmitKey; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.db.DbIo; -import org.kar.archidata.db.DbIoFactory; -import org.kar.archidata.db.DbIoMorphia; -import org.kar.archidata.db.DbIoSql; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ContextGenericTools; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.FilterValue; +import org.atriasoft.archidata.dataAccess.options.Limit; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.dataAccess.options.QueryOption; +import org.atriasoft.archidata.dataAccess.options.TransmitKey; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.db.DbIo; +import org.atriasoft.archidata.db.DbIoFactory; +import org.atriasoft.archidata.db.DbIoMorphia; +import org.atriasoft.archidata.db.DbIoSql; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ContextGenericTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/DBAccessMorphia.java b/src/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java similarity index 96% rename from src/org/kar/archidata/dataAccess/DBAccessMorphia.java rename to src/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java index 3bc8191..2620e60 100644 --- a/src/org/kar/archidata/dataAccess/DBAccessMorphia.java +++ b/src/org/atriasoft/archidata/dataAccess/DBAccessMorphia.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.io.IOException; import java.lang.reflect.Constructor; @@ -14,26 +14,26 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.annotation.CreationTimestamp; +import org.atriasoft.archidata.annotation.UpdateTimestamp; +import org.atriasoft.archidata.dataAccess.addOnMongo.AddOnManyToOne; +import org.atriasoft.archidata.dataAccess.addOnMongo.AddOnOneToMany; +import org.atriasoft.archidata.dataAccess.addOnMongo.DataAccessAddOn; +import org.atriasoft.archidata.dataAccess.options.CheckFunction; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.FilterValue; +import org.atriasoft.archidata.dataAccess.options.Limit; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.dataAccess.options.OrderBy; +import org.atriasoft.archidata.dataAccess.options.QueryOption; +import org.atriasoft.archidata.db.DbIoMorphia; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.UuidUtils; import org.bson.Document; import org.bson.conversions.Bson; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.annotation.CreationTimestamp; -import org.kar.archidata.annotation.UpdateTimestamp; -import org.kar.archidata.dataAccess.addOnMongo.AddOnManyToOne; -import org.kar.archidata.dataAccess.addOnMongo.AddOnOneToMany; -import org.kar.archidata.dataAccess.addOnMongo.DataAccessAddOn; -import org.kar.archidata.dataAccess.options.CheckFunction; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.FilterValue; -import org.kar.archidata.dataAccess.options.Limit; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.dataAccess.options.OrderBy; -import org.kar.archidata.dataAccess.options.QueryOption; -import org.kar.archidata.db.DbIoMorphia; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.UuidUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/DBAccessSQL.java b/src/org/atriasoft/archidata/dataAccess/DBAccessSQL.java similarity index 97% rename from src/org/kar/archidata/dataAccess/DBAccessSQL.java rename to src/org/atriasoft/archidata/dataAccess/DBAccessSQL.java index 01bd33e..5877cf7 100644 --- a/src/org/kar/archidata/dataAccess/DBAccessSQL.java +++ b/src/org/atriasoft/archidata/dataAccess/DBAccessSQL.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.io.IOException; import java.lang.reflect.Constructor; @@ -23,31 +23,31 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.annotation.CreationTimestamp; +import org.atriasoft.archidata.annotation.UpdateTimestamp; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnDataJson; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToMany; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToOne; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnOneToMany; +import org.atriasoft.archidata.dataAccess.addOnSQL.DataAccessAddOn; +import org.atriasoft.archidata.dataAccess.options.CheckFunction; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.DBInterfaceRoot; +import org.atriasoft.archidata.dataAccess.options.FilterValue; +import org.atriasoft.archidata.dataAccess.options.GroupBy; +import org.atriasoft.archidata.dataAccess.options.Limit; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.dataAccess.options.OrderBy; +import org.atriasoft.archidata.dataAccess.options.QueryOption; +import org.atriasoft.archidata.dataAccess.options.TransmitKey; +import org.atriasoft.archidata.db.DbIoSql; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.UuidUtils; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.annotation.CreationTimestamp; -import org.kar.archidata.annotation.UpdateTimestamp; -import org.kar.archidata.dataAccess.addOnSQL.AddOnDataJson; -import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToMany; -import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToOne; -import org.kar.archidata.dataAccess.addOnSQL.AddOnOneToMany; -import org.kar.archidata.dataAccess.addOnSQL.DataAccessAddOn; -import org.kar.archidata.dataAccess.options.CheckFunction; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.DBInterfaceRoot; -import org.kar.archidata.dataAccess.options.FilterValue; -import org.kar.archidata.dataAccess.options.GroupBy; -import org.kar.archidata.dataAccess.options.Limit; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.dataAccess.options.OrderBy; -import org.kar.archidata.dataAccess.options.QueryOption; -import org.kar.archidata.dataAccess.options.TransmitKey; -import org.kar.archidata.db.DbIoSql; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.DateTools; -import org.kar.archidata.tools.UuidUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/DataAccess.java b/src/org/atriasoft/archidata/dataAccess/DataAccess.java similarity index 97% rename from src/org/kar/archidata/dataAccess/DataAccess.java rename to src/org/atriasoft/archidata/dataAccess/DataAccess.java index 7e99fd9..65488f8 100644 --- a/src/org/kar/archidata/dataAccess/DataAccess.java +++ b/src/org/atriasoft/archidata/dataAccess/DataAccess.java @@ -1,11 +1,11 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.QueryOption; -import org.kar.archidata.exception.DataAccessException; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.QueryOption; +import org.atriasoft.archidata.exception.DataAccessException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/DataExport.java b/src/org/atriasoft/archidata/dataAccess/DataExport.java similarity index 95% rename from src/org/kar/archidata/dataAccess/DataExport.java rename to src/org/atriasoft/archidata/dataAccess/DataExport.java index 5f15f31..e3c9e4d 100644 --- a/src/org/kar/archidata/dataAccess/DataExport.java +++ b/src/org/atriasoft/archidata/dataAccess/DataExport.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.io.IOException; import java.sql.PreparedStatement; @@ -16,16 +16,16 @@ import java.util.Date; import java.util.List; import java.util.UUID; -import org.kar.archidata.dataAccess.exportTools.TableQuery; -import org.kar.archidata.dataAccess.exportTools.TableQueryTypes; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.GroupBy; -import org.kar.archidata.dataAccess.options.Limit; -import org.kar.archidata.dataAccess.options.OrderBy; -import org.kar.archidata.dataAccess.options.QueryOption; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ContextGenericTools; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.dataAccess.exportTools.TableQuery; +import org.atriasoft.archidata.dataAccess.exportTools.TableQueryTypes; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.GroupBy; +import org.atriasoft.archidata.dataAccess.options.Limit; +import org.atriasoft.archidata.dataAccess.options.OrderBy; +import org.atriasoft.archidata.dataAccess.options.QueryOption; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ContextGenericTools; +import org.atriasoft.archidata.tools.DateTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/DataFactory.java b/src/org/atriasoft/archidata/dataAccess/DataFactory.java similarity index 96% rename from src/org/kar/archidata/dataAccess/DataFactory.java rename to src/org/atriasoft/archidata/dataAccess/DataFactory.java index 34f269b..d87824f 100644 --- a/src/org/kar/archidata/dataAccess/DataFactory.java +++ b/src/org/atriasoft/archidata/dataAccess/DataFactory.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.lang.reflect.Field; import java.sql.Timestamp; @@ -10,16 +10,16 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.CreationTimestamp; +import org.atriasoft.archidata.annotation.DataIfNotExists; +import org.atriasoft.archidata.annotation.UpdateTimestamp; +import org.atriasoft.archidata.dataAccess.addOnSQL.DataAccessAddOn; +import org.atriasoft.archidata.dataAccess.options.CreateDropTable; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.CreationTimestamp; -import org.kar.archidata.annotation.DataIfNotExists; -import org.kar.archidata.annotation.UpdateTimestamp; -import org.kar.archidata.dataAccess.addOnSQL.DataAccessAddOn; -import org.kar.archidata.dataAccess.options.CreateDropTable; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/Foreign.java b/src/org/atriasoft/archidata/dataAccess/Foreign.java similarity index 86% rename from src/org/kar/archidata/dataAccess/Foreign.java rename to src/org/atriasoft/archidata/dataAccess/Foreign.java index ed99cf3..96a189e 100644 --- a/src/org/kar/archidata/dataAccess/Foreign.java +++ b/src/org/atriasoft/archidata/dataAccess/Foreign.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; // Mark as deprecated while the concept is not ready ... @Deprecated diff --git a/src/org/kar/archidata/dataAccess/LazyGetter.java b/src/org/atriasoft/archidata/dataAccess/LazyGetter.java similarity index 61% rename from src/org/kar/archidata/dataAccess/LazyGetter.java rename to src/org/atriasoft/archidata/dataAccess/LazyGetter.java index 352371e..a81e1cd 100644 --- a/src/org/kar/archidata/dataAccess/LazyGetter.java +++ b/src/org/atriasoft/archidata/dataAccess/LazyGetter.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; public interface LazyGetter { void doRequest() throws Exception; diff --git a/src/org/kar/archidata/dataAccess/QueryAnd.java b/src/org/atriasoft/archidata/dataAccess/QueryAnd.java similarity index 97% rename from src/org/kar/archidata/dataAccess/QueryAnd.java rename to src/org/atriasoft/archidata/dataAccess/QueryAnd.java index 738bcff..b7aefea 100644 --- a/src/org/kar/archidata/dataAccess/QueryAnd.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryAnd.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.ArrayList; diff --git a/src/org/kar/archidata/dataAccess/QueryCondition.java b/src/org/atriasoft/archidata/dataAccess/QueryCondition.java similarity index 97% rename from src/org/kar/archidata/dataAccess/QueryCondition.java rename to src/org/atriasoft/archidata/dataAccess/QueryCondition.java index f356dc0..171a6d9 100644 --- a/src/org/kar/archidata/dataAccess/QueryCondition.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryCondition.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/QueryInList.java b/src/org/atriasoft/archidata/dataAccess/QueryInList.java similarity index 97% rename from src/org/kar/archidata/dataAccess/QueryInList.java rename to src/org/atriasoft/archidata/dataAccess/QueryInList.java index e3b0205..31873cd 100644 --- a/src/org/kar/archidata/dataAccess/QueryInList.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryInList.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/QueryItem.java b/src/org/atriasoft/archidata/dataAccess/QueryItem.java similarity index 90% rename from src/org/kar/archidata/dataAccess/QueryItem.java rename to src/org/atriasoft/archidata/dataAccess/QueryItem.java index 5cda519..914061e 100644 --- a/src/org/kar/archidata/dataAccess/QueryItem.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryItem.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/QueryNoInList.java b/src/org/atriasoft/archidata/dataAccess/QueryNoInList.java similarity index 80% rename from src/org/kar/archidata/dataAccess/QueryNoInList.java rename to src/org/atriasoft/archidata/dataAccess/QueryNoInList.java index 97fab17..414b2a6 100644 --- a/src/org/kar/archidata/dataAccess/QueryNoInList.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryNoInList.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/QueryNotNull.java b/src/org/atriasoft/archidata/dataAccess/QueryNotNull.java similarity index 94% rename from src/org/kar/archidata/dataAccess/QueryNotNull.java rename to src/org/atriasoft/archidata/dataAccess/QueryNotNull.java index 05aa0bd..27f2574 100644 --- a/src/org/kar/archidata/dataAccess/QueryNotNull.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryNotNull.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/QueryNull.java b/src/org/atriasoft/archidata/dataAccess/QueryNull.java similarity index 94% rename from src/org/kar/archidata/dataAccess/QueryNull.java rename to src/org/atriasoft/archidata/dataAccess/QueryNull.java index 11aec2d..1d2555f 100644 --- a/src/org/kar/archidata/dataAccess/QueryNull.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryNull.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/QueryOptions.java b/src/org/atriasoft/archidata/dataAccess/QueryOptions.java similarity index 83% rename from src/org/kar/archidata/dataAccess/QueryOptions.java rename to src/org/atriasoft/archidata/dataAccess/QueryOptions.java index 886f6e7..f0b1672 100644 --- a/src/org/kar/archidata/dataAccess/QueryOptions.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryOptions.java @@ -1,12 +1,12 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.dataAccess.options.AccessDeletedItems; -import org.kar.archidata.dataAccess.options.CreateDropTable; -import org.kar.archidata.dataAccess.options.QueryOption; -import org.kar.archidata.dataAccess.options.ReadAllColumn; +import org.atriasoft.archidata.dataAccess.options.AccessDeletedItems; +import org.atriasoft.archidata.dataAccess.options.CreateDropTable; +import org.atriasoft.archidata.dataAccess.options.QueryOption; +import org.atriasoft.archidata.dataAccess.options.ReadAllColumn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/QueryOr.java b/src/org/atriasoft/archidata/dataAccess/QueryOr.java similarity index 96% rename from src/org/kar/archidata/dataAccess/QueryOr.java rename to src/org/atriasoft/archidata/dataAccess/QueryOr.java index ecede52..5beef1f 100644 --- a/src/org/kar/archidata/dataAccess/QueryOr.java +++ b/src/org/atriasoft/archidata/dataAccess/QueryOr.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.PreparedStatement; import java.util.ArrayList; diff --git a/src/org/kar/archidata/dataAccess/RetreiveFromDB.java b/src/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java similarity index 74% rename from src/org/kar/archidata/dataAccess/RetreiveFromDB.java rename to src/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java index c570fc7..9dd46cf 100644 --- a/src/org/kar/archidata/dataAccess/RetreiveFromDB.java +++ b/src/org/atriasoft/archidata/dataAccess/RetreiveFromDB.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess; +package org.atriasoft.archidata.dataAccess; import java.sql.ResultSet; diff --git a/src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToMany.java b/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java similarity index 94% rename from src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToMany.java rename to src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java index 039ec02..ec7b0a3 100644 --- a/src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToMany.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToMany.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnMongo; +package org.atriasoft.archidata.dataAccess.addOnMongo; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -6,23 +6,23 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.DBAccessMorphia; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryAnd; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.addOnSQL.model.LinkTableGeneric; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.dataAccess.options.OverrideTableName; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.bson.Document; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.DBAccessMorphia; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryAnd; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableGeneric; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.dataAccess.options.OverrideTableName; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToOne.java b/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java similarity index 94% rename from src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToOne.java rename to src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java index b295436..5ad3f28 100644 --- a/src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToOne.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnManyToOne.java @@ -1,17 +1,17 @@ -package org.kar.archidata.dataAccess.addOnMongo; +package org.atriasoft.archidata.dataAccess.addOnMongo; import java.lang.reflect.Field; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.DBAccessMorphia; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryOptions; import org.bson.Document; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.DBAccessMorphia; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnMongo/AddOnOneToMany.java b/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java similarity index 92% rename from src/org/kar/archidata/dataAccess/addOnMongo/AddOnOneToMany.java rename to src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java index 7c0ac93..e01d662 100644 --- a/src/org/kar/archidata/dataAccess/addOnMongo/AddOnOneToMany.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnMongo/AddOnOneToMany.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnMongo; +package org.atriasoft.archidata.dataAccess.addOnMongo; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -6,15 +6,15 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.DBAccessMorphia; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.options.Condition; import org.bson.Document; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.DBAccessMorphia; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.options.Condition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnMongo/DataAccessAddOn.java b/src/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java similarity index 94% rename from src/org/kar/archidata/dataAccess/addOnMongo/DataAccessAddOn.java rename to src/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java index af23a55..9d1ab76 100644 --- a/src/org/kar/archidata/dataAccess/addOnMongo/DataAccessAddOn.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnMongo/DataAccessAddOn.java @@ -1,13 +1,13 @@ -package org.kar.archidata.dataAccess.addOnMongo; +package org.atriasoft.archidata.dataAccess.addOnMongo; import java.lang.reflect.Field; import java.sql.SQLException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessMorphia; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryOptions; import org.bson.Document; -import org.kar.archidata.dataAccess.DBAccessMorphia; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryOptions; public interface DataAccessAddOn { /** Get the Class of the declaration annotation diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnDataJson.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java similarity index 90% rename from src/org/kar/archidata/dataAccess/addOnSQL/AddOnDataJson.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java index 0b4cb64..2852ba1 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnDataJson.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnDataJson.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnSQL; +package org.atriasoft.archidata.dataAccess.addOnSQL; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -10,22 +10,22 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.addOnSQL.model.TableCoversGeneric; +import org.atriasoft.archidata.dataAccess.options.OptionRenameColumn; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.dataAccess.options.OverrideTableName; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ContextGenericTools; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversGeneric; -import org.kar.archidata.dataAccess.options.OptionRenameColumn; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.dataAccess.options.OverrideTableName; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ContextGenericTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnManyToMany.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java similarity index 94% rename from src/org/kar/archidata/dataAccess/addOnSQL/AddOnManyToMany.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java index 0084c00..92bef85 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnManyToMany.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToMany.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnSQL; +package org.atriasoft.archidata.dataAccess.addOnSQL; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -9,25 +9,25 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.DBAccessMorphia; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryAnd; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.QueryInList; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.addOnSQL.model.LinkTableGeneric; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.OptionSpecifyType; +import org.atriasoft.archidata.dataAccess.options.OverrideTableName; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.DBAccessMorphia; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryAnd; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.QueryInList; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableGeneric; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.OptionSpecifyType; -import org.kar.archidata.dataAccess.options.OverrideTableName; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnManyToOne.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java similarity index 95% rename from src/org/kar/archidata/dataAccess/addOnSQL/AddOnManyToOne.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java index f3656c1..1357316 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnManyToOne.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnManyToOne.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnSQL; +package org.atriasoft.archidata.dataAccess.addOnSQL; import java.lang.reflect.Field; import java.sql.PreparedStatement; @@ -7,16 +7,16 @@ import java.sql.Types; import java.util.List; import java.util.UUID; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.UuidUtils; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.UuidUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnOneToMany.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java similarity index 94% rename from src/org/kar/archidata/dataAccess/addOnSQL/AddOnOneToMany.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java index 01a444a..0fba5d4 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/AddOnOneToMany.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/AddOnOneToMany.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnSQL; +package org.atriasoft.archidata.dataAccess.addOnSQL; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -10,18 +10,18 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/DataAccessAddOn.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java similarity index 94% rename from src/org/kar/archidata/dataAccess/addOnSQL/DataAccessAddOn.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java index 710407f..01d461f 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/DataAccessAddOn.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/DataAccessAddOn.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.addOnSQL; +package org.atriasoft.archidata.dataAccess.addOnSQL; import java.lang.reflect.Field; import java.sql.PreparedStatement; @@ -6,10 +6,10 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.LazyGetter; -import org.kar.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.LazyGetter; +import org.atriasoft.archidata.dataAccess.QueryOptions; import jakarta.validation.constraints.NotNull; diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java similarity index 81% rename from src/org/kar/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java index 57bcd84..f580dcf 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/model/LinkTableGeneric.java @@ -1,6 +1,6 @@ -package org.kar.archidata.dataAccess.addOnSQL.model; +package org.atriasoft.archidata.dataAccess.addOnSQL.model; -import org.kar.archidata.model.OIDGenericDataSoftDelete; +import org.atriasoft.archidata.model.OIDGenericDataSoftDelete; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; diff --git a/src/org/kar/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java b/src/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java similarity index 75% rename from src/org/kar/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java rename to src/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java index e74c94a..202ed4a 100644 --- a/src/org/kar/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java +++ b/src/org/atriasoft/archidata/dataAccess/addOnSQL/model/TableCoversGeneric.java @@ -1,8 +1,8 @@ -package org.kar.archidata.dataAccess.addOnSQL.model; +package org.atriasoft.archidata.dataAccess.addOnSQL.model; import java.util.List; -import org.kar.archidata.annotation.DataJson; +import org.atriasoft.archidata.annotation.DataJson; import jakarta.persistence.Id; diff --git a/src/org/kar/archidata/dataAccess/exportTools/README.md b/src/org/atriasoft/archidata/dataAccess/exportTools/README.md similarity index 100% rename from src/org/kar/archidata/dataAccess/exportTools/README.md rename to src/org/atriasoft/archidata/dataAccess/exportTools/README.md diff --git a/src/org/kar/archidata/dataAccess/exportTools/TableQuery.java b/src/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java similarity index 83% rename from src/org/kar/archidata/dataAccess/exportTools/TableQuery.java rename to src/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java index f953902..244b357 100644 --- a/src/org/kar/archidata/dataAccess/exportTools/TableQuery.java +++ b/src/org/atriasoft/archidata/dataAccess/exportTools/TableQuery.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.exportTools; +package org.atriasoft.archidata.dataAccess.exportTools; import java.util.ArrayList; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/exportTools/TableQueryTypes.java b/src/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java similarity index 87% rename from src/org/kar/archidata/dataAccess/exportTools/TableQueryTypes.java rename to src/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java index ffc49aa..079adc8 100644 --- a/src/org/kar/archidata/dataAccess/exportTools/TableQueryTypes.java +++ b/src/org/atriasoft/archidata/dataAccess/exportTools/TableQueryTypes.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.exportTools; +package org.atriasoft.archidata.dataAccess.exportTools; public class TableQueryTypes { diff --git a/src/org/kar/archidata/dataAccess/options/AccessDeletedItems.java b/src/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java similarity index 74% rename from src/org/kar/archidata/dataAccess/options/AccessDeletedItems.java rename to src/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java index 1f486e1..c0de56d 100644 --- a/src/org/kar/archidata/dataAccess/options/AccessDeletedItems.java +++ b/src/org/atriasoft/archidata/dataAccess/options/AccessDeletedItems.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; /** This option permit to access on deleted items of a table */ public class AccessDeletedItems extends QueryOption { diff --git a/src/org/kar/archidata/dataAccess/options/CheckFunction.java b/src/org/atriasoft/archidata/dataAccess/options/CheckFunction.java similarity index 87% rename from src/org/kar/archidata/dataAccess/options/CheckFunction.java rename to src/org/atriasoft/archidata/dataAccess/options/CheckFunction.java index ce3d5a7..c0e94ea 100644 --- a/src/org/kar/archidata/dataAccess/options/CheckFunction.java +++ b/src/org/atriasoft/archidata/dataAccess/options/CheckFunction.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */ public class CheckFunction extends QueryOption { diff --git a/src/org/kar/archidata/dataAccess/options/CheckFunctionInterface.java b/src/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java similarity index 81% rename from src/org/kar/archidata/dataAccess/options/CheckFunctionInterface.java rename to src/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java index 0ac9bc8..e7407b5 100644 --- a/src/org/kar/archidata/dataAccess/options/CheckFunctionInterface.java +++ b/src/org/atriasoft/archidata/dataAccess/options/CheckFunctionInterface.java @@ -1,10 +1,10 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.util.List; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.QueryOptions; /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */ public interface CheckFunctionInterface { diff --git a/src/org/kar/archidata/dataAccess/options/CheckFunctionVoid.java b/src/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java similarity index 70% rename from src/org/kar/archidata/dataAccess/options/CheckFunctionVoid.java rename to src/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java index cf2dcec..1c6f79b 100644 --- a/src/org/kar/archidata/dataAccess/options/CheckFunctionVoid.java +++ b/src/org/atriasoft/archidata/dataAccess/options/CheckFunctionVoid.java @@ -1,9 +1,9 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.util.List; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.QueryOptions; /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */ public class CheckFunctionVoid implements CheckFunctionInterface { diff --git a/src/org/kar/archidata/dataAccess/options/Condition.java b/src/org/atriasoft/archidata/dataAccess/options/Condition.java similarity index 90% rename from src/org/kar/archidata/dataAccess/options/Condition.java rename to src/org/atriasoft/archidata/dataAccess/options/Condition.java index 88709e6..fcb6403 100644 --- a/src/org/kar/archidata/dataAccess/options/Condition.java +++ b/src/org/atriasoft/archidata/dataAccess/options/Condition.java @@ -1,14 +1,14 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.sql.PreparedStatement; import java.util.ArrayList; import java.util.List; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.QueryItem; +import org.atriasoft.archidata.dataAccess.QueryOptions; import org.bson.conversions.Bson; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.QueryItem; -import org.kar.archidata.dataAccess.QueryOptions; import com.mongodb.client.model.Filters; diff --git a/src/org/kar/archidata/dataAccess/options/ConditionChecker.java b/src/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java similarity index 80% rename from src/org/kar/archidata/dataAccess/options/ConditionChecker.java rename to src/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java index 5dcb314..34f6689 100644 --- a/src/org/kar/archidata/dataAccess/options/ConditionChecker.java +++ b/src/org/atriasoft/archidata/dataAccess/options/ConditionChecker.java @@ -1,6 +1,6 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; -import org.kar.archidata.dataAccess.QueryItem; +import org.atriasoft.archidata.dataAccess.QueryItem; /** Condition model apply to the check models. */ public class ConditionChecker extends QueryOption { diff --git a/src/org/kar/archidata/dataAccess/options/CreateDropTable.java b/src/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java similarity index 77% rename from src/org/kar/archidata/dataAccess/options/CreateDropTable.java rename to src/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java index c0e6d22..f902b53 100644 --- a/src/org/kar/archidata/dataAccess/options/CreateDropTable.java +++ b/src/org/atriasoft/archidata/dataAccess/options/CreateDropTable.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; /** This option permit to create the DROP `Table` IF EXIST in the generation of structure. */ public class CreateDropTable extends QueryOption { diff --git a/src/org/kar/archidata/dataAccess/options/DBInterfaceRoot.java b/src/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java similarity index 62% rename from src/org/kar/archidata/dataAccess/options/DBInterfaceRoot.java rename to src/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java index 3796b5a..8c7db33 100644 --- a/src/org/kar/archidata/dataAccess/options/DBInterfaceRoot.java +++ b/src/org/atriasoft/archidata/dataAccess/options/DBInterfaceRoot.java @@ -1,9 +1,9 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; public class DBInterfaceRoot extends QueryOption { private final boolean root; - public DBInterfaceRoot(boolean root) { + public DBInterfaceRoot(final boolean root) { this.root = root; } diff --git a/src/org/kar/archidata/dataAccess/options/FilterValue.java b/src/org/atriasoft/archidata/dataAccess/options/FilterValue.java similarity index 90% rename from src/org/kar/archidata/dataAccess/options/FilterValue.java rename to src/org/atriasoft/archidata/dataAccess/options/FilterValue.java index 06ce818..d88fe6d 100644 --- a/src/org/kar/archidata/dataAccess/options/FilterValue.java +++ b/src/org/atriasoft/archidata/dataAccess/options/FilterValue.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.util.List; diff --git a/src/org/kar/archidata/dataAccess/options/GroupBy.java b/src/org/atriasoft/archidata/dataAccess/options/GroupBy.java similarity index 88% rename from src/org/kar/archidata/dataAccess/options/GroupBy.java rename to src/org/atriasoft/archidata/dataAccess/options/GroupBy.java index d0acf12..2d2baa4 100644 --- a/src/org/kar/archidata/dataAccess/options/GroupBy.java +++ b/src/org/atriasoft/archidata/dataAccess/options/GroupBy.java @@ -1,9 +1,9 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.sql.PreparedStatement; import java.util.List; -import org.kar.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.CountInOut; public class GroupBy extends QueryOption { protected final List childs; diff --git a/src/org/kar/archidata/dataAccess/options/Limit.java b/src/org/atriasoft/archidata/dataAccess/options/Limit.java similarity index 76% rename from src/org/kar/archidata/dataAccess/options/Limit.java rename to src/org/atriasoft/archidata/dataAccess/options/Limit.java index a469d57..434e2ce 100644 --- a/src/org/kar/archidata/dataAccess/options/Limit.java +++ b/src/org/atriasoft/archidata/dataAccess/options/Limit.java @@ -1,9 +1,9 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.sql.PreparedStatement; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; public class Limit extends QueryOption { protected final long limit; diff --git a/src/org/kar/archidata/dataAccess/options/OptionRenameColumn.java b/src/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java similarity index 83% rename from src/org/kar/archidata/dataAccess/options/OptionRenameColumn.java rename to src/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java index 987bcd4..0644818 100644 --- a/src/org/kar/archidata/dataAccess/options/OptionRenameColumn.java +++ b/src/org/atriasoft/archidata/dataAccess/options/OptionRenameColumn.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; public class OptionRenameColumn extends QueryOption { public final String columnName; diff --git a/src/org/kar/archidata/dataAccess/options/OptionSpecifyType.java b/src/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java similarity index 90% rename from src/org/kar/archidata/dataAccess/options/OptionSpecifyType.java rename to src/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java index 2389aed..690af71 100644 --- a/src/org/kar/archidata/dataAccess/options/OptionSpecifyType.java +++ b/src/org/atriasoft/archidata/dataAccess/options/OptionSpecifyType.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; public class OptionSpecifyType extends QueryOption { public final String name; diff --git a/src/org/kar/archidata/dataAccess/options/OrderBy.java b/src/org/atriasoft/archidata/dataAccess/options/OrderBy.java similarity index 86% rename from src/org/kar/archidata/dataAccess/options/OrderBy.java rename to src/org/atriasoft/archidata/dataAccess/options/OrderBy.java index 9416b3f..a1c1629 100644 --- a/src/org/kar/archidata/dataAccess/options/OrderBy.java +++ b/src/org/atriasoft/archidata/dataAccess/options/OrderBy.java @@ -1,11 +1,11 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; import java.sql.PreparedStatement; import java.util.List; +import org.atriasoft.archidata.dataAccess.CountInOut; +import org.atriasoft.archidata.dataAccess.options.OrderItem.Order; import org.bson.Document; -import org.kar.archidata.dataAccess.CountInOut; -import org.kar.archidata.dataAccess.options.OrderItem.Order; public class OrderBy extends QueryOption { protected final List childs; diff --git a/src/org/kar/archidata/dataAccess/options/OrderItem.java b/src/org/atriasoft/archidata/dataAccess/options/OrderItem.java similarity index 81% rename from src/org/kar/archidata/dataAccess/options/OrderItem.java rename to src/org/atriasoft/archidata/dataAccess/options/OrderItem.java index 49ca705..e2364b0 100644 --- a/src/org/kar/archidata/dataAccess/options/OrderItem.java +++ b/src/org/atriasoft/archidata/dataAccess/options/OrderItem.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; public class OrderItem { public enum Order { diff --git a/src/org/kar/archidata/dataAccess/options/OverrideTableName.java b/src/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java similarity index 75% rename from src/org/kar/archidata/dataAccess/options/OverrideTableName.java rename to src/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java index 506eaa6..21411ca 100644 --- a/src/org/kar/archidata/dataAccess/options/OverrideTableName.java +++ b/src/org/atriasoft/archidata/dataAccess/options/OverrideTableName.java @@ -1,7 +1,7 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; /** Option that permit to access to a table structure with an other name that is define in the structure. Note: Internal use for link tables (see: - * org.kar.archidata.dataAccess.addOn.model.LinkTable). */ + * org.atriasoft.archidata.dataAccess.addOn.model.LinkTable). */ public class OverrideTableName extends QueryOption { private final String name; diff --git a/src/org/atriasoft/archidata/dataAccess/options/QueryOption.java b/src/org/atriasoft/archidata/dataAccess/options/QueryOption.java new file mode 100644 index 0000000..e8b7a02 --- /dev/null +++ b/src/org/atriasoft/archidata/dataAccess/options/QueryOption.java @@ -0,0 +1,3 @@ +package org.atriasoft.archidata.dataAccess.options; + +public class QueryOption {} diff --git a/src/org/kar/archidata/dataAccess/options/ReadAllColumn.java b/src/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java similarity index 77% rename from src/org/kar/archidata/dataAccess/options/ReadAllColumn.java rename to src/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java index 2c78825..141819d 100644 --- a/src/org/kar/archidata/dataAccess/options/ReadAllColumn.java +++ b/src/org/atriasoft/archidata/dataAccess/options/ReadAllColumn.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */ public class ReadAllColumn extends QueryOption { diff --git a/src/org/kar/archidata/dataAccess/options/TransmitKey.java b/src/org/atriasoft/archidata/dataAccess/options/TransmitKey.java similarity index 84% rename from src/org/kar/archidata/dataAccess/options/TransmitKey.java rename to src/org/atriasoft/archidata/dataAccess/options/TransmitKey.java index 2048529..2567975 100644 --- a/src/org/kar/archidata/dataAccess/options/TransmitKey.java +++ b/src/org/atriasoft/archidata/dataAccess/options/TransmitKey.java @@ -1,4 +1,4 @@ -package org.kar.archidata.dataAccess.options; +package org.atriasoft.archidata.dataAccess.options; /** Internal option that permit to transmit the Key when updating the ManyToMany values (first step). */ public class TransmitKey extends QueryOption { diff --git a/src/org/kar/archidata/db/DbConfig.java b/src/org/atriasoft/archidata/db/DbConfig.java similarity index 95% rename from src/org/kar/archidata/db/DbConfig.java rename to src/org/atriasoft/archidata/db/DbConfig.java index aafc7a5..93f0417 100644 --- a/src/org/kar/archidata/db/DbConfig.java +++ b/src/org/atriasoft/archidata/db/DbConfig.java @@ -1,11 +1,11 @@ -package org.kar.archidata.db; +package org.atriasoft.archidata.db; import java.util.List; import java.util.Objects; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/db/DbIo.java b/src/org/atriasoft/archidata/db/DbIo.java similarity index 98% rename from src/org/kar/archidata/db/DbIo.java rename to src/org/atriasoft/archidata/db/DbIo.java index 87fc94c..bb58811 100644 --- a/src/org/kar/archidata/db/DbIo.java +++ b/src/org/atriasoft/archidata/db/DbIo.java @@ -1,4 +1,4 @@ -package org.kar.archidata.db; +package org.atriasoft.archidata.db; import java.io.Closeable; import java.io.IOException; diff --git a/src/org/kar/archidata/db/DbIoFactory.java b/src/org/atriasoft/archidata/db/DbIoFactory.java similarity index 93% rename from src/org/kar/archidata/db/DbIoFactory.java rename to src/org/atriasoft/archidata/db/DbIoFactory.java index 12841c7..ff5ef52 100644 --- a/src/org/kar/archidata/db/DbIoFactory.java +++ b/src/org/atriasoft/archidata/db/DbIoFactory.java @@ -1,10 +1,10 @@ -package org.kar.archidata.db; +package org.atriasoft.archidata.db; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.exception.DataAccessException; +import org.atriasoft.archidata.exception.DataAccessException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/db/DbIoMorphia.java b/src/org/atriasoft/archidata/db/DbIoMorphia.java similarity index 96% rename from src/org/kar/archidata/db/DbIoMorphia.java rename to src/org/atriasoft/archidata/db/DbIoMorphia.java index 6da68c2..a253d50 100644 --- a/src/org/kar/archidata/db/DbIoMorphia.java +++ b/src/org/atriasoft/archidata/db/DbIoMorphia.java @@ -1,13 +1,13 @@ -package org.kar.archidata.db; +package org.atriasoft.archidata.db; import java.io.Closeable; import java.io.IOException; +import org.atriasoft.archidata.converter.morphia.SqlTimestampCodec; import org.bson.UuidRepresentation; import org.bson.codecs.configuration.CodecRegistries; import org.bson.codecs.configuration.CodecRegistry; import org.bson.codecs.pojo.PojoCodecProvider; -import org.kar.archidata.converter.morphia.SqlTimestampCodec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/db/DbIoSql.java b/src/org/atriasoft/archidata/db/DbIoSql.java similarity index 97% rename from src/org/kar/archidata/db/DbIoSql.java rename to src/org/atriasoft/archidata/db/DbIoSql.java index f5fa030..f644451 100644 --- a/src/org/kar/archidata/db/DbIoSql.java +++ b/src/org/atriasoft/archidata/db/DbIoSql.java @@ -1,4 +1,4 @@ -package org.kar.archidata.db; +package org.atriasoft.archidata.db; import java.io.IOException; import java.sql.Connection; diff --git a/src/org/kar/archidata/exception/DataAccessException.java b/src/org/atriasoft/archidata/exception/DataAccessException.java similarity index 80% rename from src/org/kar/archidata/exception/DataAccessException.java rename to src/org/atriasoft/archidata/exception/DataAccessException.java index db8cecc..54700c3 100644 --- a/src/org/kar/archidata/exception/DataAccessException.java +++ b/src/org/atriasoft/archidata/exception/DataAccessException.java @@ -1,4 +1,4 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; public class DataAccessException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/org/kar/archidata/exception/FailException.java b/src/org/atriasoft/archidata/exception/FailException.java similarity index 90% rename from src/org/kar/archidata/exception/FailException.java rename to src/org/atriasoft/archidata/exception/FailException.java index a7d331e..1ad24f8 100644 --- a/src/org/kar/archidata/exception/FailException.java +++ b/src/org/atriasoft/archidata/exception/FailException.java @@ -1,6 +1,6 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; -import org.kar.archidata.api.DataResource; +import org.atriasoft.archidata.api.DataResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/exception/InputException.java b/src/org/atriasoft/archidata/exception/InputException.java similarity index 92% rename from src/org/kar/archidata/exception/InputException.java rename to src/org/atriasoft/archidata/exception/InputException.java index c09f0b7..008f0e1 100644 --- a/src/org/kar/archidata/exception/InputException.java +++ b/src/org/atriasoft/archidata/exception/InputException.java @@ -1,4 +1,4 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; import jakarta.ws.rs.core.Response; diff --git a/src/org/kar/archidata/exception/NotFoundException.java b/src/org/atriasoft/archidata/exception/NotFoundException.java similarity index 85% rename from src/org/kar/archidata/exception/NotFoundException.java rename to src/org/atriasoft/archidata/exception/NotFoundException.java index c2fb400..5d4a81b 100644 --- a/src/org/kar/archidata/exception/NotFoundException.java +++ b/src/org/atriasoft/archidata/exception/NotFoundException.java @@ -1,4 +1,4 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; import jakarta.ws.rs.core.Response; diff --git a/src/org/kar/archidata/exception/RESTErrorResponseException.java b/src/org/atriasoft/archidata/exception/RESTErrorResponseException.java similarity index 92% rename from src/org/kar/archidata/exception/RESTErrorResponseException.java rename to src/org/atriasoft/archidata/exception/RESTErrorResponseException.java index 7ca033b..8a8ab43 100644 --- a/src/org/kar/archidata/exception/RESTErrorResponseException.java +++ b/src/org/atriasoft/archidata/exception/RESTErrorResponseException.java @@ -1,9 +1,9 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; import java.util.List; +import org.atriasoft.archidata.catcher.RestInputError; import org.bson.types.ObjectId; -import org.kar.archidata.catcher.RestInputError; public class RESTErrorResponseException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/org/kar/archidata/exception/SystemException.java b/src/org/atriasoft/archidata/exception/SystemException.java similarity index 90% rename from src/org/kar/archidata/exception/SystemException.java rename to src/org/atriasoft/archidata/exception/SystemException.java index 22d49e9..36884e7 100644 --- a/src/org/kar/archidata/exception/SystemException.java +++ b/src/org/atriasoft/archidata/exception/SystemException.java @@ -1,4 +1,4 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; import jakarta.ws.rs.core.Response; diff --git a/src/org/kar/archidata/exception/UnAuthorizedException.java b/src/org/atriasoft/archidata/exception/UnAuthorizedException.java similarity index 85% rename from src/org/kar/archidata/exception/UnAuthorizedException.java rename to src/org/atriasoft/archidata/exception/UnAuthorizedException.java index afcb4c8..3cb1fd4 100644 --- a/src/org/kar/archidata/exception/UnAuthorizedException.java +++ b/src/org/atriasoft/archidata/exception/UnAuthorizedException.java @@ -1,4 +1,4 @@ -package org.kar.archidata.exception; +package org.atriasoft.archidata.exception; import jakarta.ws.rs.core.Response; diff --git a/src/org/kar/archidata/externalRestApi/AnalyzeApi.java b/src/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java similarity index 90% rename from src/org/kar/archidata/externalRestApi/AnalyzeApi.java rename to src/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java index 026dd04..e898bec 100644 --- a/src/org/kar/archidata/externalRestApi/AnalyzeApi.java +++ b/src/org/atriasoft/archidata/externalRestApi/AnalyzeApi.java @@ -1,11 +1,11 @@ -package org.kar.archidata.externalRestApi; +package org.atriasoft.archidata.externalRestApi; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.externalRestApi.model.ApiGroupModel; -import org.kar.archidata.externalRestApi.model.ClassModel; -import org.kar.archidata.externalRestApi.model.ModelGroup; +import org.atriasoft.archidata.externalRestApi.model.ApiGroupModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ModelGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/DotGenerateApi.java b/src/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java similarity index 93% rename from src/org/kar/archidata/externalRestApi/DotGenerateApi.java rename to src/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java index 2d8fde6..3412c5e 100644 --- a/src/org/kar/archidata/externalRestApi/DotGenerateApi.java +++ b/src/org/atriasoft/archidata/externalRestApi/DotGenerateApi.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi; +package org.atriasoft.archidata.externalRestApi; import java.io.FileWriter; import java.io.InputStream; @@ -12,15 +12,15 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.atriasoft.archidata.catcher.RestErrorResponse; +import org.atriasoft.archidata.externalRestApi.dot.DotApiGeneration; +import org.atriasoft.archidata.externalRestApi.dot.DotClassElement; +import org.atriasoft.archidata.externalRestApi.dot.DotClassElement.DefinedPosition; +import org.atriasoft.archidata.externalRestApi.dot.DotClassElementGroup; +import org.atriasoft.archidata.externalRestApi.model.ApiGroupModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; import org.glassfish.jersey.media.multipart.ContentDisposition; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.kar.archidata.catcher.RestErrorResponse; -import org.kar.archidata.externalRestApi.dot.DotApiGeneration; -import org.kar.archidata.externalRestApi.dot.DotClassElement; -import org.kar.archidata.externalRestApi.dot.DotClassElement.DefinedPosition; -import org.kar.archidata.externalRestApi.dot.DotClassElementGroup; -import org.kar.archidata.externalRestApi.model.ApiGroupModel; -import org.kar.archidata.externalRestApi.model.ClassModel; public class DotGenerateApi { diff --git a/src/org/kar/archidata/externalRestApi/PythonGenerateApi.java b/src/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java similarity index 66% rename from src/org/kar/archidata/externalRestApi/PythonGenerateApi.java rename to src/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java index aeb7a94..4c41aa5 100644 --- a/src/org/kar/archidata/externalRestApi/PythonGenerateApi.java +++ b/src/org/atriasoft/archidata/externalRestApi/PythonGenerateApi.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi; +package org.atriasoft.archidata.externalRestApi; public class PythonGenerateApi { diff --git a/src/org/kar/archidata/externalRestApi/TsGenerateApi.java b/src/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java similarity index 94% rename from src/org/kar/archidata/externalRestApi/TsGenerateApi.java rename to src/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java index 6d290c7..450881c 100644 --- a/src/org/kar/archidata/externalRestApi/TsGenerateApi.java +++ b/src/org/atriasoft/archidata/externalRestApi/TsGenerateApi.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi; +package org.atriasoft.archidata.externalRestApi; import java.io.BufferedReader; import java.io.File; @@ -17,16 +17,16 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.atriasoft.archidata.catcher.RestErrorResponse; +import org.atriasoft.archidata.externalRestApi.model.ApiGroupModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.typescript.TsApiGeneration; +import org.atriasoft.archidata.externalRestApi.typescript.TsClassElement; +import org.atriasoft.archidata.externalRestApi.typescript.TsClassElement.DefinedPosition; +import org.atriasoft.archidata.externalRestApi.typescript.TsClassElementGroup; import org.bson.types.ObjectId; import org.glassfish.jersey.media.multipart.ContentDisposition; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.kar.archidata.catcher.RestErrorResponse; -import org.kar.archidata.externalRestApi.model.ApiGroupModel; -import org.kar.archidata.externalRestApi.model.ClassModel; -import org.kar.archidata.externalRestApi.typescript.TsApiGeneration; -import org.kar.archidata.externalRestApi.typescript.TsClassElement; -import org.kar.archidata.externalRestApi.typescript.TsClassElement.DefinedPosition; -import org.kar.archidata.externalRestApi.typescript.TsClassElementGroup; public class TsGenerateApi { /** diff --git a/src/org/kar/archidata/externalRestApi/dot/DotApiGeneration.java b/src/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java similarity index 94% rename from src/org/kar/archidata/externalRestApi/dot/DotApiGeneration.java rename to src/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java index 27acaa9..0b373b8 100644 --- a/src/org/kar/archidata/externalRestApi/dot/DotApiGeneration.java +++ b/src/org/atriasoft/archidata/externalRestApi/dot/DotApiGeneration.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.dot; +package org.atriasoft.archidata.externalRestApi.dot; import java.io.IOException; import java.util.ArrayList; @@ -7,15 +7,15 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import org.kar.archidata.externalRestApi.dot.DotClassElement.DefinedPosition; -import org.kar.archidata.externalRestApi.model.ApiGroupModel; -import org.kar.archidata.externalRestApi.model.ApiModel; -import org.kar.archidata.externalRestApi.model.ApiModel.OptionalClassModel; -import org.kar.archidata.externalRestApi.model.ClassEnumModel; -import org.kar.archidata.externalRestApi.model.ClassListModel; -import org.kar.archidata.externalRestApi.model.ClassMapModel; -import org.kar.archidata.externalRestApi.model.ClassModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; +import org.atriasoft.archidata.externalRestApi.dot.DotClassElement.DefinedPosition; +import org.atriasoft.archidata.externalRestApi.model.ApiGroupModel; +import org.atriasoft.archidata.externalRestApi.model.ApiModel; +import org.atriasoft.archidata.externalRestApi.model.ApiModel.OptionalClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassEnumModel; +import org.atriasoft.archidata.externalRestApi.model.ClassListModel; +import org.atriasoft.archidata.externalRestApi.model.ClassMapModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/dot/DotClassElement.java b/src/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java similarity index 96% rename from src/org/kar/archidata/externalRestApi/dot/DotClassElement.java rename to src/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java index fc2b459..0a3b0a3 100644 --- a/src/org/kar/archidata/externalRestApi/dot/DotClassElement.java +++ b/src/org/atriasoft/archidata/externalRestApi/dot/DotClassElement.java @@ -1,15 +1,15 @@ -package org.kar.archidata.externalRestApi.dot; +package org.atriasoft.archidata.externalRestApi.dot; import java.io.IOException; import java.util.List; import java.util.Map.Entry; -import org.kar.archidata.externalRestApi.model.ClassEnumModel; -import org.kar.archidata.externalRestApi.model.ClassListModel; -import org.kar.archidata.externalRestApi.model.ClassMapModel; -import org.kar.archidata.externalRestApi.model.ClassModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty; +import org.atriasoft.archidata.externalRestApi.model.ClassEnumModel; +import org.atriasoft.archidata.externalRestApi.model.ClassListModel; +import org.atriasoft.archidata.externalRestApi.model.ClassMapModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel.FieldProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/dot/DotClassElementGroup.java b/src/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java similarity index 80% rename from src/org/kar/archidata/externalRestApi/dot/DotClassElementGroup.java rename to src/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java index 587403a..de3f177 100644 --- a/src/org/kar/archidata/externalRestApi/dot/DotClassElementGroup.java +++ b/src/org/atriasoft/archidata/externalRestApi/dot/DotClassElementGroup.java @@ -1,8 +1,8 @@ -package org.kar.archidata.externalRestApi.dot; +package org.atriasoft.archidata.externalRestApi.dot; import java.util.List; -import org.kar.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; public class DotClassElementGroup { private final List dotElements; diff --git a/src/org/kar/archidata/externalRestApi/model/ApiGroupModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java similarity index 97% rename from src/org/kar/archidata/externalRestApi/model/ApiGroupModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java index b381323..af3e5f8 100644 --- a/src/org/kar/archidata/externalRestApi/model/ApiGroupModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ApiGroupModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/org/kar/archidata/externalRestApi/model/ApiModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ApiModel.java similarity index 98% rename from src/org/kar/archidata/externalRestApi/model/ApiModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ApiModel.java index 6bb35d6..1da2f52 100644 --- a/src/org/kar/archidata/externalRestApi/model/ApiModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ApiModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.io.IOException; import java.lang.reflect.Method; @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.kar.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/model/ApiTool.java b/src/org/atriasoft/archidata/externalRestApi/model/ApiTool.java similarity index 95% rename from src/org/kar/archidata/externalRestApi/model/ApiTool.java rename to src/org/atriasoft/archidata/externalRestApi/model/ApiTool.java index b24a84c..8737781 100644 --- a/src/org/kar/archidata/externalRestApi/model/ApiTool.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ApiTool.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -6,12 +6,12 @@ import java.lang.reflect.Parameter; import java.util.Arrays; import java.util.List; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAsyncType; +import org.atriasoft.archidata.annotation.apiGenerator.ApiInputOptional; +import org.atriasoft.archidata.annotation.apiGenerator.ApiTypeScriptProgress; +import org.atriasoft.archidata.annotation.method.ARCHIVE; +import org.atriasoft.archidata.annotation.method.RESTORE; import org.glassfish.jersey.media.multipart.FormDataParam; -import org.kar.archidata.annotation.apiGenerator.ApiInputOptional; -import org.kar.archidata.annotation.apiGenerator.ApiAsyncType; -import org.kar.archidata.annotation.apiGenerator.ApiTypeScriptProgress; -import org.kar.archidata.annotation.method.ARCHIVE; -import org.kar.archidata.annotation.method.RESTORE; import io.swagger.v3.oas.annotations.Operation; import jakarta.ws.rs.Consumes; diff --git a/src/org/kar/archidata/externalRestApi/model/ClassEnumModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java similarity index 90% rename from src/org/kar/archidata/externalRestApi/model/ClassEnumModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java index 8483a12..365e22f 100644 --- a/src/org/kar/archidata/externalRestApi/model/ClassEnumModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ClassEnumModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.io.IOException; import java.lang.reflect.Method; @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.tools.AnnotationCreator; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.tools.AnnotationCreator; public class ClassEnumModel extends ClassModel { protected ClassEnumModel(final Class clazz) { diff --git a/src/org/kar/archidata/externalRestApi/model/ClassListModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java similarity index 95% rename from src/org/kar/archidata/externalRestApi/model/ClassListModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java index 252218e..ddc3646 100644 --- a/src/org/kar/archidata/externalRestApi/model/ClassListModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ClassListModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.io.IOException; import java.lang.reflect.ParameterizedType; diff --git a/src/org/kar/archidata/externalRestApi/model/ClassMapModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java similarity index 96% rename from src/org/kar/archidata/externalRestApi/model/ClassMapModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java index 80bed20..0c149d6 100644 --- a/src/org/kar/archidata/externalRestApi/model/ClassMapModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ClassMapModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.io.IOException; import java.lang.reflect.ParameterizedType; diff --git a/src/org/kar/archidata/externalRestApi/model/ClassModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ClassModel.java similarity index 93% rename from src/org/kar/archidata/externalRestApi/model/ClassModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ClassModel.java index c7a9633..9e648c1 100644 --- a/src/org/kar/archidata/externalRestApi/model/ClassModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ClassModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.io.IOException; import java.lang.reflect.ParameterizedType; @@ -8,8 +8,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.tools.AnnotationCreator; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.tools.AnnotationCreator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/model/ClassObjectModel.java b/src/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java similarity index 95% rename from src/org/kar/archidata/externalRestApi/model/ClassObjectModel.java rename to src/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java index c1abd05..666bdd5 100644 --- a/src/org/kar/archidata/externalRestApi/model/ClassObjectModel.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ClassObjectModel.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.io.IOException; import java.lang.reflect.Field; @@ -10,12 +10,12 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.apiGenerator.ApiNotNull; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.AnnotationCreator; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.apiGenerator.ApiNotNull; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.AnnotationCreator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/model/ModelGroup.java b/src/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java similarity index 95% rename from src/org/kar/archidata/externalRestApi/model/ModelGroup.java rename to src/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java index 448fdbd..4037e75 100644 --- a/src/org/kar/archidata/externalRestApi/model/ModelGroup.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/ModelGroup.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; import java.util.ArrayList; import java.util.List; diff --git a/src/org/kar/archidata/externalRestApi/model/RestTypeRequest.java b/src/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java similarity index 59% rename from src/org/kar/archidata/externalRestApi/model/RestTypeRequest.java rename to src/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java index 1c96370..7f1bddc 100644 --- a/src/org/kar/archidata/externalRestApi/model/RestTypeRequest.java +++ b/src/org/atriasoft/archidata/externalRestApi/model/RestTypeRequest.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.model; +package org.atriasoft.archidata.externalRestApi.model; public enum RestTypeRequest { GET, POST, PUT, PATCH, DELETE, RESTORE, ARCHIVE diff --git a/src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java b/src/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java similarity index 95% rename from src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java rename to src/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java index a4aca3a..fc53811 100644 --- a/src/org/kar/archidata/externalRestApi/typescript/TsApiGeneration.java +++ b/src/org/atriasoft/archidata/externalRestApi/typescript/TsApiGeneration.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.typescript; +package org.atriasoft.archidata.externalRestApi.typescript; import java.io.File; import java.io.FileWriter; @@ -14,17 +14,17 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; -import org.kar.archidata.dataAccess.DataExport; -import org.kar.archidata.externalRestApi.model.ApiGroupModel; -import org.kar.archidata.externalRestApi.model.ApiModel; -import org.kar.archidata.externalRestApi.model.ApiModel.OptionalClassModel; -import org.kar.archidata.externalRestApi.model.ClassEnumModel; -import org.kar.archidata.externalRestApi.model.ClassListModel; -import org.kar.archidata.externalRestApi.model.ClassMapModel; -import org.kar.archidata.externalRestApi.model.ClassModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; -import org.kar.archidata.externalRestApi.model.RestTypeRequest; -import org.kar.archidata.externalRestApi.typescript.TsClassElement.DefinedPosition; +import org.atriasoft.archidata.dataAccess.DataExport; +import org.atriasoft.archidata.externalRestApi.model.ApiGroupModel; +import org.atriasoft.archidata.externalRestApi.model.ApiModel; +import org.atriasoft.archidata.externalRestApi.model.ApiModel.OptionalClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassEnumModel; +import org.atriasoft.archidata.externalRestApi.model.ClassListModel; +import org.atriasoft.archidata.externalRestApi.model.ClassMapModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; +import org.atriasoft.archidata.externalRestApi.model.RestTypeRequest; +import org.atriasoft.archidata.externalRestApi.typescript.TsClassElement.DefinedPosition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/typescript/TsClassElement.java b/src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java similarity index 97% rename from src/org/kar/archidata/externalRestApi/typescript/TsClassElement.java rename to src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java index 1cf1d25..e96b905 100644 --- a/src/org/kar/archidata/externalRestApi/typescript/TsClassElement.java +++ b/src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElement.java @@ -1,4 +1,4 @@ -package org.kar.archidata.externalRestApi.typescript; +package org.atriasoft.archidata.externalRestApi.typescript; import java.io.File; import java.io.FileWriter; @@ -11,12 +11,12 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; -import org.kar.archidata.externalRestApi.model.ClassEnumModel; -import org.kar.archidata.externalRestApi.model.ClassListModel; -import org.kar.archidata.externalRestApi.model.ClassMapModel; -import org.kar.archidata.externalRestApi.model.ClassModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty; +import org.atriasoft.archidata.externalRestApi.model.ClassEnumModel; +import org.atriasoft.archidata.externalRestApi.model.ClassListModel; +import org.atriasoft.archidata.externalRestApi.model.ClassMapModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel.FieldProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/externalRestApi/typescript/TsClassElementGroup.java b/src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java similarity index 79% rename from src/org/kar/archidata/externalRestApi/typescript/TsClassElementGroup.java rename to src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java index c7dbd83..e1b08ba 100644 --- a/src/org/kar/archidata/externalRestApi/typescript/TsClassElementGroup.java +++ b/src/org/atriasoft/archidata/externalRestApi/typescript/TsClassElementGroup.java @@ -1,8 +1,8 @@ -package org.kar.archidata.externalRestApi.typescript; +package org.atriasoft.archidata.externalRestApi.typescript; import java.util.List; -import org.kar.archidata.externalRestApi.model.ClassModel; +import org.atriasoft.archidata.externalRestApi.model.ClassModel; public class TsClassElementGroup { private final List tsElements; diff --git a/src/org/kar/archidata/filter/AuthenticationFilter.java b/src/org/atriasoft/archidata/filter/AuthenticationFilter.java similarity index 97% rename from src/org/kar/archidata/filter/AuthenticationFilter.java rename to src/org/atriasoft/archidata/filter/AuthenticationFilter.java index 5c35d2b..42bbfcf 100644 --- a/src/org/kar/archidata/filter/AuthenticationFilter.java +++ b/src/org/atriasoft/archidata/filter/AuthenticationFilter.java @@ -1,4 +1,4 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import java.io.IOException; import java.lang.reflect.Method; @@ -9,11 +9,11 @@ import java.util.Map.Entry; // https://stackoverflow.com/questions/26777083/best-practice-for-rest-token-based-authentication-with-jax-rs-and-jersey/45814178#45814178 // https://stackoverflow.com/questions/32817210/how-to-access-jersey-resource-secured-by-rolesallowed -import org.kar.archidata.annotation.security.PermitTokenInURI; -import org.kar.archidata.catcher.RestErrorResponse; -import org.kar.archidata.exception.SystemException; -import org.kar.archidata.model.UserByToken; -import org.kar.archidata.tools.JWTWrapper; +import org.atriasoft.archidata.annotation.security.PermitTokenInURI; +import org.atriasoft.archidata.catcher.RestErrorResponse; +import org.atriasoft.archidata.exception.SystemException; +import org.atriasoft.archidata.model.UserByToken; +import org.atriasoft.archidata.tools.JWTWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/filter/CORSFilter.java b/src/org/atriasoft/archidata/filter/CORSFilter.java similarity index 96% rename from src/org/kar/archidata/filter/CORSFilter.java rename to src/org/atriasoft/archidata/filter/CORSFilter.java index d36e094..711a645 100644 --- a/src/org/kar/archidata/filter/CORSFilter.java +++ b/src/org/atriasoft/archidata/filter/CORSFilter.java @@ -1,4 +1,4 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import java.io.IOException; diff --git a/src/org/kar/archidata/filter/GenericContext.java b/src/org/atriasoft/archidata/filter/GenericContext.java similarity index 83% rename from src/org/kar/archidata/filter/GenericContext.java rename to src/org/atriasoft/archidata/filter/GenericContext.java index a14443e..ff68c1f 100644 --- a/src/org/kar/archidata/filter/GenericContext.java +++ b/src/org/atriasoft/archidata/filter/GenericContext.java @@ -1,8 +1,8 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import java.security.Principal; -import org.kar.archidata.model.UserByToken; +import org.atriasoft.archidata.model.UserByToken; public class GenericContext implements Principal { diff --git a/src/org/kar/archidata/filter/MySecurityContext.java b/src/org/atriasoft/archidata/filter/MySecurityContext.java similarity index 97% rename from src/org/kar/archidata/filter/MySecurityContext.java rename to src/org/atriasoft/archidata/filter/MySecurityContext.java index 2ff383a..83c05fc 100644 --- a/src/org/kar/archidata/filter/MySecurityContext.java +++ b/src/org/atriasoft/archidata/filter/MySecurityContext.java @@ -1,9 +1,9 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import java.security.Principal; import java.util.Set; -import org.kar.archidata.model.UserByToken; +import org.atriasoft.archidata.model.UserByToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/filter/OptionFilter.java b/src/org/atriasoft/archidata/filter/OptionFilter.java similarity index 96% rename from src/org/kar/archidata/filter/OptionFilter.java rename to src/org/atriasoft/archidata/filter/OptionFilter.java index fffc1a2..9eb55b9 100644 --- a/src/org/kar/archidata/filter/OptionFilter.java +++ b/src/org/atriasoft/archidata/filter/OptionFilter.java @@ -1,4 +1,4 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import java.io.IOException; import java.util.List; diff --git a/src/org/kar/archidata/filter/PartRight.java b/src/org/atriasoft/archidata/filter/PartRight.java similarity index 96% rename from src/org/kar/archidata/filter/PartRight.java rename to src/org/atriasoft/archidata/filter/PartRight.java index 0e5948c..127cc02 100644 --- a/src/org/kar/archidata/filter/PartRight.java +++ b/src/org/atriasoft/archidata/filter/PartRight.java @@ -1,4 +1,4 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/org/kar/archidata/filter/RightSafeCaster.java b/src/org/atriasoft/archidata/filter/RightSafeCaster.java similarity index 98% rename from src/org/kar/archidata/filter/RightSafeCaster.java rename to src/org/atriasoft/archidata/filter/RightSafeCaster.java index 65bafdc..13a5419 100644 --- a/src/org/kar/archidata/filter/RightSafeCaster.java +++ b/src/org/atriasoft/archidata/filter/RightSafeCaster.java @@ -1,4 +1,4 @@ -package org.kar.archidata.filter; +package org.atriasoft.archidata.filter; import java.util.Map; diff --git a/src/org/atriasoft/archidata/migration/AsyncCall.java b/src/org/atriasoft/archidata/migration/AsyncCall.java new file mode 100644 index 0000000..d82c6bd --- /dev/null +++ b/src/org/atriasoft/archidata/migration/AsyncCall.java @@ -0,0 +1,7 @@ +package org.atriasoft.archidata.migration; + +import org.atriasoft.archidata.dataAccess.DBAccess; + +public interface AsyncCall { + void doRequest(DBAccess da) throws Exception; +} diff --git a/src/org/kar/archidata/migration/MigrationEngine.java b/src/org/atriasoft/archidata/migration/MigrationEngine.java similarity index 97% rename from src/org/kar/archidata/migration/MigrationEngine.java rename to src/org/atriasoft/archidata/migration/MigrationEngine.java index d1d587c..1ac241f 100644 --- a/src/org/kar/archidata/migration/MigrationEngine.java +++ b/src/org/atriasoft/archidata/migration/MigrationEngine.java @@ -1,17 +1,17 @@ -package org.kar.archidata.migration; +package org.atriasoft.archidata.migration; import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.migration.model.Migration; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.migration.model.Migration; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/migration/MigrationException.java b/src/org/atriasoft/archidata/migration/MigrationException.java similarity index 81% rename from src/org/kar/archidata/migration/MigrationException.java rename to src/org/atriasoft/archidata/migration/MigrationException.java index a223ad4..875ca80 100644 --- a/src/org/kar/archidata/migration/MigrationException.java +++ b/src/org/atriasoft/archidata/migration/MigrationException.java @@ -1,4 +1,4 @@ -package org.kar.archidata.migration; +package org.atriasoft.archidata.migration; public class MigrationException extends Exception { diff --git a/src/org/kar/archidata/migration/MigrationInterface.java b/src/org/atriasoft/archidata/migration/MigrationInterface.java similarity index 85% rename from src/org/kar/archidata/migration/MigrationInterface.java rename to src/org/atriasoft/archidata/migration/MigrationInterface.java index 85a05d7..d5a956f 100644 --- a/src/org/kar/archidata/migration/MigrationInterface.java +++ b/src/org/atriasoft/archidata/migration/MigrationInterface.java @@ -1,7 +1,7 @@ -package org.kar.archidata.migration; +package org.atriasoft.archidata.migration; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.migration.model.Migration; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.migration.model.Migration; public interface MigrationInterface { /** Get Name of the migration diff --git a/src/org/kar/archidata/migration/MigrationSqlStep.java b/src/org/atriasoft/archidata/migration/MigrationSqlStep.java similarity index 94% rename from src/org/kar/archidata/migration/MigrationSqlStep.java rename to src/org/atriasoft/archidata/migration/MigrationSqlStep.java index fb74703..cc216f0 100644 --- a/src/org/kar/archidata/migration/MigrationSqlStep.java +++ b/src/org/atriasoft/archidata/migration/MigrationSqlStep.java @@ -1,15 +1,15 @@ -package org.kar.archidata.migration; +package org.atriasoft.archidata.migration; import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.migration.model.Migration; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.migration.model.Migration; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/migration/model/Migration.java b/src/org/atriasoft/archidata/migration/model/Migration.java similarity index 85% rename from src/org/kar/archidata/migration/model/Migration.java rename to src/org/atriasoft/archidata/migration/model/Migration.java index a3c85d5..ecb82c8 100644 --- a/src/org/kar/archidata/migration/model/Migration.java +++ b/src/org/atriasoft/archidata/migration/model/Migration.java @@ -1,8 +1,8 @@ -package org.kar.archidata.migration.model; +package org.atriasoft.archidata.migration.model; -import org.kar.archidata.annotation.DataIfNotExists; -import org.kar.archidata.annotation.DataNotRead; -import org.kar.archidata.model.GenericDataSoftDelete; +import org.atriasoft.archidata.annotation.DataIfNotExists; +import org.atriasoft.archidata.annotation.DataNotRead; +import org.atriasoft.archidata.model.GenericDataSoftDelete; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/migration/model/Migration1.java b/src/org/atriasoft/archidata/migration/model/Migration1.java similarity index 85% rename from src/org/kar/archidata/migration/model/Migration1.java rename to src/org/atriasoft/archidata/migration/model/Migration1.java index 63417e7..ffd4ca5 100644 --- a/src/org/kar/archidata/migration/model/Migration1.java +++ b/src/org/atriasoft/archidata/migration/model/Migration1.java @@ -1,7 +1,7 @@ -package org.kar.archidata.migration.model; +package org.atriasoft.archidata.migration.model; -import org.kar.archidata.annotation.DataIfNotExists; -import org.kar.archidata.model.GenericDataSoftDelete; +import org.atriasoft.archidata.annotation.DataIfNotExists; +import org.atriasoft.archidata.model.GenericDataSoftDelete; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/model/Data.java b/src/org/atriasoft/archidata/model/Data.java similarity index 83% rename from src/org/kar/archidata/model/Data.java rename to src/org/atriasoft/archidata/model/Data.java index e06cc26..971972f 100644 --- a/src/org/kar/archidata/model/Data.java +++ b/src/org/atriasoft/archidata/model/Data.java @@ -1,7 +1,7 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; -import org.kar.archidata.annotation.DataIfNotExists; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.DataIfNotExists; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/model/GenericData.java b/src/org/atriasoft/archidata/model/GenericData.java similarity index 64% rename from src/org/kar/archidata/model/GenericData.java rename to src/org/atriasoft/archidata/model/GenericData.java index b49f9ef..682e34c 100644 --- a/src/org/kar/archidata/model/GenericData.java +++ b/src/org/atriasoft/archidata/model/GenericData.java @@ -1,9 +1,9 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.apiGenerator.ApiNotNull; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.apiGenerator.ApiNotNull; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; diff --git a/src/org/kar/archidata/model/GenericDataSoftDelete.java b/src/org/atriasoft/archidata/model/GenericDataSoftDelete.java similarity index 58% rename from src/org/kar/archidata/model/GenericDataSoftDelete.java rename to src/org/atriasoft/archidata/model/GenericDataSoftDelete.java index a5fa9ca..5a1bf30 100644 --- a/src/org/kar/archidata/model/GenericDataSoftDelete.java +++ b/src/org/atriasoft/archidata/model/GenericDataSoftDelete.java @@ -1,10 +1,10 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; -import org.kar.archidata.annotation.DataDeleted; -import org.kar.archidata.annotation.DataNotRead; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.DataDeleted; +import org.atriasoft.archidata.annotation.DataNotRead; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.annotation.Nullable; diff --git a/src/org/kar/archidata/model/GenericTiming.java b/src/org/atriasoft/archidata/model/GenericTiming.java similarity index 71% rename from src/org/kar/archidata/model/GenericTiming.java rename to src/org/atriasoft/archidata/model/GenericTiming.java index 39dc9b6..9e0c0fc 100644 --- a/src/org/kar/archidata/model/GenericTiming.java +++ b/src/org/atriasoft/archidata/model/GenericTiming.java @@ -1,13 +1,13 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; import java.util.Date; -import org.kar.archidata.annotation.CreationTimestamp; -import org.kar.archidata.annotation.DataNotRead; -import org.kar.archidata.annotation.UpdateTimestamp; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.CreationTimestamp; +import org.atriasoft.archidata.annotation.DataNotRead; +import org.atriasoft.archidata.annotation.UpdateTimestamp; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/org/kar/archidata/model/GenericToken.java b/src/org/atriasoft/archidata/model/GenericToken.java similarity index 87% rename from src/org/kar/archidata/model/GenericToken.java rename to src/org/atriasoft/archidata/model/GenericToken.java index 38d88bb..3615c99 100644 --- a/src/org/kar/archidata/model/GenericToken.java +++ b/src/org/atriasoft/archidata/model/GenericToken.java @@ -1,8 +1,8 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; import java.sql.Timestamp; -import org.kar.archidata.annotation.DataIfNotExists; +import org.atriasoft.archidata.annotation.DataIfNotExists; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/model/GetToken.java b/src/org/atriasoft/archidata/model/GetToken.java similarity index 88% rename from src/org/kar/archidata/model/GetToken.java rename to src/org/atriasoft/archidata/model/GetToken.java index 78610c1..26e52df 100644 --- a/src/org/kar/archidata/model/GetToken.java +++ b/src/org/atriasoft/archidata/model/GetToken.java @@ -1,4 +1,4 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/model/OIDGenericData.java b/src/org/atriasoft/archidata/model/OIDGenericData.java similarity index 63% rename from src/org/kar/archidata/model/OIDGenericData.java rename to src/org/atriasoft/archidata/model/OIDGenericData.java index fe5f99b..e76734e 100644 --- a/src/org/kar/archidata/model/OIDGenericData.java +++ b/src/org/atriasoft/archidata/model/OIDGenericData.java @@ -1,10 +1,10 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.apiGenerator.ApiNotNull; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.apiGenerator.ApiNotNull; -import org.kar.archidata.annotation.checker.ReadOnlyField; import dev.morphia.annotations.Id; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/org/kar/archidata/model/OIDGenericDataSoftDelete.java b/src/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java similarity index 59% rename from src/org/kar/archidata/model/OIDGenericDataSoftDelete.java rename to src/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java index 4e7ac77..31c542f 100644 --- a/src/org/kar/archidata/model/OIDGenericDataSoftDelete.java +++ b/src/org/atriasoft/archidata/model/OIDGenericDataSoftDelete.java @@ -1,10 +1,10 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; -import org.kar.archidata.annotation.DataDeleted; -import org.kar.archidata.annotation.DataNotRead; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.DataDeleted; +import org.atriasoft.archidata.annotation.DataNotRead; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.annotation.Nullable; diff --git a/src/org/kar/archidata/model/Token.java b/src/org/atriasoft/archidata/model/Token.java similarity index 96% rename from src/org/kar/archidata/model/Token.java rename to src/org/atriasoft/archidata/model/Token.java index b0b6465..1d523b5 100644 --- a/src/org/kar/archidata/model/Token.java +++ b/src/org/atriasoft/archidata/model/Token.java @@ -1,4 +1,4 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/org/kar/archidata/model/UUIDGenericData.java b/src/org/atriasoft/archidata/model/UUIDGenericData.java similarity index 64% rename from src/org/kar/archidata/model/UUIDGenericData.java rename to src/org/atriasoft/archidata/model/UUIDGenericData.java index 5015827..7f2745a 100644 --- a/src/org/kar/archidata/model/UUIDGenericData.java +++ b/src/org/atriasoft/archidata/model/UUIDGenericData.java @@ -1,11 +1,11 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; import java.util.UUID; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.apiGenerator.ApiNotNull; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.apiGenerator.ApiNotNull; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Column; diff --git a/src/org/kar/archidata/model/UUIDGenericDataSoftDelete.java b/src/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java similarity index 59% rename from src/org/kar/archidata/model/UUIDGenericDataSoftDelete.java rename to src/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java index 226f2d2..d1c296b 100644 --- a/src/org/kar/archidata/model/UUIDGenericDataSoftDelete.java +++ b/src/org/atriasoft/archidata/model/UUIDGenericDataSoftDelete.java @@ -1,10 +1,10 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; -import org.kar.archidata.annotation.DataDeleted; -import org.kar.archidata.annotation.DataNotRead; -import org.kar.archidata.annotation.apiGenerator.ApiAccessLimitation; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.DataDeleted; +import org.atriasoft.archidata.annotation.DataNotRead; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAccessLimitation; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.annotation.Nullable; diff --git a/src/org/kar/archidata/model/User.java b/src/org/atriasoft/archidata/model/User.java similarity index 90% rename from src/org/kar/archidata/model/User.java rename to src/org/atriasoft/archidata/model/User.java index 2cd1483..90b0cff 100644 --- a/src/org/kar/archidata/model/User.java +++ b/src/org/atriasoft/archidata/model/User.java @@ -1,4 +1,4 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; /* CREATE TABLE `user` ( @@ -18,9 +18,9 @@ import java.sql.Timestamp; import java.util.List; import java.util.UUID; -import org.kar.archidata.annotation.DataIfNotExists; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.DataIfNotExists; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/org/kar/archidata/model/UserByToken.java b/src/org/atriasoft/archidata/model/UserByToken.java similarity index 95% rename from src/org/kar/archidata/model/UserByToken.java rename to src/org/atriasoft/archidata/model/UserByToken.java index d94f615..5b51e78 100644 --- a/src/org/kar/archidata/model/UserByToken.java +++ b/src/org/atriasoft/archidata/model/UserByToken.java @@ -1,10 +1,10 @@ -package org.kar.archidata.model; +package org.atriasoft.archidata.model; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.kar.archidata.filter.PartRight; +import org.atriasoft.archidata.filter.PartRight; public class UserByToken { public static final int TYPE_USER = -1; diff --git a/src/org/kar/archidata/model/token/JwtHeader.java b/src/org/atriasoft/archidata/model/token/JwtHeader.java similarity index 82% rename from src/org/kar/archidata/model/token/JwtHeader.java rename to src/org/atriasoft/archidata/model/token/JwtHeader.java index 28d014a..6745d5b 100644 --- a/src/org/kar/archidata/model/token/JwtHeader.java +++ b/src/org/atriasoft/archidata/model/token/JwtHeader.java @@ -1,4 +1,4 @@ -package org.kar.archidata.model.token; +package org.atriasoft.archidata.model.token; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/org/kar/archidata/model/token/JwtPayload.java b/src/org/atriasoft/archidata/model/token/JwtPayload.java similarity index 92% rename from src/org/kar/archidata/model/token/JwtPayload.java rename to src/org/atriasoft/archidata/model/token/JwtPayload.java index baa2378..10c9969 100644 --- a/src/org/kar/archidata/model/token/JwtPayload.java +++ b/src/org/atriasoft/archidata/model/token/JwtPayload.java @@ -1,4 +1,4 @@ -package org.kar.archidata.model.token; +package org.atriasoft.archidata.model.token; import java.util.Map; diff --git a/src/org/kar/archidata/model/token/JwtToken.java b/src/org/atriasoft/archidata/model/token/JwtToken.java similarity index 83% rename from src/org/kar/archidata/model/token/JwtToken.java rename to src/org/atriasoft/archidata/model/token/JwtToken.java index bb1a1b1..85aa7ff 100644 --- a/src/org/kar/archidata/model/token/JwtToken.java +++ b/src/org/atriasoft/archidata/model/token/JwtToken.java @@ -1,4 +1,4 @@ -package org.kar.archidata.model.token; +package org.atriasoft.archidata.model.token; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; diff --git a/src/org/kar/archidata/tools/AnnotationCreator.java b/src/org/atriasoft/archidata/tools/AnnotationCreator.java similarity index 94% rename from src/org/kar/archidata/tools/AnnotationCreator.java rename to src/org/atriasoft/archidata/tools/AnnotationCreator.java index 31372e7..dbbb705 100644 --- a/src/org/kar/archidata/tools/AnnotationCreator.java +++ b/src/org/atriasoft/archidata/tools/AnnotationCreator.java @@ -1,11 +1,11 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode; +import org.atriasoft.archidata.annotation.apiGenerator.ApiGenerationMode; public class AnnotationCreator { diff --git a/src/org/kar/archidata/tools/ConfigBaseVariable.java b/src/org/atriasoft/archidata/tools/ConfigBaseVariable.java similarity index 98% rename from src/org/kar/archidata/tools/ConfigBaseVariable.java rename to src/org/atriasoft/archidata/tools/ConfigBaseVariable.java index a467873..83f312b 100644 --- a/src/org/kar/archidata/tools/ConfigBaseVariable.java +++ b/src/org/atriasoft/archidata/tools/ConfigBaseVariable.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; public class ConfigBaseVariable { static public String tmpDataFolder; diff --git a/src/org/kar/archidata/tools/ContextGenericTools.java b/src/org/atriasoft/archidata/tools/ContextGenericTools.java similarity index 92% rename from src/org/kar/archidata/tools/ContextGenericTools.java rename to src/org/atriasoft/archidata/tools/ContextGenericTools.java index 81b21d7..e1899c8 100644 --- a/src/org/kar/archidata/tools/ContextGenericTools.java +++ b/src/org/atriasoft/archidata/tools/ContextGenericTools.java @@ -1,8 +1,8 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; +import org.atriasoft.archidata.converter.jackson.JacksonModules; import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.glassfish.jersey.server.ResourceConfig; -import org.kar.archidata.converter.jackson.JacksonModules; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/src/org/kar/archidata/tools/DataTools.java b/src/org/atriasoft/archidata/tools/DataTools.java similarity index 94% rename from src/org/kar/archidata/tools/DataTools.java rename to src/org/atriasoft/archidata/tools/DataTools.java index beef030..8cdd596 100644 --- a/src/org/kar/archidata/tools/DataTools.java +++ b/src/org/atriasoft/archidata/tools/DataTools.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.io.File; import java.io.FileOutputStream; @@ -16,22 +16,22 @@ import java.util.Arrays; import java.util.List; import org.apache.tika.Tika; +import org.atriasoft.archidata.annotation.AnnotationTools; +import org.atriasoft.archidata.annotation.AnnotationTools.FieldName; +import org.atriasoft.archidata.api.DataResource; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.QueryAnd; +import org.atriasoft.archidata.dataAccess.QueryCondition; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnDataJson; +import org.atriasoft.archidata.dataAccess.options.Condition; +import org.atriasoft.archidata.dataAccess.options.ReadAllColumn; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.exception.FailException; +import org.atriasoft.archidata.exception.InputException; +import org.atriasoft.archidata.model.Data; import org.bson.types.ObjectId; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; -import org.kar.archidata.annotation.AnnotationTools; -import org.kar.archidata.annotation.AnnotationTools.FieldName; -import org.kar.archidata.api.DataResource; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.QueryAnd; -import org.kar.archidata.dataAccess.QueryCondition; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.dataAccess.addOnSQL.AddOnDataJson; -import org.kar.archidata.dataAccess.options.Condition; -import org.kar.archidata.dataAccess.options.ReadAllColumn; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.exception.FailException; -import org.kar.archidata.exception.InputException; -import org.kar.archidata.model.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/tools/DateTools.java b/src/org/atriasoft/archidata/tools/DateTools.java similarity index 99% rename from src/org/kar/archidata/tools/DateTools.java rename to src/org/atriasoft/archidata/tools/DateTools.java index 9ce9040..b1e8361 100644 --- a/src/org/kar/archidata/tools/DateTools.java +++ b/src/org/atriasoft/archidata/tools/DateTools.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.io.IOException; import java.time.OffsetDateTime; diff --git a/src/org/kar/archidata/tools/JWTWrapper.java b/src/org/atriasoft/archidata/tools/JWTWrapper.java similarity index 99% rename from src/org/kar/archidata/tools/JWTWrapper.java rename to src/org/atriasoft/archidata/tools/JWTWrapper.java index 9f93e7f..b855708 100644 --- a/src/org/kar/archidata/tools/JWTWrapper.java +++ b/src/org/atriasoft/archidata/tools/JWTWrapper.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.io.BufferedReader; import java.io.IOException; @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.kar.archidata.filter.AuthenticationFilter; +import org.atriasoft.archidata.filter.AuthenticationFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/tools/ListTools.java b/src/org/atriasoft/archidata/tools/ListTools.java similarity index 93% rename from src/org/kar/archidata/tools/ListTools.java rename to src/org/atriasoft/archidata/tools/ListTools.java index af1c85c..771004d 100644 --- a/src/org/kar/archidata/tools/ListTools.java +++ b/src/org/atriasoft/archidata/tools/ListTools.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.util.List; diff --git a/src/org/kar/archidata/tools/PublicKey.java b/src/org/atriasoft/archidata/tools/PublicKey.java similarity index 73% rename from src/org/kar/archidata/tools/PublicKey.java rename to src/org/atriasoft/archidata/tools/PublicKey.java index 9f5a933..29c1cdb 100644 --- a/src/org/kar/archidata/tools/PublicKey.java +++ b/src/org/atriasoft/archidata/tools/PublicKey.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; public class PublicKey { public String key; diff --git a/src/org/kar/archidata/tools/RESTApi.java b/src/org/atriasoft/archidata/tools/RESTApi.java similarity index 99% rename from src/org/kar/archidata/tools/RESTApi.java rename to src/org/atriasoft/archidata/tools/RESTApi.java index 1a913af..cb098f5 100644 --- a/src/org/kar/archidata/tools/RESTApi.java +++ b/src/org/atriasoft/archidata/tools/RESTApi.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.io.File; import java.io.IOException; @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.atriasoft.archidata.exception.RESTErrorResponseException; import org.bson.types.ObjectId; -import org.kar.archidata.exception.RESTErrorResponseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/tools/RESTApiRequest.java b/src/org/atriasoft/archidata/tools/RESTApiRequest.java similarity index 99% rename from src/org/kar/archidata/tools/RESTApiRequest.java rename to src/org/atriasoft/archidata/tools/RESTApiRequest.java index a095ff6..ed3658e 100644 --- a/src/org/kar/archidata/tools/RESTApiRequest.java +++ b/src/org/atriasoft/archidata/tools/RESTApiRequest.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.io.File; import java.io.IOException; @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.atriasoft.archidata.exception.RESTErrorResponseException; import org.bson.types.ObjectId; -import org.kar.archidata.exception.RESTErrorResponseException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/kar/archidata/tools/StringTools.java b/src/org/atriasoft/archidata/tools/StringTools.java similarity index 91% rename from src/org/kar/archidata/tools/StringTools.java rename to src/org/atriasoft/archidata/tools/StringTools.java index 44d6831..5be43ff 100644 --- a/src/org/kar/archidata/tools/StringTools.java +++ b/src/org/atriasoft/archidata/tools/StringTools.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; public class StringTools { public static String RandGeneratedStr(final int length) { diff --git a/src/org/kar/archidata/tools/UuidUtils.java b/src/org/atriasoft/archidata/tools/UuidUtils.java similarity index 95% rename from src/org/kar/archidata/tools/UuidUtils.java rename to src/org/atriasoft/archidata/tools/UuidUtils.java index 971d3fc..b6d7380 100644 --- a/src/org/kar/archidata/tools/UuidUtils.java +++ b/src/org/atriasoft/archidata/tools/UuidUtils.java @@ -1,4 +1,4 @@ -package org.kar.archidata.tools; +package org.atriasoft.archidata.tools; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -8,7 +8,7 @@ import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import java.util.UUID; -import org.kar.archidata.exception.DataAccessException; +import org.atriasoft.archidata.exception.DataAccessException; public class UuidUtils { diff --git a/src/org/kar/archidata/dataAccess/options/QueryOption.java b/src/org/kar/archidata/dataAccess/options/QueryOption.java deleted file mode 100644 index 9f686f0..0000000 --- a/src/org/kar/archidata/dataAccess/options/QueryOption.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.kar.archidata.dataAccess.options; - -public class QueryOption {} diff --git a/src/org/kar/archidata/migration/AsyncCall.java b/src/org/kar/archidata/migration/AsyncCall.java deleted file mode 100644 index eac7cc9..0000000 --- a/src/org/kar/archidata/migration/AsyncCall.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.kar.archidata.migration; - -import org.kar.archidata.dataAccess.DBAccess; - -public interface AsyncCall { - void doRequest(DBAccess da) throws Exception; -} diff --git a/test/src/test/kar/archidata/ConfigureDb.java b/test/src/test/atriasoft/archidata/ConfigureDb.java similarity index 70% rename from test/src/test/kar/archidata/ConfigureDb.java rename to test/src/test/atriasoft/archidata/ConfigureDb.java index 5dfc80c..8b6c8d6 100644 --- a/test/src/test/kar/archidata/ConfigureDb.java +++ b/test/src/test/atriasoft/archidata/ConfigureDb.java @@ -1,39 +1,39 @@ -package test.kar.archidata; +package test.atriasoft.archidata; import java.io.IOException; import java.util.List; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.db.DbIoFactory; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.db.DbIoFactory; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import jakarta.ws.rs.InternalServerErrorException; -import test.kar.archidata.dataAccess.model.SerializeAsJson; -import test.kar.archidata.dataAccess.model.SerializeListAsJson; -import test.kar.archidata.dataAccess.model.SimpleTable; -import test.kar.archidata.dataAccess.model.SimpleTableSoftDelete; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRemote; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRoot; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRootExpand; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRoot; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRootExpand; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRoot; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRootExpand; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRemote; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRoot; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRootExpand; -import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRemote; -import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRoot; -import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRootExpand; -import test.kar.archidata.dataAccess.model.TypesEnum1; -import test.kar.archidata.dataAccess.model.TypesEnum2; -import test.kar.archidata.dataAccess.model.TypesTable; +import test.atriasoft.archidata.dataAccess.model.SerializeAsJson; +import test.atriasoft.archidata.dataAccess.model.SerializeListAsJson; +import test.atriasoft.archidata.dataAccess.model.SimpleTable; +import test.atriasoft.archidata.dataAccess.model.SimpleTableSoftDelete; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRootExpand; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRootExpand; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRootExpand; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRootExpand; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyUUIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyUUIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyUUIDRootExpand; +import test.atriasoft.archidata.dataAccess.model.TypesEnum1; +import test.atriasoft.archidata.dataAccess.model.TypesEnum2; +import test.atriasoft.archidata.dataAccess.model.TypesTable; public class ConfigureDb { final static private Logger LOGGER = LoggerFactory.getLogger(ConfigureDb.class); diff --git a/test/src/test/kar/archidata/StepwiseExtension.java b/test/src/test/atriasoft/archidata/StepwiseExtension.java similarity index 98% rename from test/src/test/kar/archidata/StepwiseExtension.java rename to test/src/test/atriasoft/archidata/StepwiseExtension.java index 11b0c4c..423d8a6 100644 --- a/test/src/test/kar/archidata/StepwiseExtension.java +++ b/test/src/test/atriasoft/archidata/StepwiseExtension.java @@ -1,4 +1,4 @@ -package test.kar.archidata; +package test.atriasoft.archidata; import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ExecutionCondition; diff --git a/test/src/test/kar/archidata/apiExtern/Common.java b/test/src/test/atriasoft/archidata/apiExtern/Common.java similarity index 92% rename from test/src/test/kar/archidata/apiExtern/Common.java rename to test/src/test/atriasoft/archidata/apiExtern/Common.java index 63fa05a..1ab1d0a 100644 --- a/test/src/test/kar/archidata/apiExtern/Common.java +++ b/test/src/test/atriasoft/archidata/apiExtern/Common.java @@ -1,10 +1,10 @@ -package test.kar.archidata.apiExtern; +package test.atriasoft.archidata.apiExtern; import java.util.Map; import java.util.UUID; +import org.atriasoft.archidata.tools.JWTWrapper; import org.junit.jupiter.api.Assertions; -import org.kar.archidata.tools.JWTWrapper; public class Common { public static final String USER_TOKEN = JWTWrapper.createJwtTestToken(16512, "test_user_login", "KarAuth", @@ -29,6 +29,5 @@ public class Common { final String[] elems = data.split("-"); Assertions.assertEquals(elems.length, 5); Assertions.assertTrue(elems[3].equals("0001")); - } } diff --git a/test/src/test/kar/archidata/apiExtern/TestAPI.java b/test/src/test/atriasoft/archidata/apiExtern/TestAPI.java similarity index 90% rename from test/src/test/kar/archidata/apiExtern/TestAPI.java rename to test/src/test/atriasoft/archidata/apiExtern/TestAPI.java index 01e2827..bca6fed 100644 --- a/test/src/test/kar/archidata/apiExtern/TestAPI.java +++ b/test/src/test/atriasoft/archidata/apiExtern/TestAPI.java @@ -1,5 +1,7 @@ -package test.kar.archidata.apiExtern; +package test.atriasoft.archidata.apiExtern; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.RESTApi; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -8,14 +10,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.RESTApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.apiExtern.model.SimpleArchiveTable; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.apiExtern.model.SimpleArchiveTable; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/apiExtern/TestAuthenticationFilter.java b/test/src/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java similarity index 80% rename from test/src/test/kar/archidata/apiExtern/TestAuthenticationFilter.java rename to test/src/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java index 93c7c47..a3f8d6c 100644 --- a/test/src/test/kar/archidata/apiExtern/TestAuthenticationFilter.java +++ b/test/src/test/atriasoft/archidata/apiExtern/TestAuthenticationFilter.java @@ -1,14 +1,12 @@ -package test.kar.archidata.apiExtern; - -import org.kar.archidata.filter.AuthenticationFilter; - -import jakarta.ws.rs.Priorities; -import jakarta.ws.rs.ext.Provider; +package test.atriasoft.archidata.apiExtern; +import org.atriasoft.archidata.filter.AuthenticationFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.Provider; //@PreMatching @Provider diff --git a/test/src/test/kar/archidata/apiExtern/TestTime.java b/test/src/test/atriasoft/archidata/apiExtern/TestTime.java similarity index 93% rename from test/src/test/kar/archidata/apiExtern/TestTime.java rename to test/src/test/atriasoft/archidata/apiExtern/TestTime.java index 94c9b5b..e76ae5d 100644 --- a/test/src/test/kar/archidata/apiExtern/TestTime.java +++ b/test/src/test/atriasoft/archidata/apiExtern/TestTime.java @@ -1,9 +1,12 @@ -package test.kar.archidata.apiExtern; +package test.atriasoft.archidata.apiExtern; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import org.atriasoft.archidata.exception.RESTErrorResponseException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.RESTApi; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -12,16 +15,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.exception.RESTErrorResponseException; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.RESTApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.apiExtern.model.DataForJSR310; -import test.kar.archidata.apiExtern.model.DataForJSR310String; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.apiExtern.model.DataForJSR310; +import test.atriasoft.archidata.apiExtern.model.DataForJSR310String; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/apiExtern/TestTimeParsing.java b/test/src/test/atriasoft/archidata/apiExtern/TestTimeParsing.java similarity index 98% rename from test/src/test/kar/archidata/apiExtern/TestTimeParsing.java rename to test/src/test/atriasoft/archidata/apiExtern/TestTimeParsing.java index 6f5a91d..3625303 100644 --- a/test/src/test/kar/archidata/apiExtern/TestTimeParsing.java +++ b/test/src/test/atriasoft/archidata/apiExtern/TestTimeParsing.java @@ -1,14 +1,14 @@ -package test.kar.archidata.apiExtern; +package test.atriasoft.archidata.apiExtern; import java.io.IOException; import java.time.OffsetDateTime; import java.util.Date; import java.util.TimeZone; +import org.atriasoft.archidata.tools.DateTools; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.kar.archidata.tools.DateTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +66,7 @@ public class TestTimeParsing { // manualFormat = parsed.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'.'SSSX")); // LOGGER.info(">> manualFormat: '{}'", manualFormat); // manualFormat = parsed.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'.'nnnnnnnnnZ")); - // LOGGER.info(">> manualFormat: '{}'", manualFormat); + // LOGGER.info(">> manualFormat: '{}'", ma nualFormat); // LOGGER.info("----------------------------------------------------"); // data = "2025-04-04T15:15:07"; // //parsed = OffsetDateTime.parse(data, timeParserPersoUTC); diff --git a/test/src/test/kar/archidata/apiExtern/WebLauncher.java b/test/src/test/atriasoft/archidata/apiExtern/WebLauncher.java similarity index 87% rename from test/src/test/kar/archidata/apiExtern/WebLauncher.java rename to test/src/test/atriasoft/archidata/apiExtern/WebLauncher.java index fe3a0f1..7e598d0 100755 --- a/test/src/test/kar/archidata/apiExtern/WebLauncher.java +++ b/test/src/test/atriasoft/archidata/apiExtern/WebLauncher.java @@ -1,4 +1,4 @@ -package test.kar.archidata.apiExtern; +package test.atriasoft.archidata.apiExtern; import java.net.URI; import java.util.Iterator; @@ -8,30 +8,30 @@ import javax.imageio.ImageIO; import javax.imageio.ImageReader; import javax.imageio.ImageWriter; +import org.atriasoft.archidata.UpdateJwtPublicKey; +import org.atriasoft.archidata.api.DataResource; +import org.atriasoft.archidata.api.ProxyResource; +import org.atriasoft.archidata.catcher.GenericCatcher; +import org.atriasoft.archidata.converter.Jakarta.DateParamConverterProvider; +import org.atriasoft.archidata.converter.Jakarta.OffsetDateTimeParamConverterProvider; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.filter.CORSFilter; +import org.atriasoft.archidata.filter.OptionFilter; +import org.atriasoft.archidata.migration.MigrationEngine; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.ContextGenericTools; import org.glassfish.grizzly.http.server.HttpServer; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.glassfish.jersey.server.ResourceConfig; -import org.kar.archidata.UpdateJwtPublicKey; -import org.kar.archidata.api.DataResource; -import org.kar.archidata.api.ProxyResource; -import org.kar.archidata.catcher.GenericCatcher; -import org.kar.archidata.converter.Jakarta.DateParamConverterProvider; -import org.kar.archidata.converter.Jakarta.OffsetDateTimeParamConverterProvider; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.filter.CORSFilter; -import org.kar.archidata.filter.OptionFilter; -import org.kar.archidata.migration.MigrationEngine; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.ContextGenericTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import jakarta.ws.rs.core.UriBuilder; -import test.kar.archidata.apiExtern.resource.TestResource; -import test.kar.archidata.apiExtern.resource.TimeResource; +import test.atriasoft.archidata.apiExtern.resource.TestResource; +import test.atriasoft.archidata.apiExtern.resource.TimeResource; public class WebLauncher { final static Logger LOGGER = LoggerFactory.getLogger(WebLauncher.class); diff --git a/test/src/test/kar/archidata/apiExtern/WebLauncherTest.java b/test/src/test/atriasoft/archidata/apiExtern/WebLauncherTest.java similarity index 84% rename from test/src/test/kar/archidata/apiExtern/WebLauncherTest.java rename to test/src/test/atriasoft/archidata/apiExtern/WebLauncherTest.java index 1b323fd..f5b5cc5 100755 --- a/test/src/test/kar/archidata/apiExtern/WebLauncherTest.java +++ b/test/src/test/atriasoft/archidata/apiExtern/WebLauncherTest.java @@ -1,7 +1,7 @@ -package test.kar.archidata.apiExtern; +package test.atriasoft.archidata.apiExtern; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/apiExtern/model/DataForJSR310.java b/test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java similarity index 92% rename from test/src/test/kar/archidata/apiExtern/model/DataForJSR310.java rename to test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java index ed0fabc..65732be 100644 --- a/test/src/test/kar/archidata/apiExtern/model/DataForJSR310.java +++ b/test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310.java @@ -1,4 +1,4 @@ -package test.kar.archidata.apiExtern.model; +package test.atriasoft.archidata.apiExtern.model; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/test/src/test/kar/archidata/apiExtern/model/DataForJSR310String.java b/test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java similarity index 90% rename from test/src/test/kar/archidata/apiExtern/model/DataForJSR310String.java rename to test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java index 03080c3..3b36c4e 100644 --- a/test/src/test/kar/archidata/apiExtern/model/DataForJSR310String.java +++ b/test/src/test/atriasoft/archidata/apiExtern/model/DataForJSR310String.java @@ -1,4 +1,4 @@ -package test.kar.archidata.apiExtern.model; +package test.atriasoft.archidata.apiExtern.model; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/test/src/test/kar/archidata/apiExtern/model/DataTimes.java b/test/src/test/atriasoft/archidata/apiExtern/model/DataTimes.java similarity index 87% rename from test/src/test/kar/archidata/apiExtern/model/DataTimes.java rename to test/src/test/atriasoft/archidata/apiExtern/model/DataTimes.java index a68215b..a9925d9 100644 --- a/test/src/test/kar/archidata/apiExtern/model/DataTimes.java +++ b/test/src/test/atriasoft/archidata/apiExtern/model/DataTimes.java @@ -1,4 +1,4 @@ -package test.kar.archidata.apiExtern.model; +package test.atriasoft.archidata.apiExtern.model; import java.sql.Timestamp; import java.time.LocalDateTime; diff --git a/test/src/test/kar/archidata/apiExtern/model/SimpleArchiveTable.java b/test/src/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java similarity index 72% rename from test/src/test/kar/archidata/apiExtern/model/SimpleArchiveTable.java rename to test/src/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java index 294206a..bffca2d 100644 --- a/test/src/test/kar/archidata/apiExtern/model/SimpleArchiveTable.java +++ b/test/src/test/atriasoft/archidata/apiExtern/model/SimpleArchiveTable.java @@ -1,8 +1,8 @@ -package test.kar.archidata.apiExtern.model; +package test.atriasoft.archidata.apiExtern.model; import java.util.Date; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/test/src/test/kar/archidata/apiExtern/resource/TestResource.java b/test/src/test/atriasoft/archidata/apiExtern/resource/TestResource.java similarity index 89% rename from test/src/test/kar/archidata/apiExtern/resource/TestResource.java rename to test/src/test/atriasoft/archidata/apiExtern/resource/TestResource.java index d378157..5b8e599 100644 --- a/test/src/test/kar/archidata/apiExtern/resource/TestResource.java +++ b/test/src/test/atriasoft/archidata/apiExtern/resource/TestResource.java @@ -1,13 +1,13 @@ -package test.kar.archidata.apiExtern.resource; +package test.atriasoft.archidata.apiExtern.resource; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.kar.archidata.annotation.apiGenerator.ApiAsyncType; -import org.kar.archidata.annotation.method.ARCHIVE; -import org.kar.archidata.annotation.method.RESTORE; -import org.kar.archidata.exception.NotFoundException; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAsyncType; +import org.atriasoft.archidata.annotation.method.ARCHIVE; +import org.atriasoft.archidata.annotation.method.RESTORE; +import org.atriasoft.archidata.exception.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import test.kar.archidata.apiExtern.model.SimpleArchiveTable; +import test.atriasoft.archidata.apiExtern.model.SimpleArchiveTable; @Path("/TestResource") @Produces({ MediaType.APPLICATION_JSON }) diff --git a/test/src/test/kar/archidata/apiExtern/resource/TestResourceSample.java b/test/src/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java similarity index 85% rename from test/src/test/kar/archidata/apiExtern/resource/TestResourceSample.java rename to test/src/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java index b2318a8..e68603b 100644 --- a/test/src/test/kar/archidata/apiExtern/resource/TestResourceSample.java +++ b/test/src/test/atriasoft/archidata/apiExtern/resource/TestResourceSample.java @@ -1,11 +1,11 @@ -package test.kar.archidata.apiExtern.resource; +package test.atriasoft.archidata.apiExtern.resource; import java.util.List; -import org.kar.archidata.annotation.apiGenerator.ApiAsyncType; -import org.kar.archidata.annotation.method.ARCHIVE; -import org.kar.archidata.annotation.method.RESTORE; -import org.kar.archidata.dataAccess.DataAccess; +import org.atriasoft.archidata.annotation.apiGenerator.ApiAsyncType; +import org.atriasoft.archidata.annotation.method.ARCHIVE; +import org.atriasoft.archidata.annotation.method.RESTORE; +import org.atriasoft.archidata.dataAccess.DataAccess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +20,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import test.kar.archidata.dataAccess.model.SimpleTable; +import test.atriasoft.archidata.dataAccess.model.SimpleTable; @Path("/TestResourceSample") @Produces({ MediaType.APPLICATION_JSON }) diff --git a/test/src/test/kar/archidata/apiExtern/resource/TimeResource.java b/test/src/test/atriasoft/archidata/apiExtern/resource/TimeResource.java similarity index 94% rename from test/src/test/kar/archidata/apiExtern/resource/TimeResource.java rename to test/src/test/atriasoft/archidata/apiExtern/resource/TimeResource.java index bf86804..44f1236 100644 --- a/test/src/test/kar/archidata/apiExtern/resource/TimeResource.java +++ b/test/src/test/atriasoft/archidata/apiExtern/resource/TimeResource.java @@ -1,4 +1,4 @@ -package test.kar.archidata.apiExtern.resource; +package test.atriasoft.archidata.apiExtern.resource; import java.time.LocalDate; import java.time.LocalDateTime; @@ -7,7 +7,7 @@ import java.time.OffsetDateTime; import java.time.ZonedDateTime; import java.util.Date; -import org.kar.archidata.tools.DateTools; +import org.atriasoft.archidata.tools.DateTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import test.kar.archidata.apiExtern.model.DataForJSR310; +import test.atriasoft.archidata.apiExtern.model.DataForJSR310; @Path("/TimeResource") @Produces({ MediaType.APPLICATION_JSON }) diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerDecimalMax.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java similarity index 97% rename from test/src/test/kar/archidata/checker/TestJPACheckerDecimalMax.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java index f77cd00..dfd7864 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerDecimalMax.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMax.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerDecimalMax { diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerDecimalMin.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java similarity index 97% rename from test/src/test/kar/archidata/checker/TestJPACheckerDecimalMin.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java index cc2d78b..a8aae8d 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerDecimalMin.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerDecimalMin.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerDecimalMin { diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerEMail.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerEMail.java similarity index 78% rename from test/src/test/kar/archidata/checker/TestJPACheckerEMail.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerEMail.java index cff4aa0..1d072ce 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerEMail.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerEMail.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerEMail { diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerMax.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerMax.java similarity index 95% rename from test/src/test/kar/archidata/checker/TestJPACheckerMax.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerMax.java index 59da493..863e98a 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerMax.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerMax.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerMax { diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerMin.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerMin.java similarity index 95% rename from test/src/test/kar/archidata/checker/TestJPACheckerMin.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerMin.java index aadb983..02f6602 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerMin.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerMin.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerMin { diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerPattern.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerPattern.java similarity index 74% rename from test/src/test/kar/archidata/checker/TestJPACheckerPattern.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerPattern.java index d992bdd..af936d5 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerPattern.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerPattern.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerPattern { diff --git a/test/src/test/kar/archidata/checker/TestJPACheckerSize.java b/test/src/test/atriasoft/archidata/checker/TestJPACheckerSize.java similarity index 73% rename from test/src/test/kar/archidata/checker/TestJPACheckerSize.java rename to test/src/test/atriasoft/archidata/checker/TestJPACheckerSize.java index 54e6994..2173072 100644 --- a/test/src/test/kar/archidata/checker/TestJPACheckerSize.java +++ b/test/src/test/atriasoft/archidata/checker/TestJPACheckerSize.java @@ -1,11 +1,11 @@ -package test.kar.archidata.checker; +package test.atriasoft.archidata.checker; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.exception.InputException; -import test.kar.archidata.checker.model.JpaBaseModel; -import test.kar.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; +import test.atriasoft.archidata.checker.model.JpaBaseModel; +import test.atriasoft.archidata.checker.model.JpaBaseModel.JpaBaseModelChecker; public class TestJPACheckerSize { diff --git a/test/src/test/kar/archidata/checker/model/JpaBaseModel.java b/test/src/test/atriasoft/archidata/checker/model/JpaBaseModel.java similarity index 97% rename from test/src/test/kar/archidata/checker/model/JpaBaseModel.java rename to test/src/test/atriasoft/archidata/checker/model/JpaBaseModel.java index da09825..bf7b758 100644 --- a/test/src/test/kar/archidata/checker/model/JpaBaseModel.java +++ b/test/src/test/atriasoft/archidata/checker/model/JpaBaseModel.java @@ -1,6 +1,6 @@ -package test.kar.archidata.checker.model; +package test.atriasoft.archidata.checker.model; -import org.kar.archidata.checker.CheckJPA; +import org.atriasoft.archidata.checker.CheckJPA; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; diff --git a/test/src/test/kar/archidata/dataAccess/TestDataJson.java b/test/src/test/atriasoft/archidata/dataAccess/TestDataJson.java similarity index 76% rename from test/src/test/kar/archidata/dataAccess/TestDataJson.java rename to test/src/test/atriasoft/archidata/dataAccess/TestDataJson.java index bb6750a..6b5c8d2 100644 --- a/test/src/test/kar/archidata/dataAccess/TestDataJson.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestDataJson.java @@ -1,16 +1,16 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; +import org.atriasoft.archidata.exception.InputException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.exception.InputException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.DataInJson; -import test.kar.archidata.dataAccess.model.DataWithSubJson; -import test.kar.archidata.dataAccess.model.DataWithSubJson.DataWithSubJsonChecker; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.DataInJson; +import test.atriasoft.archidata.dataAccess.model.DataWithSubJson; +import test.atriasoft.archidata.dataAccess.model.DataWithSubJson.DataWithSubJsonChecker; @ExtendWith(StepwiseExtension.class) public class TestDataJson { diff --git a/test/src/test/kar/archidata/dataAccess/TestJPAChecker.java b/test/src/test/atriasoft/archidata/dataAccess/TestJPAChecker.java similarity index 80% rename from test/src/test/kar/archidata/dataAccess/TestJPAChecker.java rename to test/src/test/atriasoft/archidata/dataAccess/TestJPAChecker.java index 6c54737..2c346f2 100644 --- a/test/src/test/kar/archidata/dataAccess/TestJPAChecker.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestJPAChecker.java @@ -1,19 +1,19 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.exception.DataAccessException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.exception.DataAccessException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.DataInJson; -import test.kar.archidata.dataAccess.model.DataInJson.DataInJsonChecker; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.DataInJson; +import test.atriasoft.archidata.dataAccess.model.DataInJson.DataInJsonChecker; @ExtendWith(StepwiseExtension.class) public class TestJPAChecker { diff --git a/test/src/test/kar/archidata/dataAccess/TestJson.java b/test/src/test/atriasoft/archidata/dataAccess/TestJson.java similarity index 84% rename from test/src/test/kar/archidata/dataAccess/TestJson.java rename to test/src/test/atriasoft/archidata/dataAccess/TestJson.java index ef356b6..336b0c2 100644 --- a/test/src/test/kar/archidata/dataAccess/TestJson.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestJson.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,15 +13,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.SerializeAsJson; -import test.kar.archidata.dataAccess.model.SimpleTable; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.SerializeAsJson; +import test.atriasoft.archidata.dataAccess.model.SimpleTable; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestListJson.java b/test/src/test/atriasoft/archidata/dataAccess/TestListJson.java similarity index 95% rename from test/src/test/kar/archidata/dataAccess/TestListJson.java rename to test/src/test/atriasoft/archidata/dataAccess/TestListJson.java index 0350455..b8ca625 100644 --- a/test/src/test/kar/archidata/dataAccess/TestListJson.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestListJson.java @@ -1,9 +1,12 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnDataJson; import org.bson.types.ObjectId; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -13,16 +16,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.addOnSQL.AddOnDataJson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.SerializeListAsJson; -import test.kar.archidata.dataAccess.model.SerializeListAsJsonObjectId; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.SerializeListAsJson; +import test.atriasoft.archidata.dataAccess.model.SerializeListAsJsonObjectId; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestManyToManyLong.java b/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java similarity index 92% rename from test/src/test/kar/archidata/dataAccess/TestManyToManyLong.java rename to test/src/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java index d14287f..6ae1023 100644 --- a/test/src/test/kar/archidata/dataAccess/TestManyToManyLong.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyLong.java @@ -1,8 +1,11 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToMany; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,17 +14,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToMany; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRemote; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRoot; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestManyToManyOID.java b/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java similarity index 92% rename from test/src/test/kar/archidata/dataAccess/TestManyToManyOID.java rename to test/src/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java index aac93da..ef6cae3 100644 --- a/test/src/test/kar/archidata/dataAccess/TestManyToManyOID.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyOID.java @@ -1,10 +1,13 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.Calendar; import java.util.Date; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToMany; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -13,17 +16,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToMany; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeManyToManyOIDRemote; -import test.kar.archidata.dataAccess.model.TypeManyToManyOIDRoot; -import test.kar.archidata.dataAccess.model.TypeManyToManyOIDRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyOIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyOIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyOIDRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestManyToManyUUID.java b/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java similarity index 92% rename from test/src/test/kar/archidata/dataAccess/TestManyToManyUUID.java rename to test/src/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java index 15dace8..7456969 100644 --- a/test/src/test/kar/archidata/dataAccess/TestManyToManyUUID.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestManyToManyUUID.java @@ -1,8 +1,11 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.addOnSQL.AddOnManyToMany; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,17 +14,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToMany; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRemote; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRoot; -import test.kar.archidata.dataAccess.model.TypeManyToManyLongRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToManyLongRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestManyToOneLong.java b/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java similarity index 87% rename from test/src/test/kar/archidata/dataAccess/TestManyToOneLong.java rename to test/src/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java index 4d77dac..ef67ea2 100644 --- a/test/src/test/kar/archidata/dataAccess/TestManyToOneLong.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneLong.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,18 +13,16 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRoot; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRootExpand; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRoot; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRootExpand; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRoot; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestManyToOneOID.java b/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java similarity index 89% rename from test/src/test/kar/archidata/dataAccess/TestManyToOneOID.java rename to test/src/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java index 2b5a689..6291290 100644 --- a/test/src/test/kar/archidata/dataAccess/TestManyToOneOID.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneOID.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,16 +13,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeManyToOneOIDRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneOIDRoot; -import test.kar.archidata.dataAccess.model.TypeManyToOneOIDRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneOIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneOIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneOIDRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestManyToOneUUID.java b/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java similarity index 88% rename from test/src/test/kar/archidata/dataAccess/TestManyToOneUUID.java rename to test/src/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java index b623e24..18d282b 100644 --- a/test/src/test/kar/archidata/dataAccess/TestManyToOneUUID.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestManyToOneUUID.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,17 +13,15 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeManyToOneLongRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRemote; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRoot; -import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeManyToOneUUIDRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestOneToManyLong.java b/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java similarity index 92% rename from test/src/test/kar/archidata/dataAccess/TestOneToManyLong.java rename to test/src/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java index ec8fb6d..7c5e1ad 100644 --- a/test/src/test/kar/archidata/dataAccess/TestOneToManyLong.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyLong.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,16 +13,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRemote; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRoot; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRoot; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestOneToManyOID.java b/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java similarity index 92% rename from test/src/test/kar/archidata/dataAccess/TestOneToManyOID.java rename to test/src/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java index 4c17472..1265f92 100644 --- a/test/src/test/kar/archidata/dataAccess/TestOneToManyOID.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyOID.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,16 +13,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeOneToManyOIDRemote; -import test.kar.archidata.dataAccess.model.TypeOneToManyOIDRoot; -import test.kar.archidata.dataAccess.model.TypeOneToManyOIDRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyOIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyOIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyOIDRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestOneToManyUUID.java b/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java similarity index 91% rename from test/src/test/kar/archidata/dataAccess/TestOneToManyUUID.java rename to test/src/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java index 483be77..433478c 100644 --- a/test/src/test/kar/archidata/dataAccess/TestOneToManyUUID.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestOneToManyUUID.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,17 +13,15 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypeOneToManyLongRemote; -import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRemote; -import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRoot; -import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRootExpand; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyLongRemote; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyUUIDRemote; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyUUIDRoot; +import test.atriasoft.archidata.dataAccess.model.TypeOneToManyUUIDRootExpand; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestRawQuery.java b/test/src/test/atriasoft/archidata/dataAccess/TestRawQuery.java similarity index 90% rename from test/src/test/kar/archidata/dataAccess/TestRawQuery.java rename to test/src/test/atriasoft/archidata/dataAccess/TestRawQuery.java index 2786d8b..66c475f 100644 --- a/test/src/test/kar/archidata/dataAccess/TestRawQuery.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestRawQuery.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,14 +13,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypesTable; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypesTable; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestSimpleTable.java b/test/src/test/atriasoft/archidata/dataAccess/TestSimpleTable.java similarity index 93% rename from test/src/test/kar/archidata/dataAccess/TestSimpleTable.java rename to test/src/test/atriasoft/archidata/dataAccess/TestSimpleTable.java index 78e4ac1..e619cd3 100644 --- a/test/src/test/kar/archidata/dataAccess/TestSimpleTable.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestSimpleTable.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.sql.Timestamp; @@ -6,6 +6,9 @@ import java.time.Duration; import java.time.Instant; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.QueryOptions; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -14,15 +17,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.QueryOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.SimpleTable; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.SimpleTable; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestSimpleTableSoftDelete.java b/test/src/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java similarity index 94% rename from test/src/test/kar/archidata/dataAccess/TestSimpleTableSoftDelete.java rename to test/src/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java index 01cf612..59ee25d 100644 --- a/test/src/test/kar/archidata/dataAccess/TestSimpleTableSoftDelete.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestSimpleTableSoftDelete.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.sql.Timestamp; @@ -6,6 +6,10 @@ import java.time.Duration; import java.time.Instant; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; +import org.atriasoft.archidata.dataAccess.QueryOptions; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -14,16 +18,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; -import org.kar.archidata.dataAccess.QueryOptions; -import org.kar.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.SimpleTableSoftDelete; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.SimpleTableSoftDelete; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestTypeEnum1.java b/test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java similarity index 83% rename from test/src/test/kar/archidata/dataAccess/TestTypeEnum1.java rename to test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java index 3a1bf74..968f93a 100644 --- a/test/src/test/kar/archidata/dataAccess/TestTypeEnum1.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum1.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,15 +13,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.Enum1ForTest; -import test.kar.archidata.dataAccess.model.TypesEnum1; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.Enum1ForTest; +import test.atriasoft.archidata.dataAccess.model.TypesEnum1; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestTypeEnum2.java b/test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java similarity index 89% rename from test/src/test/kar/archidata/dataAccess/TestTypeEnum2.java rename to test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java index f25e5d1..fe231ef 100644 --- a/test/src/test/kar/archidata/dataAccess/TestTypeEnum2.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestTypeEnum2.java @@ -1,8 +1,10 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,15 +13,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.Enum2ForTest; -import test.kar.archidata.dataAccess.model.TypesEnum2; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.Enum2ForTest; +import test.atriasoft.archidata.dataAccess.model.TypesEnum2; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/TestTypes.java b/test/src/test/atriasoft/archidata/dataAccess/TestTypes.java similarity index 98% rename from test/src/test/kar/archidata/dataAccess/TestTypes.java rename to test/src/test/atriasoft/archidata/dataAccess/TestTypes.java index e2732eb..b144136 100644 --- a/test/src/test/kar/archidata/dataAccess/TestTypes.java +++ b/test/src/test/atriasoft/archidata/dataAccess/TestTypes.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess; +package test.atriasoft.archidata.dataAccess; import java.io.IOException; import java.sql.Timestamp; @@ -8,6 +8,8 @@ import java.time.LocalTime; import java.util.Date; import java.util.List; +import org.atriasoft.archidata.dataAccess.DBAccessSQL; +import org.atriasoft.archidata.dataAccess.DataFactory; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -16,14 +18,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.dataAccess.DBAccessSQL; -import org.kar.archidata.dataAccess.DataFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.dataAccess.model.TypesTable; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.dataAccess.model.TypesTable; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/dataAccess/model/DataInJson.java b/test/src/test/atriasoft/archidata/dataAccess/model/DataInJson.java similarity index 80% rename from test/src/test/kar/archidata/dataAccess/model/DataInJson.java rename to test/src/test/atriasoft/archidata/dataAccess/model/DataInJson.java index e0ce4ac..9f906f9 100644 --- a/test/src/test/kar/archidata/dataAccess/model/DataInJson.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/DataInJson.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.checker.CheckJPA; +import org.atriasoft.archidata.checker.CheckJPA; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; diff --git a/test/src/test/kar/archidata/dataAccess/model/DataJsonList.java b/test/src/test/atriasoft/archidata/dataAccess/model/DataJsonList.java similarity index 56% rename from test/src/test/kar/archidata/dataAccess/model/DataJsonList.java rename to test/src/test/atriasoft/archidata/dataAccess/model/DataJsonList.java index c1eb13b..4c883e5 100644 --- a/test/src/test/kar/archidata/dataAccess/model/DataJsonList.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/DataJsonList.java @@ -1,10 +1,10 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.model.GenericData; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.GenericData; public class DataJsonList extends GenericData { @DataJson() diff --git a/test/src/test/kar/archidata/dataAccess/model/DataWithSubJson.java b/test/src/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java similarity index 60% rename from test/src/test/kar/archidata/dataAccess/model/DataWithSubJson.java rename to test/src/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java index 54b8dc9..e5d03ad 100644 --- a/test/src/test/kar/archidata/dataAccess/model/DataWithSubJson.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/DataWithSubJson.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.annotation.checker.Checker; -import org.kar.archidata.checker.CheckJPA; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.annotation.checker.Checker; +import org.atriasoft.archidata.checker.CheckJPA; public class DataWithSubJson { // Simple checker declaration diff --git a/test/src/test/kar/archidata/dataAccess/model/Enum1ForTest.java b/test/src/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java similarity index 66% rename from test/src/test/kar/archidata/dataAccess/model/Enum1ForTest.java rename to test/src/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java index b8afb73..e6a8514 100644 --- a/test/src/test/kar/archidata/dataAccess/model/Enum1ForTest.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/Enum1ForTest.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; public enum Enum1ForTest { ENUM_VALUE_1, ENUM_VALUE_2, ENUM_VALUE_3, ENUM_VALUE_4, ENUM_VALUE_5, diff --git a/test/src/test/kar/archidata/dataAccess/model/Enum2ForTest.java b/test/src/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java similarity index 80% rename from test/src/test/kar/archidata/dataAccess/model/Enum2ForTest.java rename to test/src/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java index ea1eac7..bc1e587 100644 --- a/test/src/test/kar/archidata/dataAccess/model/Enum2ForTest.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/Enum2ForTest.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; public enum Enum2ForTest { ENUM_VALUE_1(5), ENUM_VALUE_2(6), ENUM_VALUE_3(55), ENUM_VALUE_4(84241), ENUM_VALUE_5(54546); diff --git a/test/src/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java b/test/src/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java new file mode 100644 index 0000000..562d7b9 --- /dev/null +++ b/test/src/test/atriasoft/archidata/dataAccess/model/SerializeAsJson.java @@ -0,0 +1,14 @@ +package test.atriasoft.archidata.dataAccess.model; + +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.model.GenericData; + +import dev.morphia.annotations.Entity; + +@Entity +public class SerializeAsJson extends GenericData { + + @DataJson + public SimpleTable data; + +} \ No newline at end of file diff --git a/test/src/test/kar/archidata/dataAccess/model/SerializeListAsJson.java b/test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java similarity index 52% rename from test/src/test/kar/archidata/dataAccess/model/SerializeListAsJson.java rename to test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java index 5b4a7b9..2ea5a14 100644 --- a/test/src/test/kar/archidata/dataAccess/model/SerializeListAsJson.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJson.java @@ -1,9 +1,9 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; diff --git a/test/src/test/kar/archidata/dataAccess/model/SerializeListAsJsonObjectId.java b/test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java similarity index 57% rename from test/src/test/kar/archidata/dataAccess/model/SerializeListAsJsonObjectId.java rename to test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java index ffa9986..994c39a 100644 --- a/test/src/test/kar/archidata/dataAccess/model/SerializeListAsJsonObjectId.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/SerializeListAsJsonObjectId.java @@ -1,10 +1,10 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; +import org.atriasoft.archidata.annotation.DataJson; +import org.atriasoft.archidata.model.OIDGenericData; import org.bson.types.ObjectId; -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; diff --git a/test/src/test/kar/archidata/dataAccess/model/SimpleTable.java b/test/src/test/atriasoft/archidata/dataAccess/model/SimpleTable.java similarity index 63% rename from test/src/test/kar/archidata/dataAccess/model/SimpleTable.java rename to test/src/test/atriasoft/archidata/dataAccess/model/SimpleTable.java index 4ffcbcf..328f4ef 100644 --- a/test/src/test/kar/archidata/dataAccess/model/SimpleTable.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/SimpleTable.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/SimpleTableSoftDelete.java b/test/src/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java similarity index 63% rename from test/src/test/kar/archidata/dataAccess/model/SimpleTableSoftDelete.java rename to test/src/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java index e71d1fd..399675a 100644 --- a/test/src/test/kar/archidata/dataAccess/model/SimpleTableSoftDelete.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/SimpleTableSoftDelete.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.GenericDataSoftDelete; +import org.atriasoft.archidata.model.GenericDataSoftDelete; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java similarity index 78% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java index 2486620..e746afb 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRemote.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java similarity index 77% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java index c986724..557c1ba 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRoot.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java similarity index 83% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java index 21d942a..7ecee98 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyLongRootExpand.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java similarity index 79% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java index 39add45..f9fb81e 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRemote.java @@ -1,9 +1,9 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; +import org.atriasoft.archidata.model.OIDGenericData; import org.bson.types.ObjectId; -import org.kar.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java similarity index 78% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java index 3e92027..4126bac 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRoot.java @@ -1,9 +1,9 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; +import org.atriasoft.archidata.model.OIDGenericData; import org.bson.types.ObjectId; -import org.kar.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java similarity index 82% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java index 4d96cb8..33443c2 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToManyOIDRootExpand.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.OIDGenericData; +import org.atriasoft.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java similarity index 71% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java index da6c5b2..c3f4619 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRemote.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java similarity index 82% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java index 8b2c217..ace13f9 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRoot.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java similarity index 87% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java index 32c5f05..0fa8bf6 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneLongRootExpand.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java similarity index 56% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java index 2236213..efbf246 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRemote.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.OIDGenericData; +import org.atriasoft.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java similarity index 77% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java index 1621072..cd86883 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRoot.java @@ -1,7 +1,7 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; +import org.atriasoft.archidata.model.OIDGenericData; import org.bson.types.ObjectId; -import org.kar.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java similarity index 83% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java index 6315579..673bd00 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneOIDRootExpand.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.OIDGenericData; +import org.atriasoft.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java similarity index 56% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java index c8ae524..1730bfb 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.UUIDGenericData; +import org.atriasoft.archidata.model.UUIDGenericData; import dev.morphia.annotations.Entity; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java similarity index 76% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java index 960c33c..7a1b662 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.UUID; -import org.kar.archidata.model.UUIDGenericData; +import org.atriasoft.archidata.model.UUIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java similarity index 83% rename from test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java index c0bf77d..7d512f0 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeManyToOneUUIDRootExpand.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.UUIDGenericData; +import org.atriasoft.archidata.model.UUIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java similarity index 75% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java index 27e8eac..1392edb 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRemote.java @@ -1,6 +1,6 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java similarity index 75% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java index 1a88e58..e627b52 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRoot.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.GenericData; +import org.atriasoft.archidata.model.GenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.OneToMany; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java similarity index 93% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java index b38ef42..806e242 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyLongRootExpand.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java similarity index 77% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java index 4b4924f..f1ca501 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRemote.java @@ -1,7 +1,7 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; +import org.atriasoft.archidata.model.OIDGenericData; import org.bson.types.ObjectId; -import org.kar.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java similarity index 79% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java index 9704918..3182d9b 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRoot.java @@ -1,9 +1,9 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; +import org.atriasoft.archidata.model.OIDGenericData; import org.bson.types.ObjectId; -import org.kar.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java similarity index 83% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java index 3d9cd0c..8ba9643 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyOIDRootExpand.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.OIDGenericData; +import org.atriasoft.archidata.model.OIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java similarity index 76% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java index c1b009a..d243790 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRemote.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.UUID; -import org.kar.archidata.model.UUIDGenericData; +import org.atriasoft.archidata.model.UUIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.FetchType; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java similarity index 79% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java index 5313a5b..a7c02c5 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRoot.java @@ -1,9 +1,9 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; import java.util.UUID; -import org.kar.archidata.model.UUIDGenericData; +import org.atriasoft.archidata.model.UUIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java similarity index 83% rename from test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java index 7ce137d..e127bd0 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypeOneToManyUUIDRootExpand.java @@ -1,8 +1,8 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.util.List; -import org.kar.archidata.model.UUIDGenericData; +import org.atriasoft.archidata.model.UUIDGenericData; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypesEnum1.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java similarity index 88% rename from test/src/test/kar/archidata/dataAccess/model/TypesEnum1.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java index 70e061a..586f846 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypesEnum1.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum1.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypesEnum2.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java similarity index 88% rename from test/src/test/kar/archidata/dataAccess/model/TypesEnum2.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java index 810cea4..de17e33 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypesEnum2.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypesEnum2.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import dev.morphia.annotations.Entity; import jakarta.persistence.Column; diff --git a/test/src/test/kar/archidata/dataAccess/model/TypesTable.java b/test/src/test/atriasoft/archidata/dataAccess/model/TypesTable.java similarity index 94% rename from test/src/test/kar/archidata/dataAccess/model/TypesTable.java rename to test/src/test/atriasoft/archidata/dataAccess/model/TypesTable.java index 1c5d076..a753271 100644 --- a/test/src/test/kar/archidata/dataAccess/model/TypesTable.java +++ b/test/src/test/atriasoft/archidata/dataAccess/model/TypesTable.java @@ -1,4 +1,4 @@ -package test.kar.archidata.dataAccess.model; +package test.atriasoft.archidata.dataAccess.model; import java.sql.Timestamp; import java.time.LocalDate; diff --git a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiName.java b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java similarity index 85% rename from test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiName.java rename to test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java index 9b6c79e..a450242 100644 --- a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiName.java +++ b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiName.java @@ -1,11 +1,11 @@ -package test.kar.archidata.externalRestApi; +package test.atriasoft.archidata.externalRestApi; import java.util.List; +import org.atriasoft.archidata.externalRestApi.AnalyzeApi; +import org.atriasoft.archidata.externalRestApi.model.ApiModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.externalRestApi.AnalyzeApi; -import org.kar.archidata.externalRestApi.model.ApiModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiParameterType.java b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java similarity index 91% rename from test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiParameterType.java rename to test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java index 22383f8..3649774 100644 --- a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiParameterType.java +++ b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiParameterType.java @@ -1,16 +1,16 @@ -package test.kar.archidata.externalRestApi; +package test.atriasoft.archidata.externalRestApi; import java.util.List; import java.util.Map; +import org.atriasoft.archidata.externalRestApi.AnalyzeApi; +import org.atriasoft.archidata.externalRestApi.model.ApiModel; +import org.atriasoft.archidata.externalRestApi.model.ClassEnumModel; +import org.atriasoft.archidata.externalRestApi.model.ClassListModel; +import org.atriasoft.archidata.externalRestApi.model.ClassMapModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.externalRestApi.AnalyzeApi; -import org.kar.archidata.externalRestApi.model.ApiModel; -import org.kar.archidata.externalRestApi.model.ClassEnumModel; -import org.kar.archidata.externalRestApi.model.ClassListModel; -import org.kar.archidata.externalRestApi.model.ClassMapModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiPath.java b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java similarity index 93% rename from test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiPath.java rename to test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java index 81d6f2b..d6146a8 100644 --- a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiPath.java +++ b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiPath.java @@ -1,11 +1,11 @@ -package test.kar.archidata.externalRestApi; +package test.atriasoft.archidata.externalRestApi; import java.util.List; +import org.atriasoft.archidata.externalRestApi.AnalyzeApi; +import org.atriasoft.archidata.externalRestApi.model.ApiModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.externalRestApi.AnalyzeApi; -import org.kar.archidata.externalRestApi.model.ApiModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiReturn.java b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java similarity index 97% rename from test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiReturn.java rename to test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java index 7904bf8..8e21bc2 100644 --- a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiReturn.java +++ b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeApiReturn.java @@ -1,16 +1,16 @@ -package test.kar.archidata.externalRestApi; +package test.atriasoft.archidata.externalRestApi; import java.util.List; import java.util.Map; +import org.atriasoft.archidata.externalRestApi.AnalyzeApi; +import org.atriasoft.archidata.externalRestApi.model.ApiModel; +import org.atriasoft.archidata.externalRestApi.model.ClassEnumModel; +import org.atriasoft.archidata.externalRestApi.model.ClassListModel; +import org.atriasoft.archidata.externalRestApi.model.ClassMapModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.externalRestApi.AnalyzeApi; -import org.kar.archidata.externalRestApi.model.ApiModel; -import org.kar.archidata.externalRestApi.model.ClassEnumModel; -import org.kar.archidata.externalRestApi.model.ClassListModel; -import org.kar.archidata.externalRestApi.model.ClassMapModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeModel.java b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java similarity index 82% rename from test/src/test/kar/archidata/externalRestApi/TestAnalyzeModel.java rename to test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java index 4361eea..2ec086c 100644 --- a/test/src/test/kar/archidata/externalRestApi/TestAnalyzeModel.java +++ b/test/src/test/atriasoft/archidata/externalRestApi/TestAnalyzeModel.java @@ -1,10 +1,10 @@ -package test.kar.archidata.externalRestApi; +package test.atriasoft.archidata.externalRestApi; +import org.atriasoft.archidata.externalRestApi.AnalyzeApi; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel; +import org.atriasoft.archidata.externalRestApi.model.ClassObjectModel.FieldProperty; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.kar.archidata.externalRestApi.AnalyzeApi; -import org.kar.archidata.externalRestApi.model.ClassObjectModel; -import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/hybernateValidator/TestValidator.java b/test/src/test/atriasoft/archidata/hybernateValidator/TestValidator.java similarity index 87% rename from test/src/test/kar/archidata/hybernateValidator/TestValidator.java rename to test/src/test/atriasoft/archidata/hybernateValidator/TestValidator.java index 2493cf8..41bee27 100644 --- a/test/src/test/kar/archidata/hybernateValidator/TestValidator.java +++ b/test/src/test/atriasoft/archidata/hybernateValidator/TestValidator.java @@ -1,7 +1,10 @@ -package test.kar.archidata.hybernateValidator; +package test.atriasoft.archidata.hybernateValidator; import java.util.ArrayList; +import org.atriasoft.archidata.exception.RESTErrorResponseException; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.RESTApi; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -10,17 +13,14 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.exception.RESTErrorResponseException; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.RESTApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.apiExtern.Common; -import test.kar.archidata.hybernateValidator.model.ValidatorModel; -import test.kar.archidata.hybernateValidator.model.ValidatorSubModel; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.apiExtern.Common; +import test.atriasoft.archidata.hybernateValidator.model.ValidatorModel; +import test.atriasoft.archidata.hybernateValidator.model.ValidatorSubModel; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/hybernateValidator/WebLauncher.java b/test/src/test/atriasoft/archidata/hybernateValidator/WebLauncher.java similarity index 89% rename from test/src/test/kar/archidata/hybernateValidator/WebLauncher.java rename to test/src/test/atriasoft/archidata/hybernateValidator/WebLauncher.java index 7b0c9d1..9c2e623 100755 --- a/test/src/test/kar/archidata/hybernateValidator/WebLauncher.java +++ b/test/src/test/atriasoft/archidata/hybernateValidator/WebLauncher.java @@ -1,4 +1,4 @@ -package test.kar.archidata.hybernateValidator; +package test.atriasoft.archidata.hybernateValidator; import java.net.URI; import java.util.Iterator; @@ -7,26 +7,26 @@ import javax.imageio.ImageIO; import javax.imageio.ImageReader; import javax.imageio.ImageWriter; +import org.atriasoft.archidata.UpdateJwtPublicKey; +import org.atriasoft.archidata.catcher.GenericCatcher; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.exception.DataAccessException; +import org.atriasoft.archidata.filter.CORSFilter; +import org.atriasoft.archidata.filter.OptionFilter; +import org.atriasoft.archidata.migration.MigrationEngine; +import org.atriasoft.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.ContextGenericTools; import org.glassfish.grizzly.http.server.HttpServer; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.media.multipart.MultiPartFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.validation.ValidationFeature; -import org.kar.archidata.UpdateJwtPublicKey; -import org.kar.archidata.catcher.GenericCatcher; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.exception.DataAccessException; -import org.kar.archidata.filter.CORSFilter; -import org.kar.archidata.filter.OptionFilter; -import org.kar.archidata.migration.MigrationEngine; -import org.kar.archidata.tools.ConfigBaseVariable; -import org.kar.archidata.tools.ContextGenericTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import jakarta.ws.rs.core.UriBuilder; -import test.kar.archidata.hybernateValidator.resource.TestResourceValidator; +import test.atriasoft.archidata.hybernateValidator.resource.TestResourceValidator; public class WebLauncher { final static Logger LOGGER = LoggerFactory.getLogger(WebLauncher.class); diff --git a/test/src/test/kar/archidata/hybernateValidator/WebLauncherTest.java b/test/src/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java similarity index 82% rename from test/src/test/kar/archidata/hybernateValidator/WebLauncherTest.java rename to test/src/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java index 363a3a9..a55a5ef 100755 --- a/test/src/test/kar/archidata/hybernateValidator/WebLauncherTest.java +++ b/test/src/test/atriasoft/archidata/hybernateValidator/WebLauncherTest.java @@ -1,7 +1,7 @@ -package test.kar.archidata.hybernateValidator; +package test.atriasoft.archidata.hybernateValidator; -import org.kar.archidata.tools.ConfigBaseVariable; +import org.atriasoft.archidata.tools.ConfigBaseVariable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/test/kar/archidata/hybernateValidator/model/ValidatorModel.java b/test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java similarity index 71% rename from test/src/test/kar/archidata/hybernateValidator/model/ValidatorModel.java rename to test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java index cc6804a..a939db2 100644 --- a/test/src/test/kar/archidata/hybernateValidator/model/ValidatorModel.java +++ b/test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorModel.java @@ -1,8 +1,8 @@ -package test.kar.archidata.hybernateValidator.model; +package test.atriasoft.archidata.hybernateValidator.model; import java.util.List; -import org.kar.archidata.annotation.checker.ReadOnlyField; +import org.atriasoft.archidata.annotation.checker.ReadOnlyField; import jakarta.validation.Valid; import jakarta.validation.constraints.Size; diff --git a/test/src/test/kar/archidata/hybernateValidator/model/ValidatorSubModel.java b/test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java similarity index 66% rename from test/src/test/kar/archidata/hybernateValidator/model/ValidatorSubModel.java rename to test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java index 93b5ef8..75568f1 100644 --- a/test/src/test/kar/archidata/hybernateValidator/model/ValidatorSubModel.java +++ b/test/src/test/atriasoft/archidata/hybernateValidator/model/ValidatorSubModel.java @@ -1,4 +1,4 @@ -package test.kar.archidata.hybernateValidator.model; +package test.atriasoft.archidata.hybernateValidator.model; import jakarta.validation.constraints.Size; diff --git a/test/src/test/kar/archidata/hybernateValidator/resource/TestResourceValidator.java b/test/src/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java similarity index 79% rename from test/src/test/kar/archidata/hybernateValidator/resource/TestResourceValidator.java rename to test/src/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java index 66bfe28..09a7b7c 100644 --- a/test/src/test/kar/archidata/hybernateValidator/resource/TestResourceValidator.java +++ b/test/src/test/atriasoft/archidata/hybernateValidator/resource/TestResourceValidator.java @@ -1,4 +1,4 @@ -package test.kar.archidata.hybernateValidator.resource; +package test.atriasoft.archidata.hybernateValidator.resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,8 +12,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import test.kar.archidata.apiExtern.resource.TestResource; -import test.kar.archidata.hybernateValidator.model.ValidatorModel; +import test.atriasoft.archidata.apiExtern.resource.TestResource; +import test.atriasoft.archidata.hybernateValidator.model.ValidatorModel; @Path("/TestResourceValidator") @Produces({ MediaType.APPLICATION_JSON }) diff --git a/test/src/test/kar/archidata/migration/InitializationCurrent.java b/test/src/test/atriasoft/archidata/migration/InitializationCurrent.java similarity index 67% rename from test/src/test/kar/archidata/migration/InitializationCurrent.java rename to test/src/test/atriasoft/archidata/migration/InitializationCurrent.java index 27bb7d0..c3d5557 100644 --- a/test/src/test/kar/archidata/migration/InitializationCurrent.java +++ b/test/src/test/atriasoft/archidata/migration/InitializationCurrent.java @@ -1,8 +1,8 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; -import org.kar.archidata.migration.MigrationSqlStep; +import org.atriasoft.archidata.migration.MigrationSqlStep; -import test.kar.archidata.migration.model.TypesMigrationInitialisationCurrent; +import test.atriasoft.archidata.migration.model.TypesMigrationInitialisationCurrent; class InitializationCurrent extends MigrationSqlStep { diff --git a/test/src/test/kar/archidata/migration/InitializationFirst.java b/test/src/test/atriasoft/archidata/migration/InitializationFirst.java similarity index 67% rename from test/src/test/kar/archidata/migration/InitializationFirst.java rename to test/src/test/atriasoft/archidata/migration/InitializationFirst.java index feb5cf3..69f0d08 100644 --- a/test/src/test/kar/archidata/migration/InitializationFirst.java +++ b/test/src/test/atriasoft/archidata/migration/InitializationFirst.java @@ -1,8 +1,8 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; -import org.kar.archidata.migration.MigrationSqlStep; +import org.atriasoft.archidata.migration.MigrationSqlStep; -import test.kar.archidata.migration.model.TypesMigrationInitialisationFirst; +import test.atriasoft.archidata.migration.model.TypesMigrationInitialisationFirst; class InitializationFirst extends MigrationSqlStep { diff --git a/test/src/test/kar/archidata/migration/Migration1.java b/test/src/test/atriasoft/archidata/migration/Migration1.java similarity index 76% rename from test/src/test/kar/archidata/migration/Migration1.java rename to test/src/test/atriasoft/archidata/migration/Migration1.java index 881f240..c247adb 100644 --- a/test/src/test/kar/archidata/migration/Migration1.java +++ b/test/src/test/atriasoft/archidata/migration/Migration1.java @@ -1,6 +1,6 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; -import org.kar.archidata.migration.MigrationSqlStep; +import org.atriasoft.archidata.migration.MigrationSqlStep; class Migration1 extends MigrationSqlStep { diff --git a/test/src/test/kar/archidata/migration/Migration2.java b/test/src/test/atriasoft/archidata/migration/Migration2.java similarity index 77% rename from test/src/test/kar/archidata/migration/Migration2.java rename to test/src/test/atriasoft/archidata/migration/Migration2.java index 3b32fc3..2fc2284 100644 --- a/test/src/test/kar/archidata/migration/Migration2.java +++ b/test/src/test/atriasoft/archidata/migration/Migration2.java @@ -1,6 +1,6 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; -import org.kar.archidata.migration.MigrationSqlStep; +import org.atriasoft.archidata.migration.MigrationSqlStep; class Migration2 extends MigrationSqlStep { diff --git a/test/src/test/kar/archidata/migration/MigrationFail.java b/test/src/test/atriasoft/archidata/migration/MigrationFail.java similarity index 69% rename from test/src/test/kar/archidata/migration/MigrationFail.java rename to test/src/test/atriasoft/archidata/migration/MigrationFail.java index 5beaab2..6c544ea 100644 --- a/test/src/test/kar/archidata/migration/MigrationFail.java +++ b/test/src/test/atriasoft/archidata/migration/MigrationFail.java @@ -1,9 +1,9 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; import java.io.IOException; -import org.kar.archidata.dataAccess.DBAccess; -import org.kar.archidata.migration.MigrationSqlStep; +import org.atriasoft.archidata.dataAccess.DBAccess; +import org.atriasoft.archidata.migration.MigrationSqlStep; class MigrationFail extends MigrationSqlStep { diff --git a/test/src/test/kar/archidata/migration/TestMigrationFail.java b/test/src/test/atriasoft/archidata/migration/TestMigrationFail.java similarity index 82% rename from test/src/test/kar/archidata/migration/TestMigrationFail.java rename to test/src/test/atriasoft/archidata/migration/TestMigrationFail.java index 29445b4..c067468 100644 --- a/test/src/test/kar/archidata/migration/TestMigrationFail.java +++ b/test/src/test/atriasoft/archidata/migration/TestMigrationFail.java @@ -1,7 +1,10 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; import java.io.IOException; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.migration.MigrationEngine; +import org.atriasoft.archidata.migration.MigrationException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -10,15 +13,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.migration.MigrationEngine; -import org.kar.archidata.migration.MigrationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.migration.model.TypesMigrationInitialisationFirst; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.migration.model.TypesMigrationInitialisationFirst; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/migration/TestMigrationFirstInit.java b/test/src/test/atriasoft/archidata/migration/TestMigrationFirstInit.java similarity index 89% rename from test/src/test/kar/archidata/migration/TestMigrationFirstInit.java rename to test/src/test/atriasoft/archidata/migration/TestMigrationFirstInit.java index 07ab201..0ce343d 100644 --- a/test/src/test/kar/archidata/migration/TestMigrationFirstInit.java +++ b/test/src/test/atriasoft/archidata/migration/TestMigrationFirstInit.java @@ -1,7 +1,9 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; import java.io.IOException; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.migration.MigrationEngine; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -10,15 +12,13 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.migration.MigrationEngine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.migration.model.TypesMigrationInitialisationCurrent; -import test.kar.archidata.migration.model.TypesMigrationInitialisationFirst; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.migration.model.TypesMigrationInitialisationCurrent; +import test.atriasoft.archidata.migration.model.TypesMigrationInitialisationFirst; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/migration/TestMigrationFirstInitWithMigration.java b/test/src/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java similarity index 87% rename from test/src/test/kar/archidata/migration/TestMigrationFirstInitWithMigration.java rename to test/src/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java index 89538ec..d005ea9 100644 --- a/test/src/test/kar/archidata/migration/TestMigrationFirstInitWithMigration.java +++ b/test/src/test/atriasoft/archidata/migration/TestMigrationFirstInitWithMigration.java @@ -1,8 +1,11 @@ -package test.kar.archidata.migration; +package test.atriasoft.archidata.migration; import java.io.IOException; import java.util.List; +import org.atriasoft.archidata.db.DbConfig; +import org.atriasoft.archidata.migration.MigrationEngine; +import org.atriasoft.archidata.migration.model.Migration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -11,15 +14,12 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import org.kar.archidata.db.DbConfig; -import org.kar.archidata.migration.MigrationEngine; -import org.kar.archidata.migration.model.Migration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import test.kar.archidata.ConfigureDb; -import test.kar.archidata.StepwiseExtension; -import test.kar.archidata.migration.model.TypesMigrationInitialisationCurrent; +import test.atriasoft.archidata.ConfigureDb; +import test.atriasoft.archidata.StepwiseExtension; +import test.atriasoft.archidata.migration.model.TypesMigrationInitialisationCurrent; @ExtendWith(StepwiseExtension.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/test/src/test/kar/archidata/migration/model/TypesMigration1.java b/test/src/test/atriasoft/archidata/migration/model/TypesMigration1.java similarity index 89% rename from test/src/test/kar/archidata/migration/model/TypesMigration1.java rename to test/src/test/atriasoft/archidata/migration/model/TypesMigration1.java index 22aa4d5..48991b3 100644 --- a/test/src/test/kar/archidata/migration/model/TypesMigration1.java +++ b/test/src/test/atriasoft/archidata/migration/model/TypesMigration1.java @@ -1,4 +1,4 @@ -package test.kar.archidata.migration.model; +package test.atriasoft.archidata.migration.model; import jakarta.persistence.Column; import jakarta.persistence.GeneratedValue; diff --git a/test/src/test/kar/archidata/migration/model/TypesMigration2.java b/test/src/test/atriasoft/archidata/migration/model/TypesMigration2.java similarity index 89% rename from test/src/test/kar/archidata/migration/model/TypesMigration2.java rename to test/src/test/atriasoft/archidata/migration/model/TypesMigration2.java index 3ce04b9..e19eea8 100644 --- a/test/src/test/kar/archidata/migration/model/TypesMigration2.java +++ b/test/src/test/atriasoft/archidata/migration/model/TypesMigration2.java @@ -1,4 +1,4 @@ -package test.kar.archidata.migration.model; +package test.atriasoft.archidata.migration.model; import jakarta.persistence.Column; import jakarta.persistence.GeneratedValue; diff --git a/test/src/test/kar/archidata/migration/model/TypesMigrationInitialisationCurrent.java b/test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java similarity index 89% rename from test/src/test/kar/archidata/migration/model/TypesMigrationInitialisationCurrent.java rename to test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java index 83e5d58..b6ede3c 100644 --- a/test/src/test/kar/archidata/migration/model/TypesMigrationInitialisationCurrent.java +++ b/test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationCurrent.java @@ -1,4 +1,4 @@ -package test.kar.archidata.migration.model; +package test.atriasoft.archidata.migration.model; import jakarta.persistence.Column; import jakarta.persistence.GeneratedValue; diff --git a/test/src/test/kar/archidata/migration/model/TypesMigrationInitialisationFirst.java b/test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java similarity index 89% rename from test/src/test/kar/archidata/migration/model/TypesMigrationInitialisationFirst.java rename to test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java index bef281e..cefa875 100644 --- a/test/src/test/kar/archidata/migration/model/TypesMigrationInitialisationFirst.java +++ b/test/src/test/atriasoft/archidata/migration/model/TypesMigrationInitialisationFirst.java @@ -1,4 +1,4 @@ -package test.kar.archidata.migration.model; +package test.atriasoft.archidata.migration.model; import jakarta.persistence.Column; import jakarta.persistence.GeneratedValue; diff --git a/test/src/test/kar/archidata/dataAccess/model/SerializeAsJson.java b/test/src/test/kar/archidata/dataAccess/model/SerializeAsJson.java deleted file mode 100644 index 589c565..0000000 --- a/test/src/test/kar/archidata/dataAccess/model/SerializeAsJson.java +++ /dev/null @@ -1,14 +0,0 @@ -package test.kar.archidata.dataAccess.model; - -import org.kar.archidata.annotation.DataJson; -import org.kar.archidata.model.GenericData; - -import dev.morphia.annotations.Entity; - -@Entity -public class SerializeAsJson extends GenericData { - - @DataJson - public SimpleTable data; - -} \ No newline at end of file