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.

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

Update files for use in payment app. #584

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
Expand Down
2 changes: 1 addition & 1 deletion api/liquibase.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ configurations {
}

dependencies {
liquibase group: 'org.liquibase.ext', name: 'liquibase-hibernate5', version: 3.7
runtimeOnly group: 'org.liquibase.ext', name: 'liquibase-hibernate5', version: '4.27.0'
}

Properties liquibaseProps = new Properties()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import uk.gov.hmcts.fees2.register.data.exceptions.UserNotFoundException;
import uk.gov.hmcts.fees2.register.data.model.IdamUserIdResponse;
import uk.gov.hmcts.fees2.register.data.service.IdamService;
import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceImpl;
import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceFrImpl;

import java.util.Collections;

Expand All @@ -38,7 +38,7 @@ public class IdamComponentTest {
@Mock
private RestTemplate restTemplateIdam;

@InjectMocks private IdamService idamService = new IdamServiceImpl();
@InjectMocks private IdamService idamService = new IdamServiceFrImpl();

IdamUserIdResponse[] idamUserIdResponse = new IdamUserIdResponse[1];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import uk.gov.hmcts.fees2.register.data.exceptions.FeeNotFoundException;
import uk.gov.hmcts.fees2.register.data.model.DirectionType;
import uk.gov.hmcts.fees2.register.data.model.FeeVersionStatus;
import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceImpl;
import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceFrImpl;

import javax.servlet.http.HttpServletResponse;
import java.security.Principal;
Expand All @@ -38,7 +38,7 @@ public class FeeVersionControllerTest extends BaseIntegrationTest {
private HttpServletResponse response;

@MockBean
private IdamServiceImpl idamService;
private IdamServiceFrImpl idamService;

@Before
public void setup(){
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ subprojects {
}

dependencies {
implementation('com.sun.xml.bind:jaxb-osgi:2.3.1')
implementation('com.sun.xml.bind:jaxb-osgi:4.0.5')
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
implementation group:'org.dom4j',name:'dom4j',version: '2.1.3'
implementation group: 'org.dom4j', name: 'dom4j', version: '2.1.4'
implementation group: 'org.owasp.encoder', name: 'encoder', version: '1.2'
testImplementation group: 'com.github.tomakehurst', name: 'wiremock-standalone', version: '2.27.2'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.28'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import java.util.*;

@Service
public class IdamServiceImpl implements IdamService {
public class IdamServiceFrImpl implements IdamService {

private static final Logger LOG = LoggerFactory.getLogger(IdamServiceImpl.class);
private static final Logger LOG = LoggerFactory.getLogger(IdamServiceFrImpl.class);

private static final String USERID_ENDPOINT = "/api/v1/users";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class IdamServiceImplTest {
private RestTemplate restTemplateIdam;

@InjectMocks
private IdamServiceImpl idamService;
private IdamServiceFrImpl idamService;

@Before
public void initSecurityContext() {
Expand Down
Loading