Skip to content

Commit cf182cc

Browse files
enisherenisher
committed
Minor: fixed warnings
1 parent 11958d7 commit cf182cc

File tree

3 files changed

+29
-36
lines changed

3 files changed

+29
-36
lines changed

‎core/src/main/java/com/orientechnologies/orient/core/command/traverse/OTraverse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.Collection;
20+
import java.util.Collections;
2021
import java.util.Iterator;
2122
import java.util.List;
2223

@@ -42,7 +43,7 @@ public class OTraverse implements OCommand, Iterable<OIdentifiable>, Iterator<OI
4243

4344
public enum STRATEGY {
4445
DEPTH_FIRST, BREADTH_FIRST
45-
};
46+
}
4647

4748
/*
4849
* Executes a traverse collecting all the result in the returning List<OIdentifiable>. This could be memory expensive because for
@@ -58,7 +59,7 @@ public List<OIdentifiable> execute() {
5859
}
5960

6061
public OTraverseAbstractProcess<?> currentProcess() {
61-
return (OTraverseAbstractProcess<?>) context.peek();
62+
return context.peek();
6263
}
6364

6465
public boolean hasNext() {
@@ -125,8 +126,7 @@ public OTraverse target(final Iterable<? extends OIdentifiable> iTarget) {
125126

126127
public OTraverse target(final OIdentifiable... iRecords) {
127128
final List<OIdentifiable> list = new ArrayList<OIdentifiable>();
128-
for (OIdentifiable id : iRecords)
129-
list.add(id);
129+
Collections.addAll(list, iRecords);
130130
return target(list.iterator());
131131
}
132132

‎core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLResultsetAbstract.java

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,20 @@
1515
*/
1616
package com.orientechnologies.orient.core.sql;
1717

18+
import java.util.ArrayList;
19+
import java.util.Collections;
20+
import java.util.HashSet;
21+
import java.util.Iterator;
22+
import java.util.LinkedHashMap;
23+
import java.util.List;
24+
import java.util.Map;
25+
import java.util.Map.Entry;
26+
import java.util.Set;
27+
1828
import com.orientechnologies.orient.core.command.OCommandRequest;
1929
import com.orientechnologies.orient.core.command.OCommandRequestText;
2030
import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
2131
import com.orientechnologies.orient.core.db.record.ODatabaseRecord;
22-
import com.orientechnologies.orient.core.db.record.ODatabaseRecordAbstract;
2332
import com.orientechnologies.orient.core.db.record.OIdentifiable;
2433
import com.orientechnologies.orient.core.exception.OCommandExecutionException;
2534
import com.orientechnologies.orient.core.id.ORID;
@@ -46,16 +55,6 @@
4655
import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
4756
import com.orientechnologies.orient.core.storage.OStorage;
4857

