Minor refactorings and code style changes (#807)
* Made minor changes in some patterns such as removed throws clause where not needed, changed incorrect order of arguments in assertEquals * Minor refactorings and code style changes. 1) Removed several use of raw types 2) Removed unnecessary throws clauses 3) Used lambda expressions wherever applicable 4) Used apt assertion methods for readability 5) Use of try with resources wherever applicable 6) Corrected incorrect order of assertXXX arguments * Removed unused import from Promise * Addressed review comments * Addressed checkstyle issue
This commit is contained in:
@ -32,16 +32,16 @@ import units.CommanderUnit;
|
||||
*/
|
||||
public class Commander implements CommanderExtension {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(Commander.class);
|
||||
|
||||
private CommanderUnit unit;
|
||||
|
||||
public Commander(CommanderUnit commanderUnit) {
|
||||
this.unit = commanderUnit;
|
||||
}
|
||||
|
||||
final Logger logger = LoggerFactory.getLogger(Commander.class);
|
||||
|
||||
@Override
|
||||
public void commanderReady() {
|
||||
logger.info("[Commander] " + unit.getName() + " is ready!");
|
||||
LOGGER.info("[Commander] " + unit.getName() + " is ready!");
|
||||
}
|
||||
}
|
||||
|
@ -32,16 +32,16 @@ import units.SergeantUnit;
|
||||
*/
|
||||
public class Sergeant implements SergeantExtension {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(Sergeant.class);
|
||||
|
||||
private SergeantUnit unit;
|
||||
|
||||
public Sergeant(SergeantUnit sergeantUnit) {
|
||||
this.unit = sergeantUnit;
|
||||
}
|
||||
|
||||
final Logger logger = LoggerFactory.getLogger(Sergeant.class);
|
||||
|
||||
@Override
|
||||
public void sergeantReady() {
|
||||
logger.info("[Sergeant] " + unit.getName() + " is ready! ");
|
||||
LOGGER.info("[Sergeant] " + unit.getName() + " is ready! ");
|
||||
}
|
||||
}
|
||||
|
@ -31,6 +31,7 @@ import units.SoldierUnit;
|
||||
* Class defining Soldier
|
||||
*/
|
||||
public class Soldier implements SoldierExtension {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(Soldier.class);
|
||||
|
||||
private SoldierUnit unit;
|
||||
|
||||
@ -38,10 +39,8 @@ public class Soldier implements SoldierExtension {
|
||||
this.unit = soldierUnit;
|
||||
}
|
||||
|
||||
final Logger logger = LoggerFactory.getLogger(Soldier.class);
|
||||
|
||||
@Override
|
||||
public void soldierReady() {
|
||||
logger.info("[Solider] " + unit.getName() + " is ready!");
|
||||
LOGGER.info("[Solider] " + unit.getName() + " is ready!");
|
||||
}
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ import units.CommanderUnit;
|
||||
*/
|
||||
public class CommanderTest {
|
||||
@Test
|
||||
public void commanderReady() throws Exception {
|
||||
public void commanderReady() {
|
||||
final Commander commander = new Commander(new CommanderUnit("CommanderUnitTest"));
|
||||
|
||||
commander.commanderReady();
|
||||
|
@ -33,13 +33,13 @@ import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
*/
|
||||
public class CommanderUnitTest {
|
||||
@Test
|
||||
public void getUnitExtension() throws Exception {
|
||||
public void getUnitExtension() {
|
||||
|
||||
final Unit unit = new CommanderUnit("CommanderUnitName");
|
||||
|
||||
assertNull(unit.getUnitExtension("SoldierExtension"));
|
||||
assertNull(unit.getUnitExtension("SergeantExtension"));
|
||||
assertNotNull((CommanderExtension) unit.getUnitExtension("CommanderExtension"));
|
||||
assertNotNull(unit.getUnitExtension("CommanderExtension"));
|
||||
}
|
||||
|
||||
}
|
@ -33,12 +33,12 @@ import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
*/
|
||||
public class SergeantUnitTest {
|
||||
@Test
|
||||
public void getUnitExtension() throws Exception {
|
||||
public void getUnitExtension() {
|
||||
|
||||
final Unit unit = new SergeantUnit("SergeantUnitName");
|
||||
|
||||
assertNull(unit.getUnitExtension("SoldierExtension"));
|
||||
assertNotNull((SergeantExtension) unit.getUnitExtension("SergeantExtension"));
|
||||
assertNotNull(unit.getUnitExtension("SergeantExtension"));
|
||||
assertNull(unit.getUnitExtension("CommanderExtension"));
|
||||
}
|
||||
|
||||
|
@ -33,11 +33,11 @@ import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
*/
|
||||
public class SoldierUnitTest {
|
||||
@Test
|
||||
public void getUnitExtension() throws Exception {
|
||||
public void getUnitExtension() {
|
||||
|
||||
final Unit unit = new SoldierUnit("SoldierUnitName");
|
||||
|
||||
assertNotNull((SoldierExtension) unit.getUnitExtension("SoldierExtension"));
|
||||
assertNotNull(unit.getUnitExtension("SoldierExtension"));
|
||||
assertNull(unit.getUnitExtension("SergeantExtension"));
|
||||
assertNull(unit.getUnitExtension("CommanderExtension"));
|
||||
|
||||
|
Reference in New Issue
Block a user