diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e99e487d..838cbe9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Run Unit Tests and Generate Coverage Report run: ./gradlew test jacocoTestReport - working-directory: efsity + working-directory: efsity-cli run-spotless-check: runs-on: ubuntu-latest @@ -38,7 +38,7 @@ jobs: - name: Run spotless check run: ./gradlew spotlessCheck - working-directory: efsity + working-directory: efsity-cli run-importer-unit-tests: runs-on: ubuntu-latest diff --git a/efsity/.gitignore b/efisty-cli/.gitignore similarity index 100% rename from efsity/.gitignore rename to efisty-cli/.gitignore diff --git a/efsity/README.md b/efisty-cli/README.md similarity index 100% rename from efsity/README.md rename to efisty-cli/README.md diff --git a/efsity/build.gradle.kts b/efisty-cli/build.gradle.kts similarity index 100% rename from efsity/build.gradle.kts rename to efisty-cli/build.gradle.kts diff --git a/efsity/docs/QuestionnaireResponseGenerator.md b/efisty-cli/docs/QuestionnaireResponseGenerator.md similarity index 100% rename from efsity/docs/QuestionnaireResponseGenerator.md rename to efisty-cli/docs/QuestionnaireResponseGenerator.md diff --git a/efsity/gradle.properties b/efisty-cli/gradle.properties similarity index 100% rename from efsity/gradle.properties rename to efisty-cli/gradle.properties diff --git a/efsity/gradle/wrapper/gradle-wrapper.jar b/efisty-cli/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from efsity/gradle/wrapper/gradle-wrapper.jar rename to efisty-cli/gradle/wrapper/gradle-wrapper.jar diff --git a/efsity/gradle/wrapper/gradle-wrapper.properties b/efisty-cli/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from efsity/gradle/wrapper/gradle-wrapper.properties rename to efisty-cli/gradle/wrapper/gradle-wrapper.properties diff --git a/efsity/gradlew b/efisty-cli/gradlew similarity index 100% rename from efsity/gradlew rename to efisty-cli/gradlew diff --git a/efsity/gradlew.bat b/efisty-cli/gradlew.bat similarity index 100% rename from efsity/gradlew.bat rename to efisty-cli/gradlew.bat diff --git a/efsity/libs.versions.toml b/efisty-cli/libs.versions.toml similarity index 100% rename from efsity/libs.versions.toml rename to efisty-cli/libs.versions.toml diff --git a/efsity/settings.gradle.kts b/efisty-cli/settings.gradle.kts similarity index 100% rename from efsity/settings.gradle.kts rename to efisty-cli/settings.gradle.kts diff --git a/efsity/src/main/java/org/smartregister/Main.java b/efisty-cli/src/main/java/org/smartregister/Main.java similarity index 100% rename from efsity/src/main/java/org/smartregister/Main.java rename to efisty-cli/src/main/java/org/smartregister/Main.java diff --git a/efsity/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java b/efisty-cli/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/ConvertCommand.java b/efisty-cli/src/main/java/org/smartregister/command/ConvertCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/ConvertCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/ConvertCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java b/efisty-cli/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java b/efisty-cli/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java b/efisty-cli/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/TranslateCommand.java b/efisty-cli/src/main/java/org/smartregister/command/TranslateCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/TranslateCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/TranslateCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/ValidateCommand.java b/efisty-cli/src/main/java/org/smartregister/command/ValidateCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/ValidateCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/ValidateCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java b/efisty-cli/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java b/efisty-cli/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java diff --git a/efsity/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java b/efisty-cli/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java similarity index 100% rename from efsity/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java rename to efisty-cli/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java diff --git a/efsity/src/main/java/org/smartregister/domain/FctFile.java b/efisty-cli/src/main/java/org/smartregister/domain/FctFile.java similarity index 100% rename from efsity/src/main/java/org/smartregister/domain/FctFile.java rename to efisty-cli/src/main/java/org/smartregister/domain/FctFile.java diff --git a/efsity/src/main/java/org/smartregister/processor/FctValidationProcessor.java b/efisty-cli/src/main/java/org/smartregister/processor/FctValidationProcessor.java similarity index 100% rename from efsity/src/main/java/org/smartregister/processor/FctValidationProcessor.java rename to efisty-cli/src/main/java/org/smartregister/processor/FctValidationProcessor.java diff --git a/efsity/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java b/efisty-cli/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java similarity index 100% rename from efsity/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java rename to efisty-cli/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java diff --git a/efsity/src/main/java/org/smartregister/processor/StructureMapProcessor.java b/efisty-cli/src/main/java/org/smartregister/processor/StructureMapProcessor.java similarity index 100% rename from efsity/src/main/java/org/smartregister/processor/StructureMapProcessor.java rename to efisty-cli/src/main/java/org/smartregister/processor/StructureMapProcessor.java diff --git a/efsity/src/main/java/org/smartregister/util/FCTConstants.java b/efisty-cli/src/main/java/org/smartregister/util/FCTConstants.java similarity index 100% rename from efsity/src/main/java/org/smartregister/util/FCTConstants.java rename to efisty-cli/src/main/java/org/smartregister/util/FCTConstants.java diff --git a/efsity/src/main/java/org/smartregister/util/FctStructureMapUtilities.java b/efisty-cli/src/main/java/org/smartregister/util/FctStructureMapUtilities.java similarity index 100% rename from efsity/src/main/java/org/smartregister/util/FctStructureMapUtilities.java rename to efisty-cli/src/main/java/org/smartregister/util/FctStructureMapUtilities.java diff --git a/efsity/src/main/java/org/smartregister/util/FctUtils.java b/efisty-cli/src/main/java/org/smartregister/util/FctUtils.java similarity index 100% rename from efsity/src/main/java/org/smartregister/util/FctUtils.java rename to efisty-cli/src/main/java/org/smartregister/util/FctUtils.java diff --git a/efsity/src/main/java/org/smartregister/util/HttpClient.java b/efisty-cli/src/main/java/org/smartregister/util/HttpClient.java similarity index 100% rename from efsity/src/main/java/org/smartregister/util/HttpClient.java rename to efisty-cli/src/main/java/org/smartregister/util/HttpClient.java diff --git a/efsity/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java b/efisty-cli/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java similarity index 100% rename from efsity/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java rename to efisty-cli/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java diff --git a/efsity/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt b/efisty-cli/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt similarity index 100% rename from efsity/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt rename to efisty-cli/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt diff --git a/efsity/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt b/efisty-cli/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt similarity index 100% rename from efsity/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt rename to efisty-cli/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt diff --git a/efsity/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt b/efisty-cli/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt similarity index 100% rename from efsity/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt rename to efisty-cli/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt diff --git a/efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt b/efisty-cli/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt similarity index 100% rename from efsity/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt rename to efisty-cli/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt diff --git a/efsity/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java b/efisty-cli/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java similarity index 100% rename from efsity/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java rename to efisty-cli/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java diff --git a/efsity/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java b/efisty-cli/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java similarity index 100% rename from efsity/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java rename to efisty-cli/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java diff --git a/efsity/src/test/java/org/smartregister/command/TranslateCommandTest.java b/efisty-cli/src/test/java/org/smartregister/command/TranslateCommandTest.java similarity index 100% rename from efsity/src/test/java/org/smartregister/command/TranslateCommandTest.java rename to efisty-cli/src/test/java/org/smartregister/command/TranslateCommandTest.java diff --git a/efsity/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java b/efisty-cli/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java similarity index 100% rename from efsity/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java rename to efisty-cli/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java diff --git a/efsity/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java b/efisty-cli/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java similarity index 100% rename from efsity/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java rename to efisty-cli/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java diff --git a/efsity/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java b/efisty-cli/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java similarity index 100% rename from efsity/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java rename to efisty-cli/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java diff --git a/efsity/src/test/resources/clean_configs_folder/profile_config.json b/efisty-cli/src/test/resources/clean_configs_folder/profile_config.json similarity index 100% rename from efsity/src/test/resources/clean_configs_folder/profile_config.json rename to efisty-cli/src/test/resources/clean_configs_folder/profile_config.json diff --git a/efsity/src/test/resources/dirty_configs_folder/profile_config.json b/efisty-cli/src/test/resources/dirty_configs_folder/profile_config.json similarity index 100% rename from efsity/src/test/resources/dirty_configs_folder/profile_config.json rename to efisty-cli/src/test/resources/dirty_configs_folder/profile_config.json diff --git a/efsity/src/test/resources/fhirConfigsJsonSchema.json b/efisty-cli/src/test/resources/fhirConfigsJsonSchema.json similarity index 100% rename from efsity/src/test/resources/fhirConfigsJsonSchema.json rename to efisty-cli/src/test/resources/fhirConfigsJsonSchema.json diff --git a/efsity/src/test/resources/merged_questionnaire.json b/efisty-cli/src/test/resources/merged_questionnaire.json similarity index 100% rename from efsity/src/test/resources/merged_questionnaire.json rename to efisty-cli/src/test/resources/merged_questionnaire.json diff --git a/efsity/src/test/resources/profile_config.json b/efisty-cli/src/test/resources/profile_config.json similarity index 100% rename from efsity/src/test/resources/profile_config.json rename to efisty-cli/src/test/resources/profile_config.json diff --git a/efsity/src/test/resources/raw_questionnaire.json b/efisty-cli/src/test/resources/raw_questionnaire.json similarity index 100% rename from efsity/src/test/resources/raw_questionnaire.json rename to efisty-cli/src/test/resources/raw_questionnaire.json diff --git a/efsity/src/test/resources/strings_default.properties b/efisty-cli/src/test/resources/strings_default.properties similarity index 100% rename from efsity/src/test/resources/strings_default.properties rename to efisty-cli/src/test/resources/strings_default.properties diff --git a/efsity/src/test/resources/strings_fr.properties b/efisty-cli/src/test/resources/strings_fr.properties similarity index 100% rename from efsity/src/test/resources/strings_fr.properties rename to efisty-cli/src/test/resources/strings_fr.properties