49-
import java.util.ArrayList;
50-
import java.util.Collections;
51-
import java.util.HashSet;
52-
import java.util.Iterator;
53-
import java.util.LinkedHashMap;
54-
import java.util.List;
55-
import java.util.Map;
56-
import java.util.Map.Entry;
57-
import java.util.Set;
58-
5958
/**
6059
* Executes a TRAVERSE crossing records. Returns a List<OIdentifiable> containing all the traversed records that match the WHERE
6160
* condition.
@@ -166,8 +165,8 @@ protected Object getResult() {
166165
if (!(d instanceof OIdentifiable))
167166
// NON-DOCUMENT AS RESULT, COMES FROM EXPAND? CREATE A DOCUMENT AT THE FLY
168167
d = new ODocument().field("value", d);
169-
else if(!(d instanceof ORID || d instanceof ORecord))
170-
d = ((OIdentifiable) d).getRecord();
168+
else if (!(d instanceof ORID || d instanceof ORecord))
169+
d = ((OIdentifiable) d).getRecord();
171170

172171
if (!request.getResultListener().result(d))
173172
break;
@@ -186,13 +185,12 @@ protected boolean handleResult(final OIdentifiable iRecord, boolean iCloneIt) {
186185

187186
OIdentifiable recordCopy = iRecord instanceof ORecord<?> ? ((ORecord<?>) iRecord).copy() : iRecord.getIdentity().copy();
188187

189-
if (recordCopy != null)
190-
// CALL THE LISTENER NOW
191-
if (request.getResultListener() != null) {
192-
final boolean result = request.getResultListener().result(recordCopy);
193-
if (!result)
194-
return false;
195-
}
188+
// CALL THE LISTENER NOW
189+
if (recordCopy != null && request.getResultListener() != null) {
190+
final boolean result = request.getResultListener().result(recordCopy);
191+
if (!result)
192+
return false;
193+
}
196194

197195
if (limit > -1 && resultCount >= limit)
198196
// BREAK THE EXECUTION
@@ -237,7 +235,6 @@ else if (letValueAsString.startsWith("(")) {
237235
*
238236
* @param w
239237
*
240-
* @return
241238
* @return the limit found as integer, or -1 if no limit is found. -1 means no limits.
242239
* @throws OCommandSQLParsingException
243240
* if no valid limit has been found
@@ -266,7 +263,6 @@ protected int parseLimit(final String w) throws OCommandSQLParsingException {
266263
*
267264
* @param w
268265
*
269-
* @return
270266
* @return the skip found as integer, or -1 if no skip is found. -1 means no skip.
271267
* @throws OCommandSQLParsingException
272268
* if no valid skip has been found
@@ -365,8 +361,8 @@ protected void searchInClasses() {
365361
.getVariable("$locking") : OStorage.LOCKING_STRATEGY.DEFAULT;
366362

367363
final ORID[] range = getRange();
368-
target = new ORecordIteratorClass<ORecordInternal<?>>(database, (ODatabaseRecordAbstract) database, cls.getName(), true,
369-
request.isUseCache(), false, locking).setRange(range[0], range[1]);
364+
target = new ORecordIteratorClass<ORecordInternal<?>>(database, database, cls.getName(), true, request.isUseCache(), false,
365+
locking).setRange(range[0], range[1]);
370366
}
371367

372368
protected void searchInClusters() {
@@ -432,8 +428,6 @@ protected void applyLimitAndSkip() {
432428

433429
/**
434430
* Optimizes the condition tree.
435-
*
436-
* @return
437431
*/
438432
protected void optimize() {
439433
if (compiledFilter != null)

‎core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLTraverse.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@
1515
*/
1616
package com.orientechnologies.orient.core.sql;
1717

18+
import java.util.Arrays;
1819
import java.util.HashSet;
1920
import java.util.Iterator;
2021
import java.util.List;
2122
import java.util.Map;
2223
import java.util.Set;
2324

2425
import com.orientechnologies.common.log.OLogManager;
25-
import com.orientechnologies.common.parser.OBaseParser;
2626
import com.orientechnologies.orient.core.command.OCommandContext;
2727
import com.orientechnologies.orient.core.command.OCommandRequest;
28-
import com.orientechnologies.orient.core.command.OCommandRequestText;
2928
import com.orientechnologies.orient.core.command.traverse.OTraverse;
3029
import com.orientechnologies.orient.core.db.record.OIdentifiable;
3130
import com.orientechnologies.orient.core.exception.OQueryParsingException;
@@ -120,7 +119,7 @@ else if (w.equals(KEYWORD_STRATEGY))
120119
else
121120
traverse.limit(limit);
122121

123-
((OCommandRequestText) iRequest).getContext().setChild(traverse.getContext());
122+
iRequest.getContext().setChild(traverse.getContext());
124123

125124
return this;
126125
}
@@ -150,7 +149,7 @@ public Object execute(final Map<Object, Object> iArgs) {
150149
context.beginExecution(timeoutMs, timeoutStrategy);
151150

152151
// BROWSE ALL THE RECORDS AND COLLECTS RESULT
153-
final List<OIdentifiable> result = (List<OIdentifiable>) traverse.execute();
152+
final List<OIdentifiable> result = traverse.execute();
154153
for (OIdentifiable r : result)
155154
handleResult(r, true);
156155

@@ -211,7 +210,7 @@ protected int parseFields() {
211210
final String fieldName = field.trim();
212211

213212
if (fieldName.contains("("))
214-
fields.add(OSQLHelper.parseValue((OBaseParser) null, fieldName, context));
213+
fields.add(OSQLHelper.parseValue(null, fieldName, context));
215214
else
216215
fields.add(fieldName);
217216
}
@@ -238,7 +237,7 @@ protected boolean parseStrategy(final String w) throws OCommandSQLParsingExcepti
238237
try {
239238
traverse.setStrategy(OTraverse.STRATEGY.valueOf(strategyWord.toUpperCase()));
240239
} catch (IllegalArgumentException e) {
241-
throwParsingException("Invalid " + KEYWORD_STRATEGY + ". Use one between " + OTraverse.STRATEGY.values());
240+
throwParsingException("Invalid " + KEYWORD_STRATEGY + ". Use one between " + Arrays.toString(OTraverse.STRATEGY.values()));
242241
}
243242
return true;
244243
}

0 commit comments

Comments
 (0)