Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FM2-529: Remove SearchQueryIncude_2_2 and SearchQueryInclude_2_6? #440

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

FM2-529: Remove SearchQueryIncude_2_2 and SearchQueryInclude_2_6? #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions api-2.2/src/main/java/org/openmrs/module/fhir2/api/impl/FhirConditionServiceImpl_2_2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.openmrs.module.fhir2.api.dao.FhirConditionDao;
import org.openmrs.module.fhir2.api.search.SearchQuery;
import org.openmrs.module.fhir2.api.search.SearchQueryInclude;
import org.openmrs.module.fhir2.api.search.SearchQueryInclude_2_2;
import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
import org.openmrs.module.fhir2.api.translators.ConditionTranslator;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -50,7 +49,7 @@ public class FhirConditionServiceImpl_2_2 extends BaseFhirService<Condition, org
private ConditionTranslator<org.openmrs.Condition> translator;

@Autowired
private SearchQueryInclude_2_2 searchQueryInclude;
private SearchQueryInclude searchQueryInclude;

@Autowired
private SearchQuery<org.openmrs.Condition, Condition, FhirConditionDao<org.openmrs.Condition>, ConditionTranslator<org.openmrs.Condition>, SearchQueryInclude<Condition>> searchQuery;
Expand Down
75 changes: 0 additions & 75 deletions api-2.2/src/main/java/org/openmrs/module/fhir2/api/search/SearchQueryInclude_2_2.java
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ...2.2/src/test/java/org/openmrs/module/fhir2/api/impl/FhirConditionServiceImpl_2_2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import org.openmrs.module.fhir2.api.search.SearchQuery;
import org.openmrs.module.fhir2.api.search.SearchQueryBundleProvider;
import org.openmrs.module.fhir2.api.search.SearchQueryInclude;
import org.openmrs.module.fhir2.api.search.SearchQueryInclude_2_2;
import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
import org.openmrs.module.fhir2.api.translators.ConditionTranslator;

Expand All @@ -80,7 +79,7 @@ public class FhirConditionServiceImpl_2_2Test {
private FhirGlobalPropertyService globalPropertyService;

@Mock
private SearchQueryInclude_2_2 searchQueryInclude;
private SearchQueryInclude searchQueryInclude;

@Mock
private SearchQuery<Condition, org.hl7.fhir.r4.model.Condition, FhirConditionDao<Condition>, ConditionTranslator<Condition>, SearchQueryInclude<org.hl7.fhir.r4.model.Condition>> searchQuery;
Expand Down
2 changes: 1 addition & 1 deletion ...2/src/test/java/org/openmrs/module/fhir2/api/search/ConditionSearchQueryImpl_2_2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public class ConditionSearchQueryImpl_2_2Test extends BaseModuleContextSensitive
private ConditionTranslator<Condition> translator;

@Autowired
private SearchQueryInclude_2_2 searchQueryInclude;
private SearchQueryInclude searchQueryInclude;

@Autowired
private SearchQuery<Condition, org.hl7.fhir.r4.model.Condition, FhirConditionDao<Condition>, ConditionTranslator<Condition>, SearchQueryInclude<org.hl7.fhir.r4.model.Condition>> searchQuery;
Expand Down
75 changes: 0 additions & 75 deletions api-2.6/src/main/java/org/openmrs/module/fhir2/api/search/SearchQueryInclude_2_6.java
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ...est/java/org/openmrs/module/fhir2/api/impl/FhirMedicationDispenseServiceImpl_2_6Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import org.openmrs.module.fhir2.api.search.SearchQuery;
import org.openmrs.module.fhir2.api.search.SearchQueryBundleProvider;
import org.openmrs.module.fhir2.api.search.SearchQueryInclude;
import org.openmrs.module.fhir2.api.search.SearchQueryInclude_2_6;
import org.openmrs.module.fhir2.api.search.param.MedicationDispenseSearchParams;
import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
import org.openmrs.module.fhir2.api.translators.MedicationDispenseTranslator;
Expand All @@ -70,7 +69,7 @@ public class FhirMedicationDispenseServiceImpl_2_6Test {
private FhirGlobalPropertyService globalPropertyService;

@Mock
private SearchQueryInclude_2_6 searchQueryInclude;
private SearchQueryInclude searchQueryInclude;

@Mock
private SearchQuery<MedicationDispense, org.hl7.fhir.r4.model.MedicationDispense, FhirMedicationDispenseDao<MedicationDispense>, MedicationDispenseTranslator<MedicationDispense>, SearchQueryInclude<org.hl7.fhir.r4.model.MedicationDispense>> searchQuery;
Expand Down
20 changes: 10 additions & 10 deletions ...t/java/org/openmrs/module/fhir2/api/search/MedicationDispenseSearchQueryImpl_2_6Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@
*/
package org.openmrs.module.fhir2.api.search;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.hl7.fhir.r4.model.Patient.SP_IDENTIFIER;

import java.util.List;

import ca.uhn.fhir.rest.api.server.IBundleProvider;
import ca.uhn.fhir.rest.param.ReferenceAndListParam;
import ca.uhn.fhir.rest.param.ReferenceOrListParam;
Expand All @@ -42,6 +33,15 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;

import java.util.List;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.hl7.fhir.r4.model.Patient.SP_IDENTIFIER;

@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
public class MedicationDispenseSearchQueryImpl_2_6Test extends BaseModuleContextSensitiveTest {

Expand All @@ -52,7 +52,7 @@ public class MedicationDispenseSearchQueryImpl_2_6Test extends BaseModuleContext
private MedicationDispenseTranslator<MedicationDispense> translator;

@Autowired
private SearchQueryInclude_2_6 searchQueryInclude;
private SearchQueryInclude searchQueryInclude;

@Autowired
private SearchQuery<MedicationDispense, org.hl7.fhir.r4.model.MedicationDispense, FhirMedicationDispenseDao<MedicationDispense>, MedicationDispenseTranslator<MedicationDispense>, SearchQueryInclude<org.hl7.fhir.r4.model.MedicationDispense>> searchQuery;
Expand Down
9 changes: 9 additions & 0 deletions ...st/java/org/openmrs/module/fhir2/api/search/MedicationRequestSearchQueryImpl_2_6Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public License,
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
*
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
* graphic logo is a trademark of OpenMRS Inc.
*/
package org.openmrs.module.fhir2.api.search;

import static org.hamcrest.MatcherAssert.assertThat;
Expand Down