Skip to content

Commit f7e22a1

Browse files
kanwarpreet25iluwatar
kanwarpreet25
authored and
iluwatar
committed
508 : Sonar qube critical Issue Fix (iluwatar#854)
* 508 : Sonar qube critical Issue Fix Refactor this method to reduce its Cognitive Complexity from 30 to the 15 allowed. * 508: Sonar Qube Issue fxes Define a constant instead of duplicating this literal " does not exist." 3 times. * 508: sonar qube issue fixes Define a constant instead of duplicating this literal "Some external api for only realtime execution could be called here." 3 times.
1 parent c6ecf58 commit f7e22a1

File tree

3 files changed

+72
-55
lines changed

3 files changed

+72
-55
lines changed

‎event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java‎

Lines changed: 62 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public class App {
6060
/**
6161
* Program entry point.
6262
*
63-
* @param args command line args
63+
* @param args
64+
* command line args
6465
*/
6566
public static void main(String[] args) {
6667
App app = new App();
@@ -150,56 +151,11 @@ public void runInteractiveMode() {
150151
option = s.nextInt();
151152

152153
if (option == 1) {
153-
s.nextLine();
154-
LOGGER.info("Boil multiple eggs at once (A) or boil them one-by-one (S)?: ");
155-
String eventType = s.nextLine();
156-
LOGGER.info("How long should this egg be boiled for (in seconds)?: ");
157-
int eventTime = s.nextInt();
158-
if (eventType.equalsIgnoreCase("A")) {
159-
try {
160-
int eventId = eventManager.createAsync(eventTime);
161-
eventManager.start(eventId);
162-
LOGGER.info("Egg [{}] is being boiled.", eventId);
163-
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException e) {
164-
LOGGER.error(e.getMessage());
165-
}
166-
} else if (eventType.equalsIgnoreCase("S")) {
167-
try {
168-
int eventId = eventManager.create(eventTime);
169-
eventManager.start(eventId);
170-
LOGGER.info("Egg [{}] is being boiled.", eventId);
171-
} catch (MaxNumOfEventsAllowedException | InvalidOperationException | LongRunningEventException
172-
| EventDoesNotExistException e) {
173-
LOGGER.error(e.getMessage());
174-
}
175-
} else {
176-
LOGGER.info("Unknown event type.");
177-
}
154+
processOption1(eventManager, s);
178155
} else if (option == 2) {
179-
LOGGER.info("Which egg?: ");
180-
int eventId = s.nextInt();
181-
try {
182-
eventManager.cancel(eventId);
183-
LOGGER.info("Egg [{}] is removed from boiler.", eventId);
184-
} catch (EventDoesNotExistException e) {
185-
LOGGER.error(e.getMessage());
186-
}
156+
processOption2(eventManager, s);
187157
} else if (option == 3) {
188-
s.nextLine();
189-
LOGGER.info("Just one egg (O) OR all of them (A) ?: ");
190-
String eggChoice = s.nextLine();
191-
192-
if (eggChoice.equalsIgnoreCase("O")) {
193-
LOGGER.info("Which egg?: ");
194-
int eventId = s.nextInt();
195-
try {
196-
eventManager.status(eventId);
197-
} catch (EventDoesNotExistException e) {
198-
LOGGER.error(e.getMessage());
199-
}
200-
} else if (eggChoice.equalsIgnoreCase("A")) {
201-
eventManager.statusOfAllEvents();
202-
}
158+
processOption3(eventManager, s);
203159
} else if (option == 4) {
204160
eventManager.shutdown();
205161
}
@@ -208,4 +164,61 @@ public void runInteractiveMode() {
208164
s.close();
209165
}
210166

167+
private void processOption3(EventManager eventManager, Scanner s) {
168+
s.nextLine();
169+
LOGGER.info("Just one egg (O) OR all of them (A) ?: ");
170+
String eggChoice = s.nextLine();
171+
172+
if (eggChoice.equalsIgnoreCase("O")) {
173+
LOGGER.info("Which egg?: ");
174+
int eventId = s.nextInt();
175+
try {
176+
eventManager.status(eventId);
177+
} catch (EventDoesNotExistException e) {
178+
LOGGER.error(e.getMessage());
179+
}
180+
} else if (eggChoice.equalsIgnoreCase("A")) {
181+
eventManager.statusOfAllEvents();
182+
}
183+
}
184+
185+
private void processOption2(EventManager eventManager, Scanner s) {
186+
LOGGER.info("Which egg?: ");
187+
int eventId = s.nextInt();
188+
try {
189+
eventManager.cancel(eventId);
190+
LOGGER.info("Egg [{}] is removed from boiler.", eventId);
191+
} catch (EventDoesNotExistException e) {
192+
LOGGER.error(e.getMessage());
193+
}
194+
}
195+
196+
private void processOption1(EventManager eventManager, Scanner s) {
197+
s.nextLine();
198+
LOGGER.info("Boil multiple eggs at once (A) or boil them one-by-one (S)?: ");
199+
String eventType = s.nextLine();
200+
LOGGER.info("How long should this egg be boiled for (in seconds)?: ");
201+
int eventTime = s.nextInt();
202+
if (eventType.equalsIgnoreCase("A")) {
203+
try {
204+
int eventId = eventManager.createAsync(eventTime);
205+
eventManager.start(eventId);
206+
LOGGER.info("Egg [{}] is being boiled.", eventId);
207+
} catch (MaxNumOfEventsAllowedException | LongRunningEventException | EventDoesNotExistException e) {
208+
LOGGER.error(e.getMessage());
209+
}
210+
} else if (eventType.equalsIgnoreCase("S")) {
211+
try {
212+
int eventId = eventManager.create(eventTime);
213+
eventManager.start(eventId);
214+
LOGGER.info("Egg [{}] is being boiled.", eventId);
215+
} catch (MaxNumOfEventsAllowedException | InvalidOperationException | LongRunningEventException
216+
| EventDoesNotExistException e) {
217+
LOGGER.error(e.getMessage());
218+
}
219+
} else {
220+
LOGGER.info("Unknown event type.");
221+
}
222+
}
223+
211224
}

‎event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public class EventManager implements ThreadCompleteListener {
3939
private int currentlyRunningSyncEvent = -1;
4040
private Random rand;
4141
private Map<Integer, Event> eventPool;
42+
43+
private static final String DOES_NOT_EXIST = " does not exist.";
4244

4345
/**
4446
* EventManager constructor.
@@ -112,7 +114,7 @@ private int createEvent(int eventTime, boolean isSynchronous)
112114
*/
113115
public void start(int eventId) throws EventDoesNotExistException {
114116
if (!eventPool.containsKey(eventId)) {
115-
throw new EventDoesNotExistException(eventId + " does not exist.");
117+
throw new EventDoesNotExistException(eventId + DOES_NOT_EXIST);
116118
}
117119

118120
eventPool.get(eventId).start();
@@ -126,7 +128,7 @@ public void start(int eventId) throws EventDoesNotExistException {
126128
*/
127129
public void cancel(int eventId) throws EventDoesNotExistException {
128130
if (!eventPool.containsKey(eventId)) {
129-
throw new EventDoesNotExistException(eventId + " does not exist.");
131+
throw new EventDoesNotExistException(eventId + DOES_NOT_EXIST);
130132
}
131133

132134
if (eventId == currentlyRunningSyncEvent) {
@@ -145,7 +147,7 @@ public void cancel(int eventId) throws EventDoesNotExistException {
145147
*/
146148
public void status(int eventId) throws EventDoesNotExistException {
147149
if (!eventPool.containsKey(eventId)) {
148-
throw new EventDoesNotExistException(eventId + " does not exist.");
150+
throw new EventDoesNotExistException(eventId + DOES_NOT_EXIST);
149151
}
150152

151153
eventPool.get(eventId).status();

‎event-sourcing/src/main/java/com/iluwatar/event/sourcing/domain/Account.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public class Account {
4444
private final int accountNo;
4545
private final String owner;
4646
private BigDecimal money;
47+
48+
private static final String MSG = "Some external api for only realtime execution could be called here.";
4749

4850
/**
4951
* Instantiates a new Account.
@@ -126,7 +128,7 @@ private void handleDeposit(BigDecimal money, boolean realTime) {
126128
depositMoney(money);
127129
AccountAggregate.putAccount(this);
128130
if (realTime) {
129-
LOGGER.info("Some external api for only realtime execution could be called here.");
131+
LOGGER.info(MSG);
130132
}
131133
}
132134

@@ -138,7 +140,7 @@ private void handleWithdrawal(BigDecimal money, boolean realTime) {
138140
withdrawMoney(money);
139141
AccountAggregate.putAccount(this);
140142
if (realTime) {
141-
LOGGER.info("Some external api for only realtime execution could be called here.");
143+
LOGGER.info(MSG);
142144
}
143145
}
144146

@@ -160,7 +162,7 @@ public void handleEvent(MoneyDepositEvent moneyDepositEvent) {
160162
public void handleEvent(AccountCreateEvent accountCreateEvent) {
161163
AccountAggregate.putAccount(this);
162164
if (accountCreateEvent.isRealTime()) {
163-
LOGGER.info("Some external api for only realtime execution could be called here.");
165+
LOGGER.info(MSG);
164166
}
165167
}
166168

0 commit comments

Comments
 (0)