resolved merge conflicts
No related branches found
No related tags found
Showing
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/constants/Constants.java 13 additions, 2 deletions...pse/openk/gridfailureinformation/constants/Constants.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/BranchController.java 2 additions, 2 deletions...k/gridfailureinformation/controller/BranchController.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationController.java 9 additions, 9 deletions...einformation/controller/FailureInformationController.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/mapper/BranchMapper.java 1 addition, 1 deletion...pse/openk/gridfailureinformation/mapper/BranchMapper.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/mapper/GridFailureInformationMapper.java 3 additions, 3 deletions...ilureinformation/mapper/GridFailureInformationMapper.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/BranchService.java 1 addition, 1 deletion...e/openk/gridfailureinformation/service/BranchService.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java 7 additions, 7 deletions...failureinformation/service/FailureInformationService.java
- gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FailureInformationDto.java 1 addition, 1 deletion...idfailureinformation/viewmodel/FailureInformationDto.java
- gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/config/TestConfiguration.java 5 additions, 5 deletions...penk/gridfailureinformation/config/TestConfiguration.java
- gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationControllerTest.java 58 additions, 0 deletions...ormation/controller/FailureInformationControllerTest.java
- gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java 57 additions, 0 deletions...ureinformation/service/FailureInformationServiceTest.java
- gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java 83 additions, 0 deletions.../openk/gridfailureinformation/support/MockDataHelper.java
Loading
Please register or sign in to comment