Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.

Commit 0362411

Browse files
author
shubay
committed
Fix lint errors.
1 parent 67bd740 commit 0362411

File tree

13 files changed

+152
-55
lines changed

13 files changed

+152
-55
lines changed

‎src/main/java/com/google/visualization/datasource/base/Warning.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Warning {
3535
* Constructs a new exception with a reason type and a message for the user.
3636
*
3737
* @param reasonType The reason type of the exception.
38-
* @param message The message the user.
38+
* @param messageToUser The message to the user.
3939
*/
4040
public Warning(ReasonType reasonType, String messageToUser) {
4141
this.messageToUser = messageToUser;

‎src/main/java/com/google/visualization/datasource/query/ColumnColumnFilter.java‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,30 @@ public int hashCode() {
153153

154154
@Override
155155
public boolean equals(Object obj) {
156-
if (this == obj) return true;
157-
if (obj == null) return false;
158-
if (getClass() != obj.getClass()) return false;
156+
if (this == obj) {
157+
return true;
158+
}
159+
if (obj == null) {
160+
return false;
161+
}
162+
if (getClass() != obj.getClass()) {
163+
return false;
164+
}
159165
ColumnColumnFilter other = (ColumnColumnFilter) obj;
160166
if (firstColumn == null) {
161-
if (other.firstColumn != null) return false;
162-
} else if (!firstColumn.equals(other.firstColumn)) return false;
167+
if (other.firstColumn != null) {
168+
return false;
169+
}
170+
} else if (!firstColumn.equals(other.firstColumn)) {
171+
return false;
172+
}
163173
if (secondColumn == null) {
164-
if (other.secondColumn != null) return false;
165-
} else if (!secondColumn.equals(other.secondColumn)) return false;
174+
if (other.secondColumn != null) {
175+
return false;
176+
}
177+
} else if (!secondColumn.equals(other.secondColumn)) {
178+
return false;
179+
}
166180
return true;
167181
}
168182
}

‎src/main/java/com/google/visualization/datasource/query/ColumnIsNullFilter.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,23 @@ public int hashCode() {
107107

108108
@Override
109109
public boolean equals(Object obj) {
110-
if (this == obj) return true;
111-
if (obj == null) return false;
112-
if (getClass() != obj.getClass()) return false;
110+
if (this == obj) {
111+
return true;
112+
}
113+
if (obj == null) {
114+
return false;
115+
}
116+
if (getClass() != obj.getClass()) {
117+
return false;
118+
}
113119
ColumnIsNullFilter other = (ColumnIsNullFilter) obj;
114120
if (column == null) {
115-
if (other.column != null) return false;
116-
} else if (!column.equals(other.column)) return false;
121+
if (other.column != null) {
122+
return false;
123+
}
124+
} else if (!column.equals(other.column)) {
125+
return false;
126+
}
117127
return true;
118128
}
119129
}

‎src/main/java/com/google/visualization/datasource/query/CompoundFilter.java‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,30 @@ public int hashCode() {
188188

189189
@Override
190190
public boolean equals(Object obj) {
191-
if (this == obj) return true;
192-
if (obj == null) return false;
193-
if (getClass() != obj.getClass()) return false;
191+
if (this == obj) {
192+
return true;
193+
}
194+
if (obj == null) {
195+
return false;
196+
}
197+
if (getClass() != obj.getClass()) {
198+
return false;
199+
}
194200
CompoundFilter other = (CompoundFilter) obj;
195201
if (operator == null) {
196-
if (other.operator != null) return false;
197-
} else if (!operator.equals(other.operator)) return false;
202+
if (other.operator != null) {
203+
return false;
204+
}
205+
} else if (!operator.equals(other.operator)) {
206+
return false;
207+
}
198208
if (subFilters == null) {
199-
if (other.subFilters != null) return false;
200-
} else if (!subFilters.equals(other.subFilters)) return false;
209+
if (other.subFilters != null) {
210+
return false;
211+
}
212+
} else if (!subFilters.equals(other.subFilters)) {
213+
return false;
214+
}
201215
return true;
202216
}
203217
}

‎src/main/java/com/google/visualization/datasource/query/QueryFormat.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,23 @@ public int hashCode() {
144144

145145
@Override
146146
public boolean equals(Object obj) {
147-
if (this == obj) return true;
148-
if (obj == null) return false;
149-
if (getClass() != obj.getClass()) return false;
147+
if (this == obj) {
148+
return true;
149+
}
150+
if (obj == null) {
151+
return false;
152+
}
153+
if (getClass() != obj.getClass()) {
154+
return false;
155+
}
150156
QueryFormat other = (QueryFormat) obj;
151157
if (columnPatterns == null) {
152-
if (other.columnPatterns != null) return false;
153-
} else if (!columnPatterns.equals(other.columnPatterns)) return false;
158+
if (other.columnPatterns != null) {
159+
return false;
160+
}
161+
} else if (!columnPatterns.equals(other.columnPatterns)) {
162+
return false;
163+
}
154164
return true;
155165
}
156166

