Skip to content

Commit a63c19c

Browse files
committed
Removing unnecessary validations
1 parent 62a49ee commit a63c19c

File tree

1 file changed

+1
-145
lines changed

1 file changed

+1
-145
lines changed

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewCronGroupValidator.java

Lines changed: 1 addition & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,7 @@ public NewCronGroupValidator() {
4949
public boolean validate(final NewCronGroupDialog dialog) {
5050
final CronGroupXmlData cronGroupXmlData = dialog.getCronGroupXmlData();
5151

52-
return this.isGroupNameValid(cronGroupXmlData)
53-
&& isScheduleGenerateEveryValid(cronGroupXmlData)
54-
&& isScheduleAheadForValid(cronGroupXmlData)
55-
&& isScheduleLifetimeValid(cronGroupXmlData)
56-
&& isHistoryCleanupEveryValid(cronGroupXmlData)
57-
&& isHistorySuccessLifetimeValid(cronGroupXmlData)
58-
&& isHistoryFailureLifetimeValid(cronGroupXmlData);
52+
return this.isGroupNameValid(cronGroupXmlData);
5953
}
6054

6155
private boolean isGroupNameValid(final CronGroupXmlData cronGroupXmlData) {
@@ -94,144 +88,6 @@ private boolean isGroupNameValid(final CronGroupXmlData cronGroupXmlData) {
9488
return true;
9589
}
9690

97-
private boolean isScheduleGenerateEveryValid(final CronGroupXmlData cronGroupXmlData) {
98-
if (cronGroupXmlData.getScheduleGenerateEvery() == null) {
99-
return true;
100-
}
101-
102-
if (cronGroupXmlData.getScheduleGenerateEvery() <= 0) {
103-
final String errorMessage = validatorBundle.message(
104-
MUST_NOT_BE_NEGATIVE,
105-
"schedule_generate_every option"
106-
);
107-
JOptionPane.showMessageDialog(
108-
null,
109-
errorMessage,
110-
getErrorTitle(),
111-
JOptionPane.ERROR_MESSAGE
112-
);
113-
114-
return false;
115-
}
116-
117-
return true;
118-
}
119-
120-
private boolean isScheduleAheadForValid(final CronGroupXmlData cronGroupXmlData) {
121-
if (cronGroupXmlData.getScheduleAheadFor() == null) {
122-
return true;
123-
}
124-
125-
if (cronGroupXmlData.getScheduleAheadFor() <= 0) {
126-
final String errorMessage = validatorBundle.message(
127-
MUST_NOT_BE_NEGATIVE,
128-
"schedule_ahead_for option"
129-
);
130-
JOptionPane.showMessageDialog(
131-
null,
132-
errorMessage,
133-
getErrorTitle(),
134-
JOptionPane.ERROR_MESSAGE
135-
);
136-
137-
return false;
138-
}
139-
140-
return true;
141-
}
142-
143-
private boolean isScheduleLifetimeValid(final CronGroupXmlData cronGroupXmlData) {
144-
if (cronGroupXmlData.getScheduleLifetime() == null) {
145-
return true;
146-
}
147-
148-
if (cronGroupXmlData.getScheduleLifetime() <= 0) {
149-
final String errorMessage = validatorBundle.message(
150-
MUST_NOT_BE_NEGATIVE,
151-
"schedule_lifetime option"
152-
);
153-
JOptionPane.showMessageDialog(
154-
null,
155-
errorMessage,
156-
getErrorTitle(),
157-
JOptionPane.ERROR_MESSAGE
158-
);
159-
160-
return false;
161-
}
162-
163-
return true;
164-
}
165-
166-
private boolean isHistoryCleanupEveryValid(final CronGroupXmlData cronGroupXmlData) {
167-
if (cronGroupXmlData.getHistoryCleanupEvery() == null) {
168-
return true;
169-
}
170-
171-
if (cronGroupXmlData.getHistoryCleanupEvery() <= 0) {
172-
final String errorMessage = validatorBundle.message(
173-
MUST_NOT_BE_NEGATIVE,
174-
"history_cleanup_every option"
175-
);
176-
JOptionPane.showMessageDialog(
177-
null,
178-
errorMessage,
179-
getErrorTitle(),
180-
JOptionPane.ERROR_MESSAGE
181-
);
182-
183-
return false;
184-
}
185-
186-
return true;
187-
}
188-
189-
private boolean isHistorySuccessLifetimeValid(final CronGroupXmlData cronGroupXmlData) {
190-
if (cronGroupXmlData.getHistorySuccessLifetime() == null) {
191-
return true;
192-
}
193-
194-
if (cronGroupXmlData.getHistorySuccessLifetime() <= 0) {
195-
final String errorMessage = validatorBundle.message(
196-
MUST_NOT_BE_NEGATIVE,
197-
"history_success_lifetime option"
198-
);
199-
JOptionPane.showMessageDialog(
200-
null,
201-
errorMessage,
202-
getErrorTitle(),
203-
JOptionPane.ERROR_MESSAGE
204-
);
205-
206-
return false;
207-
}
208-
209-
return true;
210-
}
211-
212-
private boolean isHistoryFailureLifetimeValid(final CronGroupXmlData cronGroupXmlData) {
213-
if (cronGroupXmlData.getHistoryFailureLifetime() == null) {
214-
return true;
215-
}
216-
217-
if (cronGroupXmlData.getHistoryFailureLifetime() <= 0) {
218-
final String errorMessage = validatorBundle.message(
219-
MUST_NOT_BE_NEGATIVE,
220-
"history_failure_lifetime option"
221-
);
222-
JOptionPane.showMessageDialog(
223-
null,
224-
errorMessage,
225-
getErrorTitle(),
226-
JOptionPane.ERROR_MESSAGE
227-
);
228-
229-
return false;
230-
}
231-
232-
return true;
233-
}
234-
23591
private String getErrorTitle() {
23692
return commonBundle.message("common.error");
23793
}

0 commit comments

Comments
 (0)