diff --git a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryActivator.java b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryActivator.java index febe709..8a3e9b3 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryActivator.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryActivator.java @@ -28,9 +28,9 @@ @Component public class ClientRegistryActivator extends BaseModuleActivator implements ApplicationContextAware, DaemonTokenAware { - private static ApplicationContext applicationContext; + private ApplicationContext applicationContext; - private static DaemonToken daemonToken; + private DaemonToken daemonToken; // Log private Log log = LogFactory.getLog(this.getClass()); diff --git a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConfig.java b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConfig.java index 574e7f7..e9325cb 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConfig.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConfig.java @@ -21,29 +21,29 @@ */ @Component public class ClientRegistryConfig { - + public final static String MODULE_PRIVILEGE = "Client Registry Privilege"; - + @Autowired @Qualifier("adminService") AdministrationService administrationService; - + @Value("${clientregistry.serverUrl}") private String serverUrl; - + @Value("${clientregistry.username}") private String username; - + @Value("${clientregistry.password}") private String password; - + @Value("${clientregistry.identifierRoot}") private String identifierRoot; - + public boolean clientRegistryConnectionEnabled() { return StringUtils.isNotBlank(getClientRegistryServerUrl()); } - + public String getClientRegistryServerUrl() { return serverUrl; } @@ -65,11 +65,11 @@ public String getClientRegistryDefaultPatientIdentifierSystem() { public String getClientRegistryUserName() { return username; } - + public String getClientRegistryPassword() { return password; } - + public String getClientRegistryIdentifierRoot() { return identifierRoot; } diff --git a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConstants.java b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConstants.java index bde5225..5a7614b 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConstants.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConstants.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry; public class ClientRegistryConstants { diff --git a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryTransactionType.java b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryTransactionType.java index 57d83f1..feaba39 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryTransactionType.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryTransactionType.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry; public enum ClientRegistryTransactionType { diff --git a/api/src/main/java/org/openmrs/module/clientregistry/FhirConfig.java b/api/src/main/java/org/openmrs/module/clientregistry/FhirConfig.java index 6a1c7db..701a041 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/FhirConfig.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/FhirConfig.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry; import ca.uhn.fhir.context.FhirContext; diff --git a/api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java b/api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java index f1cc9da..07c7573 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry.api; import org.hl7.fhir.r4.model.Patient; diff --git a/api/src/main/java/org/openmrs/module/clientregistry/api/ClientRegistryManager.java b/api/src/main/java/org/openmrs/module/clientregistry/api/ClientRegistryManager.java index 512921f..0dccb6e 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/api/ClientRegistryManager.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/api/ClientRegistryManager.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry.api; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/api/src/main/java/org/openmrs/module/clientregistry/api/event/PatientCreateUpdateListener.java b/api/src/main/java/org/openmrs/module/clientregistry/api/event/PatientCreateUpdateListener.java index bab5bce..7aec163 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/api/event/PatientCreateUpdateListener.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/api/event/PatientCreateUpdateListener.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry.api.event; import javax.jms.JMSException; diff --git a/api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java b/api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java index 6f91773..88cfc92 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java @@ -1,14 +1,18 @@ +/** + * 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.clientregistry.api.impl; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInputAndPartialOutput; -import ca.uhn.fhir.rest.gclient.IQuery; import ca.uhn.fhir.rest.gclient.StringClientParam; -import ca.uhn.fhir.rest.param.StringOrListParam; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.param.TokenParam; -import ca.uhn.fhir.rest.param.UriOrListParam; -import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.r4.model.*; import org.openmrs.module.clientregistry.ClientRegistryConfig; import org.openmrs.module.clientregistry.api.CRPatientService; diff --git a/api/src/main/java/org/openmrs/module/clientregistry/exception/ClientRegistryException.java b/api/src/main/java/org/openmrs/module/clientregistry/exception/ClientRegistryException.java index 670ba66..c7736ff 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/exception/ClientRegistryException.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/exception/ClientRegistryException.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry.exception; /** diff --git a/api/src/main/java/org/openmrs/module/clientregistry/providers/FhirCRConstants.java b/api/src/main/java/org/openmrs/module/clientregistry/providers/FhirCRConstants.java index 66c7286..a0b0fdd 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/providers/FhirCRConstants.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/providers/FhirCRConstants.java @@ -1,10 +1,17 @@ +/** + * 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.clientregistry.providers; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.rest.gclient.StringClientParam; import ca.uhn.fhir.rest.gclient.TokenClientParam; import ca.uhn.fhir.rest.gclient.UriClientParam; -import ca.uhn.fhir.rest.param.StringOrListParam; public class FhirCRConstants { diff --git a/api/src/main/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java b/api/src/main/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java index c88cad7..00c2327 100644 --- a/api/src/main/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java +++ b/api/src/main/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java @@ -1,3 +1,11 @@ +/** + * 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.clientregistry.providers.r4; import ca.uhn.fhir.model.valueset.BundleTypeEnum; diff --git a/api/src/test/java/org/openmrs/module/clientregistry/PatientCreationListenerTest.java b/api/src/test/java/org/openmrs/module/clientregistry/PatientCreationListenerTest.java index e766110..5b0fc6d 100644 --- a/api/src/test/java/org/openmrs/module/clientregistry/PatientCreationListenerTest.java +++ b/api/src/test/java/org/openmrs/module/clientregistry/PatientCreationListenerTest.java @@ -7,10 +7,12 @@ public class PatientCreationListenerTest { @Before public void setUp() throws Exception { + } @Test public void onMessage() { + } } diff --git a/license-header.txt b/license-header.txt deleted file mode 100644 index 23731d7..0000000 --- a/license-header.txt +++ /dev/null @@ -1,7 +0,0 @@ -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. diff --git a/pom.xml b/pom.xml index 0d474cd..23fd753 100644 --- a/pom.xml +++ b/pom.xml @@ -195,24 +195,20 @@ - github-packages - - - github-packages - Github Maven Repo - https://maven.pkg.github.com/i-tech-uw/openmrs-module-clientregistry - false - - - github-packages - Github Maven Repo - https://maven.pkg.github.com/i-tech-uw/openmrs-module-clientregistry - true - - - + + openmrs-repo-modules + Modules + http://mavenrepo.openmrs.org/nexus/content/repositories/modules/ + + + openmrs-repo-snapshots + OpenMRS Snapshots + http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots + + +