Skip to content

Commit 56833a1

Browse files
sharon2719sharon2719
authored
Merge pull request #74 from opensrp/code-reformatter
Closes #167 Code reformat for opensrp-server-connector
2 parents 2dc9049 + 6bb9b8f commit 56833a1

File tree

166 files changed

+74129
-30977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+74129
-30977
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
19-
with:
20-
submodules: recursive
21-
- name: Set up JDK 11
22-
uses: actions/setup-java@v1
23-
with:
24-
java-version: 11
25-
- name: Run Unit tests with Maven
26-
run: mvn -B clean test jacoco:report --file pom.xml --no-transfer-progress
27-
- name: Set Branch name Environment variable
28-
env:
29-
BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
30-
run: echo "BRANCH_NAME=${BRANCH_NAME_OR_REF#refs/heads/}" >> $GITHUB_ENV
31-
- name: Set PR Number Environment variable
32-
run: |
33-
echo "PR_NUMBER=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV
34-
- name: Upload coveralls report
35-
env:
36-
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
37-
run: |
38-
mvn -B coveralls:report --file pom.xml \
39-
--no-transfer-progress \
40-
-D repoToken="$COVERALLS_REPO_TOKEN" \
41-
-D serviceName=Github \
42-
-D branch="$BRANCH_NAME" \
43-
-D pullRequest="$PR_NUMBER" \
18+
- uses: actions/checkout@v2
19+
with:
20+
submodules: recursive
21+
- name: Set up JDK 11
22+
uses: actions/setup-java@v1
23+
with:
24+
java-version: 11
25+
- name: Run Unit tests with Maven
26+
run: mvn -B clean test jacoco:report --file pom.xml --no-transfer-progress
27+
- name: Set Branch name Environment variable
28+
env:
29+
BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
30+
run: echo "BRANCH_NAME=${BRANCH_NAME_OR_REF#refs/heads/}" >> $GITHUB_ENV
31+
- name: Set PR Number Environment variable
32+
run: |
33+
echo "PR_NUMBER=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV
34+
- name: Upload coveralls report
35+
env:
36+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
37+
run: |
38+
mvn -B coveralls:report --file pom.xml \
39+
--no-transfer-progress \
40+
-D repoToken="$COVERALLS_REPO_TOKEN" \
41+
-D serviceName=Github \
42+
-D branch="$BRANCH_NAME" \
43+
-D pullRequest="$PR_NUMBER" \

