Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing squid:S1155 - Collection.isEmpty() should be used to test for emptiness #725

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ language: java
jdk:
- oraclejdk8

script: ./bin/travis/run-tests.sh
before_script:
- echo "MAVEN_OPTS='-Xmx4096m -Xms4096m'" > ~/.mavenrc

script: travis_wait ./bin/travis/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ public Date getTimeAfter(Date afterTime) {
int sec = cl.get(Calendar.SECOND);
int min = cl.get(Calendar.MINUTE);
st = seconds.tailSet(sec);
if (st.size() != 0) {
if (!st.isEmpty()) {
sec = st.first();
} else {
sec = seconds.first();
Expand All @@ -928,7 +928,7 @@ public Date getTimeAfter(Date afterTime) {
int hr = cl.get(Calendar.HOUR_OF_DAY);
t = -1;
st = minutes.tailSet(min);
if (st.size() != 0) {
if (!st.isEmpty()) {
t = min;
min = st.first();
} else {
Expand All @@ -946,7 +946,7 @@ public Date getTimeAfter(Date afterTime) {
int day = cl.get(Calendar.DAY_OF_MONTH);
t = -1;
st = hours.tailSet(hr);
if (st.size() != 0) {
if (!st.isEmpty()) {
t = hr;
hr = st.first();
} else {
Expand Down Expand Up @@ -1047,7 +1047,7 @@ public Date getTimeAfter(Date afterTime) {
day = daysOfMonth.first();
mon++;
}
} else if (st.size() != 0) {
} else if (!st.isEmpty()) {
t = day;
day = st.first();
int lastDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
Expand Down Expand Up @@ -1143,7 +1143,7 @@ public Date getTimeAfter(Date afterTime) {
int dow = daysOfWeek.first(); // desired
// d-o-w
st = daysOfWeek.tailSet(cDow);
if (st.size() > 0) {
if (!st.isEmpty()) {
dow = st.first();
}

Expand Down Expand Up @@ -1187,7 +1187,7 @@ public Date getTimeAfter(Date afterTime) {
return null;
}
st = months.tailSet(mon);
if (st.size() != 0) {
if (!st.isEmpty()) {
t = mon;
mon = st.first();
} else {
Expand All @@ -1206,7 +1206,7 @@ public Date getTimeAfter(Date afterTime) {
cl.set(Calendar.MONTH, mon - 1);
year = cl.get(Calendar.YEAR);
st = years.tailSet(year);
if (st.size() != 0) {
if (!st.isEmpty()) {
t = year;
year = st.first();
} else {
Expand Down