‎src/main/java/com/google/visualization/datasource/query/QueryGroup.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,23 @@ public int hashCode() {
123123

124124
@Override
125125
public boolean equals(Object obj) {
126-
if (this == obj) return true;
127-
if (obj == null) return false;
128-
if (getClass() != obj.getClass()) return false;
126+
if (this == obj) {
127+
return true;
128+
}
129+
if (obj == null) {
130+
return false;
131+
}
132+
if (getClass() != obj.getClass()) {
133+
return false;
134+
}
129135
QueryGroup other = (QueryGroup) obj;
130136
if (columns == null) {
131-
if (other.columns != null) return false;
132-
} else if (!columns.equals(other.columns)) return false;
137+
if (other.columns != null) {
138+
return false;
139+
}
140+
} else if (!columns.equals(other.columns)) {
141+
return false;
142+
}
133143
return true;
134144
}
135145

‎src/main/java/com/google/visualization/datasource/query/QueryLabels.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,23 @@ public int hashCode() {
138138

139139
@Override
140140
public boolean equals(Object obj) {
141-
if (this == obj) return true;
142-
if (obj == null) return false;
143-
if (getClass() != obj.getClass()) return false;
141+
if (this == obj) {
142+
return true;
143+
}
144+
if (obj == null) {
145+
return false;
146+
}
147+
if (getClass() != obj.getClass()) {
148+
return false;
149+
}
144150
QueryLabels other = (QueryLabels) obj;
145151
if (columnLabels == null) {
146-
if (other.columnLabels != null) return false;
147-
} else if (!columnLabels.equals(other.columnLabels)) return false;
152+
if (other.columnLabels != null) {
153+
return false;
154+
}
155+
} else if (!columnLabels.equals(other.columnLabels)) {
156+
return false;
157+
}
148158
return true;
149159
}
150160

‎src/main/java/com/google/visualization/datasource/query/QueryOptions.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,22 @@ public int hashCode() {
9898

9999
@Override
100100
public boolean equals(Object obj) {
101-
if (this == obj) return true;
102-
if (obj == null) return false;
103-
if (getClass() != obj.getClass()) return false;
101+
if (this == obj) {
102+
return true;
103+
}
104+
if (obj == null) {
105+
return false;
106+
}
107+
if (getClass() != obj.getClass()) {
108+
return false;
109+
}
104110
QueryOptions other = (QueryOptions) obj;
105-
if (noFormat != other.noFormat) return false;
106-
if (noValues != other.noValues) return false;
111+
if (noFormat != other.noFormat) {
112+
return false;
113+
}
114+
if (noValues != other.noValues) {
115+
return false;
116+
}
107117
return true;
108118
}
109119

‎src/main/java/com/google/visualization/datasource/query/QueryPivot.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,23 @@ public int hashCode() {
120120

121121
@Override
122122
public boolean equals(Object obj) {
123-
if (this == obj) return true;
124-
if (obj == null) return false;
125-
if (getClass() != obj.getClass()) return false;
123+
if (this == obj) {
124+
return true;
125+
}
126+
if (obj == null) {
127+
return false;
128+
}
129+
if (getClass() != obj.getClass()) {
130+
return false;
131+
}
126132
QueryPivot other = (QueryPivot) obj;
127133
if (columns == null) {
128-
if (other.columns != null) return false;
129-
} else if (!columns.equals(other.columns)) return false;
134+
if (other.columns != null) {
135+
return false;
136+
}
137+
} else if (!columns.equals(other.columns)) {
138+
return false;
139+
}
130140
return true;
131141
}
132142

‎src/main/java/com/google/visualization/datasource/query/QuerySort.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,23 @@ public int hashCode() {
144144

145145
@Override
146146
public boolean equals(Object obj) {
147-
if (this == obj) return true;
148-
if (obj == null) return false;
149-
if (getClass() != obj.getClass()) return false;
147+
if (this == obj) {
148+
return true;
149+
}
150+
if (obj == null) {
151+
return false;
152+
}
153+
if (getClass() != obj.getClass()) {
154+
return false;
155+
}
150156
QuerySort other = (QuerySort) obj;
151157
if (sortColumns == null) {
152-
if (other.sortColumns != null) return false;
153-
} else if (!sortColumns.equals(other.sortColumns)) return false;
158+
if (other.sortColumns != null) {
159+
return false;
160+
}
161+
} else if (!sortColumns.equals(other.sortColumns)) {
162+
return false;
163+
}
154164
return true;
155165
}
156166

0 commit comments

Comments
 (0)