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

Jump to bottom

Add Lincense Headers #12

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Lincense Headers #12

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
4 changes: 2 additions & 2 deletions api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
20 changes: 10 additions & 10 deletions api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -65,11 +65,11 @@ public String getClientRegistryDefaultPatientIdentifierSystem() {
public String getClientRegistryUserName() {
return username;
}

public String getClientRegistryPassword() {
return password;
}

public String getClientRegistryIdentifierRoot() {
return identifierRoot;
}
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/clientregistry/ClientRegistryTransactionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/clientregistry/FhirConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/clientregistry/api/ClientRegistryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 8 additions & 0 deletions ...rc/main/java/org/openmrs/module/clientregistry/api/event/PatientCreateUpdateListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 8 additions & 4 deletions api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/org/openmrs/module/clientregistry/exception/ClientRegistryException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
9 changes: 8 additions & 1 deletion api/src/main/java/org/openmrs/module/clientregistry/providers/FhirCRConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
8 changes: 8 additions & 0 deletions ...in/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions api/src/test/java/org/openmrs/module/clientregistry/PatientCreationListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ public class PatientCreationListenerTest {

@Before
public void setUp() throws Exception {

}

@Test
public void onMessage() {

}

}
7 changes: 0 additions & 7 deletions license-header.txt
View file
Open in desktop

This file was deleted.

28 changes: 12 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,24 +195,20 @@
</dependencyManagement>
<profiles>
<profile>
<!-- Github Packages Integration -->
<id>github-packages</id>
<distributionManagement>
<!-- Deploy to Github Packages -->
<repository>
<id>github-packages</id>
<name>Github Maven Repo</name>
<url>https://maven.pkg.github.com/i-tech-uw/openmrs-module-clientregistry</url>
<uniqueVersion>false</uniqueVersion>
</repository>
<snapshotRepository>
<id>github-packages</id>
<name>Github Maven Repo</name>
<url>https://maven.pkg.github.com/i-tech-uw/openmrs-module-clientregistry</url>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
</distributionManagement>
</profile>
<repository>
<id>openmrs-repo-modules</id>
<name>Modules</name>
<url>http://mavenrepo.openmrs.org/nexus/content/repositories/modules/</url>
</repository>
<snapshotRepository>
<id>openmrs-repo-snapshots</id>
<name>OpenMRS Snapshots</name>
<url>http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
</snapshotRepository>
Comment on lines +200 to +209
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In as much as these redirect to the same place, I would simply:

       <repository>
            <id>openmrs-repo-modules</id>
            <name>OpenMRS Nexus Modules</name>
            <url>https://mavenrepo.openmrs.org/modules</url>
        </repository>
        <snapshotRepository>
            <id>openmrs-repo-snapshots</id>
            <name>OpenMRS Nexus Snapshots</name>
            <url>https://mavenrepo.openmrs.org/snapshots</url>
        </snapshotRepository>

</distributionManagement>
</profile>
</profiles>

<properties>
Expand Down
Loading