From 669d92b2302ea31b71804deef33738f69fbb738a Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Sat, 21 Apr 2018 00:04:30 +0100 Subject: [PATCH] OGM-1407 Check Positional parameters without using Apache Commmons --- .../ogm/datastore/neo4j/query/impl/QueryParser.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/query/impl/QueryParser.java b/neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/query/impl/QueryParser.java index 9e03e1f56f..8374b13548 100644 --- a/neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/query/impl/QueryParser.java +++ b/neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/query/impl/QueryParser.java @@ -7,8 +7,6 @@ package org.hibernate.ogm.datastore.neo4j.query.impl; import org.hibernate.engine.query.spi.ParameterParser.Recognizer; - -import org.apache.commons.lang3.math.NumberUtils; import org.parboiled.BaseParser; import org.parboiled.Rule; import org.parboiled.annotations.SkipNode; @@ -166,9 +164,12 @@ private RecognizerAdapter(Recognizer recognizer) { } private boolean addParameter(String identifier, int position) { - return NumberUtils.isCreatable( identifier ) - ? addPositionalParameter( Integer.parseInt( identifier ), position ) - : addNamedParameter( identifier, position ); + try { + return addPositionalParameter( Integer.parseInt( identifier ), position ); + } + catch (NumberFormatException nfe) { + return addNamedParameter( identifier, position ); + } } private boolean addNamedParameter(String name, int position) {