| Revision | 73 (tree) |
|---|---|
| Time | 2015-08-21 01:14:41 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -1,6 +1,8 @@ | ||
| 1 | 1 | package batch.status; |
| 2 | 2 | |
| 3 | 3 | import java.util.EnumSet; |
| 4 | +import java.util.Optional; | |
| 5 | +import java.util.stream.Stream; | |
| 4 | 6 | |
| 5 | 7 | |
| 6 | 8 | /** |
| @@ -54,15 +56,6 @@ | ||
| 54 | 56 | } |
| 55 | 57 | |
| 56 | 58 | /** |
| 57 | - * 同一確認 | |
| 58 | - * @param val 値 | |
| 59 | - * @return 同一の場合 true を返す。 | |
| 60 | - */ | |
| 61 | - public boolean equals(final int val) { | |
| 62 | - return this.value == val; | |
| 63 | - } | |
| 64 | - | |
| 65 | - /** | |
| 66 | 59 | * 実行中状態 |
| 67 | 60 | * @return 実行中状態 |
| 68 | 61 | */ |
| @@ -84,12 +77,7 @@ | ||
| 84 | 77 | * @return リクエスト状態の場合 true を返す。 |
| 85 | 78 | */ |
| 86 | 79 | public static boolean isRequest(final int val) { |
| 87 | - for (final JobState js : requested()) { | |
| 88 | - if (js.equals(val)) { | |
| 89 | - return true; | |
| 90 | - } | |
| 91 | - } | |
| 92 | - return false; | |
| 80 | + return requested().stream().anyMatch(js -> js.value() == val); | |
| 93 | 81 | } |
| 94 | 82 | |
| 95 | 83 | /** |
| @@ -98,12 +86,7 @@ | ||
| 98 | 86 | * @return 実行中状態の場合 true を返す。 |
| 99 | 87 | */ |
| 100 | 88 | public static boolean isRunning(final int val) { |
| 101 | - for (final JobState js : running()) { | |
| 102 | - if (js.equals(val)) { | |
| 103 | - return true; | |
| 104 | - } | |
| 105 | - } | |
| 106 | - return false; | |
| 89 | + return running().stream().anyMatch(js -> js.value() == val); | |
| 107 | 90 | } |
| 108 | 91 | |
| 109 | 92 | /** |
| @@ -112,7 +95,8 @@ | ||
| 112 | 95 | * @return 終了状態の場合 true を返す。 |
| 113 | 96 | */ |
| 114 | 97 | public static boolean isEnd(final int val) { |
| 115 | - return ID_B_NEND.equals(val) || ID_B_NODATA.equals(val) || ID_B_WARNING.equals(val); | |
| 98 | + return EnumSet.of(ID_B_NEND, ID_B_NODATA, ID_B_WARNING). | |
| 99 | + stream().anyMatch(js -> js.value() == val); | |
| 116 | 100 | } |
| 117 | 101 | |
| 118 | 102 | /** |
| @@ -121,7 +105,7 @@ | ||
| 121 | 105 | * @return キャンセル状態の場合 true を返す。 |
| 122 | 106 | */ |
| 123 | 107 | public static boolean isCancel(final int val) { |
| 124 | - return ID_B_CANCEL.equals(val) || ID_B_IRAI_CAN.equals(val); | |
| 108 | + return ID_B_CANCEL.value() == val || ID_B_IRAI_CAN.value() == val; | |
| 125 | 109 | } |
| 126 | 110 | |
| 127 | 111 | /** |
| @@ -130,7 +114,7 @@ | ||
| 130 | 114 | * @return エラー状態の場合 true を返す。 |
| 131 | 115 | */ |
| 132 | 116 | public static boolean isError(final int val) { |
| 133 | - return ID_B_INVALID.equals(val); | |
| 117 | + return ID_B_INVALID.value() == val; | |
| 134 | 118 | } |
| 135 | 119 | |
| 136 | 120 | /** |
| @@ -154,10 +138,10 @@ | ||
| 154 | 138 | * @return オブジェクト |
| 155 | 139 | */ |
| 156 | 140 | public static JobState valueOf(final int val) { |
| 157 | - for (final JobState js : JobState.values()) { | |
| 158 | - if (js.value() == val) { | |
| 159 | - return js; | |
| 160 | - } | |
| 141 | + Optional<JobState> opt = Stream.of(JobState.values()). | |
| 142 | + filter(js -> js.value() == val).findFirst(); | |
| 143 | + if (opt.isPresent()) { | |
| 144 | + return opt.get(); | |
| 161 | 145 | } |
| 162 | 146 | |
| 163 | 147 | throw new IllegalArgumentException(String.valueOf(val)); |
| @@ -235,7 +235,7 @@ | ||
| 235 | 235 | |
| 236 | 236 | if (JobState.isCancel(job.getJobSts())) { |
| 237 | 237 | ret = Batch.RET_CANCELED; |
| 238 | - } else if (!JobState.ID_B_SH_START.equals(job.getJobSts())) { | |
| 238 | + } else if (JobState.ID_B_SH_START.value() != job.getJobSts()) { | |
| 239 | 239 | ret = Batch.RET_ENV_ERROR; |
| 240 | 240 | } else { |
| 241 | 241 | // ジョブ管理状態確認・更新 |
| @@ -428,14 +428,14 @@ | ||
| 428 | 428 | } else if (JobState.isCancel(jdsts)) { |
| 429 | 429 | ret = Batch.RET_CANCELED; |
| 430 | 430 | job.setJobSts(JobState.ID_B_CANCEL.value()); |
| 431 | - } else if (JobState.ID_B_NODATA.equals(jdsts) && ret == -1) { | |
| 431 | + } else if (JobState.ID_B_NODATA.value() == jdsts && ret == -1) { | |
| 432 | 432 | ret = Batch.RET_NODATA; |
| 433 | 433 | job.setJobSts(JobState.ID_B_NODATA.value()); |
| 434 | - } else if (JobState.ID_B_NEND.equals(jdsts) | |
| 434 | + } else if (JobState.ID_B_NEND.value() == jdsts | |
| 435 | 435 | && (ret == -1 || ret == Batch.RET_NODATA)) { |
| 436 | 436 | ret = Batch.RET_SUCCESS; |
| 437 | 437 | job.setJobSts(JobState.ID_B_NEND.value()); |
| 438 | - } else if (JobState.ID_B_WARNING.equals(jdsts) | |
| 438 | + } else if (JobState.ID_B_WARNING.value() == jdsts | |
| 439 | 439 | && (ret == -1 || ret == Batch.RET_NODATA || ret == Batch.RET_SUCCESS)) { |
| 440 | 440 | ret = Batch.RET_WARNING; |
| 441 | 441 | job.setJobSts(JobState.ID_B_WARNING.value()); |
| @@ -466,7 +466,7 @@ | ||
| 466 | 466 | } |
| 467 | 467 | |
| 468 | 468 | // ジョブ詳細管理が処理中のとき |
| 469 | - if (JobState.ID_B_EDIT.equals(dtlsts)) { | |
| 469 | + if (JobState.ID_B_EDIT.value() == dtlsts) { | |
| 470 | 470 | JobDetail jd = dtllst.get(0); |
| 471 | 471 | if (JobState.isCancel(jobsts)) { |
| 472 | 472 | jds.updateJobDetail(conn, this.jobSeq, dtlno, |
| @@ -100,7 +100,7 @@ | ||
| 100 | 100 | setOnlineParams(job.getExecParam()); |
| 101 | 101 | |
| 102 | 102 | // 中止依頼 |
| 103 | - if (!JobState.ID_B_EDIT.equals(job.getJobSts())) { | |
| 103 | + if (JobState.ID_B_EDIT.value() != job.getJobSts()) { | |
| 104 | 104 | return false; |
| 105 | 105 | } |
| 106 | 106 |