‎README.md‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
# opensrp-server-connector
2+
23
[![Build Status](https://travis-ci.org/OpenSRP/opensrp-server-connector.svg?branch=master)](https://travis-ci.org/OpenSRP/opensrp-server-connector) [![Coverage Status](https://coveralls.io/repos/github/opensrp/opensrp-server-connector/badge.svg)](https://coveralls.io/github/opensrp/opensrp-server-connector) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/03bd8f9cb9f941c6a922c3b474e8c589)](https://www.codacy.com/gh/opensrp/opensrp-server-connector/dashboard?utm_source=github.com&utm_medium=referral&utm_content=OpenSRP/opensrp-server-connector&utm_campaign=Badge_Grade)
34

45
Integration with external systems - OpenMRS (REST and Atomfeed), DHIS2, RapidPro
56

67
#### Relevant Wiki Pages ####
8+
79
* OpenSRP Server Refactor and Cleanup
8-
* [Refactor and Cleanup](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/562659330/OpenSRP+Server+Refactor+and+Clean+up)
9-
* [How to upload and use maven jar artifacts](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/564428801/How+to+upload+and+use+maven+jar+artifacts)
10-
* [Managing Server Wide Properties](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/602570753/Managing+Server+Wide+Properties)
11-
* [Server Web Build](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/616595457/Server+Web+Build)
10+
* [Refactor and Cleanup](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/562659330/OpenSRP+Server+Refactor+and+Clean+up)
11+
12+
* [How to upload and use maven jar artifacts](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/564428801/How+to+upload+and+use+maven+jar+artifacts)
13+
14+
* [Managing Server Wide Properties](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/602570753/Managing+Server+Wide+Properties)
15+
16+
* [Server Web Build](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/616595457/Server+Web+Build)
17+
1218
* [OpenSRP Server Build](https://smartregister.atlassian.net/wiki/display/Documentation/OpenSRP+Server+Build)
19+
1320
* Deployment
14-
* [Docker Setup](https://smartregister.atlassian.net/wiki/display/Documentation/Docker+Setup)
15-
* [Docker Compose Setup](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/52690976/Docker+Compose+Setup)
16-
* [Ansible Playbooks](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/540901377/Ansible+Playbooks)
21+
* [Docker Setup](https://smartregister.atlassian.net/wiki/display/Documentation/Docker+Setup)
22+
23+
* [Docker Compose Setup](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/52690976/Docker+Compose+Setup)
24+
25+
* [Ansible Playbooks](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/540901377/Ansible+Playbooks)
26+
1727
* [Postgres Database Support](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/251068417/Postgres+Database+Support+as+Main+Datastore)
28+
1829
* [OpenSRP Load Testing](https://smartregister.atlassian.net/wiki/spaces/Documentation/pages/268075009/OpenSRP+Load+Testing)

‎pom.xml‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.smartregister</groupId>
@@ -15,7 +15,7 @@
1515
<main.basedir>${project.basedir}</main.basedir>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<nexus-staging-maven-plugin.version>1.5.1</nexus-staging-maven-plugin.version>
18-
<spring.version>5.2.20.RELEASE</spring.version>
18+
<spring.version>5.2.20.RELEASE</spring.version>
1919
<opensrp.core.version>2.13.4-SNAPSHOT</opensrp.core.version>
2020
<powermock.version>2.0.5</powermock.version>
2121
<lombok.version>1.18.12</lombok.version>
@@ -107,64 +107,64 @@
107107
<version>1.70</version>
108108
</dependency>
109109
<dependency>
110-
<groupId>com.squareup.okhttp3</groupId>
111-
<artifactId>okhttp</artifactId>
112-
<version>4.9.3</version>
113-
</dependency>
114-
<dependency>
115-
<groupId>org.ektorp</groupId>
116-
<artifactId>org.ektorp</artifactId>
117-
<version>1.5.0</version>
118-
</dependency>
110+
<groupId>com.squareup.okhttp3</groupId>
111+
<artifactId>okhttp</artifactId>
112+
<version>4.9.3</version>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.ektorp</groupId>
116+
<artifactId>org.ektorp</artifactId>
117+
<version>1.5.0</version>
118+
</dependency>
119119
<dependency>
120120
<groupId>org.projectlombok</groupId>
121121
<artifactId>lombok</artifactId>
122122
<version>${lombok.version}</version>
123123
<scope>provided</scope>
124124
</dependency>
125125
<!-- Test dependencies -->
126-
<dependency>
127-
<groupId>junit</groupId>
128-
<artifactId>junit</artifactId>
129-
<version>4.13.2</version>
130-
<scope>test</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>org.powermock</groupId>
134-
<artifactId>powermock-module-junit4</artifactId>
135-
<version>${powermock.version}</version>
136-
<scope>test</scope>
137-
</dependency>
138-
<dependency>
139-
<groupId>org.powermock</groupId>
140-
<artifactId>powermock-module-junit4-rule</artifactId>
141-
<version>${powermock.version}</version>
142-
<scope>test</scope>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.powermock</groupId>
146-
<artifactId>powermock-api-mockito2</artifactId>
147-
<version>${powermock.version}</version>
148-
<scope>test</scope>
149-
</dependency>
150-
<dependency>
151-
<groupId>org.powermock</groupId>
152-
<artifactId>powermock-classloading-xstream</artifactId>
153-
<version>${powermock.version}</version>
154-
<scope>test</scope>
155-
</dependency>
156-
<dependency>
157-
<groupId>org.mockito</groupId>
158-
<artifactId>mockito-core</artifactId>
159-
<version>3.3.0</version>
160-
<scope>test</scope>
161-
</dependency>
162-
<dependency>
163-
<groupId>org.springframework</groupId>
164-
<artifactId>spring-test</artifactId>
165-
<version>${spring.version}</version>
166-
<scope>test</scope>
167-
</dependency>
126+
<dependency>
127+
<groupId>junit</groupId>
128+
<artifactId>junit</artifactId>
129+
<version>4.13.2</version>
130+
<scope>test</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.powermock</groupId>
134+
<artifactId>powermock-module-junit4</artifactId>
135+
<version>${powermock.version}</version>
136+
<scope>test</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.powermock</groupId>
140+
<artifactId>powermock-module-junit4-rule</artifactId>
141+
<version>${powermock.version}</version>
142+
<scope>test</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>org.powermock</groupId>
146+
<artifactId>powermock-api-mockito2</artifactId>
147+
<version>${powermock.version}</version>
148+
<scope>test</scope>
149+
</dependency>
150+
<dependency>
151+
<groupId>org.powermock</groupId>
152+
<artifactId>powermock-classloading-xstream</artifactId>
153+
<version>${powermock.version}</version>
154+
<scope>test</scope>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.mockito</groupId>
158+
<artifactId>mockito-core</artifactId>
159+
<version>3.3.0</version>
160+
<scope>test</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.springframework</groupId>
164+
<artifactId>spring-test</artifactId>
165+
<version>${spring.version}</version>
166+
<scope>test</scope>
167+
</dependency>
168168
</dependencies>
169169

170170
<build>
@@ -289,12 +289,12 @@
289289
<artifactId>coveralls-maven-plugin</artifactId>
290290
<version>4.3.0</version>
291291
<dependencies>
292-
<dependency>
293-
<groupId>javax.xml.bind</groupId>
294-
<artifactId>jaxb-api</artifactId>
295-
<version>2.3.1</version>
296-
</dependency>
297-
</dependencies>
292+
<dependency>
293+
<groupId>javax.xml.bind</groupId>
294+
<artifactId>jaxb-api</artifactId>
295+
<version>2.3.1</version>
296+
</dependency>
297+
</dependencies>
298298
</plugin>
299299
</plugins>
300300
</build>

‎src/main/java/org/opensrp/connector/HttpMethod.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
*
2+
*
33
*/
44
package org.opensrp.connector;
55

‎src/main/java/org/opensrp/connector/HttpUtils.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
/**
2-
*
2+
*
33
*/
44
package org.opensrp.connector;
55

6+
import org.apache.commons.lang3.StringUtils;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
9+
610
import java.io.IOException;
711

812
import okhttp3.Call;
913
import okhttp3.Credentials;
1014
import okhttp3.OkHttpClient;
1115
import okhttp3.Request;
1216
import okhttp3.Response;
13-
import org.apache.commons.lang3.StringUtils;
14-
import org.apache.logging.log4j.LogManager;
15-
import org.apache.logging.log4j.Logger;
1617

1718

1819
/**
1920
* @author Samuel Githengi created on 09/10/20
2021
*/
2122
public class HttpUtils {
22-
23-
private static Logger logger = LogManager.getLogger(HttpUtils.class);
24-
25-
public static String getURL(String url,String username, String password) {
26-
Request request = new Request.Builder().url(url)
27-
.addHeader("Authorization", Credentials.basic(username, password)).build();
28-
OkHttpClient client = new OkHttpClient();
29-
Call call = client.newCall(request);
30-
Response response;
31-
try {
32-
response = call.execute();
33-
String responseBody = response.body().string();
34-
if (!StringUtils.isBlank(responseBody)) {
35-
return responseBody;
36-
}
37-
}
38-
catch (IOException e) {
39-
logger.error(e.getMessage(), e);
40-
}
41-
return null;
42-
43-
}
23+
24+
private static Logger logger = LogManager.getLogger(HttpUtils.class);
25+
26+
public static String getURL(String url, String username, String password) {
27+
Request request = new Request.Builder().url(url)
28+
.addHeader("Authorization", Credentials.basic(username, password)).build();
29+
OkHttpClient client = new OkHttpClient();
30+
Call call = client.newCall(request);
31+
Response response;
32+
try {
33+
response = call.execute();
34+
String responseBody = response.body().string();
35+
if (!StringUtils.isBlank(responseBody)) {
36+
return responseBody;
37+
}
38+
} catch (IOException e) {
39+
logger.error(e.getMessage(), e);
40+
}
41+
return null;
42+
43+
}
4444
}

0 commit comments

Comments
 (0)