Skip to content

Fix package paths #35

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

Merged
igbanam merged 1 commit into from
Jan 28, 2025
Merged

Fix package paths #35

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
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/Dhis2HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/Dhis2IdConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/Period.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

import java.time.LocalDate;
import java.time.LocalDateTime;
Expand Down
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/TestUniqueId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

public final class TestUniqueId {

Expand Down
8 changes: 4 additions & 4 deletions ...Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/definitions/Dhis2StepDefinitions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package org.rtsl.dhis2.cucumber.definitions;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.rtsl.dhis2.cucumber.utils.Helper.toISODateTimeString;
import static org.rtsl.dhis2.cucumber.Helper.toISODateTimeString;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.hisp.dhis.api.model.v40_2_2.AttributeInfo;
import org.rtsl.dhis2.cucumber.utils.Dhis2HttpClient;
import org.rtsl.dhis2.cucumber.utils.Dhis2IdConverter;
import org.rtsl.dhis2.cucumber.Dhis2HttpClient;
import org.rtsl.dhis2.cucumber.Dhis2IdConverter;
import org.rtsl.dhis2.cucumber.factories.OrganisationUnit;
import org.rtsl.dhis2.cucumber.factories.TrackedEntityInstance;
import org.rtsl.dhis2.cucumber.utils.Period;
import org.rtsl.dhis2.cucumber.Period;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
6 changes: 3 additions & 3 deletions ...Utils/Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/factories/OrganisationUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.rtsl.dhis2.cucumber.factories;

import static org.rtsl.dhis2.cucumber.utils.Helper.toISODateTimeString;
import static org.rtsl.dhis2.cucumber.Helper.toISODateTimeString;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

import org.rtsl.dhis2.cucumber.utils.Dhis2HttpClient;
import org.rtsl.dhis2.cucumber.utils.TestUniqueId;
import org.rtsl.dhis2.cucumber.Dhis2HttpClient;
import org.rtsl.dhis2.cucumber.TestUniqueId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
6 changes: 3 additions & 3 deletions .../Dhis2Verifier/src/main/java/org/rtsl/dhis2/cucumber/factories/TrackedEntityInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.rtsl.dhis2.cucumber.utils.Dhis2HttpClient;
import org.rtsl.dhis2.cucumber.utils.Dhis2IdConverter;
import org.rtsl.dhis2.cucumber.Dhis2HttpClient;
import org.rtsl.dhis2.cucumber.Dhis2IdConverter;
import org.rtsl.dhis2.cucumber.definitions.Dhis2StepDefinitions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Map;

import static org.rtsl.dhis2.cucumber.utils.Helper.toISODateTimeString;
import static org.rtsl.dhis2.cucumber.Helper.toISODateTimeString;

public class TrackedEntityInstance {

Expand Down
6 changes: 3 additions & 3 deletions CommonUtils/Dhis2Verifier/src/main/resources/spring.main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</property>
</bean>

<bean id="testUniqueId" class="org.rtsl.dhis2.cucumber.utils.TestUniqueId" scope="cucumber-glue"/>
<bean id="testUniqueId" class="org.rtsl.dhis2.cucumber.TestUniqueId" scope="cucumber-glue"/>
<bean id="organisationUnit" class="org.rtsl.dhis2.cucumber.factories.OrganisationUnit" scope="cucumber-glue">
<constructor-arg value="${dhis2.orgUnit.level1Name}"/>
<constructor-arg value="${dhis2.orgUnit.level2NamePrefix}"/>
Expand All @@ -70,12 +70,12 @@
<constructor-arg value="${dhis2.api.password}" />
</bean>
<bean id="dhisSdkClient" factory-bean="dhis2SdkClientBuilder" factory-method="build" />
<bean id="testClient" class="org.rtsl.dhis2.cucumber.utils.Dhis2HttpClient" scope="singleton">
<bean id="testClient" class="org.rtsl.dhis2.cucumber.Dhis2HttpClient" scope="singleton">
<constructor-arg value="${dhis2.api.url}" />
<constructor-arg value="${dhis2.api.username}" />
<constructor-arg value="${dhis2.api.password}" />
</bean>
<bean id="testIdConverter" class="org.rtsl.dhis2.cucumber.utils.Dhis2IdConverter" init-method="getMetadata" scope="singleton">
<bean id="testIdConverter" class="org.rtsl.dhis2.cucumber.Dhis2IdConverter" init-method="getMetadata" scope="singleton">
<constructor-arg ref="testClient" />
</bean>
</beans>
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/test/java/org/rtsl/dhis2/cucumber/HelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion CommonUtils/Dhis2Verifier/src/test/java/org/rtsl/dhis2/cucumber/PeriodTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rtsl.dhis2.cucumber.utils;
package org.rtsl.dhis2.cucumber;

import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
Expand Down