- */
-public class DbQuery extends DbQueryBase {
-
- /**
- * Creates new query.
- */
- public DbQuery(final DbOom dbOom, final Connection conn, final String sqlString) {
- super(dbOom);
- this.connection = conn;
- this.sqlString = sqlString;
- }
-
- public static DbQuery query(final Connection conn, final String sqlString) {
- return new DbQuery(DbOom.get(), conn, sqlString);
- }
-
- /**
- * Creates a new query from {@link DbSession}.
- */
- public DbQuery(final DbOom dbOom, final DbSession session, final String sqlString) {
- super(dbOom);
- initSession(session);
- this.session.attachQuery(this);
- this.sqlString = sqlString;
- }
-
- public static DbQuery query(final DbSession session, final String sqlString) {
- return new DbQuery(DbOom.get(), session, sqlString);
- }
-
- /**
- * Creates a new query using default session provider.
- */
- public DbQuery(final DbOom dbOom, final String sqlString) {
- this(dbOom, (DbSession)null, sqlString);
- }
-
- public static DbQuery query(final String sqlString) {
- return new DbQuery(DbOom.get(), sqlString);
- }
-
-
- // ---------------------------------------------------------------- additional statement parameters
-
- /**
- * Clears the current parameter values immediately.
- *
- * In general, parameter values remain in force for repeated use of a
- * statement. Setting a parameter value automatically clears its
- * previous value. However, in some cases it is useful to immediately
- * release the resources used by the current parameter values; this can
- * be done by calling the method clearParameters.
- */
- public Q clearParameters() {
- init();
- if (preparedStatement == null) {
- return _this();
- }
- try {
- preparedStatement.clearParameters();
- } catch (SQLException sex) {
- throw new DbSqlException(sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- methods for setting statement parameters
-
- private void throwSetParamError(final int index, final Exception ex) {
- throw new DbSqlException(this, "Invalid SQL parameter with index: " + index, ex);
- }
-
- private void throwSetParamError(final String param, final Exception ex) {
- throw new DbSqlException(this, "Invalid SQL parameter with name: " + param, ex);
- }
-
- // ---------------------------------------------------------------- null
-
- public Q setNull(final int index, final int type) {
- initPrepared();
- try {
- preparedStatement.setNull(index, type);
- } catch (SQLException sex) {
- throw new DbSqlException(this, "Failed to set null to parameter: " + index, sex);
- }
- return _this();
- }
-
- public Q setNull(final String param, final int type) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setNull(position, type);
- }
- } catch (SQLException sex) {
- throw new DbSqlException(this, "Failed to set null to parameter: " + param, sex);
- }
- return _this();
- }
-
- public Q setNull(final int index, final int type, final String typeName) {
- initPrepared();
- try {
- preparedStatement.setNull(index, type, typeName);
- } catch (SQLException sex) {
- throw new DbSqlException(this, "Failed to set null to parameter: " + index, sex);
- }
- return _this();
- }
-
- public Q setNull(final String param, final int value, final String typeName) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setNull(position, value, typeName);
- }
- } catch (SQLException sex) {
- throw new DbSqlException(this, "Failed to set null to parameter: " + param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- int
-
- public Q setInteger(final int index, final int value) {
- initPrepared();
- try {
- preparedStatement.setInt(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setInteger(final String param, final int value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setInt(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q outInteger(final int index) {
- return registerOutParameter(index, Types.INTEGER);
- }
- public Q outInteger(final String param) {
- return registerOutParameter(param, Types.INTEGER);
- }
-
- // ---------------------------------------------------------------- Integer
-
- public Q setInteger(final int index, final Number value) {
- if (value == null) {
- setNull(index, Types.INTEGER);
- }
- else {
- setInteger(index, value.intValue());
- }
- return _this();
- }
-
- public Q setInteger(final String param, final Number value) {
- if (value == null) {
- setNull(param, Types.INTEGER);
- }
- else {
- setInteger(param, value.intValue());
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- boolean
-
- public Q setBoolean(final int index, final boolean value) {
- initPrepared();
- try {
- preparedStatement.setBoolean(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setBoolean(final String param, final boolean value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setBoolean(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q outBoolean(final int index) {
- return registerOutParameter(index, Types.BOOLEAN);
- }
- public Q outBoolean(final String param) {
- return registerOutParameter(param, Types.BOOLEAN);
- }
-
- // ---------------------------------------------------------------- Boolean
-
- public Q setBoolean(final int index, final Boolean value) {
- if (value == null) {
- setNull(index, Types.BOOLEAN);
- }
- else {
- setBoolean(index, value.booleanValue());
- }
- return _this();
- }
-
- public Q setBoolean(final String param, final Boolean value) {
- if (value == null) {
- setNull(param, Types.BOOLEAN);
- }
- else {
- setBoolean(param, value.booleanValue());
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- long
-
- public Q setLong(final int index, final long value) {
- initPrepared();
- try {
- preparedStatement.setLong(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setLong(final String param, final long value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setLong(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- Long
-
- public Q setLong(final int index, final Number value) {
- if (value == null) {
- setNull(index, Types.BIGINT);
- }
- else {
- setLong(index, value.longValue());
- }
- return _this();
- }
-
- public Q setLong(final String param, final Number value) {
- if (value == null) {
- setNull(param, Types.BIGINT);
- }
- else {
- setLong(param, value.longValue());
- }
- return _this();
- }
-
- public Q outLong(final int index) {
- return registerOutParameter(index, Types.BIGINT);
- }
- public Q outLong(final String param) {
- return registerOutParameter(param, Types.BIGINT);
- }
-
- // ---------------------------------------------------------------- byte
-
- public Q setByte(final int index, final byte value) {
- initPrepared();
- try {
- preparedStatement.setByte(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setByte(final String param, final byte value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setByte(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q outByte(final int index) {
- return registerOutParameter(index, Types.SMALLINT);
- }
- public Q outByte(final String param) {
- return registerOutParameter(param, Types.SMALLINT);
- }
-
- // ---------------------------------------------------------------- Byte
-
- public Q setByte(final int index, final Number value) {
- if (value == null) {
- setNull(index, Types.SMALLINT);
- }
- else {
- setByte(index, value.byteValue());
- }
- return _this();
- }
-
- public Q setByte(final String param, final Number value) {
- if (value == null) {
- setNull(param, Types.SMALLINT);
- }
- else {
- setByte(param, value.byteValue());
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- bytes[]
-
- public Q setBytes(final int index, final byte[] value) {
- initPrepared();
- try {
- preparedStatement.setBytes(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setBytes(final String param, final byte[] value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setBytes(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- double
-
- public Q setDouble(final int index, final double value) {
- initPrepared();
- try {
- preparedStatement.setDouble(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setDouble(final String param, final double value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setDouble(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q outDouble(final int index) {
- return registerOutParameter(index, Types.DOUBLE);
- }
- public Q outDouble(final String param) {
- return registerOutParameter(param, Types.DOUBLE);
- }
-
- // ---------------------------------------------------------------- Double
-
- public Q setDouble(final int index, final Number value) {
- if (value == null) {
- setNull(index, Types.DOUBLE);
- }
- else {
- setDouble(index, value.doubleValue());
- }
- return _this();
- }
-
- public Q setDouble(final String param, final Number value) {
- if (value == null) {
- setNull(param, Types.DOUBLE);
- }
- else {
- setDouble(param, value.doubleValue());
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- float
-
- public Q setFloat(final int index, final float value) {
- initPrepared();
- try {
- preparedStatement.setFloat(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setFloat(final String param, final float value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setFloat(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q outFloat(final int index) {
- return registerOutParameter(index, Types.FLOAT);
- }
- public Q outFloat(final String param) {
- return registerOutParameter(param, Types.FLOAT);
- }
-
- // ---------------------------------------------------------------- Float
-
- public Q setFloat(final int index, final Number value) {
- if (value == null) {
- setNull(index, Types.FLOAT);
- }
- else {
- setFloat(index, value.floatValue());
- }
- return _this();
- }
-
- public Q setFloat(final String param, final Number value) {
- if (value == null) {
- setNull(param, Types.FLOAT);
- }
- else {
- setFloat(param, value.floatValue());
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- short
-
- public Q setShort(final int index, final short value) {
- initPrepared();
- try {
- preparedStatement.setShort(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setShort(final String param, final short value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- final int index = position;
- preparedStatement.setShort(index, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- Short
-
- public Q setShort(final int index, final Number value) {
- if (value == null) {
- setNull(index, Types.SMALLINT);
- }
- else {
- setShort(index, value.shortValue());
- }
- return _this();
- }
-
- public Q setShort(final String param, final Number value) {
- if (value == null) {
- setNull(param, Types.SMALLINT);
- }
- else {
- setShort(param, value.shortValue());
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- string
-
- public Q setString(final int index, final String value) {
- initPrepared();
- try {
- preparedStatement.setString(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setString(final String param, final String value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setString(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q outString(final int index) {
- return registerOutParameter(index, Types.VARCHAR);
- }
- public Q outString(final String param) {
- return registerOutParameter(param, Types.VARCHAR);
- }
-
-
- // ---------------------------------------------------------------- date
-
- public Q setDate(final int index, final Date value) {
- initPrepared();
- try {
- preparedStatement.setDate(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setDate(final String param, final Date value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setDate(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- time
-
- public Q setTime(final int index, final Time value) {
- initPrepared();
- try {
- preparedStatement.setTime(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setTime(final String param, final Time value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setTime(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- timestamp
-
- public Q setTimestamp(final int index, final Timestamp value) {
- initPrepared();
- try {
- preparedStatement.setTimestamp(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setTimestamp(final String param, final Timestamp value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setTimestamp(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- big decimal
-
- public Q setBigDecimal(final int index, final BigDecimal value) {
- initPrepared();
- try {
- preparedStatement.setBigDecimal(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setBigDecimal(final String param, final BigDecimal value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setBigDecimal(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- big integer
-
- public Q setBigInteger(final int index, final BigInteger value) {
- if (value == null) {
- setNull(index, Types.NUMERIC);
- }
- else {
- setLong(index, value.longValue());
- }
- return _this();
- }
-
- public Q setBigInteger(final String param, final BigInteger value) {
- if (value == null) {
- setNull(param, Types.NUMERIC);
- }
- else {
- setLong(param, value.longValue());
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- URL
-
-
- public Q setURL(final int index, final URL value) {
- initPrepared();
- try {
- preparedStatement.setURL(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setURL(final String param, final URL value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setURL(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- BLOB
-
- public Q setBlob(final int index, final Blob value) {
- initPrepared();
- try {
- preparedStatement.setBlob(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setBlob(final String param, final Blob value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setBlob(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- CLOB
-
- public Q setClob(final int index, final Clob value) {
- initPrepared();
- try {
- preparedStatement.setClob(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setClob(final String param, final Clob value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setClob(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- Array
-
- public Q setArray(final int index, final Array value) {
- initPrepared();
- try {
- preparedStatement.setArray(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setArray(final String param, final Array value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setArray(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- Ref
-
- public Q setRef(final int index, final Ref value) {
- initPrepared();
- try {
- preparedStatement.setRef(index, value);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setRef(final String param, final Ref value) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setRef(position, value);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- ascii streams
-
- public Q setAsciiStream(final int index, final InputStream stream) {
- initPrepared();
- try {
- preparedStatement.setAsciiStream(index, stream, stream.available());
- } catch (IOException | SQLException ioex) {
- throwSetParamError(index, ioex);
- }
- return _this();
- }
-
- public Q setAsciiStream(final String param, final InputStream stream) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setAsciiStream(position, stream, stream.available());
- }
- } catch (IOException | SQLException ioex) {
- throwSetParamError(param, ioex);
- }
- return _this();
- }
-
- public Q setAsciiStream(final int index, final InputStream stream, final int length) {
- initPrepared();
- try {
- preparedStatement.setAsciiStream(index, stream, length);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setAsciiStream(final String param, final InputStream stream, final int length) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setAsciiStream(position, stream, length);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- public Q setCharacterStream(final int index, final Reader reader, final int length) {
- initPrepared();
- try {
- preparedStatement.setCharacterStream(index, reader, length);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- public Q setCharacterStream(final String param, final Reader reader, final int length) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setCharacterStream(position, reader, length);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- bean
-
- /**
- * Sets bean parameters from bean. Non-existing bean properties are ignored.
- */
- public Q setBean(final String beanName, final Object bean) {
- if (bean == null) {
- return _this();
- }
- init();
- final String beanNamePrefix = beanName + '.';
-
- query.forEachNamedParameter(p -> {
- final String paramName = p.name;
-
- if (paramName.startsWith(beanNamePrefix)) {
- final String propertyName = paramName.substring(beanNamePrefix.length());
-
- if (BeanUtil.declared.hasRootProperty(bean, propertyName)) {
- final Object value = BeanUtil.declared.getProperty(bean, propertyName);
- setObject(paramName, value);
- }
- }
-
- });
-
- return _this();
- }
-
- // ---------------------------------------------------------------- map
-
- /**
- * Sets properties from the map.
- */
- public Q setMap(final Map parameters) {
- if (parameters == null) {
- return _this();
- }
- init();
- query.forEachNamedParameter(p -> {
- final String paramName = p.name;
- setObject(paramName, parameters.get(paramName));
- });
- return _this();
- }
-
-
- // ---------------------------------------------------------------- objects
-
- /**
- * Sets the value of the designated parameter with the given object.
- * This method is like the method setObject
- * above, except that it assumes a scale of zero.
- */
- public Q setObject(final int index, final Object object, final int targetSqlType) {
- initPrepared();
- try {
- preparedStatement.setObject(index, object, targetSqlType);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- /**
- * Sets the value of the designated parameter with the given object.
- * This method is like the method setObject
- * above, except that it assumes a scale of zero.
- */
- public Q setObject(final String param, final Object object, final int targetSqlType) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setObject(position, object, targetSqlType);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- /**
- * Sets the value of the designated parameter with the given object.
- * This method is like the method setObject
- * above, except that it assumes a scale of zero.
- */
- void setObject(final int index, final Object object, final int targetSqlType, final int scale) {
- initPrepared();
- try {
- preparedStatement.setObject(index, object, targetSqlType, scale);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- }
-
- /**
- * Sets the value of the designated parameter with the given object.
- * This method is like the method setObject
- * above, except that it assumes a scale of zero.
- */
- void setObject(final String param, final Object object, final int targetSqlType, final int scale) {
- initPrepared();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- preparedStatement.setObject(position, object, targetSqlType, scale);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- }
-
-
-
- // ---------------------------------------------------------------- object ex
-
- /**
- * @see #setObject(String, Object, Class, int)
- */
- public Q setObject(final int index, final Object value) {
- setObject(index, value, null, Types.OTHER);
- return _this();
- }
-
- /**
- * Sets object parameter in an advanced way.
- *
- * First, it checks if object is null and invokes setNull if so.
- * If object is not null, it tries to resolve {@link SqlType sql type} (by looking up
- * or using provided class) and use it for setting data.
- * If sql type is not found, default setObject is invoked.
- */
- @SuppressWarnings({"unchecked"})
- public Q setObject(final int index, final Object value, final Class sqlTypeClass, final int dbSqlType) {
- init();
- if (value == null) {
- setNull(index, Types.NULL);
- return _this();
- }
- final SqlType sqlType;
- if (sqlTypeClass != null) {
- sqlType = SqlTypeManager.get().lookupSqlType(sqlTypeClass);
- } else {
- sqlType = SqlTypeManager.get().lookup(value.getClass());
- }
- try {
- if ((sqlType != null) && (dbSqlType != SqlType.DB_SQLTYPE_NOT_AVAILABLE)) {
- sqlType.storeValue(preparedStatement, index, value, dbSqlType);
- } else {
- DbUtil.setPreparedStatementObject(preparedStatement, index, value, dbSqlType);
- }
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
-
- /**
- * @see #setObject(String, Object, Class, int)
- */
- public Q setObject(final String param, final Object value) {
- setObject(param, value, null, Types.OTHER);
- return _this();
- }
-
- /**
- * @see #setObject(String, Object, Class, int)
- */
- public Q setObject(final String param, final Object value, final Class sqlTypeClass, final int dbSqlType) {
- init();
- final int[] positions = query.getNamedParameterIndices(param);
- for (final int position : positions) {
- setObject(position, value, sqlTypeClass, dbSqlType);
- }
- return _this();
- }
-
-
- // ---------------------------------------------------------------- set object shortcuts
-
- /**
- * Sets an array of objects parameters in given order.
- */
- public Q setObjects(final Object... objects) {
- int index = 1;
- for (final Object object : objects) {
- setObject(index++, object);
- }
- return _this();
- }
-
- /**
- * Sets sql parameters from two arrays: names and values.
- */
- public Q setObjects(final String[] names, final Object[] values) {
- init();
- if (names.length != values.length) {
- throw new DbSqlException(this, "Different number of parameter names and values");
- }
- for (int i = 0; i < names.length; i++) {
- setObject(names[i], values[i]);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- batch
-
- /**
- * Sets batch parameters with given array of values.
- */
- public Q setBatch(final String name, final int[] array, int startingIndex) {
- init();
- final int batchSize = query.getBatchParameterSize(name);
-
- for (int i = 1; i <= batchSize; i++) {
- final String paramName = name + '.' + i;
-
- if (startingIndex < array.length) {
- setInteger(paramName, array[startingIndex]);
- } else {
- setNull(paramName, Types.INTEGER);
- }
- startingIndex++;
- }
- return _this();
- }
- /**
- * Sets batch parameters with given array of values.
- */
- public Q setBatch(final String name, final long[] array, int startingIndex) {
- init();
- final int batchSize = query.getBatchParameterSize(name);
-
- for (int i = 1; i <= batchSize; i++) {
- final String paramName = name + '.' + i;
-
- if (startingIndex < array.length) {
- setLong(paramName, array[startingIndex]);
- } else {
- setNull(paramName, Types.INTEGER);
- }
- startingIndex++;
- }
- return _this();
- }
-
- /**
- * Sets batch parameters with given array of values.
- */
- public Q setBatch(final String name, final Object[] array, int startingIndex) {
- init();
- final int batchSize = query.getBatchParameterSize(name);
-
- for (int i = 1; i <= batchSize; i++) {
- final String paramName = name + '.' + i;
-
- if (startingIndex < array.length) {
- setObject(paramName, array[startingIndex]);
- } else {
- setObject(paramName, null);
- }
- startingIndex++;
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- utils
-
- private void initPrepared() {
- init();
- if (preparedStatement == null) {
- throw new DbSqlException("Prepared statement not initialized.");
- }
- }
- private void initCallable() {
- init();
- if (callableStatement == null) {
- throw new DbSqlException("Callable statement not initialized.");
- }
- }
-
- private Q registerOutParameter(final int index, final int type) {
- initCallable();
- try {
- callableStatement.registerOutParameter(index,type);
- } catch (SQLException sex) {
- throwSetParamError(index, sex);
- }
- return _this();
- }
- private Q registerOutParameter(final String param, final int type) {
- initCallable();
- final int[] positions = query.getNamedParameterIndices(param);
- try {
- for (final int position : positions) {
- callableStatement.registerOutParameter(position, type);
- }
- } catch (SQLException sex) {
- throwSetParamError(param, sex);
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- close
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Q autoClose() {
- super.autoClose();
- return _this();
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbQueryBase.java b/jodd-db/src/main/java/jodd/db/DbQueryBase.java
deleted file mode 100644
index 8368eab00..000000000
--- a/jodd-db/src/main/java/jodd/db/DbQueryBase.java
+++ /dev/null
@@ -1,1004 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import jodd.db.debug.LoggableCallableStatement;
-import jodd.db.debug.LoggablePreparedStatement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static jodd.db.DbQueryBase.State.CLOSED;
-import static jodd.db.DbQueryBase.State.CREATED;
-import static jodd.db.DbQueryBase.State.INITIALIZED;
-
-/**
- * Support for {@link DbQuery} holds all configuration, initialization and the execution code.
- */
-abstract class DbQueryBase implements AutoCloseable {
-
- private static final Logger log = LoggerFactory.getLogger(DbQueryBase.class);
-
- protected final DbOom dbOom;
-
- // ---------------------------------------------------------------- ctor
-
- protected DbQueryBase(final DbOom dbOom) {
- this.dbOom = dbOom;
- this.forcePreparedStatement = dbOom.queryConfig().isForcePreparedStatement();
- this.type = dbOom.queryConfig().getType();
- this.concurrencyType = dbOom.queryConfig().getConcurrencyType();
- this.holdability = dbOom.queryConfig().getHoldability();
- this.debug = dbOom.queryConfig().isDebug();
- this.fetchSize = dbOom.queryConfig().getFetchSize();
- this.maxRows = dbOom.queryConfig().getMaxRows();
- }
-
- @SuppressWarnings("unchecked")
- protected Q _this() {
- return (Q) this;
- }
-
-
- // ---------------------------------------------------------------- query states
-
- /**
- * Query states.
- */
- public enum State {
- CREATED, INITIALIZED, CLOSED
- }
- protected State queryState = CREATED;
-
- /**
- * Returns query state.
- */
- public State getQueryState() {
- return queryState;
- }
-
- /**
- * Checks if query is not closed and throws an exception if it is.
- */
- protected void checkNotClosed() {
- if (queryState == CLOSED) {
- throw new DbSqlException(this, "Query is closed. Operation may be performed only on active queries.");
- }
- }
-
- /**
- * Checks if query is created (and not yet initialized or closed) and throws an exception if it is not.
- */
- protected void checkCreated() {
- if (queryState != CREATED) {
- final String message = (queryState == INITIALIZED ?
- "Query is already initialized." : "Query is closed.");
- throw new DbSqlException(this, message + " Operation may be performed only on created queries.");
- }
- }
-
- /**
- * Checks if query is initialized and throws an exception if it is not.
- */
- protected void checkInitialized() {
- if (queryState != INITIALIZED) {
- final String message = (queryState == CREATED ?
- "Query is created but not yet initialized." : "Query is closed.");
- throw new DbSqlException(this, message + " Operation may be performed only on initialized queries.");
- }
- }
-
-
-
- /**
- * Returns true if query is closed.
- */
- public boolean isClosed() {
- return queryState == CLOSED;
- }
-
- /**
- * Returns true if query is active: created and possibly initialized.
- * Opened query may be not initialized.
- */
- public boolean isActive() {
- return queryState != CLOSED;
- }
-
- /**
- * Returns true if query is initialized. Initialized query is the one that has
- * created JDBC statements.
- */
- public boolean isInitialized() {
- return queryState == INITIALIZED;
- }
-
- // ---------------------------------------------------------------- input
-
- protected Connection connection;
- protected DbSession session;
- protected String sqlString;
-
- /**
- * Returns used {@link DbSession}.
- */
- public DbSession getSession() {
- return session;
- }
-
- // ---------------------------------------------------------------- statement
-
- protected Statement statement;
- protected PreparedStatement preparedStatement;
- protected CallableStatement callableStatement;
- protected Set resultSets;
- protected DbQueryParser query;
-
- /**
- * Stores result set.
- */
- protected void saveResultSet(final ResultSet rs) {
- if (resultSets == null) {
- resultSets = new HashSet<>();
- }
- resultSets.add(rs);
- }
-
- // ---------------------------------------------------------------- configuration
-
- /**
- * If set to true all created statements will be prepared.
- */
- protected boolean forcePreparedStatement;
-
- /**
- * Forces creation of prepared statements.
- */
- public Q forcePreparedStatement() {
- checkCreated();
- forcePreparedStatement = true;
- return _this();
- }
-
- // ---------------------------------------------------------------- initialization
-
- /**
- * Initializes the query if not already initialized.
- * Usually, user doesn't have to invoke it at all, since it will
- * be called before all methods that deals directly with JDBC statement.
- * Throws an exception if called on closed query.
- */
- public final void init() {
- checkNotClosed();
- if (queryState == INITIALIZED) {
- return;
- }
- initializeJdbc();
- queryState = INITIALIZED;
- prepareQuery();
- }
-
- /**
- * Initializes session. When not specified (i.e. is null),
- * session is fetched from session provider.
- */
- protected void initSession(final DbSession session) {
- if (session != null) {
- this.session = session;
- return;
- }
-
- final DbSessionProvider dbSessionProvider = dbOom.sessionProvider();
-
- this.session = dbSessionProvider.getDbSession();
- }
-
- /**
- * Performs JDBC initialization of the query. Obtains connection, parses the SQL query string
- * and creates statements. Initialization is performed only once, when switching to initialized state.
- */
- @SuppressWarnings("MagicConstant")
- protected void initializeJdbc() {
- // connection
- if (connection == null) {
- initSession(session);
-
- connection = session.getConnection();
- }
-
- this.query = new DbQueryParser(sqlString);
-
- // callable statement
-
- if (query.callable) {
- try {
- if (debug) {
- if (holdability != QueryHoldability.DEFAULT) {
- callableStatement = new LoggableCallableStatement(
- connection.prepareCall(query.sql, type.value(), concurrencyType.value(), holdability.value()),
- query.sql
- );
- } else {
- callableStatement = new LoggableCallableStatement(
- connection.prepareCall(query.sql, type.value(), concurrencyType.value()),
- query.sql
- );
- }
- }
- else {
- if (holdability != QueryHoldability.DEFAULT) {
- callableStatement = connection.prepareCall(
- query.sql, type.value(), concurrencyType.value(), holdability.value());
- } else {
- callableStatement = connection.prepareCall(
- query.sql, type.value(), concurrencyType.value());
- }
- }
- }
- catch (final SQLException sex) {
- throw new DbSqlException(this, "Error creating callable statement", sex);
- }
-
- preparedStatement = callableStatement;
- statement = callableStatement;
-
- return;
- }
-
- // prepared statement
-
- if (query.prepared || forcePreparedStatement) {
- try {
- if (debug) {
- if (generatedColumns != null) {
- if (generatedColumns.length == 0) {
- preparedStatement = new LoggablePreparedStatement(
- connection.prepareStatement(query.sql, Statement.RETURN_GENERATED_KEYS),
- query.sql);
- } else {
- preparedStatement = new LoggablePreparedStatement(
- connection.prepareStatement(query.sql, generatedColumns),
- query.sql);
- }
- } else {
- if (holdability != QueryHoldability.DEFAULT) {
- preparedStatement = new LoggablePreparedStatement(
- connection.prepareStatement(query.sql, type.value(), concurrencyType.value(), holdability.value()),
- query.sql);
- } else {
- preparedStatement = new LoggablePreparedStatement(
- connection.prepareStatement(query.sql, type.value(), concurrencyType.value()),
- query.sql);
- }
- }
- } else {
- if (generatedColumns != null) {
- if (generatedColumns.length == 0) {
- preparedStatement = connection.prepareStatement(query.sql, Statement.RETURN_GENERATED_KEYS);
- } else {
- preparedStatement = connection.prepareStatement(query.sql, generatedColumns);
- }
- } else {
- if (holdability != QueryHoldability.DEFAULT) {
- preparedStatement = connection.prepareStatement(
- query.sql, type.value(), concurrencyType.value(), holdability.value());
- } else {
- preparedStatement = connection.prepareStatement(
- query.sql, type.value(), concurrencyType.value());
- }
- }
- }
- }
- catch (final SQLException sex) {
- throw new DbSqlException(this, "Error creating prepared statement", sex);
- }
-
- statement = preparedStatement;
-
- return;
- }
-
- // statement
-
- try {
- if (holdability != QueryHoldability.DEFAULT) {
- statement = connection.createStatement(type.value(), concurrencyType.value(), holdability.value());
- } else {
- statement = connection.createStatement(type.value(), concurrencyType.value());
- }
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "Error creating statement", sex);
- }
- }
-
- /**
- * Prepares the query just after the initialization.
- * Query is fully set and ready.
- */
- protected void prepareQuery() {
- if (fetchSize != 0) {
- setFetchSize(fetchSize);
- }
- if (maxRows != 0) {
- setMaxRows(maxRows);
- }
- }
-
-
- // ---------------------------------------------------------------- close
-
- protected boolean autoClose;
-
- /**
- * Defines that query should be automatically closed immediately after using.
- * Should be called before actual statement execution.
- */
- public Q autoClose() {
- autoClose = true;
- return _this();
- }
-
- /**
- * Closes all result sets opened by this query. Query remains active.
- * Returns SQLException (stacked with all exceptions)
- * or null.
- */
- private SQLException closeQueryResultSets() {
- SQLException sqlException = null;
-
- if (resultSets != null) {
- for (final ResultSet rs : resultSets) {
- try {
- rs.close();
- } catch (final SQLException sex) {
- if (sqlException == null) {
- sqlException = sex;
- } else {
- sqlException.setNextException(sex);
- }
- } finally {
- totalOpenResultSetCount--;
- }
- }
- resultSets.clear();
- resultSets = null;
- }
- return sqlException;
- }
-
- /**
- * Closes all result sets created by this query. Query remains active.
- */
- public Q closeAllResultSets() {
- final SQLException sex = closeQueryResultSets();
- if (sex != null) {
- throw new DbSqlException("Close associated ResultSets error", sex);
- }
- return _this();
- }
-
- /**
- * Closes all assigned result sets and then closes the query. Query becomes closed.
- */
- protected SQLException closeQuery() {
- SQLException sqlException = closeQueryResultSets();
- if (statement != null) {
- try {
- statement.close();
- } catch (final SQLException sex) {
- if (sqlException == null) {
- sqlException = sex;
- } else {
- sqlException.setNextException(sex);
- }
- }
- statement = null;
- }
- query = null;
- queryState = CLOSED;
- return sqlException;
- }
-
- /**
- * Closes the query and all created results sets and detaches itself from the session.
- */
- @Override
- @SuppressWarnings({"ClassReferencesSubclass"})
- public void close() {
- final SQLException sqlException = closeQuery();
- connection = null;
- if (this.session != null) {
- this.session.detachQuery(this);
- }
- if (sqlException != null) {
- throw new DbSqlException("Close query error", sqlException);
- }
- }
-
- /**
- * Closes single result set that was created by this query. It is not necessary to close result sets
- * explicitly, since {@link DbQueryBase#close()} method closes all created result sets.
- * Query remains active.
- */
- public void closeResultSet(final ResultSet rs) {
- if (rs == null) {
- return;
- }
- if (!resultSets.remove(rs)) {
- throw new DbSqlException(this, "ResultSet is not created by this query");
- }
- try {
- rs.close();
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "Close result set error", sex);
- } finally {
- totalOpenResultSetCount--;
- }
- }
-
- // ---------------------------------------------------------------- result set type
-
- protected QueryScrollType type;
-
- public QueryScrollType getType() {
- return type;
- }
-
- public Q setType(final QueryScrollType type) {
- checkCreated();
- this.type = type;
- return _this();
- }
- public Q typeForwardOnly() {
- setType(QueryScrollType.FORWARD_ONLY);
- return _this();
- }
- public Q typeScrollSensitive() {
- setType(QueryScrollType.SCROLL_SENSITIVE);
- return _this();
- }
- public Q typeScrollInsensitive() {
- setType(QueryScrollType.SCROLL_INSENSITIVE);
- return _this();
- }
-
- // ---------------------------------------------------------------- concurrency
-
- protected QueryConcurrencyType concurrencyType;
-
- public QueryConcurrencyType getConcurrencyType() {
- return concurrencyType;
- }
-
- public Q setConcurrencyType(final QueryConcurrencyType concurrencyType) {
- checkCreated();
- this.concurrencyType = concurrencyType;
- return _this();
- }
- public Q concurrentReadOnly() {
- setConcurrencyType(QueryConcurrencyType.READ_ONLY);
- return _this();
- }
- public Q concurrentUpdatable() {
- setConcurrencyType(QueryConcurrencyType.UPDATABLE);
- return _this();
- }
-
- // ---------------------------------------------------------------- holdability
-
- protected QueryHoldability holdability;
-
- public QueryHoldability getHoldability() {
- return holdability;
- }
-
- public Q setHoldability(final QueryHoldability holdability) {
- checkCreated();
- this.holdability = holdability;
- return _this();
- }
-
- public Q holdCursorsOverCommit() {
- setHoldability(QueryHoldability.HOLD_CURSORS_OVER_COMMIT);
- return _this();
- }
-
- public Q closeCursorsAtCommit() {
- setHoldability(QueryHoldability.CLOSE_CURSORS_AT_COMMIT);
- return _this();
- }
-
- // ---------------------------------------------------------------- debug mode
-
- protected boolean debug;
-
- public boolean isInDebugMode() {
- return debug;
- }
-
- public Q setDebug(final boolean debug) {
- checkCreated();
- this.debug = debug;
- return _this();
- }
- public Q setDebugMode() {
- setDebug(true);
- return _this();
- }
-
-
- // ---------------------------------------------------------------- generated keys
-
- protected String[] generatedColumns;
-
- /**
- * Returns generated column names.
- */
- public String[] getGeneratedColumnNames() {
- return generatedColumns;
- }
-
- /**
- * Specifies columns which values will be generated by database.
- */
- public Q setGeneratedColumns(final String... columns) {
- checkCreated();
- generatedColumns = columns;
- return _this();
- }
-
- /**
- * Specifies that database will generate some columns values,
- * usually the single id.
- */
- public Q setGeneratedKey() {
- setGeneratedColumns();
- return _this();
- }
-
- /**
- * Resets creating generated columns.
- */
- public Q resetGeneratedColumns() {
- checkCreated();
- generatedColumns = null;
- return _this();
- }
-
-
- // ---------------------------------------------------------------- performance hints
-
- protected int fetchSize;
-
- /**
- * Returns fetch size.
- * @see #setFetchSize(int)
- */
- public int getFetchSize() {
- return fetchSize;
- }
-
- /**
- * Gives the JDBC driver a hint as to the number of rows that should be fetched from the database when
- * more rows are needed. The number of rows specified affects only result sets created using this statement.
- * If the value specified is zero, then the hint is ignored. The default value is zero.
- * @see Statement#setFetchSize(int)
- */
- public Q setFetchSize(final int rows) {
- checkNotClosed();
- this.fetchSize = rows;
- if (statement != null) {
- try {
- statement.setFetchSize(fetchSize);
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "Unable to set fetch size: " + fetchSize, sex);
- }
- }
- return _this();
- }
-
- protected int maxRows;
-
- /**
- * Returns max rows.
- * @see #setMaxRows(int)
- */
- public int getMaxRows() {
- return maxRows;
- }
-
- /**
- * Sets the limit for the maximum number of rows that any ResultSet object can contain to the given number.
- * If the limit is exceeded, the excess rows are silently dropped. Zero means there is no limit.
- * @see Statement#setMaxRows(int)
- */
- public Q setMaxRows(final int maxRows) {
- checkNotClosed();
- this.maxRows = maxRows;
- if (statement != null) {
- try {
- statement.setMaxRows(maxRows);
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "Unable to set max rows: " + maxRows, sex);
- }
- }
- return _this();
- }
-
- // ---------------------------------------------------------------- execute
- protected long start;
- protected long elapsed = -1;
-
- /**
- * Returns query execution elapsed time in milliseconds.
- * Returns -1 if query is still not executed.
- */
- public long getExecutionTime() {
- return elapsed;
- }
-
- /**
- * Executes the query. If this method is invoked at least once, the query or
- * all created ResultSets must be explicitly closed at the end of query usage.
- * This can be done explicitly by calling {@link DbQueryBase#closeResultSet(ResultSet)}
- * оr implicitly, during {@link DbQueryBase#close()}.
- * @see Statement#execute(String)
- */
- public ResultSet execute() {
- start = System.currentTimeMillis();
-
- init();
- ResultSet rs = null;
- if (log.isDebugEnabled()) {
- log.debug("Executing statement: " + getQueryString());
- }
- try {
- if (preparedStatement == null) {
- rs = statement.executeQuery(query.sql);
- } else {
- rs = preparedStatement.executeQuery();
- }
- rs.setFetchSize(fetchSize);
- } catch (final SQLException sex) {
- DbUtil.close(rs);
- throw new DbSqlException(this, "Query execution failed", sex);
- }
- saveResultSet(rs);
- totalOpenResultSetCount++;
-
- elapsed = System.currentTimeMillis() - start;
- if (log.isDebugEnabled()) {
- log.debug("execution time: " + elapsed + "ms");
- }
- return rs;
- }
-
- public DbCallResult executeCall() {
- start = System.currentTimeMillis();
-
- init();
- if (log.isDebugEnabled()) {
- log.debug("Calling statement: " + getQueryString());
- }
- try {
- callableStatement.execute();
- } catch (final SQLException sex) {
- DbUtil.close(callableStatement);
- throw new DbSqlException(this, "Query execution failed", sex);
- }
-
- elapsed = System.currentTimeMillis() - start;
- if (log.isDebugEnabled()) {
- log.debug("execution time: " + elapsed + "ms");
- }
- return new DbCallResult(query, callableStatement);
- }
-
- /**
- * Executes UPDATE, INSERT or DELETE queries. Query is not closed afterwards
- * unless {@link #autoClose() auto close mode} is set.
- * @see Statement#executeUpdate(String)
- */
- public int executeUpdate() {
- return executeUpdate(autoClose);
- }
-
- /**
- * Executes UPDATE, INSERT or DELETE queries and optionally closes the query.
- * @see Statement#executeUpdate(String)
- */
- protected int executeUpdate(final boolean closeQuery) {
- start = System.currentTimeMillis();
-
- init();
- final int result;
- if (log.isDebugEnabled()) {
- log.debug("Executing update: " + getQueryString());
- }
- try {
- if (preparedStatement == null) {
- if (generatedColumns != null) {
- if (generatedColumns.length == 0) {
- result = statement.executeUpdate(query.sql, Statement.RETURN_GENERATED_KEYS);
- } else {
- result = statement.executeUpdate(query.sql, generatedColumns);
- }
- } else {
- result = statement.executeUpdate(query.sql);
- }
- } else {
- result = preparedStatement.executeUpdate();
- }
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "Query execution failed", sex);
- }
- if (closeQuery) {
- close();
- }
-
- elapsed = System.currentTimeMillis() - start;
- if (log.isDebugEnabled()) {
- log.debug("execution time: " + elapsed + "ms");
- }
- return result;
- }
-
- /**
- * Special execute() for 'select count(*)' queries. Query is not closed after the execution
- * unless {@link #autoClose() auto-close mode} is set.
- * Doesn't check if query is really a count query, so it would work for any
- * query that has number in the first column of result.
- * If result set returns zero rows (very unlikely), returns -1.
- */
- public long executeCount() {
- return executeCount(autoClose);
- }
-
- /**
- * Executes count queries and optionally closes query afterwards.
- */
- protected long executeCount(final boolean close) {
- start = System.currentTimeMillis();
-
- init();
- ResultSet rs = null;
- if (log.isDebugEnabled()) {
- log.debug("Executing prepared count: " + getQueryString());
- }
- try {
- if (preparedStatement == null) {
- rs = statement.executeQuery(query.sql);
- } else {
- rs = preparedStatement.executeQuery();
- }
-
- final long firstLong = DbUtil.getFirstLong(rs);
-
- elapsed = System.currentTimeMillis() - start;
- if (log.isDebugEnabled()) {
- log.debug("execution time: " + elapsed + "ms");
- }
-
- return firstLong;
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "Count query failed", sex);
- } finally {
- DbUtil.close(rs);
- if (close) {
- close();
- }
- }
- }
-
- // ---------------------------------------------------------------- result set mapper
-
- /**
- * {@link #execute() Executes} the query, iterates result set and
- * {@link QueryMapper maps} each row.
- */
- public List list(final QueryMapper queryMapper) {
- final ResultSet resultSet = execute();
-
- final List list = new ArrayList<>();
-
- try {
- while (resultSet.next()) {
- final T t = queryMapper.process(resultSet);
- if (t == null) {
- break;
- }
- list.add(t);
- }
- } catch (final SQLException sex) {
- throw new DbSqlException(sex);
- } finally {
- DbUtil.close(resultSet);
- }
-
- return list;
- }
-
- /**
- * {@link #execute() Executes} the query and {@link QueryMapper maps} single result row.
- */
- public T find(final QueryMapper queryMapper) {
- final ResultSet resultSet = execute();
-
- try {
- if (resultSet.next()) {
- return queryMapper.process(resultSet);
- }
- } catch (final SQLException sex) {
- throw new DbSqlException(sex);
- } finally {
- DbUtil.close(resultSet);
- }
- return null;
- }
-
- /**
- * {@link #execute() Executes} the query, iterates all rows and
- * {@link QueryMapper maps} them.
- */
- public Set listSet(final QueryMapper queryMapper) {
- final ResultSet resultSet = execute();
-
- final Set set = new HashSet<>();
-
- try {
- while (resultSet.next()) {
- final T t = queryMapper.process(resultSet);
- if (t == null) {
- break;
- }
- set.add(t);
- }
- } catch (final SQLException sex) {
- throw new DbSqlException(sex);
- } finally {
- DbUtil.close(resultSet);
- }
- return set;
- }
-
- // ---------------------------------------------------------------- generated keys
-
- /**
- * Returns generated columns.
- */
- public ResultSet getGeneratedColumns() {
- checkInitialized();
- if (generatedColumns == null) {
- throw new DbSqlException(this, "No column is specified as auto-generated");
- }
- final ResultSet rs;
- try {
- rs = statement.getGeneratedKeys();
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "No generated keys", sex);
- }
- saveResultSet(rs);
- totalOpenResultSetCount++;
- return rs;
- }
-
- /**
- * Returns generated key i.e. first generated column as long.
- */
- public long getGeneratedKey() {
- checkInitialized();
- final ResultSet rs = getGeneratedColumns();
- try {
- return DbUtil.getFirstLong(rs);
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "No generated key as long", sex);
- } finally {
- DbUtil.close(rs);
- resultSets.remove(rs);
- totalOpenResultSetCount--;
- }
- }
-
- public Object getGeneratedKeyObject() {
- checkInitialized();
- final ResultSet rs = getGeneratedColumns();
- try {
- return DbUtil.getFirstObject(rs);
- } catch (final SQLException sex) {
- throw new DbSqlException(this, "No generated key as long", sex);
- } finally {
- DbUtil.close(rs);
- resultSets.remove(rs);
- totalOpenResultSetCount--;
- }
- }
-
-
- // ---------------------------------------------------------------- query string
-
- /**
- * Returns query SQL string. For prepared statements, returned sql string with quick-and-dirty replaced values.
- */
- public String getQueryString() {
- if (debug) {
- if ((callableStatement != null)) {
- if (preparedStatement instanceof LoggableCallableStatement) {
- return ((LoggableCallableStatement) callableStatement).getQueryString();
- }
- }
- if (preparedStatement != null) {
- if (preparedStatement instanceof LoggablePreparedStatement) {
- return ((LoggablePreparedStatement) preparedStatement).getQueryString();
- }
- }
- }
- if (query != null) {
- return query.sql;
- }
- return sqlString;
- }
-
- /**
- * @see #getQueryString()
- */
- @Override
- public String toString() {
- return getQueryString();
- }
-
-
-
- // ---------------------------------------------------------------- statistics
-
-
- protected static int totalOpenResultSetCount;
-
- /**
- * Returns total number of open result sets.
- * @see #getOpenResultSetCount()
- */
- public static int getTotalOpenResultSetCount() {
- return totalOpenResultSetCount;
- }
-
- /**
- * Returns number of created result sets that are still not explicitly closed.
- * @see #getTotalOpenResultSetCount()
- */
- public int getOpenResultSetCount() {
- return resultSets == null ? 0 : resultSets.size();
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbQueryConfig.java b/jodd-db/src/main/java/jodd/db/DbQueryConfig.java
deleted file mode 100644
index 354d2cc71..000000000
--- a/jodd-db/src/main/java/jodd/db/DbQueryConfig.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-/**
- * Db query default configuration.
- */
-public class DbQueryConfig {
-
- /**
- * Default debug mode.
- */
- private boolean debug = false;
- /**
- * Enables creation of prepared statements for all queries.
- */
- private boolean forcePreparedStatement = false;
- /**
- * Default type.
- */
- private QueryScrollType type = QueryScrollType.FORWARD_ONLY;
- /**
- * Default concurrency type.
- */
- private QueryConcurrencyType concurrencyType = QueryConcurrencyType.READ_ONLY;
- /**
- * Default holdability.
- */
- private QueryHoldability holdability = QueryHoldability.DEFAULT;
- /**
- * Default value for fetch size.
- */
- private int fetchSize = 0;
- /**
- * Default value for max rows.
- */
- private int maxRows = 0;
-
-
- public boolean isDebug() {
- return debug;
- }
-
- public void setDebug(final boolean debug) {
- this.debug = debug;
- }
-
- public boolean isForcePreparedStatement() {
- return forcePreparedStatement;
- }
-
- public void setForcePreparedStatement(final boolean forcePreparedStatement) {
- this.forcePreparedStatement = forcePreparedStatement;
- }
-
- public QueryScrollType getType() {
- return type;
- }
-
- public void setType(final QueryScrollType type) {
- this.type = type;
- }
-
- public QueryConcurrencyType getConcurrencyType() {
- return concurrencyType;
- }
-
- public void setConcurrencyType(final QueryConcurrencyType concurrencyType) {
- this.concurrencyType = concurrencyType;
- }
-
- public QueryHoldability getHoldability() {
- return holdability;
- }
-
- public void setHoldability(final QueryHoldability holdability) {
- this.holdability = holdability;
- }
-
- public int getFetchSize() {
- return fetchSize;
- }
-
- public void setFetchSize(final int fetchSize) {
- this.fetchSize = fetchSize;
- }
-
- public int getMaxRows() {
- return maxRows;
- }
-
- public void setMaxRows(final int maxRows) {
- this.maxRows = maxRows;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbQueryNamedParameter.java b/jodd-db/src/main/java/jodd/db/DbQueryNamedParameter.java
deleted file mode 100644
index 02669d6c4..000000000
--- a/jodd-db/src/main/java/jodd/db/DbQueryNamedParameter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import java.util.Arrays;
-
-/**
- * Storage for named parameters.
- */
-class DbQueryNamedParameter {
- /**
- * Name.
- */
- public final String name;
- /**
- * Indices.
- */
- public int[] indices;
- public DbQueryNamedParameter next;
-
- DbQueryNamedParameter(final String name) {
- this.name = name;
- }
-
- public boolean equalsName(final String name) {
- return this.name.equals(name);
- }
-
- public void add(final int index) {
- indices = Arrays.copyOf(indices, indices.length + 1);
- indices[indices.length - 1] = index;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbQueryParser.java b/jodd-db/src/main/java/jodd/db/DbQueryParser.java
deleted file mode 100644
index be3c76e94..000000000
--- a/jodd-db/src/main/java/jodd/db/DbQueryParser.java
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import jodd.util.CharUtil;
-import jodd.util.StringUtil;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-/**
- * SQL parameters parser that recognizes named and ordinal parameters.
- */
-class DbQueryParser {
-
- public static final String SQL_SEPARATORS = " \n\r\f\t,()=<>&|+-=/*'^![]#~\\";
-
- boolean prepared;
- boolean callable;
- String sql;
-
- // ---------------------------------------------------------------- ctors
-
- DbQueryParser(final String sql) {
- parseSql(sql);
- }
-
- // ---------------------------------------------------------------- parameters
-
- private DbQueryNamedParameter rootNP;
-
- void storeNamedParameter(final String name, final int position) {
- DbQueryNamedParameter p = lookupNamedParameter(name);
- if (p == null) {
- p = new DbQueryNamedParameter(name);
- p.indices = new int[] {position};
- p.next = rootNP;
- rootNP = p;
- }
- else {
- p.add(position);
- }
- }
-
- /**
- * Lookup for named parameter.
- */
- DbQueryNamedParameter lookupNamedParameter(final String name) {
- DbQueryNamedParameter p = rootNP;
- while (p != null) {
- if (p.equalsName(name)) {
- return p;
- }
- p = p.next;
- }
- return null;
- }
-
- int[] getNamedParameterIndices(final String name) {
- final DbQueryNamedParameter p = lookupNamedParameter(name);
- if (p == null) {
- throw new DbSqlException("Named parameter not found: " + name + "\nQuery: " + sql);
- }
- return p.indices;
- }
-
- void forEachNamedParameter(final Consumer consumer) {
- DbQueryNamedParameter p = rootNP;
- while (p != null) {
- consumer.accept(p);
- p = p.next;
- }
- }
-
- // ---------------------------------------------------------------- batch
-
- private Map batchParams;
-
- private void saveBatchParameter(final String name, final int size) {
- if (batchParams == null) {
- batchParams = new HashMap<>();
- }
- batchParams.put(name, Integer.valueOf(size));
- }
-
- /**
- * Returns the size of batch parameter. Returns 0
- * if parameter does not exist.
- */
- protected int getBatchParameterSize(final String name) {
- if (batchParams == null) {
- return 0;
- }
- Integer size = batchParams.get(name);
- if (size == null) {
- return 0;
- }
- return size.intValue();
- }
-
- // ---------------------------------------------------------------- parser
-
- void parseSql(final String sqlString) {
- rootNP = null;
- final int stringLength = sqlString.length();
- final StringBuilder pureSql = new StringBuilder(stringLength);
- boolean inQuote = false;
- int index = 0;
- int paramCount = 0;
-
- while (index < stringLength) {
- char c = sqlString.charAt(index);
- if (inQuote) {
- if (c == '\'') {
- inQuote = false;
- }
- }
- else if (c == '\'') {
- inQuote = true;
- }
- else if (c == ':' && index + 1 < stringLength
- && sqlString.charAt(index + 1) == ':') {
- // don't treat '::foo' sequence as named parameter; skip this
- // chunk
- int right = StringUtil.indexOfChars(sqlString,
- SQL_SEPARATORS, index + 2);
- if (right < 0) {
- right = stringLength;
- }
- pureSql.append(sqlString.substring(index, right));
- index = right;
- continue;
- }
- else if (c == ':') {
- int right = StringUtil.indexOfChars(sqlString, SQL_SEPARATORS, index + 1);
- boolean batch = false;
-
- if (right < 0) {
- right = stringLength;
- } else {
- if (sqlString.charAt(right) == '!') {
- batch = true;
- }
- }
-
- String param = sqlString.substring(index + 1, right);
-
- if (!batch) {
- paramCount++;
- storeNamedParameter(param, paramCount);
- pureSql.append('?');
- }
- else {
- // read batch size
- right++;
- int numStart = right;
-
- while (right < stringLength) {
- if (!CharUtil.isDigit(sqlString.charAt(right))) {
- break;
- }
- right++;
- }
-
- String numberValue = sqlString.substring(numStart, right);
- int batchSize;
- try {
- batchSize = Integer.parseInt(numberValue);
- } catch (NumberFormatException nfex) {
- throw new DbSqlException("Batch size is not an integer: " + numberValue, nfex);
- }
-
- saveBatchParameter(param, batchSize);
-
- // create batch parameters
- for (int i = 1; i <= batchSize; i++) {
- if (i != 1) {
- pureSql.append(',');
- }
- paramCount++;
- storeNamedParameter(param + '.' + i, paramCount);
- pureSql.append('?');
- }
- }
-
- index = right;
- continue;
- }
- else if (c == '?') { // either an ordinal or positional parameter
- if ((index < stringLength - 1) && (Character.isDigit(sqlString.charAt(index + 1)))) { // positional parameter
- int right = StringUtil.indexOfChars(sqlString, SQL_SEPARATORS, index + 1);
- if (right < 0) {
- right = stringLength;
- }
- String param = sqlString.substring(index + 1, right);
- try {
- Integer.parseInt(param);
- } catch (NumberFormatException nfex) {
- throw new DbSqlException("Positional parameter is not an integer: " + param, nfex);
- }
- paramCount++;
- storeNamedParameter(param, paramCount);
- pureSql.append('?');
- index = right;
- continue;
- }
- paramCount++; // ordinal param
- }
- pureSql.append(c);
- index++;
- }
- this.prepared = (paramCount != 0);
- this.sql = pureSql.toString();
-
- if (this.sql.startsWith("{")) {
- this.callable = true;
- }
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbSession.java b/jodd-db/src/main/java/jodd/db/DbSession.java
deleted file mode 100644
index b1e75758a..000000000
--- a/jodd-db/src/main/java/jodd/db/DbSession.java
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import jodd.db.connection.ConnectionProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Encapsulates db connection. Initially works in auto-commit mode.
- * May start and work with transactions, after committing/rolling back
- * DbSession goes back to auto-commit mode.
- *
- * All invoked queries are stored within one session and closed implicitly
- * on session closing.
- *
- * For managed transaction see DbJtxTransactionManager from jodd-tx.
- */
-public class DbSession implements AutoCloseable {
-
- private static final Logger log = LoggerFactory.getLogger(DbSession.class);
-
- // ---------------------------------------------------------------- init & close
-
- protected final ConnectionProvider connectionProvider;
- protected Connection connection;
-
- /**
- * Creates new database session with default transaction mode and in autocommit mode.
- */
- public DbSession(ConnectionProvider connectionProvider) {
- log.debug("Creating new db session");
-
- if (connectionProvider == null) {
- connectionProvider = DbOom.get().connectionProvider();
-
- if (connectionProvider == null) {
- throw new DbSqlException("Connection provider is not available");
- }
- }
-
- this.connectionProvider = connectionProvider;
- this.txActive = false;
- this.txMode = DbTransactionMode.READ_ONLY_TX;
- this.queries = new HashSet<>();
- }
-
-
- /**
- * Closes current session and all allocated resources.
- * All attached queries are closed. If a transaction is still active, exception occurs.
- * Database connection is returned to the {@link ConnectionProvider}.
- * Closed session is no longer available for usage.
- */
- public void closeSession() {
- log.debug("Closing db session");
-
- SQLException sqlException = null;
-
- if (queries != null) {
- for (final DbQueryBase query : queries) {
- final SQLException sex = query.closeQuery();
- if (sex != null) {
- if (sqlException == null) {
- sqlException = sex;
- } else {
- sqlException.setNextException(sex);
- }
- }
- }
- }
- if (connection != null) {
- if (txActive) {
- throw new DbSqlException("TX was not closed before closing the session");
- }
- connectionProvider.closeConnection(connection);
- connection = null;
- }
- queries = null;
- if (sqlException != null) {
- throw new DbSqlException("Closing DbSession failed", sqlException);
- }
- }
-
- @Override
- public void close() {
- closeSession();
- }
-
- /**
- * Indicates whether a session is closed.
- */
- public boolean isSessionClosed() {
- return queries == null;
- }
-
- /**
- * Returns true if session is open.
- */
- public boolean isSessionOpen() {
- return queries != null;
- }
-
-
- // ---------------------------------------------------------------- query
-
- /**
- * Bag of all queries attached to this session. Explicitly closed queries
- * remains in the set. If null, session is closed.
- * If not null, but empty, session is still considered as open.
- */
- protected Set queries;
-
- /**
- * Returns total number of queries assigned to this session.
- */
- public int getTotalQueries() {
- if (queries == null) {
- return 0;
- }
- return queries.size();
- }
-
- /**
- * Returns current connection.
- */
- public Connection getConnection() {
- return connection;
- }
-
-
- /**
- * Attaches a new {@link DbQuery}. May be invoked both inside and outside of transaction.
- */
- protected void attachQuery(final DbQueryBase query) {
- assertSessionIsOpen();
- openConnectionForQuery();
- queries.add(query);
- }
-
- /**
- * Detach used {@link DbQuery}. Usually invoked by {@link jodd.db.DbQuery#close()}.
- */
- protected void detachQuery(final DbQueryBase query) {
- queries.remove(query);
- }
-
-
- /**
- * Opens connection in auto-commit mode, if already not opened.
- */
- protected void openConnectionForQuery() {
- if (connection == null) {
- connection = connectionProvider.getConnection();
- txActive = false; // txAction should already be false
- try {
- connection.setAutoCommit(true);
- } catch (final SQLException sex) {
- throw new DbSqlException("Failed to open non-TX connection", sex);
- }
- }
- }
-
- // ---------------------------------------------------------------- transaction
-
- protected boolean txActive;
-
- protected DbTransactionMode txMode;
-
- /**
- * Indicate whether a transaction is in progress.
- */
- public boolean isTransactionActive() {
- return txActive;
- }
-
-
- /**
- * Opens a transaction.
- */
- protected void openTx() {
- if (connection == null) {
- connection = connectionProvider.getConnection();
- }
- txActive = true;
- try {
- connection.setAutoCommit(false);
- if (txMode.getIsolation() != DbTransactionMode.ISOLATION_DEFAULT) {
- connection.setTransactionIsolation(txMode.getIsolation());
- }
- connection.setReadOnly(txMode.isReadOnly());
- } catch (final SQLException sex) {
- throw new DbSqlException("Open TX failed", sex);
- }
- }
-
- /**
- * Closes current transaction.
- */
- protected void closeTx() {
- txActive = false;
- try {
- connection.setAutoCommit(true);
- } catch (final SQLException sex) {
- throw new DbSqlException("Close TX failed", sex);
- }
- }
-
-
- /**
- * Starts a transaction.
- */
- public void beginTransaction(final DbTransactionMode mode) {
- log.debug("Beginning transaction");
-
- assertTxIsClosed();
- this.txMode = mode;
- openTx();
- }
-
- /**
- * Commit the current transaction, writing any unflushed changes to the database.
- * Transaction mode is closed.
- */
- public void commitTransaction() {
- log.debug("Committing transaction");
-
- assertTxIsActive();
- try {
- connection.commit();
- } catch (final SQLException sex) {
- throw new DbSqlException("Commit TX failed", sex);
- } finally {
- closeTx();
- }
- }
-
- /**
- * Roll back the current transaction. Transaction mode is closed.
- */
- public void rollbackTransaction() {
- log.debug("Rolling-back transaction");
-
- assertTxIsActive();
-
- try {
- connection.rollback();
- } catch (final SQLException sex) {
- throw new DbSqlException("Rollback TX failed", sex);
- } finally {
- closeTx();
- }
- }
-
-
- // ---------------------------------------------------------------- checking
-
- protected void assertSessionIsOpen() {
- if (queries == null) {
- throw new DbSqlException("Session is closed");
- }
- }
-
- protected void assertTxIsClosed() {
- assertSessionIsOpen();
- if (txActive) {
- throw new DbSqlException("TX already started for this session");
- }
- }
-
- protected void assertTxIsActive() {
- assertSessionIsOpen();
- if (!txActive) {
- throw new DbSqlException("TX not available for this session");
- }
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbSessionProvider.java b/jodd-db/src/main/java/jodd/db/DbSessionProvider.java
deleted file mode 100644
index f85eaa11d..000000000
--- a/jodd-db/src/main/java/jodd/db/DbSessionProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-/**
- * Provide {@link DbSession} when requested by {@link DbQuery}.
- * Important: DbSessionProvider implementations
- * should NOT create new db sessions! DbSession should
- * be already created and somehow assigned to DbSessionProvider
- * implementation. User must control session opening and closing,
- * and not DbSessionProvider, as we can not figure
- * weather connection should be closed after closing a query;
- * or still hold on open for the next query.
- */
-@FunctionalInterface
-public interface DbSessionProvider {
-
- /**
- * Returns {@link DbSession}. May throws an exception
- * if session can not be provided.
- */
- DbSession getDbSession();
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbSqlException.java b/jodd-db/src/main/java/jodd/db/DbSqlException.java
deleted file mode 100644
index ea5425cfd..000000000
--- a/jodd-db/src/main/java/jodd/db/DbSqlException.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import jodd.exception.UncheckedException;
-
-/**
- * Unchecked SQL exception.
- */
-public class DbSqlException extends UncheckedException {
-
- public DbSqlException(final Throwable t) {
- super(t);
- }
-
- public DbSqlException(final String message) {
- super(message);
- }
-
- public DbSqlException(final DbQueryBase dbQuery, final String message) {
- super(message + "\nQuery: " + dbQuery.getQueryString());
- }
-
- public DbSqlException(final String message, final Throwable t) {
- super(message, t);
- }
-
- public DbSqlException(final DbQueryBase dbQuery, final String message, final Throwable t) {
- super(message + "\nQuery: " + dbQuery.getQueryString(), t);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/DbThreadSession.java b/jodd-db/src/main/java/jodd/db/DbThreadSession.java
deleted file mode 100644
index 8f52b5bfe..000000000
--- a/jodd-db/src/main/java/jodd/db/DbThreadSession.java
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import jodd.db.connection.ConnectionProvider;
-
-/**
- * Thread assigned {@link jodd.db.DbSession}. Upon creation, it assigns
- * the session to current thread. Useful when only one session (i.e. connection)
- * is used per thread, through service layers.
- *
- * {@link jodd.db.DbThreadSession} uses {@link jodd.db.ThreadDbSessionHolder} for storing
- * created sessions in the thread storage. Note that holder may be manipulated from outside
- * of this class.
- */
-public class DbThreadSession extends DbSession {
-
- /**
- * Creates new db session and assigns it to the current thread.
- * Closes already assigned session, if any exist.
- * @param connectionProvider connection provider
- */
- public DbThreadSession(final ConnectionProvider connectionProvider) {
- super(connectionProvider);
-
- final DbSession session = ThreadDbSessionHolder.get();
- if (session != null) {
- session.closeSession();
- }
- ThreadDbSessionHolder.set(this);
- }
-
- /**
- * Creates new db session and assigns it to the current thread, using
- * default connection provider.
- */
- public DbThreadSession() {
- this(null);
- }
-
-
- /**
- * Closes current session and remove the association from current thread.
- * @see jodd.db.DbSession#closeSession()
- */
- @Override
- public void closeSession() {
- ThreadDbSessionHolder.remove();
- super.closeSession();
- }
-
- // ---------------------------------------------------------------- static stuff
-
- /**
- * Returns current thread session or null if no session is assigned
- * to a thread.
- */
- public static DbSession getCurrentSession() {
- return ThreadDbSessionHolder.get();
- }
-
- /**
- * Returns existing thread session, or new one if already not exist. If session doesn't exist, it will be created
- * using default connection provider.
- */
- public static DbThreadSession getThreadSession() {
- DbThreadSession session = (DbThreadSession) ThreadDbSessionHolder.get();
- if (session == null) {
- session = new DbThreadSession();
- }
- return session;
- }
-
- /**
- * Closes thread session.
- */
- public static void closeThreadSession() {
- DbThreadSession session = (DbThreadSession) ThreadDbSessionHolder.get();
- if (session != null) {
- session.closeSession();
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbTransactionMode.java b/jodd-db/src/main/java/jodd/db/DbTransactionMode.java
deleted file mode 100644
index b034563d2..000000000
--- a/jodd-db/src/main/java/jodd/db/DbTransactionMode.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import java.sql.Connection;
-import java.util.Objects;
-
-/**
- * Native SQL transaction mode for {@link DbSession} transactions.
- */
-public class DbTransactionMode {
-
- // ---------------------------------------------------------------- isolation
-
- /**
- * Default isolation.
- */
- public static final int ISOLATION_DEFAULT = -1;
- /**
- * @see Connection#TRANSACTION_NONE
- */
- public static final int ISOLATION_NONE = Connection.TRANSACTION_NONE;
- /**
- * @see Connection#TRANSACTION_READ_UNCOMMITTED
- */
- public static final int ISOLATION_READ_UNCOMMITTED = Connection.TRANSACTION_READ_UNCOMMITTED;
- /**
- * @see Connection#TRANSACTION_READ_COMMITTED
- */
- public static final int ISOLATION_READ_COMMITTED = Connection.TRANSACTION_READ_COMMITTED;
- /**
- * @see Connection#TRANSACTION_REPEATABLE_READ
- */
- public static final int ISOLATION_REPEATABLE_READ = Connection.TRANSACTION_REPEATABLE_READ;
- /**
- * @see Connection#TRANSACTION_SERIALIZABLE
- */
- public static final int ISOLATION_SERIALIZABLE = Connection.TRANSACTION_SERIALIZABLE;
-
- private final int isolation;
-
- /**
- * Returns isolation level.
- */
- public int getIsolation() {
- return isolation;
- }
-
- // ---------------------------------------------------------------- read-only
-
- public static final boolean READ_ONLY = true;
- public static final boolean READ_WRITE = false;
-
- private final boolean readOnlyMode;
-
- /**
- * Returns {@code true} if transaction is read-only.
- */
- public boolean isReadOnly() {
- return readOnlyMode;
- }
-
-
- // ---------------------------------------------------------------- ctor
-
- public static final DbTransactionMode READ_ONLY_TX = new DbTransactionMode(ISOLATION_DEFAULT, READ_ONLY);
- public static final DbTransactionMode READ_WRITE_TX = new DbTransactionMode(ISOLATION_DEFAULT, READ_WRITE);
-
- public DbTransactionMode(final int isolation, boolean readOnlyMode) {
- this.isolation = isolation;
- this.readOnlyMode = readOnlyMode;
- }
-
- // ---------------------------------------------------------------- equals & hashCode
-
- @Override
- public boolean equals(final Object object) {
- if (this == object) {
- return true;
- }
- if (this.getClass() != object.getClass()) {
- return false;
- }
- DbTransactionMode mode = (DbTransactionMode) object;
- return (mode.getIsolation() == this.isolation) &&
- (mode.isReadOnly() == this.readOnlyMode);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(readOnlyMode, isolation);
- }
-
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/DbUtil.java b/jodd-db/src/main/java/jodd/db/DbUtil.java
deleted file mode 100644
index e310c67b2..000000000
--- a/jodd-db/src/main/java/jodd/db/DbUtil.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import jodd.db.type.SqlType;
-import jodd.typeconverter.Converter;
-import jodd.typeconverter.TypeConverterManager;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.sql.Types;
-
-/**
- * Various DB utilities.
- */
-public class DbUtil {
-
- /**
- * Closes statement safely without throwing an exception.
- */
- public static void close(final Statement statement) {
- if (statement == null) {
- return;
- }
-
- try {
- statement.close();
- } catch (SQLException sex) {
- // ignore
- }
- }
-
- /**
- * Closes result set safely without throwing an exception.
- */
- public static void close(final ResultSet resultSet) {
- if (resultSet == null) {
- return;
- }
- try {
- resultSet.close();
- } catch (SQLException sex) {
- // ignore
- }
- }
-
- /**
- * Returns long value of very first column in result set.
- */
- public static long getFirstLong(final ResultSet resultSet) throws SQLException {
- if (resultSet.next()) {
- return resultSet.getLong(1);
- }
- return -1;
- }
-
- /**
- * Returns int value of very first column in result set.
- */
- public static int getFirstInt(final ResultSet resultSet) throws SQLException {
- if (resultSet.next()) {
- return resultSet.getInt(1);
- }
- return -1;
- }
-
- public static Object getFirstObject(final ResultSet resultSet) throws SQLException {
- if (resultSet.next()) {
- return resultSet.getObject(1);
- }
- return null;
- }
-
- /**
- * Sets prepared statement object using target SQL type.
- * Here Jodd makes conversion and not JDBC driver.
- * See: http://www.tutorialspoint.com/jdbc/jdbc-data-types.htm
- */
- public static void setPreparedStatementObject(final PreparedStatement preparedStatement, final int index, final Object value, final int targetSqlType) throws SQLException {
- if (value == null) {
- preparedStatement.setNull(index, Types.NULL);
- return;
- }
-
- switch (targetSqlType) {
- case Types.VARCHAR:
- case Types.LONGVARCHAR:
- case Types.CHAR:
- preparedStatement.setString(index, Converter.get().toString(value));
- break;
-
- case Types.INTEGER:
- case Types.SMALLINT:
- case Types.TINYINT:
- preparedStatement.setInt(index, Converter.get().toIntValue(value));
- break;
-
- case Types.BIGINT:
- preparedStatement.setLong(index, Converter.get().toLongValue(value));
- break;
-
- case Types.BOOLEAN:
- case Types.BIT:
- preparedStatement.setBoolean(index, Converter.get().toBooleanValue(value));
- break;
-
- case Types.DATE:
- preparedStatement.setDate(index, TypeConverterManager.get().convertType(value, java.sql.Date.class));
- break;
-
- case Types.NUMERIC:
- case Types.DECIMAL:
- preparedStatement.setBigDecimal(index, Converter.get().toBigDecimal(value));
- break;
-
- case Types.DOUBLE:
- preparedStatement.setDouble(index, Converter.get().toDoubleValue(value));
- break;
-
- case Types.REAL:
- case Types.FLOAT:
- preparedStatement.setFloat(index, Converter.get().toFloatValue(value));
- break;
-
- case Types.TIME:
- preparedStatement.setTime(index, TypeConverterManager.get().convertType(value, java.sql.Time.class));
- break;
-
- case Types.TIMESTAMP:
- preparedStatement.setTimestamp(index, TypeConverterManager.get().convertType(value, Timestamp.class));
- break;
-
- case Types.BINARY:
- case Types.VARBINARY:
- preparedStatement.setBytes(index, TypeConverterManager.get().convertType(value, byte[].class));
- break;
-
- default:
- if (targetSqlType != SqlType.DB_SQLTYPE_NOT_AVAILABLE) {
- preparedStatement.setObject(index, value, targetSqlType);
- } else {
- preparedStatement.setObject(index, value);
- }
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/QueryConcurrencyType.java b/jodd-db/src/main/java/jodd/db/QueryConcurrencyType.java
deleted file mode 100644
index 75740914d..000000000
--- a/jodd-db/src/main/java/jodd/db/QueryConcurrencyType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import java.sql.ResultSet;
-
-/**
- * Query concurrency type.
- */
-public enum QueryConcurrencyType {
-
- READ_ONLY(ResultSet.CONCUR_READ_ONLY),
- UPDATABLE(ResultSet.CONCUR_UPDATABLE);
-
- private final int type;
-
- QueryConcurrencyType(final int type) {
- this.type = type;
- }
-
- public int value() {
- return type;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/QueryHoldability.java b/jodd-db/src/main/java/jodd/db/QueryHoldability.java
deleted file mode 100644
index cbffd6eb2..000000000
--- a/jodd-db/src/main/java/jodd/db/QueryHoldability.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import java.sql.ResultSet;
-
-/**
- * Query holdability.
- */
-public enum QueryHoldability {
- /**
- * Default holdability. JDBC specification does not specifies default value for holdability.
- */
- DEFAULT(-1),
- CLOSE_CURSORS_AT_COMMIT(ResultSet.CLOSE_CURSORS_AT_COMMIT),
- HOLD_CURSORS_OVER_COMMIT(ResultSet.HOLD_CURSORS_OVER_COMMIT);
-
- private final int type;
-
- QueryHoldability(final int type) {
- this.type = type;
- }
-
- public int value() {
- return type;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/QueryMapper.java b/jodd-db/src/main/java/jodd/db/QueryMapper.java
deleted file mode 100644
index f71497725..000000000
--- a/jodd-db/src/main/java/jodd/db/QueryMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Process {@link jodd.db.DbQuery query} and map it execution result to a type.
- */
-public interface QueryMapper {
-
- /**
- * Processes single result sets row.
- * Returns null to stop iterations.
- */
- T process(ResultSet resultSet) throws SQLException;
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/QueryScrollType.java b/jodd-db/src/main/java/jodd/db/QueryScrollType.java
deleted file mode 100644
index 94663e66e..000000000
--- a/jodd-db/src/main/java/jodd/db/QueryScrollType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import java.sql.ResultSet;
-
-/**
- * Query scroll type.
- */
-public enum QueryScrollType {
- /**
- * @see ResultSet#TYPE_FORWARD_ONLY
- */
- FORWARD_ONLY(ResultSet.TYPE_FORWARD_ONLY),
- /**
- * @see ResultSet#TYPE_SCROLL_SENSITIVE
- */
- SCROLL_SENSITIVE(ResultSet.TYPE_SCROLL_SENSITIVE),
- /**
- * @see ResultSet#TYPE_SCROLL_INSENSITIVE
- */
- SCROLL_INSENSITIVE(ResultSet.TYPE_SCROLL_INSENSITIVE);
-
- private final int type;
-
- QueryScrollType(final int type) {
- this.type = type;
- }
-
- public int value() {
- return type;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/ThreadDbSessionHolder.java b/jodd-db/src/main/java/jodd/db/ThreadDbSessionHolder.java
deleted file mode 100644
index 634828434..000000000
--- a/jodd-db/src/main/java/jodd/db/ThreadDbSessionHolder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-/**
- * {@link DbSession} thread storage.
- */
-public class ThreadDbSessionHolder {
-
- private static final ThreadLocal DB_SESSION_THREAD_LOCAL = new ThreadLocal<>();
-
- /**
- * Returns current thread db session.
- */
- public static DbSession get() {
- return DB_SESSION_THREAD_LOCAL.get();
- }
-
- /**
- * Sets current db session.
- */
- public static void set(final DbSession dbSession) {
- DB_SESSION_THREAD_LOCAL.set(dbSession);
- }
-
- /**
- * Removes current db session from the thread and returns it.
- */
- public static void remove() {
- DB_SESSION_THREAD_LOCAL.set(null);
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/ThreadDbSessionProvider.java b/jodd-db/src/main/java/jodd/db/ThreadDbSessionProvider.java
deleted file mode 100644
index 52e358df1..000000000
--- a/jodd-db/src/main/java/jodd/db/ThreadDbSessionProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Returns {@link DbSession} assigned to current thread.
- * @see DbThreadSession
- * @see ThreadDbSessionHolder
- */
-public class ThreadDbSessionProvider implements DbSessionProvider {
-
- private static final Logger log = LoggerFactory.getLogger(ThreadDbSessionProvider.class);
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DbSession getDbSession() {
- log.debug("Requesting thread session");
-
- final DbSession session = ThreadDbSessionHolder.get();
-
- if (session == null) {
- throw new DbSqlException(
- "No DbSession associated with current thread. " +
- "It seems that ThreadDbSessionHolder is not used.");
- }
- return session;
- }
-
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/connection/ConnectionPoolDataSourceConnectionProvider.java b/jodd-db/src/main/java/jodd/db/connection/ConnectionPoolDataSourceConnectionProvider.java
deleted file mode 100644
index 6909e10ae..000000000
--- a/jodd-db/src/main/java/jodd/db/connection/ConnectionPoolDataSourceConnectionProvider.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.connection;
-
-import jodd.db.DbSqlException;
-
-import javax.sql.ConnectionPoolDataSource;
-import javax.sql.PooledConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * Connection pool data source {@link jodd.db.connection.ConnectionProvider}
- */
-public class ConnectionPoolDataSourceConnectionProvider implements ConnectionProvider {
- // ---------------------------------------------------------------- properties
-
- private ConnectionPoolDataSource cpds;
-
- public ConnectionPoolDataSourceConnectionProvider(final ConnectionPoolDataSource cpds) {
- this.cpds = cpds;
- }
-
- // ---------------------------------------------------------------- init/close
-
- @Override
- public void init() {
- }
-
- @Override
- public void close() {
- cpds = null;
- }
-
- // ---------------------------------------------------------------- get/free
-
- @Override
- public Connection getConnection() {
- PooledConnection pconn;
- try {
- pconn = cpds.getPooledConnection();
- } catch (SQLException sex) {
- throw new DbSqlException("Invalid pooled connection", sex);
- }
- try {
- return pconn.getConnection();
- } catch (SQLException sex) {
- throw new DbSqlException("Invalid pooled connection", sex);
- }
- }
-
- @Override
- public void closeConnection(final Connection connection) {
- try {
- if (connection != null) {
- connection.close();
- }
- } catch (SQLException sex) {
- // ignore
- }
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/connection/ConnectionProvider.java b/jodd-db/src/main/java/jodd/db/connection/ConnectionProvider.java
deleted file mode 100644
index 92402175c..000000000
--- a/jodd-db/src/main/java/jodd/db/connection/ConnectionProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.connection;
-
-import java.sql.Connection;
-
-/**
- * A generic strategy for obtaining JDBC connections.
- *
- * Implementors might also implement connection pooling.
- *
- * Implementations should provide a public default constructor.
- */
-public interface ConnectionProvider extends AutoCloseable {
-
- /**
- * Initialize the connection provider. May be called more then once;
- * does not have any effect if pool is already initialized.
- */
- void init();
-
- /**
- * Returns a connection from connection pool.
- */
- Connection getConnection();
-
- /**
- * Dispose of a used {@link #getConnection() connection}.
- */
- void closeConnection(Connection connection);
-
- /**
- * Closes a provider and releases all its resources.
- */
- @Override
- void close();
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/connection/DataSourceConnectionProvider.java b/jodd-db/src/main/java/jodd/db/connection/DataSourceConnectionProvider.java
deleted file mode 100644
index e885f8f6d..000000000
--- a/jodd-db/src/main/java/jodd/db/connection/DataSourceConnectionProvider.java
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.connection;
-
-import jodd.db.DbSqlException;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * DataSource connection provider. Note that data source implementation might
- * not support dataSource.getConnection(username, password).
- */
-public class DataSourceConnectionProvider implements ConnectionProvider {
-
- private final DataSource dataSource;
- private final String username;
- private final String password;
-
- public DataSourceConnectionProvider(final String jndiName) {
- this(jndiName, null, null);
- }
-
- public DataSourceConnectionProvider(final String jndiName, final String user, final String pass) {
- try {
- InitialContext initialContext = new InitialContext();
-
- this.dataSource = (DataSource) initialContext.lookup(jndiName);
- } catch (NamingException nex) {
- throw new DbSqlException("Invalid JNDI datasource name: " + jndiName, nex);
- }
- this.username = user;
- this.password = pass;
- }
-
- public DataSourceConnectionProvider(final DataSource dataSource) {
- this.dataSource = dataSource;
- username = password = null;
- }
-
- public DataSourceConnectionProvider(final DataSource dataSource, final String user, final String pass) {
- this.dataSource = dataSource;
- this.username = user;
- this.password = pass;
- }
-
- @Override
- public void init() {}
-
- @Override
- public Connection getConnection() {
- try {
- if (username != null || password != null) {
- return dataSource.getConnection(username, password);
- } else {
- return dataSource.getConnection();
- }
- } catch (SQLException sex) {
- throw new DbSqlException("Invalid datasource connection", sex);
- }
- }
-
- @Override
- public void closeConnection(final Connection connection) {
- try {
- connection.close();
- } catch (SQLException sex) {
- // ignore
- }
- }
-
- @Override
- public void close() {}
-}
diff --git a/jodd-db/src/main/java/jodd/db/connection/DriverManagerConnectionProvider.java b/jodd-db/src/main/java/jodd/db/connection/DriverManagerConnectionProvider.java
deleted file mode 100644
index 9a3c5329c..000000000
--- a/jodd-db/src/main/java/jodd/db/connection/DriverManagerConnectionProvider.java
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.connection;
-
-import jodd.db.DbSqlException;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-/**
- * Driver manager connection provider;
- */
-public class DriverManagerConnectionProvider implements ConnectionProvider {
-
- // ---------------------------------------------------------------- properties
-
- private String url;
- private String username;
- private String password;
- private String driverClass;
- private Integer isolation;
- private Boolean autoCommit;
-
- public void setUrl(final String url) {
- this.url = url;
- }
-
- public void setUsername(final String username) {
- this.username = username;
- }
-
- public void setPassword(final String password) {
- this.password = password;
- }
-
- public void setDriverClass(final String driverClass) {
- this.driverClass = driverClass;
- }
-
- public void setIsolation(final Integer isolation) {
- this.isolation = isolation;
- }
-
- public void setAutoCommit(final Boolean autoCommit) {
- this.autoCommit = autoCommit;
- }
-
- // ---------------------------------------------------------------- ctors
-
- public DriverManagerConnectionProvider(final String driverClass, final String url, final String username, final String password) {
- this.driverClass = driverClass;
- this.password = password;
- this.username = username;
- this.url = url;
- }
- public DriverManagerConnectionProvider(final String driverClass, final String url) {
- this.driverClass = driverClass;
- this.url = url;
- }
-
- // ---------------------------------------------------------------- provider
-
- @Override
- public synchronized void init() {
- try {
- Class.forName(driverClass);
- } catch (ClassNotFoundException cnfex) {
- throw new DbSqlException("JDBC driver not found: " + driverClass, cnfex);
- }
- }
-
- @Override
- public Connection getConnection() {
- Connection conn;
- try {
- if (username != null) {
- conn = DriverManager.getConnection(url, username, password);
- } else {
- conn = DriverManager.getConnection(url);
- }
- if (isolation != null) {
- conn.setTransactionIsolation(isolation.intValue());
- }
- if (autoCommit != null) {
- conn.setAutoCommit(autoCommit.booleanValue());
- }
- }
- catch (SQLException sex) {
- throw new DbSqlException("Connection not found", sex);
- }
- return conn;
- }
-
- @Override
- public void closeConnection(final Connection connection) {
- try {
- connection.close();
- } catch (SQLException sex) {
- // ignore
- }
- }
-
- @Override
- public void close() {
- }
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/connection/XADataSourceConnectionProvider.java b/jodd-db/src/main/java/jodd/db/connection/XADataSourceConnectionProvider.java
deleted file mode 100644
index ac55a58be..000000000
--- a/jodd-db/src/main/java/jodd/db/connection/XADataSourceConnectionProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.connection;
-
-import jodd.db.DbSqlException;
-
-import javax.sql.XAConnection;
-import javax.sql.XADataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * XA-DataSource connection provider.
- */
-public class XADataSourceConnectionProvider implements ConnectionProvider {
-
- private final XADataSource xaDataSource;
- private final String username;
- private final String password;
-
- public XADataSourceConnectionProvider(final XADataSource dataSource) {
- this.xaDataSource = dataSource;
- this.username = this.password = null;
- }
- public XADataSourceConnectionProvider(final XADataSource dataSource, final String user, final String pass) {
- this.xaDataSource = dataSource;
- this.username = user;
- this.password = pass;
- }
-
- @Override
- public void init() {}
-
- @Override
- public Connection getConnection() {
- try {
- XAConnection xaConnection;
- if (username != null) {
- xaConnection = xaDataSource.getXAConnection(username, password);
- } else {
- xaConnection = xaDataSource.getXAConnection();
- }
- return xaConnection.getConnection();
- } catch (SQLException sex) {
- throw new DbSqlException("Unable to get connection from XA datasource", sex);
- }
- }
-
- @Override
- public void closeConnection(final Connection connection) {
- try {
- connection.close();
- } catch (SQLException sex) {
- // ignore
- }
- }
-
- @Override
- public void close() {}
-}
diff --git a/jodd-db/src/main/java/jodd/db/connection/package-info.java b/jodd-db/src/main/java/jodd/db/connection/package-info.java
deleted file mode 100644
index 3f7607524..000000000
--- a/jodd-db/src/main/java/jodd/db/connection/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Various database connection providers.
- */
-package jodd.db.connection;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/debug/BaseLoggableStatement.java b/jodd-db/src/main/java/jodd/db/debug/BaseLoggableStatement.java
deleted file mode 100644
index e407f7846..000000000
--- a/jodd-db/src/main/java/jodd/db/debug/BaseLoggableStatement.java
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.debug;
-
-import jodd.typeconverter.Converter;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.StringTokenizer;
-
-public abstract class BaseLoggableStatement implements Statement {
-
- protected final S wrappedStatement;
- protected final String sqlTemplate;
-
- public BaseLoggableStatement(final S wrappedStatement, final String sqlTemplate) {
- this.wrappedStatement = wrappedStatement;
- this.sqlTemplate = sqlTemplate;
- }
-
- // ---------------------------------------------------------------- query
-
- protected ArrayList parameterValues;
-
- /**
- * Returns the query string.
- */
- public String getQueryString() {
- if (sqlTemplate == null) {
- return toString();
- }
- if (parameterValues == null) {
- return sqlTemplate;
- }
-
- final StringBuilder sb = new StringBuilder();
-
- int qMarkCount = 0;
- final StringTokenizer tok = new StringTokenizer(sqlTemplate + ' ', "?");
-
- while (tok.hasMoreTokens()) {
- final String oneChunk = tok.nextToken();
- sb.append(oneChunk);
- try {
- Object value = null;
- if (parameterValues.size() > 1 + qMarkCount) {
- value = parameterValues.get(1 + qMarkCount);
- qMarkCount++;
- } else {
- if (!tok.hasMoreTokens()) {
- value = "";
- }
- }
- if (value == null) {
- value = "?";
- }
- sb.append(value);
- } catch (Throwable th) {
- sb.append("--- Building query failed: ").append(th.toString());
- }
- }
- return sb.toString().trim();
- }
-
- /**
- * Saves the parameter value obj for the specified
- * position for use in logging output.
- *
- * @param position position (starting at 1) of the parameter to save
- * @param obj java.lang.Object the parameter value to save
- */
- protected void saveQueryParamValue(final int position, final Object obj) {
- final String strValue;
- if (obj instanceof String || obj instanceof Date) {
- strValue = "'" + obj + '\''; // if we have a String or Date, include '' in the saved value
- } else if (obj instanceof LocalDateTime || obj instanceof LocalDate || obj instanceof LocalTime) {
- strValue = "'" + Converter.get().toString(obj) + '\''; // time as string with '
- } else if (obj == null) {
- strValue = ""; // convert null to the string null
- } else {
- strValue = Converter.get().toString(obj); // all other objects (includes all Numbers, arrays, etc)
- }
-
- // if we are setting a position larger than current size of parameterValues,
- // first make it larger
- if (parameterValues == null) {
- parameterValues = new ArrayList<>();
- }
-
- while (position >= parameterValues.size()) {
- parameterValues.add(null);
- }
- parameterValues.set(position, strValue);
- }
-
- // ---------------------------------------------------------------- statement
-
- @Override
- public ResultSet executeQuery(String sql) throws SQLException {
- return wrappedStatement.executeQuery(sql);
- }
-
- @Override
- public int executeUpdate(String sql) throws SQLException {
- return wrappedStatement.executeUpdate(sql);
- }
-
- @Override
- public void close() throws SQLException {
- wrappedStatement.close();
- }
-
- @Override
- public int getMaxFieldSize() throws SQLException {
- return wrappedStatement.getMaxFieldSize();
- }
-
- @Override
- public void setMaxFieldSize(int max) throws SQLException {
- wrappedStatement.setMaxFieldSize(max);
- }
-
- @Override
- public int getMaxRows() throws SQLException {
- return wrappedStatement.getMaxRows();
- }
-
- @Override
- public void setMaxRows(int max) throws SQLException {
- wrappedStatement.setMaxRows(max);
- }
-
- @Override
- public void setEscapeProcessing(boolean enable) throws SQLException {
- wrappedStatement.setEscapeProcessing(enable);
- }
-
- @Override
- public int getQueryTimeout() throws SQLException {
- return wrappedStatement.getQueryTimeout();
- }
-
- @Override
- public void setQueryTimeout(int seconds) throws SQLException {
- wrappedStatement.setQueryTimeout(seconds);
- }
-
- @Override
- public void cancel() throws SQLException {
- wrappedStatement.cancel();
- }
-
- @Override
- public SQLWarning getWarnings() throws SQLException {
- return wrappedStatement.getWarnings();
- }
-
- @Override
- public void clearWarnings() throws SQLException {
- wrappedStatement.clearWarnings();
- }
-
- @Override
- public void setCursorName(String name) throws SQLException {
- wrappedStatement.setCursorName(name);
- }
-
- @Override
- public boolean execute(String sql) throws SQLException {
- return wrappedStatement.execute(sql);
- }
-
- @Override
- public ResultSet getResultSet() throws SQLException {
- return wrappedStatement.getResultSet();
- }
-
- @Override
- public int getUpdateCount() throws SQLException {
- return wrappedStatement.getUpdateCount();
- }
-
- @Override
- public boolean getMoreResults() throws SQLException {
- return wrappedStatement.getMoreResults();
- }
-
- @Override
- public void setFetchDirection(int direction) throws SQLException {
- wrappedStatement.setFetchDirection(direction);
- }
-
- @Override
- public int getFetchDirection() throws SQLException {
- return wrappedStatement.getFetchDirection();
- }
-
- @Override
- public void setFetchSize(int rows) throws SQLException {
- wrappedStatement.setFetchDirection(rows);
- }
-
- @Override
- public int getFetchSize() throws SQLException {
- return wrappedStatement.getFetchSize();
- }
-
- @Override
- public int getResultSetConcurrency() throws SQLException {
- return wrappedStatement.getResultSetConcurrency();
- }
-
- @Override
- public int getResultSetType() throws SQLException {
- return wrappedStatement.getResultSetType();
- }
-
- @Override
- public void addBatch(String sql) throws SQLException {
- wrappedStatement.addBatch(sql);
- }
-
- @Override
- public void clearBatch() throws SQLException {
- wrappedStatement.clearBatch();
- }
-
- @Override
- public int[] executeBatch() throws SQLException {
- return wrappedStatement.executeBatch();
- }
-
- @Override
- public Connection getConnection() throws SQLException {
- return wrappedStatement.getConnection();
- }
-
- @Override
- public boolean getMoreResults(int current) throws SQLException {
- return wrappedStatement.getMoreResults(current);
- }
-
- @Override
- public ResultSet getGeneratedKeys() throws SQLException {
- return wrappedStatement.getGeneratedKeys();
- }
-
- @Override
- public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
- return wrappedStatement.executeUpdate(sql, autoGeneratedKeys);
- }
-
- @Override
- public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
- return wrappedStatement.executeUpdate(sql, columnIndexes);
- }
-
- @Override
- public int executeUpdate(String sql, String[] columnNames) throws SQLException {
- return wrappedStatement.executeUpdate(sql, columnNames);
- }
-
- @Override
- public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
- return wrappedStatement.execute(sql, autoGeneratedKeys);
- }
-
- @Override
- public boolean execute(String sql, int[] columnIndexes) throws SQLException {
- return wrappedStatement.execute(sql, columnIndexes);
- }
-
- @Override
- public boolean execute(String sql, String[] columnNames) throws SQLException {
- return wrappedStatement.execute(sql, columnNames);
- }
-
- @Override
- public int getResultSetHoldability() throws SQLException {
- return wrappedStatement.getResultSetHoldability();
- }
-
- @Override
- public boolean isClosed() throws SQLException {
- return wrappedStatement.isClosed();
- }
-
- @Override
- public void setPoolable(boolean poolable) throws SQLException {
- wrappedStatement.setPoolable(poolable);
- }
-
- @Override
- public boolean isPoolable() throws SQLException {
- return wrappedStatement.isPoolable();
- }
-
- @Override
- public void closeOnCompletion() throws SQLException {
- wrappedStatement.closeOnCompletion();
- }
-
- @Override
- public boolean isCloseOnCompletion() throws SQLException {
- return wrappedStatement.isCloseOnCompletion();
- }
-
- @Override
- public T unwrap(Class iface) throws SQLException {
- return wrappedStatement.unwrap(iface);
- }
-
- @Override
- public boolean isWrapperFor(Class iface) throws SQLException {
- return wrappedStatement.isWrapperFor(iface);
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/debug/LoggableCallableStatement.java b/jodd-db/src/main/java/jodd/db/debug/LoggableCallableStatement.java
deleted file mode 100644
index d00fba877..000000000
--- a/jodd-db/src/main/java/jodd/db/debug/LoggableCallableStatement.java
+++ /dev/null
@@ -1,622 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.debug;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Map;
-
-public class LoggableCallableStatement extends LoggablePreparedStatement implements CallableStatement {
- private CallableStatement callableStatement;
-
- public LoggableCallableStatement(final CallableStatement wrappedStatement, final String sqlTemplate) {
- super(wrappedStatement, sqlTemplate);
- this.callableStatement = wrappedStatement;
- }
-
- @Override
- public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException {
- callableStatement.registerOutParameter(parameterIndex, sqlType);
- }
-
- @Override
- public void registerOutParameter(int parameterIndex, int sqlType, int scale) throws SQLException {
- callableStatement.registerOutParameter(parameterIndex, sqlType, scale);
- }
-
- @Override
- public boolean wasNull() throws SQLException {
- return callableStatement.wasNull();
- }
-
- @Override
- public String getString(int parameterIndex) throws SQLException {
- return callableStatement.getString(parameterIndex);
- }
-
- @Override
- public boolean getBoolean(int parameterIndex) throws SQLException {
- return callableStatement.getBoolean(parameterIndex);
- }
-
- @Override
- public byte getByte(int parameterIndex) throws SQLException {
- return callableStatement.getByte(parameterIndex);
- }
-
- @Override
- public short getShort(int parameterIndex) throws SQLException {
- return callableStatement.getShort(parameterIndex);
- }
-
- @Override
- public int getInt(int parameterIndex) throws SQLException {
- return callableStatement.getInt(parameterIndex);
- }
-
- @Override
- public long getLong(int parameterIndex) throws SQLException {
- return callableStatement.getLong(parameterIndex);
- }
-
- @Override
- public float getFloat(int parameterIndex) throws SQLException {
- return callableStatement.getFloat(parameterIndex);
- }
-
- @Override
- public double getDouble(int parameterIndex) throws SQLException {
- return callableStatement.getDouble(parameterIndex);
- }
-
- @Override
- @Deprecated
- public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException {
- return callableStatement.getBigDecimal(parameterIndex, scale);
- }
-
- @Override
- public byte[] getBytes(int parameterIndex) throws SQLException {
- return callableStatement.getBytes(parameterIndex);
- }
-
- @Override
- public Date getDate(int parameterIndex) throws SQLException {
- return callableStatement.getDate(parameterIndex);
- }
-
- @Override
- public Time getTime(int parameterIndex) throws SQLException {
- return callableStatement.getTime(parameterIndex);
- }
-
- @Override
- public Timestamp getTimestamp(int parameterIndex) throws SQLException {
- return callableStatement.getTimestamp(parameterIndex);
- }
-
- @Override
- public Object getObject(int parameterIndex) throws SQLException {
- return callableStatement.getObject(parameterIndex);
- }
-
- @Override
- public BigDecimal getBigDecimal(int parameterIndex) throws SQLException {
- return callableStatement.getBigDecimal(parameterIndex);
- }
-
- @Override
- public Object getObject(int parameterIndex, Map> map) throws SQLException {
- return callableStatement.getObject(parameterIndex, map);
- }
-
- @Override
- public Ref getRef(int parameterIndex) throws SQLException {
- return callableStatement.getRef(parameterIndex);
- }
-
- @Override
- public Blob getBlob(int parameterIndex) throws SQLException {
- return callableStatement.getBlob(parameterIndex);
- }
-
- @Override
- public Clob getClob(int parameterIndex) throws SQLException {
- return callableStatement.getClob(parameterIndex);
- }
-
- @Override
- public Array getArray(int parameterIndex) throws SQLException {
- return callableStatement.getArray(parameterIndex);
- }
-
- @Override
- public Date getDate(int parameterIndex, Calendar cal) throws SQLException {
- return callableStatement.getDate(parameterIndex, cal);
- }
-
- @Override
- public Time getTime(int parameterIndex, Calendar cal) throws SQLException {
- return callableStatement.getTime(parameterIndex, cal);
- }
-
- @Override
- public Timestamp getTimestamp(int parameterIndex, Calendar cal) throws SQLException {
- return callableStatement.getTimestamp(parameterIndex, cal);
- }
-
- @Override
- public void registerOutParameter(int parameterIndex, int sqlType, String typeName) throws SQLException {
- callableStatement.registerOutParameter(parameterIndex, sqlType, typeName);
- }
-
- @Override
- public void registerOutParameter(String parameterName, int sqlType) throws SQLException {
- callableStatement.registerOutParameter(parameterName, sqlType);
- }
-
- @Override
- public void registerOutParameter(String parameterName, int sqlType, int scale) throws SQLException {
- callableStatement.registerOutParameter(parameterName, sqlType, scale);
- }
-
- @Override
- public void registerOutParameter(String parameterName, int sqlType, String typeName) throws SQLException {
- callableStatement.registerOutParameter(parameterName, sqlType, typeName);
- }
-
- @Override
- public URL getURL(int parameterIndex) throws SQLException {
- return callableStatement.getURL(parameterIndex);
- }
-
- @Override
- public void setURL(String parameterName, URL val) throws SQLException {
- callableStatement.setURL(parameterName, val);
- }
-
- @Override
- public void setNull(String parameterName, int sqlType) throws SQLException {
- callableStatement.setNull(parameterName, sqlType);
- }
-
- @Override
- public void setBoolean(String parameterName, boolean x) throws SQLException {
- callableStatement.setBoolean(parameterName, x);
- }
-
- @Override
- public void setByte(String parameterName, byte x) throws SQLException {
- callableStatement.setByte(parameterName, x);
- }
-
- @Override
- public void setShort(String parameterName, short x) throws SQLException {
- callableStatement.setShort(parameterName, x);
- }
-
- @Override
- public void setInt(String parameterName, int x) throws SQLException {
- callableStatement.setInt(parameterName, x);
- }
-
- @Override
- public void setLong(String parameterName, long x) throws SQLException {
- callableStatement.setLong(parameterName, x);
- }
-
- @Override
- public void setFloat(String parameterName, float x) throws SQLException {
- callableStatement.setFloat(parameterName, x);
- }
-
- @Override
- public void setDouble(String parameterName, double x) throws SQLException {
- callableStatement.setDouble(parameterName, x);
- }
-
- @Override
- public void setBigDecimal(String parameterName, BigDecimal x) throws SQLException {
- callableStatement.setBigDecimal(parameterName, x);
- }
-
- @Override
- public void setString(String parameterName, String x) throws SQLException {
- callableStatement.setString(parameterName, x);
- }
-
- @Override
- public void setBytes(String parameterName, byte[] x) throws SQLException {
- callableStatement.setBytes(parameterName, x);
- }
-
- @Override
- public void setDate(String parameterName, Date x) throws SQLException {
- callableStatement.setDate(parameterName, x);
- }
-
- @Override
- public void setTime(String parameterName, Time x) throws SQLException {
- callableStatement.setTime(parameterName, x);
- }
-
- @Override
- public void setTimestamp(String parameterName, Timestamp x) throws SQLException {
- callableStatement.setTimestamp(parameterName, x);
- }
-
- @Override
- public void setAsciiStream(String parameterName, InputStream x, int length) throws SQLException {
- callableStatement.setAsciiStream(parameterName, x, length);
- }
-
- @Override
- public void setBinaryStream(String parameterName, InputStream x, int length) throws SQLException {
- callableStatement.setBinaryStream(parameterName, x, length);
- }
-
- @Override
- public void setObject(String parameterName, Object x, int targetSqlType, int scale) throws SQLException {
- callableStatement.setObject(parameterName, x, targetSqlType, scale);
- }
-
- @Override
- public void setObject(String parameterName, Object x, int targetSqlType) throws SQLException {
- callableStatement.setObject(parameterName, x, targetSqlType);
- }
-
- @Override
- public void setObject(String parameterName, Object x) throws SQLException {
- callableStatement.setObject(parameterName, x);
- }
-
- @Override
- public void setCharacterStream(String parameterName, Reader reader, int length) throws SQLException {
- callableStatement.setCharacterStream(parameterName, reader, length);
- }
-
- @Override
- public void setDate(String parameterName, Date x, Calendar cal) throws SQLException {
- callableStatement.setDate(parameterName, x, cal);
- }
-
- @Override
- public void setTime(String parameterName, Time x, Calendar cal) throws SQLException {
- callableStatement.setTime(parameterName, x, cal);
- }
-
- @Override
- public void setTimestamp(String parameterName, Timestamp x, Calendar cal) throws SQLException {
- callableStatement.setTimestamp(parameterName, x, cal);
- }
-
- @Override
- public void setNull(String parameterName, int sqlType, String typeName) throws SQLException {
- callableStatement.setNull(parameterName, sqlType, typeName);
- }
-
- @Override
- public String getString(String parameterName) throws SQLException {
- return callableStatement.getString(parameterName);
- }
-
- @Override
- public boolean getBoolean(String parameterName) throws SQLException {
- return callableStatement.getBoolean(parameterName);
- }
-
- @Override
- public byte getByte(String parameterName) throws SQLException {
- return callableStatement.getByte(parameterName);
- }
-
- @Override
- public short getShort(String parameterName) throws SQLException {
- return callableStatement.getShort(parameterName);
- }
-
- @Override
- public int getInt(String parameterName) throws SQLException {
- return callableStatement.getInt(parameterName);
- }
-
- @Override
- public long getLong(String parameterName) throws SQLException {
- return callableStatement.getLong(parameterName);
- }
-
- @Override
- public float getFloat(String parameterName) throws SQLException {
- return callableStatement.getFloat(parameterName);
- }
-
- @Override
- public double getDouble(String parameterName) throws SQLException {
- return callableStatement.getDouble(parameterName);
- }
-
- @Override
- public byte[] getBytes(String parameterName) throws SQLException {
- return callableStatement.getBytes(parameterName);
- }
-
- @Override
- public Date getDate(String parameterName) throws SQLException {
- return callableStatement.getDate(parameterName);
- }
-
- @Override
- public Time getTime(String parameterName) throws SQLException {
- return callableStatement.getTime(parameterName);
- }
-
- @Override
- public Timestamp getTimestamp(String parameterName) throws SQLException {
- return callableStatement.getTimestamp(parameterName);
- }
-
- @Override
- public Object getObject(String parameterName) throws SQLException {
- return callableStatement.getObject(parameterName);
- }
-
- @Override
- public BigDecimal getBigDecimal(String parameterName) throws SQLException {
- return callableStatement.getBigDecimal(parameterName);
- }
-
- @Override
- public Object getObject(String parameterName, Map> map) throws SQLException {
- return callableStatement.getObject(parameterName, map);
- }
-
- @Override
- public Ref getRef(String parameterName) throws SQLException {
- return callableStatement.getRef(parameterName);
- }
-
- @Override
- public Blob getBlob(String parameterName) throws SQLException {
- return callableStatement.getBlob(parameterName);
- }
-
- @Override
- public Clob getClob(String parameterName) throws SQLException {
- return callableStatement.getClob(parameterName);
- }
-
- @Override
- public Array getArray(String parameterName) throws SQLException {
- return callableStatement.getArray(parameterName);
- }
-
- @Override
- public Date getDate(String parameterName, Calendar cal) throws SQLException {
- return callableStatement.getDate(parameterName, cal);
- }
-
- @Override
- public Time getTime(String parameterName, Calendar cal) throws SQLException {
- return callableStatement.getTime(parameterName, cal);
- }
-
- @Override
- public Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLException {
- return callableStatement.getTimestamp(parameterName, cal);
- }
-
- @Override
- public URL getURL(String parameterName) throws SQLException {
- return callableStatement.getURL(parameterName);
- }
-
- @Override
- public RowId getRowId(int parameterIndex) throws SQLException {
- return callableStatement.getRowId(parameterIndex);
- }
-
- @Override
- public RowId getRowId(String parameterName) throws SQLException {
- return callableStatement.getRowId(parameterName);
- }
-
- @Override
- public void setRowId(String parameterName, RowId x) throws SQLException {
- callableStatement.setRowId(parameterName, x);
- }
-
- @Override
- public void setNString(String parameterName, String value) throws SQLException {
- callableStatement.setNString(parameterName, value);
- }
-
- @Override
- public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
- callableStatement.setNCharacterStream(parameterName, value, length);
- }
-
- @Override
- public void setNClob(String parameterName, NClob value) throws SQLException {
- callableStatement.setNClob(parameterName, value);
- }
-
- @Override
- public void setClob(String parameterName, Reader reader, long length) throws SQLException {
- callableStatement.setClob(parameterName, reader, length);
- }
-
- @Override
- public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
- callableStatement.setBlob(parameterName, inputStream, length);
- }
-
- @Override
- public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
- callableStatement.setNClob(parameterName, reader, length);
- }
-
- @Override
- public NClob getNClob(int parameterIndex) throws SQLException {
- return callableStatement.getNClob(parameterIndex);
- }
-
- @Override
- public NClob getNClob(String parameterName) throws SQLException {
- return callableStatement.getNClob(parameterName);
- }
-
- @Override
- public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
- callableStatement.setSQLXML(parameterName, xmlObject);
- }
-
- @Override
- public SQLXML getSQLXML(int parameterIndex) throws SQLException {
- return callableStatement.getSQLXML(parameterIndex);
- }
-
- @Override
- public SQLXML getSQLXML(String parameterName) throws SQLException {
- return callableStatement.getSQLXML(parameterName);
- }
-
- @Override
- public String getNString(int parameterIndex) throws SQLException {
- return callableStatement.getNString(parameterIndex);
- }
-
- @Override
- public String getNString(String parameterName) throws SQLException {
- return callableStatement.getNString(parameterName);
- }
-
- @Override
- public Reader getNCharacterStream(int parameterIndex) throws SQLException {
- return callableStatement.getNCharacterStream(parameterIndex);
- }
-
- @Override
- public Reader getNCharacterStream(String parameterName) throws SQLException {
- return callableStatement.getNCharacterStream(parameterName);
- }
-
- @Override
- public Reader getCharacterStream(int parameterIndex) throws SQLException {
- return callableStatement.getCharacterStream(parameterIndex);
- }
-
- @Override
- public Reader getCharacterStream(String parameterName) throws SQLException {
- return callableStatement.getCharacterStream(parameterName);
- }
-
- @Override
- public void setBlob(String parameterName, Blob x) throws SQLException {
- callableStatement.setBlob(parameterName, x);
- }
-
- @Override
- public void setClob(String parameterName, Clob x) throws SQLException {
- callableStatement.setClob(parameterName, x);
- }
-
- @Override
- public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
- callableStatement.setAsciiStream(parameterName, x, length);
- }
-
- @Override
- public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
- callableStatement.setBinaryStream(parameterName, x, length);
- }
-
- @Override
- public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
- callableStatement.setCharacterStream(parameterName, reader, length);
- }
-
- @Override
- public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
- callableStatement.setAsciiStream(parameterName, x);
- }
-
- @Override
- public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
- callableStatement.setBinaryStream(parameterName, x);
- }
-
- @Override
- public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
- callableStatement.setCharacterStream(parameterName, reader);
- }
-
- @Override
- public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
- callableStatement.setNCharacterStream(parameterName, value);
- }
-
- @Override
- public void setClob(String parameterName, Reader reader) throws SQLException {
- callableStatement.setClob(parameterName, reader);
- }
-
- @Override
- public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
- callableStatement.setBlob(parameterName, inputStream);
- }
-
- @Override
- public void setNClob(String parameterName, Reader reader) throws SQLException {
- callableStatement.setNClob(parameterName, reader);
- }
-
- @Override
- public T getObject(int parameterIndex, Class type) throws SQLException {
- return callableStatement.getObject(parameterIndex, type);
- }
-
- @Override
- public T getObject(String parameterName, Class type) throws SQLException {
- return callableStatement.getObject(parameterName, type);
- }
-}
-
-
diff --git a/jodd-db/src/main/java/jodd/db/debug/LoggablePreparedStatement.java b/jodd-db/src/main/java/jodd/db/debug/LoggablePreparedStatement.java
deleted file mode 100644
index 992b07285..000000000
--- a/jodd-db/src/main/java/jodd/db/debug/LoggablePreparedStatement.java
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.debug;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-/**
- * Factory for loggable prepared statements - a PreparedStatement with added logging capability.
- *
- * In addition to the methods declared in PreparedStatement,
- * LoggablePreparedStatement provides a method {@link #getQueryString} that can be used to get
- * the query string in a format suitable for logging.
- *
- * Should not be used in production!
- */
-@SuppressWarnings("MagicConstant")
-public class LoggablePreparedStatement extends BaseLoggableStatement implements PreparedStatement {
-
- public LoggablePreparedStatement(final PreparedStatement wrappedStatement, final String sqlTemplate) {
- super(wrappedStatement, sqlTemplate);
- }
-
- @Override
- public ResultSet executeQuery() throws SQLException {
- return wrappedStatement.executeQuery();
- }
-
- @Override
- public int executeUpdate() throws SQLException {
- return wrappedStatement.executeUpdate();
- }
-
- @Override
- public void setNull(int parameterIndex, int sqlType) throws SQLException {
- saveQueryParamValue(parameterIndex, null);
- wrappedStatement.setNull(parameterIndex, sqlType);
- }
-
- @Override
- public void setBoolean(int parameterIndex, boolean x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBoolean(parameterIndex, x);
- }
-
- @Override
- public void setByte(int parameterIndex, byte x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setByte(parameterIndex, x);
- }
-
- @Override
- public void setShort(int parameterIndex, short x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setShort(parameterIndex, x);
- }
-
- @Override
- public void setInt(int parameterIndex, int x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setInt(parameterIndex, x);
- }
-
- @Override
- public void setLong(int parameterIndex, long x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setLong(parameterIndex, x);
- }
-
- @Override
- public void setFloat(int parameterIndex, float x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setFloat(parameterIndex, x);
- }
-
- @Override
- public void setDouble(int parameterIndex, double x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setDouble(parameterIndex, x);
- }
-
- @Override
- public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBigDecimal(parameterIndex, x);
- }
-
- @Override
- public void setString(int parameterIndex, String x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setString(parameterIndex, x);
- }
-
- @Override
- public void setBytes(int parameterIndex, byte[] x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBytes(parameterIndex, x);
- }
-
- @Override
- public void setDate(int parameterIndex, Date x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setDate(parameterIndex, x);
- }
-
- @Override
- public void setTime(int parameterIndex, Time x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setTime(parameterIndex, x);
- }
-
- @Override
- public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setTimestamp(parameterIndex, x);
- }
-
- @Override
- public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setAsciiStream(parameterIndex, x);
- }
-
- @Override
- @Deprecated
- public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setUnicodeStream(parameterIndex, x, length);
- }
-
- @Override
- public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBinaryStream(parameterIndex, x, length);
- }
-
- @Override
- public void clearParameters() throws SQLException {
- wrappedStatement.clearParameters();
- }
-
- @Override
- public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setObject(parameterIndex, x, targetSqlType);
- }
-
- @Override
- public void setObject(int parameterIndex, Object x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setObject(parameterIndex, x);
- }
-
- @Override
- public boolean execute() throws SQLException {
- return wrappedStatement.execute();
- }
-
- @Override
- public void addBatch() throws SQLException {
- wrappedStatement.addBatch();
- }
-
- @Override
- public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setCharacterStream(parameterIndex, reader, length);
- }
-
- @Override
- public void setRef(int parameterIndex, Ref x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setRef(parameterIndex, x);
- }
-
- @Override
- public void setBlob(int parameterIndex, Blob x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBlob(parameterIndex, x);
- }
-
- @Override
- public void setClob(int parameterIndex, Clob x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setClob(parameterIndex, x);
- }
-
- @Override
- public void setArray(int parameterIndex, Array x) throws SQLException {
- wrappedStatement.setArray(parameterIndex, x);
- }
-
- @Override
- public ResultSetMetaData getMetaData() throws SQLException {
- return wrappedStatement.getMetaData();
- }
-
- @Override
- public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setDate(parameterIndex, x, cal);
- }
-
- @Override
- public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setTime(parameterIndex, x, cal);
- }
-
- @Override
- public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setTimestamp(parameterIndex, x, cal);
- }
-
- @Override
- public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
- saveQueryParamValue(parameterIndex, null);
- wrappedStatement.setNull(parameterIndex, sqlType, typeName);
- }
-
- @Override
- public void setURL(int parameterIndex, URL x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setURL(parameterIndex, x);
- }
-
- @Override
- public ParameterMetaData getParameterMetaData() throws SQLException {
- return wrappedStatement.getParameterMetaData();
- }
-
- @Override
- public void setRowId(int parameterIndex, RowId x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setRowId(parameterIndex, x);
- }
-
- @Override
- public void setNString(int parameterIndex, String value) throws SQLException {
- saveQueryParamValue(parameterIndex, value);
- wrappedStatement.setNString(parameterIndex, value);
- }
-
- @Override
- public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, value);
- wrappedStatement.setNCharacterStream(parameterIndex, value, length);
- }
-
- @Override
- public void setNClob(int parameterIndex, NClob value) throws SQLException {
- saveQueryParamValue(parameterIndex, value);
- wrappedStatement.setNClob(parameterIndex, value);
- }
-
- @Override
- public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setClob(parameterIndex, reader, length);
- }
-
- @Override
- public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, inputStream);
- wrappedStatement.setBlob(parameterIndex, inputStream, length);
- }
-
- @Override
- public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setNClob(parameterIndex, reader, length);
- }
-
- @Override
- public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
- saveQueryParamValue(parameterIndex, xmlObject);
- wrappedStatement.setSQLXML(parameterIndex, xmlObject);
- }
-
- @Override
- public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
- }
-
- @Override
- public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setAsciiStream(parameterIndex, x, length);
- }
-
- @Override
- public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBinaryStream(parameterIndex, x, length);
- }
-
- @Override
- public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setCharacterStream(parameterIndex, reader, length);
- }
-
- @Override
- public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setAsciiStream(parameterIndex, x);
- }
-
- @Override
- public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
- saveQueryParamValue(parameterIndex, x);
- wrappedStatement.setBinaryStream(parameterIndex, x);
- }
-
- @Override
- public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setCharacterStream(parameterIndex, reader);
- }
-
- @Override
- public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
- saveQueryParamValue(parameterIndex, value);
- wrappedStatement.setNCharacterStream(parameterIndex, value);
- }
-
- @Override
- public void setClob(int parameterIndex, Reader reader) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setClob(parameterIndex, reader);
- }
-
- @Override
- public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
- saveQueryParamValue(parameterIndex, inputStream);
- wrappedStatement.setBlob(parameterIndex, inputStream);
- }
-
- @Override
- public void setNClob(int parameterIndex, Reader reader) throws SQLException {
- saveQueryParamValue(parameterIndex, reader);
- wrappedStatement.setNClob(parameterIndex, reader);
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/debug/package-info.java b/jodd-db/src/main/java/jodd/db/debug/package-info.java
deleted file mode 100644
index 880542698..000000000
--- a/jodd-db/src/main/java/jodd/db/debug/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Various database debugging tools. Not for use in production.
- */
-package jodd.db.debug;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/jtx/DbJtxResourceManager.java b/jodd-db/src/main/java/jodd/db/jtx/DbJtxResourceManager.java
deleted file mode 100644
index 9b834356d..000000000
--- a/jodd-db/src/main/java/jodd/db/jtx/DbJtxResourceManager.java
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.jtx;
-
-import jodd.db.DbSession;
-import jodd.db.connection.ConnectionProvider;
-import jodd.jtx.JtxException;
-import jodd.jtx.JtxResourceManager;
-import jodd.jtx.JtxTransactionMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Database {@link jodd.jtx.JtxResourceManager} manages life-cycle of {@link jodd.db.DbSession} resources.
- * Also acts as an adapter of resource object (of any type) and JTX engine.
- *
- * Transaction resources may be of any type. The only thing what is important is that resource must be
- * aware of its transactional state - is it in no-transactional mode (i.e. auto-commit), or under the transaction.
- */
-public class DbJtxResourceManager implements JtxResourceManager {
-
- private static final Logger log = LoggerFactory.getLogger(DbJtxResourceManager.class);
-
- protected final ConnectionProvider connectionProvider;
-
- /**
- * Creates resource manager.
- */
- public DbJtxResourceManager(final ConnectionProvider connectionProvider) {
- this.connectionProvider = connectionProvider;
- }
-
- /**
- * {@inheritDoc}
- */
- public Class getResourceType() {
- return DbSession.class;
- }
-
- // ---------------------------------------------------------------- resource manager
-
- /**
- * {@inheritDoc}
- */
- public DbSession beginTransaction(final JtxTransactionMode jtxMode, final boolean active) {
- final DbSession session = new DbSession(connectionProvider);
- if (active) {
- log.debug("begin jtx");
-
- session.beginTransaction(JtxDbUtil.convertToDbMode(jtxMode));
- }
- return session;
- }
-
- /**
- * {@inheritDoc}
- */
- public void commitTransaction(final DbSession resource) {
- if (resource.isTransactionActive()) {
- log.debug("commit jtx");
-
- resource.commitTransaction();
- }
- resource.closeSession();
- }
-
- /**
- * {@inheritDoc}
- */
- public void rollbackTransaction(final DbSession resource) {
- try {
- if (resource.isTransactionActive()) {
- log.debug("rollback tx");
-
- resource.rollbackTransaction();
- }
- } catch (final Exception ex) {
- throw new JtxException(ex);
- } finally {
- resource.closeSession();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void close() {
- connectionProvider.close();
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/jtx/DbJtxSessionProvider.java b/jodd-db/src/main/java/jodd/db/jtx/DbJtxSessionProvider.java
deleted file mode 100644
index a5a37fe77..000000000
--- a/jodd-db/src/main/java/jodd/db/jtx/DbJtxSessionProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.jtx;
-
-import jodd.db.DbSession;
-import jodd.db.DbSessionProvider;
-import jodd.db.DbSqlException;
-import jodd.jtx.JtxTransactionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Returns session from the db {@link JtxTransactionManager transaction manager},
- * like {@link DbJtxTransactionManager}.
- */
-public class DbJtxSessionProvider implements DbSessionProvider {
-
- private static final Logger log = LoggerFactory.getLogger(DbJtxSessionProvider.class);
-
- protected final JtxTransactionManager jtxTxManager;
-
- /**
- * Creates new JTX session provider.
- */
- public DbJtxSessionProvider(final JtxTransactionManager txManager) {
- this.jtxTxManager = txManager;
- }
-
- /**
- * Returns session from JTX transaction manager and started transaction.
- */
- @Override
- public DbSession getDbSession() {
- log.debug("Requesting db TX manager session");
-
- final DbJtxTransaction jtx = (DbJtxTransaction) jtxTxManager.getTransaction();
-
- if (jtx == null) {
- throw new DbSqlException(
- "No transaction is in progress and DbSession can't be provided. " +
- "It seems that transaction manager is not used to begin a transaction.");
- }
-
- return jtx.requestResource();
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/jtx/DbJtxTransaction.java b/jodd-db/src/main/java/jodd/db/jtx/DbJtxTransaction.java
deleted file mode 100644
index c0f0802bb..000000000
--- a/jodd-db/src/main/java/jodd/db/jtx/DbJtxTransaction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.jtx;
-
-import jodd.db.DbSession;
-import jodd.jtx.JtxTransaction;
-import jodd.jtx.JtxTransactionManager;
-import jodd.jtx.JtxTransactionMode;
-
-/**
- * {@link JtxTransaction} extension that simplifies beginning of the transaction since
- * related {@link DbJtxTransactionManager} allows only one resource type.
- */
-public class DbJtxTransaction extends JtxTransaction {
-
- protected DbJtxTransaction(final JtxTransactionManager txManager, final JtxTransactionMode mode, final Object scope, final boolean active) {
- super(txManager, mode, scope, active);
- }
-
- public DbSession requestResource() {
- return requestResource(DbSession.class);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/jtx/DbJtxTransactionManager.java b/jodd-db/src/main/java/jodd/db/jtx/DbJtxTransactionManager.java
deleted file mode 100644
index bfa397e2b..000000000
--- a/jodd-db/src/main/java/jodd/db/jtx/DbJtxTransactionManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.jtx;
-
-import jodd.db.connection.ConnectionProvider;
-import jodd.jtx.JtxTransaction;
-import jodd.jtx.JtxTransactionManager;
-import jodd.jtx.JtxTransactionMode;
-
-/**
- * {@link jodd.jtx.JtxTransactionManager} that uses only one JTX db resource type.
- * Usually, applications have only one transactional resource type - the database.
- * This manager just simplifies the usage, nothing more.
- * @see jodd.jtx.JtxTransactionManager
- */
-public class DbJtxTransactionManager extends JtxTransactionManager {
-
- /**
- * Creates db jtx manager and registers provided {@link DbJtxResourceManager}.
- */
- public DbJtxTransactionManager(final DbJtxResourceManager resourceManager) {
- setMaxResourcesPerTransaction(1);
- setSingleResourceManager(true);
- super.registerResourceManager(resourceManager);
-
- }
-
- /**
- * Creates db jtx manager and registers new {@link DbJtxResourceManager}.
- */
- public DbJtxTransactionManager(final ConnectionProvider connectionProvider) {
- this(new DbJtxResourceManager(connectionProvider));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DbJtxTransaction requestTransaction(final JtxTransactionMode mode) {
- return (DbJtxTransaction) super.requestTransaction(mode, null);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DbJtxTransaction requestTransaction(final JtxTransactionMode mode, final Object scope) {
- return (DbJtxTransaction) super.requestTransaction(mode, scope);
- }
-
- /**
- * Builds new transaction instance.
- */
- @Override
- protected JtxTransaction createNewTransaction(final JtxTransactionMode tm, final Object scope, final boolean active) {
- return new DbJtxTransaction(this, tm, scope, active);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/jtx/JtxDbUtil.java b/jodd-db/src/main/java/jodd/db/jtx/JtxDbUtil.java
deleted file mode 100644
index 0dd936a47..000000000
--- a/jodd-db/src/main/java/jodd/db/jtx/JtxDbUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.jtx;
-
-import jodd.db.DbTransactionMode;
-import jodd.jtx.JtxTransactionMode;
-
-/**
- * Helpers for jtx db.
- */
-public class JtxDbUtil {
-
- /**
- * Converter JTX transaction mode to DB transaction mode.
- */
- public static DbTransactionMode convertToDbMode(final JtxTransactionMode txMode) {
- final int isolation;
- switch (txMode.getIsolationLevel()) {
- case ISOLATION_DEFAULT: isolation = DbTransactionMode.ISOLATION_DEFAULT; break;
- case ISOLATION_NONE: isolation = DbTransactionMode.ISOLATION_NONE; break;
- case ISOLATION_READ_COMMITTED: isolation = DbTransactionMode.ISOLATION_READ_COMMITTED; break;
- case ISOLATION_READ_UNCOMMITTED: isolation = DbTransactionMode.ISOLATION_READ_UNCOMMITTED; break;
- case ISOLATION_REPEATABLE_READ: isolation = DbTransactionMode.ISOLATION_REPEATABLE_READ; break;
- case ISOLATION_SERIALIZABLE: isolation = DbTransactionMode.ISOLATION_SERIALIZABLE; break;
- default:
- throw new IllegalArgumentException();
- }
- return new DbTransactionMode(isolation, txMode.isReadOnly());
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/jtx/package-info.java b/jodd-db/src/main/java/jodd/db/jtx/package-info.java
deleted file mode 100644
index ba6691d2b..000000000
--- a/jodd-db/src/main/java/jodd/db/jtx/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Database extension for propagated transactions.
- */
-package jodd.db.jtx;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/AutomagicDbOomConfigurator.java b/jodd-db/src/main/java/jodd/db/oom/AutomagicDbOomConfigurator.java
deleted file mode 100644
index fff733e24..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/AutomagicDbOomConfigurator.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.oom.meta.DbTable;
-import jodd.io.findfile.ClassScanner;
-import jodd.util.Consumers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.function.Consumer;
-
-/**
- * Auto-magically scans classpath for domain objects annotated with DbOom annotations.
- */
-public class AutomagicDbOomConfigurator {
-
- private static final Logger log = LoggerFactory.getLogger(AutomagicDbOomConfigurator.class);
-
- protected final static byte[] DB_TABLE_ANNOTATION_BYTES = ClassScanner.bytecodeSignatureOfType(DbTable.class);
- protected final boolean registerAsEntities;
- protected final DbEntityManager dbEntityManager;
- private final Consumers classScannerConsumers = new Consumers<>();
-
- public AutomagicDbOomConfigurator(final DbEntityManager dbEntityManager, final boolean registerAsEntities) {
- this.dbEntityManager = dbEntityManager;
- this.registerAsEntities = registerAsEntities;
- }
-
- public AutomagicDbOomConfigurator withScanner(final Consumer scannerConsumer) {
- classScannerConsumers.add(scannerConsumer);
- return this;
- }
-
-
- /**
- * Configures {@link DbEntityManager} with specified class path.
- */
- public void configure() {
- long elapsed = System.currentTimeMillis();
-
- final ClassScanner classScanner = new ClassScanner();
-
- classScanner.detectEntriesMode(true);
- classScanner.scanDefaultClasspath();
-
- classScannerConsumers.accept(classScanner);
-
- registerAsConsumer(classScanner);
-
- try {
- classScanner.start();
- } catch (final Exception ex) {
- throw new DbOomException("Scan classpath error", ex);
- }
- elapsed = System.currentTimeMillis() - elapsed;
- if (log.isInfoEnabled()) {
- log.info("DbEntityManager configured in " + elapsed + "ms. Total entities: " + dbEntityManager.getTotalNames());
- }
- }
-
- /**
- * Registers a class consumer that registers only those annotated with {@link DbTable}.
- * Because of performance purposes, classes are not dynamically loaded; instead, their
- * file content is examined.
- */
- public void registerAsConsumer(final ClassScanner classScanner) {
- classScanner.registerEntryConsumer(classPathEntry -> {
- if (!classPathEntry.isTypeSignatureInUse(DB_TABLE_ANNOTATION_BYTES)) {
- return;
- }
-
- final Class beanClass;
- try {
- beanClass = classPathEntry.loadClass();
- } catch (final ClassNotFoundException cnfex) {
- throw new DbOomException("Entry class not found: " + classPathEntry.name(), cnfex);
- }
-
- if (beanClass == null) {
- return;
- }
-
- final DbTable dbTable = beanClass.getAnnotation(DbTable.class);
-
- if (dbTable == null) {
- return;
- }
-
- if (registerAsEntities) {
- dbEntityManager.registerEntity(beanClass);
- } else {
- dbEntityManager.registerType(beanClass);
- }
- });
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/ColumnAliasType.java b/jodd-db/src/main/java/jodd/db/oom/ColumnAliasType.java
deleted file mode 100644
index 653e1a7d0..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/ColumnAliasType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-/**
- * Various column alias types. Sometimes, when database JDBC driver does not
- * support table names in ResultSet metadata, it might be useful to include
- * table name or a reference in the column name, separated by some separator.
- *
- * Using TABLE_NAME type might be dangerous, since most databases (including Oracle)
- * has some maximum length for column names, so adding table name prefix might
- * be too much;)
- *
- * Column types are usually used internally by SQL generators (see: {@link DbSqlGenerator}).
- */
-public enum ColumnAliasType {
-
- TABLE_NAME(1), // table_namecolumn_name
- TABLE_REFERENCE(2), // table_referencecolumn_name
- COLUMN_CODE(3); // col__
-
- int value;
-
- ColumnAliasType(final int aliasType) {
- this.value = aliasType;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/ColumnData.java b/jodd-db/src/main/java/jodd/db/oom/ColumnData.java
deleted file mode 100644
index 281d64f66..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/ColumnData.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-/**
- * Column data.
- */
-public class ColumnData {
-
- private final String tableName;
- private final String columnName;
-
- public ColumnData(final String tableName) {
- this.tableName = tableName;
- this.columnName = null;
- }
-
- public ColumnData(final String tableName, final String columnName) {
- this.tableName = tableName;
- this.columnName = columnName;
- }
-
- /**
- * Returns table name for this column.
- */
- public String getTableName() {
- return tableName;
- }
-
- /**
- * Returns column name for this column.
- */
- public String getColumnName() {
- return columnName;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbEntityColumnDescriptor.java b/jodd-db/src/main/java/jodd/db/oom/DbEntityColumnDescriptor.java
deleted file mode 100644
index e1a437748..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbEntityColumnDescriptor.java
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.type.SqlType;
-import jodd.util.StringUtil;
-
-/**
- * Column descriptors.
- */
-public class DbEntityColumnDescriptor implements Comparable {
-
- protected final DbEntityDescriptor dbEntityDescriptor;
- protected final String columnName;
- protected final String columnNameForQuery;
- protected final String propertyName;
- protected final Class propertyType;
- protected final boolean isId;
- protected final Class sqlTypeClass;
- protected int dbSqlType = SqlType.DB_SQLTYPE_UNKNOWN;
-
- public DbEntityColumnDescriptor(
- final DbEntityDescriptor ded,
- final String columnName,
- final String fieldName,
- final Class fieldType,
- final boolean isId,
- final Class sqlTypeClass) {
-
- this.dbEntityDescriptor = ded;
- this.propertyName = fieldName;
- this.propertyType = fieldType;
- this.isId = isId;
- this.sqlTypeClass = sqlTypeClass;
-
- this.columnNameForQuery = columnName;
-
- if (StringUtil.detectQuoteChar(columnNameForQuery) != 0) {
- this.columnName = StringUtil.substring(columnNameForQuery, 1, -1);
- }
- else {
- this.columnName = columnNameForQuery;
- }
- }
-
- /**
- * Returns {@link jodd.db.oom.DbEntityDescriptor} that this column description belongs to.
- */
- public DbEntityDescriptor getDbEntityDescriptor() {
- return dbEntityDescriptor;
- }
-
- /**
- * Returns column name.
- */
- public String getColumnName() {
- return columnName;
- }
-
- /**
- * Returns column name to be used in the generated sql.
- */
- public String getColumnNameForQuery() {
- return columnNameForQuery;
- }
-
- /**
- * Returns property name.
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Returns property type.
- */
- public Class getPropertyType() {
- return propertyType;
- }
-
- /**
- * Returns true if column is ID column.
- */
- public boolean isId() {
- return isId;
- }
-
- /**
- * Returns SqlType or null for default type.
- */
- public Class getSqlTypeClass() {
- return sqlTypeClass;
- }
-
- /**
- * Returns db sql type. Important: available only after first saving of column value
- * to database!
- */
- public int getDbSqlType() {
- return dbSqlType;
- }
-
- /**
- * Updates db sql type if not already set.
- */
- public void updateDbSqlType(final int dbSqlType) {
- if (this.dbSqlType == SqlType.DB_SQLTYPE_UNKNOWN) {
- this.dbSqlType = dbSqlType;
- }
- }
-
- // ---------------------------------------------------------------- comparable
-
- /**
- * Compares two column descriptors. Identity columns should be the first on the list.
- * Each group then will be sorted by column name.
- */
- @Override
- public int compareTo(final Object o) {
- DbEntityColumnDescriptor that = (DbEntityColumnDescriptor) o;
- if (this.isId != that.isId) {
- return this.isId ? -1 : 1; // IDs should be the first in the array
- }
- return this.columnName.compareTo(that.columnName);
- }
-
- // ---------------------------------------------------------------- equals and hash
-
- @Override
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (this.getClass() != o.getClass()) {
- return false;
- }
- DbEntityColumnDescriptor that = (DbEntityColumnDescriptor) o;
- return columnName.equals(that.columnName);
- }
-
- @Override
- public int hashCode() {
- return columnName.hashCode();
- }
-
- // ---------------------------------------------------------------- to string
-
-
- @Override
- public String toString() {
- return "DbEntityColumnDescriptor{" +
- "columnName='" + columnName + '\'' +
- ", propertyName='" + propertyName + '\'' +
- ", isId=" + isId +
- '}';
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbEntityDescriptor.java b/jodd-db/src/main/java/jodd/db/oom/DbEntityDescriptor.java
deleted file mode 100644
index 825b2b53a..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbEntityDescriptor.java
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.bean.BeanUtil;
-import jodd.db.oom.naming.ColumnNamingStrategy;
-import jodd.db.oom.naming.TableNamingStrategy;
-import jodd.introspector.ClassIntrospector;
-import jodd.introspector.PropertyDescriptor;
-import jodd.util.StringPool;
-import jodd.util.StringUtil;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * Holds all information about some entity type, such as table name and {@link DbEntityColumnDescriptor columns data}.
- */
-public class DbEntityDescriptor {
-
- public DbEntityDescriptor(
- final Class type,
- final String schemaName,
- final TableNamingStrategy tableNamingStrategy,
- final ColumnNamingStrategy columnNamingStrategy) {
-
- this.type = type;
- this.entityName = type.getSimpleName();
- this.isAnnotated = DbMetaUtil.resolveIsAnnotated(type);
- this.schemaName = DbMetaUtil.resolveSchemaName(type, schemaName);
- this.columnNamingStrategy = columnNamingStrategy;
- this.mappedTypes = DbMetaUtil.resolveMappedTypes(type);
-
- this.tableNameForQuery = DbMetaUtil.resolveTableName(type, tableNamingStrategy);
-
- if (StringUtil.detectQuoteChar(tableNameForQuery) != 0) {
- this.tableName = StringUtil.substring(tableNameForQuery, 1, -1);
- } else {
- this.tableName = tableNameForQuery;
- }
- }
-
- // ---------------------------------------------------------------- type and table
-
- private final Class type;
- private final String entityName;
- private final boolean isAnnotated;
- private final String tableName;
- private final String tableNameForQuery;
- private final String schemaName;
- private final ColumnNamingStrategy columnNamingStrategy;
- private final Class[] mappedTypes;
-
- /**
- * Returns entity type.
- */
- public Class getType() {
- return type;
- }
-
- /**
- * Returns true if type is annotated with {@link jodd.db.oom.meta.DbTable}.
- */
- public boolean isAnnotated() {
- return isAnnotated;
- }
-
- /**
- * Returns table name to which the entity is mapped.
- */
- public String getTableName() {
- return tableName;
- }
-
- /**
- * Returns table name to be used when generating queries.
- */
- public String getTableNameForQuery() {
- return tableNameForQuery;
- }
-
- /**
- * Returns type name.
- */
- public String getEntityName() {
- return entityName;
- }
-
- /**
- * Returns schema name or null if not available.
- */
- public String getSchemaName() {
- return schemaName;
- }
-
- /**
- * Returns mapped types.
- */
- public Class[] getMappedTypes() {
- return mappedTypes;
- }
-
- // ---------------------------------------------------------------- columns and fields
-
- private DbEntityColumnDescriptor[] columnDescriptors;
- private DbEntityColumnDescriptor[] idColumnDescriptors;
-
- /**
- * Returns the array of column descriptors.
- */
- public DbEntityColumnDescriptor[] getColumnDescriptors() {
- init();
- return columnDescriptors;
- }
-
- // ---------------------------------------------------------------- initialization
-
- /**
- * Lazy initialization of descriptor.
- */
- protected void init() {
- if (columnDescriptors == null) {
- resolveColumnsAndProperties(type);
- }
- }
-
- /**
- * Resolves list of all columns and properties.
- */
- private void resolveColumnsAndProperties(final Class type) {
- final PropertyDescriptor[] allProperties = ClassIntrospector.get().lookup(type).getAllPropertyDescriptors();
- final List decList = new ArrayList<>(allProperties.length);
- int idcount = 0;
-
- final HashSet names = new HashSet<>(allProperties.length);
-
- for (final PropertyDescriptor propertyDescriptor : allProperties) {
-
- final DbEntityColumnDescriptor dec =
- DbMetaUtil.resolveColumnDescriptors(this, propertyDescriptor, isAnnotated, columnNamingStrategy);
-
- if (dec != null) {
- if (!names.add(dec.getColumnName())) {
- throw new DbOomException("Duplicate column name: " + dec.getColumnName());
- }
-
- decList.add(dec);
-
- if (dec.isId) {
- idcount++;
- }
- }
- }
- if (decList.isEmpty()) {
- throw new DbOomException("No column mappings in entity: " + type);
- }
- columnDescriptors = decList.toArray(new DbEntityColumnDescriptor[0]);
- Arrays.sort(columnDescriptors);
-
- // extract ids from sorted list
- if (idcount > 0) {
- idColumnDescriptors = new DbEntityColumnDescriptor[idcount];
- idcount = 0;
- for (final DbEntityColumnDescriptor dec : columnDescriptors) {
- if (dec.isId) {
- idColumnDescriptors[idcount++] = dec;
- }
- }
- }
- }
-
- // ---------------------------------------------------------------- finders
-
- /**
- * Finds column descriptor by column name. Case is ignored.
- */
- public DbEntityColumnDescriptor findByColumnName(final String columnName) {
- if (columnName == null) {
- return null;
- }
- init();
- for (final DbEntityColumnDescriptor columnDescriptor : columnDescriptors) {
- if (columnDescriptor.columnName.equalsIgnoreCase(columnName)) {
- return columnDescriptor;
- }
- }
- return null;
- }
- /**
- * Finds column descriptor by property name.
- */
- public DbEntityColumnDescriptor findByPropertyName(final String propertyName) {
- if (propertyName == null) {
- return null;
- }
- init();
- for (final DbEntityColumnDescriptor columnDescriptor : columnDescriptors) {
- if (columnDescriptor.propertyName.equals(propertyName)) {
- return columnDescriptor;
- }
- }
- return null;
- }
-
-
- /**
- * Returns property name for specified column name.
- */
- public String getPropertyName(final String columnName) {
- final DbEntityColumnDescriptor dec = findByColumnName(columnName);
- return dec == null ? null : dec.propertyName;
- }
-
- /**
- * Returns column name for specified property name..
- */
- public String getColumnName(final String propertyName) {
- final DbEntityColumnDescriptor dec = findByPropertyName(propertyName);
- return dec == null ? null : dec.columnName;
- }
-
- // ---------------------------------------------------------------- column work
-
- /**
- * Returns total number of columns.
- */
- public int getColumnsCount() {
- init();
- return columnDescriptors.length;
- }
-
- /**
- * Returns total number of identity columns.
- */
- public int getIdColumnsCount() {
- init();
- return idColumnDescriptors == null ? 0 : idColumnDescriptors.length;
- }
-
- /**
- * Returns true if entity has one ID column.
- */
- public boolean hasIdColumn() {
- return getIdColumnsCount() == 1;
- }
-
- private void ensureSingleIdColumn() {
- init();
- if (idColumnDescriptors == null) {
- throw new DbOomException("No identity column in entity: " + entityName);
- } else if (idColumnDescriptors.length > 1) {
- throw new DbOomException("More then one identity column in entity: " + entityName);
- }
- }
-
- /**
- * Returns the identity column name of column marked as identity.
- * Throws an exception if table has composite primary key.
- */
- public String getIdColumnName() {
- ensureSingleIdColumn();
- return idColumnDescriptors[0].getColumnName();
- }
-
- /**
- * Returns the first property name of column marked as identity.
- * Throws an exception if table has composite primary key.
- */
- public String getIdPropertyName() {
- ensureSingleIdColumn();
- return idColumnDescriptors[0].getPropertyName();
- }
-
- /**
- * Returns ID value for given entity instance.
- */
- public Object getIdValue(final E object) {
- final String propertyName = getIdPropertyName();
- return BeanUtil.declared.getProperty(object, propertyName);
- }
-
- /**
- * Sets ID value for given entity.
- */
- public void setIdValue(final E object, final Object value) {
- final String propertyName = getIdPropertyName();
- BeanUtil.declared.setProperty(object, propertyName, value);
- }
-
- /**
- * Returns unique key for this entity. Returned key
- * is built from entity class and id value.
- */
- public String getKeyValue(final E object) {
- final Object idValue = getIdValue(object);
-
- final String idValueString = idValue == null ? StringPool.NULL : idValue.toString();
-
- return type.getName().concat(StringPool.COLON).concat(idValueString);
- }
-
- // ---------------------------------------------------------------- toString
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder();
- sb.append("DbEntity: ");
- if (schemaName != null) {
- sb.append(schemaName);
- sb.append('.');
- }
- sb.append(tableName);
- return sb.toString();
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbEntityManager.java b/jodd-db/src/main/java/jodd/db/oom/DbEntityManager.java
deleted file mode 100644
index 50a9a5afb..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbEntityManager.java
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.oom.naming.ColumnNamingStrategy;
-import jodd.db.oom.naming.TableNamingStrategy;
-import jodd.util.ClassUtil;
-import jodd.util.StringUtil;
-import jodd.util.TypeCache;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-/**
- * DbOom Entity manager.
- *
- * Important: configure settings before entity registration!
- *
- * Mapping definitions are used only by a result set mapper (such as {@link jodd.db.oom.mapper.ResultSetMapper})
- * to lookup for an entity from table name. Table names are read from result-set meta data, for example.
- * It is not needed to use mappings at all: in that case just provide entity types during the conversion of
- * result set to objects.
- */
-public class DbEntityManager {
-
- private static final Logger log = LoggerFactory.getLogger(DbEntityManager.class);
-
- private final DbOomConfig dbOomConfig;
-
- public DbEntityManager(final DbOomConfig dbOomConfig) {
- this.dbOomConfig = dbOomConfig;
- }
-
- // ---------------------------------------------------------------- registration
-
- protected String[] primitiveEntitiesPrefixes = new String[] {
- "java.lang.",
- "jodd.mutable.",
- int.class.getName(),
- long.class.getName(),
- float.class.getName(),
- double.class.getName(),
- short.class.getName(),
- boolean.class.getName(),
- byte.class.getName()};
-
- public String[] getPrimitiveEntitiesPrefixes() {
- return primitiveEntitiesPrefixes;
- }
-
- /**
- * Specifies array of class name prefixes that will be mapped directly to column.
- */
- public void setPrimitiveEntitiesPrefixes(final String... primitiveEntitiesPrefixes) {
- this.primitiveEntitiesPrefixes = primitiveEntitiesPrefixes;
- }
-
- protected TypeCache descriptorsMap = TypeCache.createDefault();
- protected Map entityNamesMap = new HashMap<>();
- protected Map tableNamesMap = new NamedValuesHashMap<>();
-
- /**
- * Lookups {@link DbEntityDescriptor} for some type and registers the type if is new.
- *
- * Returns null for core classes from java run-time packages!
- * Some types are not entities, i.e. domain objects. Instead, primitive entities
- * are simply mapped to one column.
- */
- public DbEntityDescriptor lookupType(final Class type) {
- final String typeName = type.getName();
- if (StringUtil.startsWithOne(typeName, primitiveEntitiesPrefixes) != -1) {
- return null;
- }
- DbEntityDescriptor ded = descriptorsMap.get(type);
- if (ded == null) {
- ded = registerType(type);
- }
- return ded;
- }
-
-
- /**
- * Lookups for {@link jodd.db.oom.DbEntityDescriptor} that was registered with this manager.
- * Returns null if name not found.
- */
- public DbEntityDescriptor lookupName(final String typeName) {
- return entityNamesMap.get(typeName);
- }
-
- /**
- * Lookups for {@link jodd.db.oom.DbEntityDescriptor} that was registered with this manager.
- * Returns null if table name not found. Lookup is case-insensitive.
- */
- public DbEntityDescriptor lookupTableName(final String tableName) {
- return tableNamesMap.get(tableName);
- }
-
- /**
- * Registers just type and entity names. Enough for most usages.
- */
- public DbEntityDescriptor registerType(final Class type) {
- final DbEntityDescriptor ded = createDbEntityDescriptor(type);
- DbEntityDescriptor existing = descriptorsMap.put(type, ded);
-
- if (log.isDebugEnabled()) {
- log.debug("Register " + type.getName() + " as " + ded.getTableName());
- }
-
- if (existing != null) {
- if (ded.getType() == type) {
- return ded;
- }
- throw new DbOomException("Type already registered: " + existing.getType());
- }
-
- existing = entityNamesMap.put(ded.getEntityName(), ded);
-
- if (existing != null) {
- throw new DbOomException("Name '" + ded.getEntityName() + "' already mapped to an entity: " + existing.getType());
- }
- return ded;
- }
-
- /**
- * Registers entity. {@link #registerType(Class) Registers types} and table names.
- */
- public DbEntityDescriptor registerEntity(final Class type) {
- final DbEntityDescriptor ded = registerType(type);
- final DbEntityDescriptor existing = tableNamesMap.put(ded.getTableName(), ded);
-
- if (existing != null) {
- if (ded.getType() == type) {
- return ded;
- }
- throw new DbOomException("Entity registration failed! Table '" + ded.getTableName() + "' already mapped to an entity: " + existing.getType());
- }
- return ded;
- }
-
- /**
- * Registers entity. Existing entity will be removed if exist, so no exception will be thrown.
- */
- public DbEntityDescriptor registerEntity(final Class type, final boolean force) {
- if (force) {
- removeEntity(type);
- }
- return registerEntity(type);
- }
-
- /**
- * Removes entity and returns removed descriptor.
- */
- public DbEntityDescriptor removeEntity(final Class type) {
- DbEntityDescriptor ded = descriptorsMap.remove(type);
- if (ded == null) {
- ded = createDbEntityDescriptor(type);
- }
- entityNamesMap.remove(ded.getEntityName());
- tableNamesMap.remove(ded.getTableName());
- return ded;
- }
-
- /**
- * Creates {@link DbEntityDescriptor}.
- */
- protected DbEntityDescriptor createDbEntityDescriptor(final Class type) {
- final String schemaName = dbOomConfig.getSchemaName();
- final TableNamingStrategy tableNames = dbOomConfig.getTableNames();
- final ColumnNamingStrategy columnNames = dbOomConfig.getColumnNames();
-
- return new DbEntityDescriptor<>(type, schemaName, tableNames, columnNames);
- }
-
- // ---------------------------------------------------------------- stats
-
- /**
- * Returns total number of registered entity names.
- */
- public int getTotalNames() {
- return entityNamesMap.size();
- }
-
- /**
- * Returns total number of registered table names.
- */
- public int getTotalTableNames() {
- return tableNamesMap.size();
- }
-
- /**
- * Returns total number of registered types.
- */
- public int getTotalTypes() {
- return descriptorsMap.size();
- }
-
- /**
- * Resets the manager and clears descriptors maps.
- */
- public void reset() {
- descriptorsMap.clear();
- entityNamesMap.clear();
- tableNamesMap.clear();
- }
-
- /**
- * Creates new entity instances.
- */
- public E createEntityInstance(final Class type) {
- try {
- return ClassUtil.newInstance(type);
- } catch (final Exception ex) {
- throw new DbOomException(ex);
- }
- }
-
- public void forEachEntity(final Consumer consumer) {
- descriptorsMap.forEachValue(consumer);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbListIterator.java b/jodd-db/src/main/java/jodd/db/oom/DbListIterator.java
deleted file mode 100644
index b006d1408..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbListIterator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.oom.mapper.ResultSetMapper;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * Internal result set iterator.
- */
-class DbListIterator implements Iterator {
-
- protected final DbOomQuery query;
- protected final boolean entityAwareMode;
- protected final ResultSetMapper resultSetMapper;
- protected final Class[] types;
- protected final boolean closeOnEnd;
-
- // ---------------------------------------------------------------- ctors
-
- DbListIterator(final DbOomQuery query, final Class[] types, final boolean closeOnEnd) {
- this.query = query;
- this.resultSetMapper = query.executeAndBuildResultSetMapper();
- this.entityAwareMode = query.entityAwareMode;
- this.types = (types == null ? resultSetMapper.resolveTables() : types);
- this.closeOnEnd = closeOnEnd;
- }
-
- DbListIterator(final DbOomQuery query, final Class[] types, final ResultSetMapper resultSetMapper, final boolean closeOnEnd) {
- this.query = query;
- this.resultSetMapper = resultSetMapper;
- this.entityAwareMode = query.entityAwareMode;
- this.types = (types == null ? resultSetMapper.resolveTables() : types);
- this.closeOnEnd = closeOnEnd;
- }
-
- // ---------------------------------------------------------------- iterate
-
- protected T previousElement;
- protected T newElement;
- protected int count;
- protected boolean last;
- protected Boolean hasNext;
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns true if there is {@link #next() next} parsed object
- * available.
- */
- @Override
- public boolean hasNext() {
- if (hasNext == null) {
- hasNext = Boolean.valueOf(moveToNext());
- }
- return hasNext.booleanValue();
- }
-
- /**
- * Returns next mapped object.
- */
- @Override
- public T next() {
- if (hasNext == null) {
- hasNext = Boolean.valueOf(moveToNext());
- }
- if (hasNext == false) {
- throw new NoSuchElementException();
- }
-
- if (!entityAwareMode) {
- hasNext = null;
- return newElement;
- }
-
- count++;
-
- T result = previousElement;
-
- previousElement = newElement;
-
- hasNext = null;
- return result;
- }
-
-
- /**
- * Moves to next element.
- */
- private boolean moveToNext() {
- if (last) {
- // last has been set to true, so no more rows to iterate - close everything
-
- if (closeOnEnd) {
- query.close();
- } else {
- query.closeResultSet(resultSetMapper.getResultSet());
- }
-
- return false;
- }
-
- while (true) {
-
- if (!resultSetMapper.next()) {
- // no more rows, no more parsing, previousElement is the last one to iterate
- last = true;
- return entityAwareMode;
- }
-
- // parse row
-
- Object[] objects = resultSetMapper.parseObjects(types);
-
- Object row = query.resolveRowResults(objects);
-
- newElement = (T) row;
-
- if (entityAwareMode) {
-
- if (count == 0 && previousElement == null) {
- previousElement = newElement;
-
- continue;
- }
-
- if (previousElement != null && newElement != null) {
- boolean equals;
-
- if (newElement.getClass().isArray()) {
- equals = Arrays.equals((Object[]) previousElement, (Object[]) newElement);
- } else {
- equals = previousElement.equals(newElement);
- }
-
- if (equals) {
- continue;
- }
- }
- }
-
- break;
- }
-
- return true;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbMetaUtil.java b/jodd-db/src/main/java/jodd/db/oom/DbMetaUtil.java
deleted file mode 100644
index 053d750aa..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbMetaUtil.java
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.oom.meta.DbColumn;
-import jodd.db.oom.meta.DbId;
-import jodd.db.oom.meta.DbMapTo;
-import jodd.db.oom.meta.DbTable;
-import jodd.db.oom.naming.ColumnNamingStrategy;
-import jodd.db.oom.naming.TableNamingStrategy;
-import jodd.db.type.SqlType;
-import jodd.introspector.PropertyDescriptor;
-import jodd.util.StringUtil;
-
-/**
- * Meta-data resolving utils.
- */
-public class DbMetaUtil {
-
- /**
- * Resolves table name from a type. If type is annotated, table name
- * will be read from annotation value. If this value is empty or if
- * type is not annotated, table name will be set to wildcard pattern '*'
- * (to match all tables).
- */
- public static String resolveTableName(final Class type, final TableNamingStrategy tableNamingStrategy) {
- String tableName = null;
- final DbTable dbTable = type.getAnnotation(DbTable.class);
- if (dbTable != null) {
- tableName = dbTable.value().trim();
- }
- if ((tableName == null) || (tableName.length() == 0)) {
- tableName = tableNamingStrategy.convertEntityNameToTableName(type);
- } else {
- if (!tableNamingStrategy.isStrictAnnotationNames()) {
- tableName = tableNamingStrategy.applyToTableName(tableName);
- }
- }
-
- return quoteIfRequired(tableName, tableNamingStrategy.isAlwaysQuoteNames(), tableNamingStrategy.getQuoteChar());
- }
-
- /**
- * Resolves schema name from a type. Uses default schema name if not specified.
- */
- public static String resolveSchemaName(final Class type, final String defaultSchemaName) {
- String schemaName = null;
- final DbTable dbTable = type.getAnnotation(DbTable.class);
- if (dbTable != null) {
- schemaName = dbTable.schema().trim();
- }
- if ((schemaName == null) || (schemaName.length() == 0)) {
- schemaName = defaultSchemaName;
- }
- return schemaName;
- }
-
- /**
- * Returns true if class is annotated with DbTable annotation.
- */
- public static boolean resolveIsAnnotated(final Class type) {
- final DbTable dbTable = type.getAnnotation(DbTable.class);
- return dbTable != null;
- }
-
- /**
- * Resolves column descriptor from property. If property is annotated value will be read
- * from annotation. If property is not annotated, then property will be ignored
- * if entity is annotated. Otherwise, column name is generated from the property name.
- */
- public static DbEntityColumnDescriptor resolveColumnDescriptors(
- final DbEntityDescriptor dbEntityDescriptor,
- final PropertyDescriptor property,
- final boolean isAnnotated,
- final ColumnNamingStrategy columnNamingStrategy) {
-
- String columnName = null;
- boolean isId = false;
- Class sqlTypeClass = null;
-
- // read ID annotation
-
- DbId dbId = null;
-
- if (property.getFieldDescriptor() != null) {
- dbId = property.getFieldDescriptor().getField().getAnnotation(DbId.class);
- }
- if (dbId == null && property.getReadMethodDescriptor() != null) {
- dbId = property.getReadMethodDescriptor().getMethod().getAnnotation(DbId.class);
- }
- if (dbId == null && property.getWriteMethodDescriptor() != null) {
- dbId = property.getWriteMethodDescriptor().getMethod().getAnnotation(DbId.class);
- }
-
- if (dbId != null) {
- columnName = dbId.value().trim();
- sqlTypeClass = dbId.sqlType();
- isId = true;
- } else {
- DbColumn dbColumn = null;
-
- if (property.getFieldDescriptor() != null) {
- dbColumn = property.getFieldDescriptor().getField().getAnnotation(DbColumn.class);
- }
- if (dbColumn == null && property.getReadMethodDescriptor() != null) {
- dbColumn = property.getReadMethodDescriptor().getMethod().getAnnotation(DbColumn.class);
- }
- if (dbColumn == null && property.getWriteMethodDescriptor() != null) {
- dbColumn = property.getWriteMethodDescriptor().getMethod().getAnnotation(DbColumn.class);
- }
-
- if (dbColumn != null) {
- columnName = dbColumn.value().trim();
- sqlTypeClass = dbColumn.sqlType();
- } else {
- if (isAnnotated) {
- return null;
- }
- }
- }
-
- if (StringUtil.isEmpty(columnName)) {
- // default annotation value
- columnName = columnNamingStrategy.convertPropertyNameToColumnName(property.getName());
- } else {
- if (!columnNamingStrategy.isStrictAnnotationNames()) {
- columnName = columnNamingStrategy.applyToColumnName(columnName);
- }
- }
- if (sqlTypeClass == SqlType.class) {
- sqlTypeClass = null;
- }
-
- return new DbEntityColumnDescriptor(
- dbEntityDescriptor,
- quoteIfRequired(columnName, columnNamingStrategy.isAlwaysQuoteNames(), columnNamingStrategy.getQuoteChar()),
- property.getName(),
- property.getType(),
- isId,
- sqlTypeClass);
- }
-
- /**
- * Resolves mapped types from {@link jodd.db.oom.meta.DbMapTo} annotation.
- */
- public static Class[] resolveMappedTypes(final Class type) {
- final DbMapTo dbMapTo = (DbMapTo) type.getAnnotation(DbMapTo.class);
- if (dbMapTo == null) {
- return null;
- }
- return dbMapTo.value();
- }
-
- // ---------------------------------------------------------------- privates
-
- private static String quoteIfRequired(final String name, final boolean alwaysQuoteNames, final char quoteChar) {
- if (StringUtil.detectQuoteChar(name) != 0) {
- return name; // already quoted
- }
- if (alwaysQuoteNames && quoteChar != 0) {
- return quoteChar + name + quoteChar;
- }
- return name;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbOomConfig.java b/jodd-db/src/main/java/jodd/db/oom/DbOomConfig.java
deleted file mode 100644
index e5e93ec5c..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbOomConfig.java
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.oom.naming.ColumnNamingStrategy;
-import jodd.db.oom.naming.TableNamingStrategy;
-
-/**
- * DBOOM configuration for names and SQL generation.
- */
-public class DbOomConfig {
-
- /**
- * Specifies separator for column aliases that divides table reference and column name.
- * Separator should contains of characters that are not used in table names, such as:
- * '$' or '__'.
- */
- private String columnAliasSeparator = "$";
- /**
- * Default column alias type.
- */
- private ColumnAliasType defaultColumnAliasType;
- /**
- * Optional schema name.
- */
- private String schemaName;
- /**
- * Table name strategy.
- */
- private TableNamingStrategy tableNames = new TableNamingStrategy();
- /**
- * Column name strategy.
- */
- private ColumnNamingStrategy columnNames = new ColumnNamingStrategy();
-
- /**
- * {@code true} if SQL syntax allow usage of table alias in the update query.
- */
- private boolean updateAcceptsTableAlias = true;
-
- /**
- * {@code true} if database supports update of the primary key.
- */
- private boolean updateablePrimaryKey = true;
-
- /**
- * Defines entity-aware mode, when resulting collections does not have duplicates.
- * It make sense to enable it if {@link #cacheEntitiesInResultSet cache} is set.
- */
- private boolean entityAwareMode = false;
-
- /**
- * Defines if entities have to be cached in result set.
- * When cached, more memory is consumed during the existence of
- * {@link jodd.db.oom.mapper.ResultSetMapper}.
- */
- private boolean cacheEntitiesInResultSet = false;
-
- /**
- * Specifies how primary keys are generated by database.
- */
- protected boolean keysGeneratedByDatabase = true;
-
- // ---------------------------------------------------------------- r/o
-
- public TableNamingStrategy getTableNames() {
- return tableNames;
- }
-
- public ColumnNamingStrategy getColumnNames() {
- return columnNames;
- }
-
-
- // ---------------------------------------------------------------- access
-
- public String getColumnAliasSeparator() {
- return columnAliasSeparator;
- }
-
- public void setColumnAliasSeparator(final String separator) {
- this.columnAliasSeparator = separator;
- }
-
-
- public ColumnAliasType getDefaultColumnAliasType() {
- return defaultColumnAliasType;
- }
-
- public void setDefaultColumnAliasType(final ColumnAliasType defaultColumnAliasType) {
- this.defaultColumnAliasType = defaultColumnAliasType;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setSchemaName(final String schemaName) {
- this.schemaName = schemaName;
- }
-
- public boolean isUpdateAcceptsTableAlias() {
- return updateAcceptsTableAlias;
- }
-
- public void setUpdateAcceptsTableAlias(final boolean updateAcceptsTableAlias) {
- this.updateAcceptsTableAlias = updateAcceptsTableAlias;
- }
-
- public boolean isUpdateablePrimaryKey() {
- return updateablePrimaryKey;
- }
-
- public void setUpdateablePrimaryKey(final boolean updateablePrimaryKey) {
- this.updateablePrimaryKey = updateablePrimaryKey;
- }
-
- public boolean isEntityAwareMode() {
- return entityAwareMode;
- }
-
- public void setEntityAwareMode(final boolean entityAwareMode) {
- this.entityAwareMode = entityAwareMode;
- }
-
- public boolean isCacheEntitiesInResultSet() {
- return cacheEntitiesInResultSet;
- }
-
- public void setCacheEntitiesInResultSet(final boolean cacheEntitiesInResultSet) {
- this.cacheEntitiesInResultSet = cacheEntitiesInResultSet;
- }
-
- public boolean isKeysGeneratedByDatabase() {
- return keysGeneratedByDatabase;
- }
-
- public void setKeysGeneratedByDatabase(final boolean keysGeneratedByDatabase) {
- this.keysGeneratedByDatabase = keysGeneratedByDatabase;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbOomException.java b/jodd-db/src/main/java/jodd/db/oom/DbOomException.java
deleted file mode 100644
index 759ce71f8..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbOomException.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.DbQuery;
-import jodd.db.DbSqlException;
-
-/**
- * DbOom exceptions.
- */
-public class DbOomException extends DbSqlException {
-
- public DbOomException(final Throwable t) {
- super(t);
- }
-
- public DbOomException(final String message) {
- super(message);
- }
-
- public DbOomException(final DbQuery dbQuery, final String message) {
- super(dbQuery, message);
- }
-
- public DbOomException(final String message, final Throwable t) {
- super(message, t);
- }
-
- public DbOomException(final DbQuery dbQuery, final String message, final Throwable t) {
- super(dbQuery, message, t);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbOomQuery.java b/jodd-db/src/main/java/jodd/db/oom/DbOomQuery.java
deleted file mode 100644
index 64f4dbb6b..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbOomQuery.java
+++ /dev/null
@@ -1,563 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.bean.BeanUtil;
-import jodd.db.DbOom;
-import jodd.db.DbQuery;
-import jodd.db.DbSession;
-import jodd.db.DbUtil;
-import jodd.db.oom.mapper.DefaultResultSetMapper;
-import jodd.db.oom.mapper.ResultSetMapper;
-import jodd.db.oom.sqlgen.ParameterValue;
-import jodd.db.type.SqlType;
-import jodd.util.CharUtil;
-import jodd.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A simple ORM extension for {@link DbQuery}.
- *
- * OOM extension may map results to objects in two ways:
- *
- *
auto mode - when result set is mapped to provided types, and
- */
-public class DbOomQuery extends DbQuery {
-
- private static final Logger log = LoggerFactory.getLogger(DbOomQuery.class);
-
- // ---------------------------------------------------------------- default ctors
-
- public DbOomQuery(final DbOom dbOom, final Connection conn, final String sqlString) {
- super(dbOom, conn, sqlString);
- this.sqlgen = null;
- init(dbOom);
- }
-
- public static DbOomQuery query(final Connection conn, final String sqlString) {
- return new DbOomQuery(DbOom.get(), conn, sqlString);
- }
-
- public DbOomQuery(final DbOom dbOom, final DbSession session, final String sqlString) {
- super(dbOom, session, sqlString);
- this.sqlgen = null;
- init(dbOom);
- }
-
- public static DbOomQuery query(final DbSession session, final String sqlString) {
- return new DbOomQuery(DbOom.get(), session, sqlString);
- }
-
- public DbOomQuery(final DbOom dbOom, final String sqlString) {
- super(dbOom, sqlString);
- this.sqlgen = null;
- init(dbOom);
- }
-
- public static DbOomQuery query(final String sqlString) {
- return new DbOomQuery(DbOom.get(), sqlString);
- }
-
- // ---------------------------------------------------------------- sqlgen ctors
-
- protected final DbSqlGenerator sqlgen;
-
- public DbOomQuery(final DbOom dbOom, final Connection conn, final DbSqlGenerator sqlgen) {
- super(dbOom, conn, sqlgen.generateQuery());
- this.sqlgen = sqlgen;
- init(dbOom);
- }
- public static DbOomQuery query(final Connection conn, final DbSqlGenerator sqlgen) {
- return new DbOomQuery(DbOom.get(), conn, sqlgen);
- }
-
- public DbOomQuery(final DbOom dbOom, final DbSession session, final DbSqlGenerator sqlgen) {
- super(dbOom, session, sqlgen.generateQuery());
- this.sqlgen = sqlgen;
- init(dbOom);
- }
- public static DbOomQuery query(final DbSession session, final DbSqlGenerator sqlgen) {
- return new DbOomQuery(DbOom.get(), session, sqlgen);
- }
-
- public DbOomQuery(final DbOom dbOom, final DbSqlGenerator sqlgen) {
- super(dbOom, sqlgen.generateQuery());
- this.sqlgen = sqlgen;
- init(dbOom);
- }
- public static DbOomQuery query(final DbSqlGenerator sqlgen) {
- return new DbOomQuery(DbOom.get(), sqlgen);
- }
-
- protected void init(final DbOom dbOom) {
- this.sqlString = preprocessSql(sqlString);
- this.cacheEntities = dbOom.config().isCacheEntitiesInResultSet();
- this.entityAwareMode = dbOom.config().isEntityAwareMode();
- }
-
- // ---------------------------------------------------------------- initialization
-
- /**
- * Prepares the query after initialization. Besides default work, it checks if sql generator
- * is used, and if so, generator hints and query parameters will be used for this query.
- * Note regarding hints: since hints can be added manually, generators hints will be ignored
- * if there exists some manually set hints.
- */
- @Override
- protected void prepareQuery() {
- super.prepareQuery();
- if (sqlgen == null) {
- return;
- }
- if (hints == null) {
- final String[] joinHints = sqlgen.getJoinHints();
- if (joinHints != null) {
- withHints(joinHints);
- }
- }
- // insert parameters
- final Map parameters = sqlgen.getQueryParameters();
- if (parameters == null) {
- return;
- }
- for (final Map.Entry entry : parameters.entrySet()) {
- final String paramName = entry.getKey();
- final ParameterValue param = entry.getValue();
- final DbEntityColumnDescriptor dec = param.getColumnDescriptor();
- if (dec == null) {
- setObject(paramName, param.getValue());
- } else {
- resolveColumnDbSqlType(connection, dec);
- setObject(paramName, param.getValue(), dec.getSqlTypeClass(), dec.getDbSqlType());
- }
- }
- }
-
- /**
- * Resolves column db sql type and populates it in column descriptor if missing.
- */
- protected void resolveColumnDbSqlType(final Connection connection, final DbEntityColumnDescriptor dec) {
- if (dec.dbSqlType != SqlType.DB_SQLTYPE_UNKNOWN) {
- return;
- }
- ResultSet rs = null;
- final DbEntityDescriptor ded = dec.getDbEntityDescriptor();
- try {
- final DatabaseMetaData dmd = connection.getMetaData();
- rs = dmd.getColumns(null, ded.getSchemaName(), ded.getTableName(), dec.getColumnName());
- if (rs.next()) {
- dec.dbSqlType = rs.getInt("DATA_TYPE");
- } else {
- dec.dbSqlType = SqlType.DB_SQLTYPE_NOT_AVAILABLE;
- if (log.isWarnEnabled()) {
- log.warn("Column SQL type not available: " + ded.toString() + '.' + dec.getColumnName());
- }
- }
- } catch (final SQLException sex) {
- dec.dbSqlType = SqlType.DB_SQLTYPE_NOT_AVAILABLE;
- if (log.isWarnEnabled()) {
- log.warn("Column SQL type not resolved: " + ded.toString() + '.' + dec.getColumnName(), sex);
- }
- } finally {
- DbUtil.close(rs);
- }
- }
-
- /**
- * Pre-process SQL before using it. If string starts with a non-ascii char
- * or it has no spaces, it will be loaded from the query map.
- */
- protected String preprocessSql(String sqlString) {
- // detects callable statement
- if (sqlString.charAt(0) == '{') {
- return sqlString;
- }
-
- // quickly detect if SQL string is a key
- if (!CharUtil.isAlpha(sqlString.charAt(0))) {
- sqlString = sqlString.substring(1);
- }
- else if (sqlString.indexOf(' ') != -1) {
- return sqlString;
- }
-
- final String sqlFromMap = dbOom.queryMap().getQuery(sqlString);
-
- if (sqlFromMap != null) {
- sqlString = sqlFromMap.trim();
- }
-
- return sqlString;
- }
-
-
-
- // ---------------------------------------------------------------- join hints
-
- protected JoinHintResolver hintResolver;
-
- protected String[] hints;
-
- /**
- * Specifies hints for the query. Provided string is
- * split on ',' separator.
- */
- public DbOomQuery withHints(final String hint) {
- this.hints = StringUtil.splitc(hint, ',');
- return this;
- }
-
- /**
- * Specifies multiple hints for the query.
- */
- public DbOomQuery withHints(final String... hints) {
- this.hints = hints;
- return this;
- }
-
- /**
- * Prepares a row (array of rows mapped object) using hints.
- * Returns either single object or objects array.
- */
- protected Object resolveRowResults(Object[] row) {
- if (hintResolver == null) {
- hintResolver = new JoinHintResolver();
- }
- row = hintResolver.join(row, hints);
- return row.length == 1 ? row[0] : row;
- }
-
- // ---------------------------------------------------------------- result set
-
- protected boolean cacheEntities;
-
- /**
- * Defines if entities should be cached in {@link ResultSetMapper}.
- * Overrides default value in {@link DbEntityManager}.
- */
- public DbOomQuery cacheEntities(final boolean cacheEntities) {
- this.cacheEntities = cacheEntities;
- return this;
- }
-
- /**
- * Executes the query and returns {@link #createResultSetMapper(java.sql.ResultSet) builded ResultSet mapper}.
- */
- protected ResultSetMapper executeAndBuildResultSetMapper() {
- final ResultSet resultSet = execute();
-
- return createResultSetMapper(resultSet);
- }
-
- /**
- * Factory for result sets mapper.
- */
- protected ResultSetMapper createResultSetMapper(final ResultSet resultSet) {
- final Map columnAliases = sqlgen != null ? sqlgen.getColumnData() : null;
-
- return new DefaultResultSetMapper(dbOom, resultSet, columnAliases, cacheEntities, this);
- }
-
- // ---------------------------------------------------------------- db list
-
- protected boolean entityAwareMode;
-
- /**
- * Defines entity-aware mode for entities tracking in result collection.
- */
- public DbOomQuery entityAwareMode(final boolean entityAware) {
- if (entityAware) {
- this.cacheEntities = true;
- }
- this.entityAwareMode = entityAware;
- return this;
- }
-
- // ---------------------------------------------------------------- iterator
-
- public Iterator iterate(final Class... types) {
- return iterate(types, autoClose);
- }
- public Iterator iterate() {
- return iterate(null, autoClose);
- }
- protected Iterator iterate(final Class[] types, final boolean close) {
- return new DbListIterator<>(this, types, close);
- }
-
- // ---------------------------------------------------------------- list
-
- public List list(final Class... types) {
- return list(types, -1, autoClose);
- }
- public List list() {
- return list(null, -1, autoClose);
- }
- public List list(final int max, final Class... types) {
- return list(types, max, autoClose);
- }
- public List list(final int max) {
- return list(null, max, autoClose);
- }
- /**
- * Iterates result set, maps rows to classes and populates resulting array list.
- * @param types mapping types
- * @param max max number of rows to collect, -1 for all
- * @param close true if query is closed at the end, otherwise false.
- * @return list of mapped entities or array of entities
- */
- @SuppressWarnings({"unchecked"})
- protected List list(Class[] types, final int max, final boolean close) {
- final List result = new ArrayList<>(initialCollectionSize(max));
-
- final ResultSetMapper rsm = executeAndBuildResultSetMapper();
- if (types == null) {
- types = rsm.resolveTables();
- }
-
- Object previousElement = null;
-
- while (rsm.next()) {
- final Object[] objects = rsm.parseObjects(types);
- final Object row = resolveRowResults(objects);
-
- final int size = result.size();
-
- final T newElement = (T) row;
-
- if (entityAwareMode && size > 0) {
- if (previousElement != null && newElement != null) {
- final boolean equals;
-
- if (newElement.getClass().isArray()) {
- equals = Arrays.equals((Object[]) previousElement, (Object[]) newElement);
- } else {
- equals = previousElement.equals(newElement);
- }
-
- if (equals) {
- continue;
- }
- }
- }
-
- if (size == max) {
- break;
- }
-
- result.add(newElement);
- previousElement = newElement;
- }
-
- close(rsm, close);
- return result;
- }
-
- /**
- * Returns initial collections size when max
- * value is provided.
- */
- private static int initialCollectionSize(final int max) {
- return max > 0 ? max : 10;
- }
-
-
- // ---------------------------------------------------------------- set
-
- public Set listSet(final Class... types) {
- return listSet(types, -1, autoClose);
- }
- public Set listSet() {
- return listSet(null, -1, autoClose);
- }
- public Set listSet(final int max, final Class... types) {
- return listSet(types, max, autoClose);
- }
- public Set listSet(final int max) {
- return listSet(null, max, autoClose);
- }
- @SuppressWarnings({"unchecked"})
- protected Set listSet(Class[] types, final int max, final boolean close) {
- final Set result = new LinkedHashSet<>(initialCollectionSize(max));
-
- final ResultSetMapper rsm = executeAndBuildResultSetMapper();
- if (types == null) {
- types = rsm.resolveTables();
- }
-
- Object previousElement = null;
-
- while (rsm.next()) {
- final Object[] objects = rsm.parseObjects(types);
- final Object row = resolveRowResults(objects);
-
- final int size = result.size();
-
- final T newElement = (T) row;
-
- if (entityAwareMode && size > 0) {
- if (previousElement != null && newElement != null) {
- final boolean equals;
-
- if (newElement.getClass().isArray()) {
- equals = Arrays.equals((Object[]) previousElement, (Object[]) newElement);
- } else {
- equals = previousElement.equals(newElement);
- }
-
- if (equals) {
- continue;
- }
- }
- }
-
- if (size == max) {
- break;
- }
-
- result.add(newElement);
- previousElement = newElement;
- }
-
- close(rsm, close);
- return result;
- }
-
- // ---------------------------------------------------------------- find
-
- public T find(final Class... types) {
- return find(types, autoClose, null);
- }
- public T find() {
- return find(null, autoClose, null);
- }
- protected T find(final Class[] types, final boolean close, ResultSet resultSet) {
- if (resultSet == null) {
- resultSet = execute();
- }
- final ResultSetMapper rsm = createResultSetMapper(resultSet);
-
- final Iterator iterator = new DbListIterator<>(this, types, rsm, false);
-
- T result = null;
-
- if (iterator.hasNext()) {
- result = iterator.next();
- }
-
- close(rsm, close);
- return result;
- }
-
- // ---------------------------------------------------------------- generated columns
-
- /**
- * Finds generated key column of given type.
- */
- public T findGeneratedKey(final Class type) {
- return find(new Class[] {type}, false, getGeneratedColumns());
- }
-
- /**
- * Finds generated columns.
- */
- public Object findGeneratedColumns(final Class... types) {
- return find(types, false, getGeneratedColumns());
- }
-
-
- /**
- * Populates entity with generated column values from executed query.
- */
- public void populateGeneratedKeys(final Object entity) {
-
- final String[] generatedColumns = getGeneratedColumnNames();
- if (generatedColumns == null) {
- return;
- }
- final DbEntityDescriptor ded = dbOom.entityManager().lookupType(entity.getClass());
-
- // prepare key types
- final Class[] keyTypes = new Class[generatedColumns.length];
- final String[] properties = new String[generatedColumns.length];
- for (int i = 0; i < generatedColumns.length; i++) {
- final String column = generatedColumns[i];
- final DbEntityColumnDescriptor decd = ded.findByColumnName(column);
- if (decd != null) {
- keyTypes[i] = decd.getPropertyType();
- properties[i] = decd.getPropertyName();
- }
- }
-
- final Object keyValues = findGeneratedColumns(keyTypes);
- if (!keyValues.getClass().isArray()) {
- BeanUtil.declared.setProperty(entity, properties[0], keyValues);
- } else {
- for (int i = 0; i < properties.length; i++) {
- BeanUtil.declared.setProperty(entity, properties[i], ((Object[]) keyValues)[i]);
- }
- }
- }
-
-
- // ---------------------------------------------------------------- util
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DbOomQuery autoClose() {
- super.autoClose();
- return this;
- }
-
- /**
- * Closes results set or whole query.
- */
- protected void close(final ResultSetMapper rsm, final boolean closeQuery) {
- if (closeQuery) {
- close();
- } else {
- closeResultSet(rsm.getResultSet());
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/DbSqlGenerator.java b/jodd-db/src/main/java/jodd/db/oom/DbSqlGenerator.java
deleted file mode 100644
index e746abc85..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/DbSqlGenerator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.db.oom.sqlgen.ParameterValue;
-
-import java.util.Map;
-
-/**
- * Generates SQL queries.
- */
-public interface DbSqlGenerator {
-
- /**
- * Generates SQL query. May be called multiple times.
- */
- String generateQuery();
-
- /**
- * Returns a map of SQL parameters used by generated query.
- * Must be invoked only after the {@link #generateQuery()}.
- * May be null
- */
- Map getQueryParameters();
-
- /**
- * Returns an optional map of table and column names, used by {@link jodd.db.oom.mapper.ResultSetMapper}.
- * May be null.
- */
- Map getColumnData();
-
- /**
- * Returns join hints. May be null.
- */
- String[] getJoinHints();
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/JoinHintResolver.java b/jodd-db/src/main/java/jodd/db/oom/JoinHintResolver.java
deleted file mode 100644
index ad9c5762a..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/JoinHintResolver.java
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import jodd.bean.BeanUtil;
-import jodd.introspector.ClassDescriptor;
-import jodd.introspector.ClassIntrospector;
-import jodd.util.ArraysUtil;
-import jodd.util.ClassUtil;
-import jodd.util.StringUtil;
-
-import java.lang.reflect.Array;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Joins an array of objects using provided hints.
- * If hint is not available, methods returns the very same object array instance.
- */
-public class JoinHintResolver {
-
- public Object[] join(final Object[] data, final String hints) {
- if (hints == null) {
- return data;
- }
- return join(data, StringUtil.splitc(hints, ','));
- }
-
- /**
- * Joins entity array using provided string hints.
- */
- public Object[] join(final Object[] data, final String[] hints) {
- if (hints == null) {
- return data;
- }
- // build context
- Map context = new HashMap<>(hints.length);
- for (int i = 0; i < hints.length; i++) {
- hints[i] = hints[i].trim();
- String hint = hints[i];
- if (hint.indexOf('.') == -1) {
- context.put(hint, data[i]);
- }
- }
-
- // no joining hints found
- if (context.size() == data.length) {
- return data;
- }
-
- // joining
- Object[] result = new Object[context.size()];
- int count = 0;
- for (int i = 0; i < hints.length; i++) {
-
- String hint = hints[i];
- int ndx = hint.indexOf('.');
- if (ndx != -1) {
- String key = hint.substring(0, ndx);
- Object value = context.get(key);
- if (value == null) {
- throw new DbOomException("Hint value missing: " + key);
- }
-
- // don't merge nulls
- if (data[i] == null) {
- continue;
- }
-
- String hintPropertyName = hint.substring(ndx + 1);
- Class hintPropertyType = BeanUtil.pojo.getPropertyType(value, hintPropertyName);
-
- if (hintPropertyType != null) {
- ClassDescriptor cd = ClassIntrospector.get().lookup(hintPropertyType);
-
- if (cd.isCollection()) {
- // add element to collection
- try {
- Collection collection = BeanUtil.declared.getProperty(value, hintPropertyName);
-
- if (collection == null) {
- collection = (Collection) ClassUtil.newInstance(hintPropertyType);
- BeanUtil.declaredSilent.setProperty(value, hintPropertyName, collection);
- }
-
- collection.add(data[i]);
- } catch (Exception ex) {
- throw new DbOomException(ex);
- }
- } else if (cd.isArray()) {
- // add element to array
- try {
- Object[] array = BeanUtil.declared.getProperty(value, hintPropertyName);
-
- if (array == null) {
- array = (Object[]) Array.newInstance(hintPropertyType.getComponentType(), 1);
-
- BeanUtil.declaredSilent.setProperty(value, hintPropertyName, array);
-
- array[0] = data[i];
- } else {
- Object[] newArray = ArraysUtil.append(array, data[i]);
-
- if (newArray != array) {
- BeanUtil.declaredSilent.setProperty(value, hintPropertyName, newArray);
- }
- }
- } catch (Exception ex) {
- throw new DbOomException(ex);
- }
- } else {
- // set value
- BeanUtil.declaredSilent.setProperty(value, hintPropertyName, data[i]);
- }
- }
- else {
- // special case - the property probably contains the collection in the way
-
- int lastNdx = hintPropertyName.lastIndexOf('.');
-
- String name = hintPropertyName.substring(0, lastNdx);
-
- Object target = resolveValueInSpecialCase(value, name);
-
- if (target != null) {
- String targetSimpleName = hintPropertyName.substring(lastNdx + 1);
-
- BeanUtil.declaredForcedSilent.setProperty(target, targetSimpleName, data[i]);
- }
- }
-
- } else {
- result[count] = data[i];
- count++;
- }
- }
- return result;
- }
-
- protected Object resolveValueInSpecialCase(Object value, final String name) {
- String[] elements = StringUtil.splitc(name, '.');
-
- for (String element : elements) {
- value = BeanUtil.declaredSilent.getProperty(value, element);
-
- if (value instanceof List) {
- List list = (List) value;
-
- value = list.get(list.size() - 1);
- }
- }
-
- return value;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/NamedValuesHashMap.java b/jodd-db/src/main/java/jodd/db/oom/NamedValuesHashMap.java
deleted file mode 100644
index f10f99134..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/NamedValuesHashMap.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom;
-
-import java.util.HashMap;
-
-/**
- * HashMap with String keys that are case-insensitive.
- */
-public class NamedValuesHashMap extends HashMap {
-
- @Override
- public V put(String key, final V value) {
- key = key.toUpperCase();
- return super.put(key, value);
- }
-
- @Override
- public V get(Object key) {
- key = ((String)key).toUpperCase();
- return super.get(key);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/dao/GenericDao.java b/jodd-db/src/main/java/jodd/db/oom/dao/GenericDao.java
deleted file mode 100644
index 73d0108e2..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/dao/GenericDao.java
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.dao;
-
-import jodd.bean.BeanUtil;
-import jodd.db.DbOom;
-import jodd.db.DbQuery;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbOomException;
-
-import java.util.List;
-
-import static jodd.db.oom.DbOomQuery.query;
-
-/**
- * Generic DAO. Contains many convenient wrappers.
- */
-public class GenericDao {
-
- private final DbOom dbOom;
-
- public GenericDao(final DbOom dbOom) {
- this.dbOom = dbOom;
- }
-
- // ---------------------------------------------------------------- store
-
- /**
- * Returns true if entity is persistent.
- */
- protected boolean isPersistent(final DbEntityDescriptor ded, final E entity) {
- final Object key = ded.getIdValue(entity);
-
- if (key == null) {
- return false;
- }
- if (key instanceof Number) {
- final long value = ((Number)key).longValue();
-
- if (value == 0) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Sets new ID value for entity.
- */
- protected void setEntityId(final DbEntityDescriptor ded, final E entity, final ID newIdValue) {
- ded.setIdValue(entity, newIdValue);
- }
-
- /**
- * Generates next id for given type.
- */
- protected ID generateNextId(final DbEntityDescriptor dbEntityDescriptor) {
- throw new UnsupportedOperationException("Use Joy");
- }
-
- /**
- * Saves or updates entity. If ID is not null, entity will be updated.
- * Otherwise, entity will be inserted into the database.
- */
- public E store(final E entity) {
- final Class type = entity.getClass();
- final DbEntityDescriptor ded = dbOom.entityManager().lookupType(type);
-
- if (ded == null) {
- throw new DbOomException("Not an entity: " + type);
- }
- if (!isPersistent(ded, entity)) {
- final DbQuery q;
- if (dbOom.config().isKeysGeneratedByDatabase()) {
- q = query(dbOom.entities().insert(entity));
- q.setGeneratedKey();
- q.executeUpdate();
- final Object nextId = q.getGeneratedKey();
- setEntityId(ded, entity, nextId);
- }
- else {
- final Object nextId = generateNextId(ded);
- setEntityId(ded, entity, nextId);
- q = query(dbOom.entities().insert(entity));
- q.executeUpdate();
- }
- q.close();
- }
- else {
- query(dbOom.entities().updateAll(entity)).autoClose().executeUpdate();
- }
- return entity;
- }
-
- /**
- * Simply inserts object into the database.
- */
- public void save(final Object entity) {
- final DbQuery q = query(dbOom.entities().insert(entity));
- q.autoClose().executeUpdate();
- }
-
- /**
- * Inserts bunch of objects into the database.
- * @see #save(Object)
- */
- public void saveAll(final Iterable entities) {
- for (final Object entity: entities) {
- save(entity);
- }
- }
-
- // ---------------------------------------------------------------- update
-
- /**
- * Updates single entity.
- */
- public void update(final Object entity) {
- query(dbOom.entities().updateAll(entity)).autoClose().executeUpdate();
- }
-
- /**
- * Updates all entities.
- * @see #update(Object)
- */
- public void updateAll(final Iterable entities) {
- for (final Object entity : entities) {
- update(entity);
- }
- }
-
- /**
- * Updates single property in database and in the bean.
- */
- public E updateProperty(final E entity, final String name, final Object newValue) {
- query(dbOom.entities().updateColumn(entity, name, newValue)).autoClose().executeUpdate();
- BeanUtil.declared.setProperty(entity, name, newValue);
- return entity;
- }
-
- /**
- * Updates property in the database by storing the current property value.
- */
- public E updateProperty(final E entity, final String name) {
- Object value = BeanUtil.declared.getProperty(entity, name);
- query(dbOom.entities().updateColumn(entity, name, value)).autoClose().executeUpdate();
- return entity;
- }
-
- // ---------------------------------------------------------------- find
-
- /**
- * Finds single entity by its id.
- */
- public E findById(final Class entityType, final ID id) {
- return query(dbOom.entities().findById(entityType, id)).autoClose().find(entityType);
- }
-
- /**
- * Finds single entity by matching property.
- */
- public E findOneByProperty(final Class entityType, final String name, final Object value) {
- return query(dbOom.entities().findByColumn(entityType, name, value)).autoClose().find(entityType);
- }
-
- /**
- * Finds one entity for given criteria.
- */
- @SuppressWarnings({"unchecked"})
- public E findOne(final Object criteria) {
- return (E) query(dbOom.entities().find(criteria)).autoClose().find(criteria.getClass());
- }
-
- /**
- * Finds list of entities matching given criteria.
- */
- @SuppressWarnings({"unchecked"})
- public List find(final Object criteria) {
- return query(dbOom.entities().find(criteria)).autoClose().list(criteria.getClass());
- }
-
- /**
- * Finds list of entities matching given criteria.
- */
- public List find(final Class entityType, final Object criteria) {
- return query(dbOom.entities().find(entityType, criteria)).autoClose().list(entityType);
- }
-
- // ---------------------------------------------------------------- delete
-
- /**
- * Deleted single entity by its id.
- */
- public void deleteById(final Class entityType, final ID id) {
- query(dbOom.entities().deleteById(entityType, id)).autoClose().executeUpdate();
- }
-
- /**
- * Delete single object by its id. Resets ID value.
- */
- public void deleteById(final Object entity) {
- if (entity != null) {
- int result = query(dbOom.entities().deleteById(entity)).autoClose().executeUpdate();
-
- if (result != 0) {
- // now reset the ID value
- Class type = entity.getClass();
- DbEntityDescriptor ded = dbOom.entityManager().lookupType(type);
-
- setEntityId(ded, entity, 0);
- }
- }
- }
-
- /**
- * Deletes all objects by their ids.
- */
- public void deleteAllById(final Iterable objects) {
- for (final Object entity : objects) {
- deleteById(entity);
- }
- }
-
- // ---------------------------------------------------------------- count
-
- /**
- * Counts number of all entities.
- */
- public long count(final Class entityType) {
- return query(dbOom.entities().count(entityType)).autoClose().executeCount();
- }
-
-
- // ---------------------------------------------------------------- increase
-
- /**
- * Increases a property.
- */
- public void increaseProperty(final Class entityType, final ID id, final String name, final Number delta) {
- query(dbOom.entities().increaseColumn(entityType, id, name, delta, true)).autoClose().executeUpdate();
- }
-
- /**
- * Decreases a property.
- */
- public void decreaseProperty(final Class entityType, final ID id, final String name, final Number delta) {
- query(dbOom.entities().increaseColumn(entityType, id, name, delta, false)).autoClose().executeUpdate();
- }
-
- // ---------------------------------------------------------------- related
-
- /**
- * Finds related entity.
- */
- public List findRelated(final Class target, final Object source) {
- return query(dbOom.entities().findForeign(target, source)).autoClose().list(target);
- }
-
- // ---------------------------------------------------------------- list
-
- /**
- * List all entities.
- */
- public List listAll(final Class target) {
- return query(dbOom.entities().from(target)).autoClose().list(target);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/dao/package-info.java b/jodd-db/src/main/java/jodd/db/oom/dao/package-info.java
deleted file mode 100644
index 712fa88d2..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/dao/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Generic DAO.
- */
-package jodd.db.oom.dao;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/mapper/BaseResultSetMapper.java b/jodd-db/src/main/java/jodd/db/oom/mapper/BaseResultSetMapper.java
deleted file mode 100644
index 3210436da..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/mapper/BaseResultSetMapper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.mapper;
-
-import jodd.db.oom.DbOomException;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Common {@link ResultSetMapper} implementation.
- */
-public abstract class BaseResultSetMapper implements ResultSetMapper {
-
- protected final ResultSet resultSet;
-
- protected BaseResultSetMapper(final ResultSet resultSet) {
- this.resultSet = resultSet;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean next() {
- try {
- return resultSet.next();
- } catch (SQLException sex) {
- throw new DbOomException(sex);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void close() {
- try {
- resultSet.close();
- } catch (SQLException sex) {
- // ignore
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ResultSet getResultSet() {
- return resultSet;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Object parseOneObject(final Class... types) {
- return parseObjects(types)[0];
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/mapper/DefaultResultSetMapper.java b/jodd-db/src/main/java/jodd/db/oom/mapper/DefaultResultSetMapper.java
deleted file mode 100644
index cc9fb8d9a..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/mapper/DefaultResultSetMapper.java
+++ /dev/null
@@ -1,524 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.mapper;
-
-import jodd.bean.BeanUtil;
-import jodd.db.DbOom;
-import jodd.db.oom.ColumnData;
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.DbOomException;
-import jodd.db.oom.DbOomQuery;
-import jodd.db.type.SqlType;
-import jodd.db.type.SqlTypeManager;
-import jodd.typeconverter.TypeConverterManager;
-
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Maps all columns of database result set (RS) row to objects.
- * It does it in two steps: preparation (reading table and column names)
- * and parsing (parsing one result set row to resulting objects).
- *
- * Preparation
- * Default mapper reads RS column and table names from RS meta-data and external maps, if provided.
- * Since column name is always available in RS meta-data, it may be used to hold table name information.
- * Column names may contain table code separator that
- * divides column name to table reference and column name. Here, table reference may be either table name or
- * table alias. When it is table alias, external alias-to-name map must be provided.
- * Hence, this defines the table name, and there is no need to read it from RS meta-data.
- *
- * When column name doesn't contain a separator, it may be either an actual column name, or a column code.
- * For column codes, both table and column name is lookup-ed from external map. If column name is an actual column name,
- * table information is read from the RS meta data. Unfortunately, some DBs (such Oracle) doesn't implements
- * this simple JDBC feature. Therefore, it must be expected that column table name is not available.
- *
- * Table name is also not available for columns which are not directly table columns:
- * e.g. some calculations, counts etc.
- *
- * Parsing
- * Parser takes types array and tries to populate their instances in best possible way. It assumes that provided
- * types list matches selected columns. That is very important, and yet very easy and natural to follow.
- * So, parser will try to inject columns value into the one result instance. Now, there are two types of instances:
- * simple types (numbers and strings) and entities (pojo objects). Simple types are always mapped to
- * one and only one column. Entities will be mapped to all possible columns that can be matched starting from
- * current column. So, simple types are not column-hungry, entity types are column-hungry:)
- *
- *
- * A column can be injected in one entities property only once. If one column is already mapped to current result,
- * RS mapper will assume that current result is finished with mapping and will proceed to the next one.
- * Similarly, if property name is not found for a column, RS mapper will proceed to the next result.
- * Therefore, entity types are column precise and hungry;) - all listed columns must be mapped somewhere.
- *
- *
- * Results that are not used during parsing will be set to null.
- *
- */
-public class DefaultResultSetMapper extends BaseResultSetMapper {
-
- protected final DbOomQuery dbOomQuery;
- protected final boolean cacheEntities;
- protected final int totalColumns; // total number of columns
- protected final String[] columnNames; // list of all column names
- protected final int[] columnDbSqlTypes; // list of all column db types
- protected final String[] tableNames; // list of table names for each column, table name may be null
-
- private final Set resultColumns; // internal columns per entity cache
- private final DbEntityManager dbEntityManager;
-
- // ---------------------------------------------------------------- ctor
-
- /**
- * Reads ResultSet meta-data for column and table names.
- * @param resultSet JDBC result set
- * @param columnAliases alias names for columns, if exist
- * @param cacheEntities flag if entities should be cached
- * @param dbOomQuery query that created this mapper.
- */
- public DefaultResultSetMapper(
- final DbOom dbOom,
- final ResultSet resultSet,
- final Map columnAliases,
- final boolean cacheEntities,
- final DbOomQuery dbOomQuery) {
- super(resultSet);
-
- this.dbEntityManager = dbOom.entityManager();
- this.dbOomQuery = dbOomQuery;
- this.cacheEntities = cacheEntities;
-
- //this.resultColumns = new HashSet();
- try {
- ResultSetMetaData rsMetaData = resultSet.getMetaData();
- if (rsMetaData == null) {
- throw new DbOomException("No ResultSet meta-data");
- }
-
- totalColumns = rsMetaData.getColumnCount();
-
- this.resultColumns = new HashSet<>(totalColumns);
- columnNames = new String[totalColumns];
- columnDbSqlTypes = new int[totalColumns];
- tableNames = new String[totalColumns];
-
- for (int i = 0; i < totalColumns; i++) {
- String columnName = rsMetaData.getColumnLabel(i + 1);
-
- if (columnName == null) {
- columnName = rsMetaData.getColumnName(i + 1);
- }
-
- String tableName = null;
-
- // resolve column and table name
- int sepNdx = columnName.indexOf(dbOom.config().getColumnAliasSeparator());
- if (sepNdx != -1) {
- // column alias exist, result set is ignored and columnAliases contains table data
- tableName = columnName.substring(0, sepNdx);
- if (columnAliases != null) {
- ColumnData columnData = columnAliases.get(tableName);
- if (columnData != null) {
- tableName = columnData.getTableName();
- }
- }
- columnName = columnName.substring(sepNdx + 1);
- } else {
- // column alias does not exist, table name is read from columnAliases and result set (if available)
- if (columnAliases != null) {
- ColumnData columnData = columnAliases.get(columnName);
- if (columnData != null) {
- tableName = columnData.getTableName();
- columnName = columnData.getColumnName();
- }
- }
- if (tableName == null) {
- try {
- tableName = rsMetaData.getTableName(i + 1);
- } catch (SQLException sex) {
- // ignore
- }
- if ((tableName != null) && (tableName.length() == 0)) {
- tableName = null;
- }
- }
- }
-
- columnName = columnName.trim();
- if (columnName.length() == 0) {
- columnName = null;
- }
-
- if (columnName != null) {
- columnName = columnName.trim();
- columnName = columnName.toUpperCase();
- }
- columnNames[i] = columnName;
-
- if (tableName != null) {
- tableName = tableName.trim();
- tableName = tableName.toUpperCase();
- }
- tableNames[i] = tableName;
- columnDbSqlTypes[i] = rsMetaData.getColumnType(i + 1);
- }
- } catch (SQLException sex) {
- throw new DbOomException(dbOomQuery, "Reading ResultSet meta-data failed", sex);
- }
- }
-
- // ---------------------------------------------------------------- delegates
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Class[] resolveTables() {
- List classes = new ArrayList<>(tableNames.length);
- String lastTableName = null;
- resultColumns.clear();
-
- for (int i = 0; i < tableNames.length; i++) {
- String tableName = tableNames[i];
- String columnName = columnNames[i];
-
- if (tableName == null) {
- // maybe JDBC driver does not support it
- throw new DbOomException(dbOomQuery, "Table name missing in meta-data");
- }
-
- if ((!tableName.equals(lastTableName)) || (resultColumns.contains(columnName))) {
- resultColumns.clear();
- lastTableName = tableName;
-
- DbEntityDescriptor ded = dbEntityManager.lookupTableName(tableName);
- if (ded == null) {
- throw new DbOomException(dbOomQuery, "Table name not registered: " + tableName);
- }
-
- classes.add(ded.getType());
- }
- resultColumns.add(columnName);
- }
- return classes.toArray(new Class[0]);
- }
-
- // ---------------------------------------------------------------- cache
-
- protected DbEntityDescriptor[] cachedDbEntityDescriptors;
- protected Class[] cachedUsedTypes;
- protected String[] cachedTypesTableNames;
- protected String[][] cachedMappedNames;
-
- /**
- * Resolves {@link jodd.db.oom.DbEntityDescriptor} for all given types,
- * so not to repeat every time.
- */
- protected DbEntityDescriptor[] resolveDbEntityDescriptors(final Class[] types) {
- if (cachedDbEntityDescriptors == null) {
- DbEntityDescriptor[] descs = new DbEntityDescriptor[types.length];
- for (int i = 0; i < types.length; i++) {
- Class type = types[i];
- if (type != null) {
- descs[i] = dbEntityManager.lookupType(type);
- }
- }
- cachedDbEntityDescriptors = descs;
- }
- return cachedDbEntityDescriptors;
- }
-
- /**
- * Creates table names for all specified types.
- * Since this is usually done once per result set, these names are cached.
- * Type name will be null for simple names, i.e. for all those
- * types that returns null when used by {@link DbEntityManager#lookupType(Class)}.
- */
- protected String[] resolveTypesTableNames(final Class[] types) {
- if (types != cachedUsedTypes) {
- cachedTypesTableNames = createTypesTableNames(types);
- cachedUsedTypes = types;
- }
- return cachedTypesTableNames;
- }
-
- /**
- * Resolved mapped type names for each type.
- */
- protected String[][] resolveMappedTypesTableNames(final Class[] types) {
- if (cachedMappedNames == null) {
- String[][] names = new String[types.length][];
- for (int i = 0; i < types.length; i++) {
- Class type = types[i];
- if (type != null) {
- DbEntityDescriptor ded = cachedDbEntityDescriptors[i];
- if (ded != null) {
- Class[] mappedTypes = ded.getMappedTypes();
- if (mappedTypes != null) {
- names[i] = createTypesTableNames(mappedTypes);
- }
- }
- }
- }
- cachedMappedNames = names;
- }
- return cachedMappedNames;
- }
-
- /**
- * Creates table names for given types.
- */
- protected String[] createTypesTableNames(final Class[] types) {
- String[] names = new String[types.length];
- for (int i = 0; i < types.length; i++) {
- if (types[i] == null) {
- names[i] = null;
- continue;
- }
- DbEntityDescriptor ded = dbEntityManager.lookupType(types[i]);
- if (ded != null) {
- String tableName = ded.getTableName();
- tableName = tableName.toUpperCase();
- names[i] = tableName;
- }
- }
- return names;
- }
-
- protected int cachedColumnNdx;
- protected Object cachedColumnValue;
-
- // ---------------------------------------------------------------- parse object
-
- /**
- * Reads column value from result set. Since this method may be called more then once for
- * the same column, it caches column values.
- */
- @SuppressWarnings({"unchecked"})
- protected Object readColumnValue(final int colNdx, final Class destinationType, final Class sqlTypeClass, final int columnDbSqlType) {
- if (colNdx != cachedColumnNdx) {
- try {
- SqlType sqlType;
- if (sqlTypeClass != null) {
- sqlType = SqlTypeManager.get().lookupSqlType(sqlTypeClass);
- } else {
- sqlType = SqlTypeManager.get().lookup(destinationType);
- }
- if (sqlType != null) {
- cachedColumnValue = sqlType.readValue(resultSet, colNdx + 1, destinationType, columnDbSqlType);
- } else {
- cachedColumnValue = resultSet.getObject(colNdx + 1);
- cachedColumnValue = TypeConverterManager.get().convertType(cachedColumnValue, destinationType);
- }
- } catch (SQLException sex) {
- throw new DbOomException(dbOomQuery, "Invalid value for column #" + (colNdx + 1), sex);
- }
- cachedColumnNdx = colNdx;
- }
- return cachedColumnValue;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Object[] parseObjects(final Class... types) {
- resultColumns.clear();
-
- int totalTypes = types.length;
- Object[] result = new Object[totalTypes];
- boolean[] resultUsage = new boolean[totalTypes];
- DbEntityDescriptor[] dbEntityDescriptors = resolveDbEntityDescriptors(types);
- String[] typesTableNames = resolveTypesTableNames(types);
- String[][] mappedNames = resolveMappedTypesTableNames(types);
-
- int currentResult = 0;
- cachedColumnNdx = -1;
- int colNdx = 0;
- while (colNdx < totalColumns) {
-
- // no more types for mapping?
- if (currentResult >= totalTypes) {
- break;
- }
-
- // skip columns that doesn't map
- Class currentType = types[currentResult];
- if (currentType == null) {
- colNdx++;
- currentResult++;
- resultColumns.clear();
- continue;
- }
-
- String columnName = columnNames[colNdx];
- int columnDbSqlType = columnDbSqlTypes[colNdx];
- String tableName = tableNames[colNdx];
- String resultTableName = typesTableNames[currentResult];
-
- if (resultTableName == null) {
- // match: simple type
- result[currentResult] = readColumnValue(colNdx, currentType, null, columnDbSqlType);
- resultUsage[currentResult] = true;
- colNdx++;
- currentResult++; resultColumns.clear();
- continue;
- }
-
- // match table
- boolean tableMatched = false;
-
- if (tableName == null) {
- tableMatched = true;
- } else if (resultTableName.equals(tableName)) {
- tableMatched = true;
- } else {
- String[] mapped = mappedNames[currentResult];
- if (mapped != null) {
- for (String m : mapped) {
- if (m.equals(tableName)) {
- tableMatched = true;
- break;
- }
- }
- }
- }
-
- if (tableMatched) {
- if (!resultColumns.contains(columnName)) {
- //DbEntityDescriptor ded = dbEntityManager.lookupType(currentType);
- DbEntityDescriptor ded = dbEntityDescriptors[currentResult];
-
- DbEntityColumnDescriptor dec = ded.findByColumnName(columnName);
- String propertyName = (dec == null ? null : dec.getPropertyName());
-
- // check if a property that matches column name exist
- if (propertyName != null) {
-
- // if current entity instance does not exist (i.e. we are at the first column
- // of some entity), create the instance and store it
- if (result[currentResult] == null) {
- result[currentResult] = dbEntityManager.createEntityInstance(currentType);
- }
-/*
- boolean success = value != null ?
- BeanUtil.setDeclaredPropertySilent(result[currentResult], propertyName, value) :
- BeanUtil.hasDeclaredProperty(result[currentResult], propertyName);
-*/
- Class type = BeanUtil.declared.getPropertyType(result[currentResult], propertyName);
- if (type != null) {
- // match: entity
- dec.updateDbSqlType(columnDbSqlType); // updates column db sql type information for the entity!!!
- Class sqlTypeClass = dec.getSqlTypeClass();
- Object value = readColumnValue(colNdx, type, sqlTypeClass, columnDbSqlType);
-
- if (value != null) {
- // inject column value into existing entity
- BeanUtil.declared.setProperty(result[currentResult], propertyName, value);
- resultUsage[currentResult] = true;
- }
- colNdx++;
- resultColumns.add(columnName);
- continue;
- }
- }
- }
- }
- // go to next type, i.e. result
- currentResult++;
- resultColumns.clear();
- }
-
- resultColumns.clear();
- for (int i = 0; i < resultUsage.length; i++) {
- if (!resultUsage[i]) {
- result[i] = null;
- }
- }
-
- if (cacheEntities) {
- cacheResultSetEntities(result);
- }
-
- return result;
- }
-
-
- // ---------------------------------------------------------------- cache
-
- protected HashMap entitiesCache;
-
- /**
- * Caches returned entities. Replaces new instances with existing ones.
- */
- protected void cacheResultSetEntities(final Object[] result) {
- if (entitiesCache == null) {
- entitiesCache = new HashMap<>();
- }
-
- for (int i = 0; i < result.length; i++) {
- Object object = result[i];
-
- if (object == null) {
- continue;
- }
-
- DbEntityDescriptor ded = cachedDbEntityDescriptors[i];
-
- if (ded == null) { // not a type, continue
- continue;
- }
-
- // calculate key
- Object key;
- if (ded.hasIdColumn()) {
- //noinspection unchecked
- key = ded.getKeyValue(object);
- } else {
- key = object;
- }
-
- Object cachedObject = entitiesCache.get(key);
-
- if (cachedObject == null) {
- // object is not in the cache, add it
- entitiesCache.put(key, object);
- } else {
- // object is in the cache, replace it
- result[i] = cachedObject;
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/mapper/ResultSetMapper.java b/jodd-db/src/main/java/jodd/db/oom/mapper/ResultSetMapper.java
deleted file mode 100644
index a42868481..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/mapper/ResultSetMapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.mapper;
-
-import jodd.db.oom.DbEntityManager;
-
-import java.sql.ResultSet;
-
-/**
- * ResultSet mapper which implementations parse objects from one result set row.
- * There are two ways of mapping. The basic way is mapping against provided
- * entity types. The second, extended, way is auto-mapping, where no types
- * are provided. Instead, they are mapped by {@link DbEntityManager} or
- * similar external class.
- *
- * There should be only one instance of ResultSetMapper per ResultSet.
- */
-public interface ResultSetMapper {
-
- // ---------------------------------------------------------------- moving
-
- /**
- * Moves the cursor down one row from its current position.
- */
- boolean next();
-
- /**
- * Releases this ResultSet object's database and JDBC resources immediately instead of
- * waiting for this to happen when it is automatically closed.
- */
- void close();
-
- /**
- * Return JDBC result set.
- */
- ResultSet getResultSet();
-
-
- // ---------------------------------------------------------------- parse types
-
- /**
- * Resolves table names into the list of entity types.
- * Resolving is used when query is executed without specified types.
- */
- Class[] resolveTables();
-
- /**
- * Parse objects from one result set row to specified types.
- */
- Object[] parseObjects(Class... types);
-
- /**
- * Parse single object from result set row to specified type.
- * @see #parseObjects(Class[])
- */
- Object parseOneObject(Class... types);
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/mapper/package-info.java b/jodd-db/src/main/java/jodd/db/oom/mapper/package-info.java
deleted file mode 100644
index 17325a729..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/mapper/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * ResultSet to objects mappers.
- */
-package jodd.db.oom.mapper;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/meta/DbColumn.java b/jodd-db/src/main/java/jodd/db/oom/meta/DbColumn.java
deleted file mode 100644
index 7254c2307..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/meta/DbColumn.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.meta;
-
-import jodd.db.type.SqlType;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Fields marker for mapped columns.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface DbColumn {
-
- /**
- * Column name.
- */
- String value() default "";
-
- /**
- * SqlType class.
- */
- Class sqlType() default SqlType.class;
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/meta/DbId.java b/jodd-db/src/main/java/jodd/db/oom/meta/DbId.java
deleted file mode 100644
index 85a498322..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/meta/DbId.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.meta;
-
-import jodd.db.type.SqlType;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Field marker for ID columns, not necessary to use, but might be helpful.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface DbId {
-
- /**
- * ID column name.
- */
- String value() default "";
-
- /**
- * SqlType class.
- */
- Class sqlType() default SqlType.class;
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/meta/DbMapTo.java b/jodd-db/src/main/java/jodd/db/oom/meta/DbMapTo.java
deleted file mode 100644
index 6b7fe39b3..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/meta/DbMapTo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.meta;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker for 'composed' entities. They are mapped to more then one
- * resulting table.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface DbMapTo {
-
- /**
- * List of entities object is composed of.
- */
- Class[] value();
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/meta/DbTable.java b/jodd-db/src/main/java/jodd/db/oom/meta/DbTable.java
deleted file mode 100644
index c14dbfa42..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/meta/DbTable.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.meta;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Class marker for entity mapped to a table or a view.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface DbTable {
-
- /**
- * Table or view name.
- */
- String value() default "";
-
- /**
- * Schema name.
- */
- String schema() default "";
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/meta/package-info.java b/jodd-db/src/main/java/jodd/db/oom/meta/package-info.java
deleted file mode 100644
index 4be519b94..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/meta/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * DbOom annotations.
- */
-package jodd.db.oom.meta;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/naming/BaseNamingStrategy.java b/jodd-db/src/main/java/jodd/db/oom/naming/BaseNamingStrategy.java
deleted file mode 100644
index fa32a7eac..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/naming/BaseNamingStrategy.java
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.naming;
-
-/**
- * Common stuff for both naming strategies.
- */
-abstract class BaseNamingStrategy {
-
- // ---------------------------------------------------------------- common properties
-
- protected boolean splitCamelCase = true;
- protected char separatorChar = '_';
- protected boolean changeCase = true;
- protected boolean uppercase = true;
- protected boolean strictAnnotationNames = true;
- protected boolean alwaysQuoteNames = false;
- protected char quoteChar = 0;
-
- public boolean isSplitCamelCase() {
- return splitCamelCase;
- }
-
- /**
- * Specifies if camel case name has to be split.
- * If set to false, then name is passed unchanged.
- */
- public void setSplitCamelCase(final boolean splitCamelCase) {
- this.splitCamelCase = splitCamelCase;
- }
-
- public char getSeparatorChar() {
- return separatorChar;
- }
-
- /**
- * Separator character, when camel case names
- * are {@link #setSplitCamelCase(boolean) split}.
- */
- public void setSeparatorChar(final char separatorChar) {
- this.separatorChar = separatorChar;
- }
-
- public boolean isChangeCase() {
- return changeCase;
- }
-
- /**
- * Specifies if database names should be convert to
- * uppercase or lowercase.
- */
- public void setChangeCase(final boolean changeCase) {
- this.changeCase = changeCase;
- }
-
- public boolean isUppercase() {
- return uppercase;
- }
-
- /**
- * Specifies if table name should be converted to uppercase.
- * Table names includes prefix and suffix. Otherwise, table name
- * will be converted to lowercase.
- */
- public void setUppercase(final boolean uppercase) {
- this.uppercase = uppercase;
- }
-
- public boolean isLowercase() {
- return !uppercase;
- }
-
- /**
- * Alternative property to {@link #setUppercase(boolean)}.
- * Does just the opposite.
- */
- public void setLowercase(final boolean lowercase) {
- this.uppercase = !lowercase;
- }
-
- public boolean isStrictAnnotationNames() {
- return strictAnnotationNames;
- }
-
- /**
- * Defines if annotation names are strict, or if all the naming
- * rules should apply on them, too.
- */
- public void setStrictAnnotationNames(final boolean strictAnnotationNames) {
- this.strictAnnotationNames = strictAnnotationNames;
- }
-
- public boolean isAlwaysQuoteNames() {
- return alwaysQuoteNames;
- }
-
- /**
- * Defines if all table and column names should be quoted.
- */
- public void setAlwaysQuoteNames(final boolean alwaysQuoteNames) {
- this.alwaysQuoteNames = alwaysQuoteNames;
- }
-
- public char getQuoteChar() {
- return quoteChar;
- }
-
- /**
- * Defines quote char.
- */
- public void setQuoteChar(final char quoteChar) {
- this.quoteChar = quoteChar;
- }
-
- // ---------------------------------------------------------------- util methods
-
- protected static StringBuilder toUppercase(final StringBuilder string) {
- final int strLen = string.length();
-
- for (int i = 0; i < strLen; i++) {
- char c = string.charAt(i);
-
- char uppercaseChar = Character.toUpperCase(c);
- if (c != uppercaseChar) {
- string.setCharAt(i, uppercaseChar);
- }
- }
- return string;
- }
-
- protected static StringBuilder toLowercase(final StringBuilder string) {
- final int strLen = string.length();
-
- for (int i = 0; i < strLen; i++) {
- char c = string.charAt(i);
-
- char lowercaseChar = Character.toLowerCase(c);
- if (c != lowercaseChar) {
- string.setCharAt(i, lowercaseChar);
- }
- }
- return string;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/naming/ColumnNamingStrategy.java b/jodd-db/src/main/java/jodd/db/oom/naming/ColumnNamingStrategy.java
deleted file mode 100644
index 0f06f08bf..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/naming/ColumnNamingStrategy.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.naming;
-
-import jodd.util.StringUtil;
-
-/**
- * Naming strategy for converting property names
- * to database column names.
- */
-public class ColumnNamingStrategy extends BaseNamingStrategy {
-
- // ---------------------------------------------------------------- methods
-
- /**
- * Converts property name to column name.
- */
- public String convertPropertyNameToColumnName(final String propertyName) {
- final StringBuilder tableName = new StringBuilder(propertyName.length() * 2);
-
- if (splitCamelCase) {
- final String convertedTableName = StringUtil.fromCamelCase(propertyName, separatorChar);
- tableName.append(convertedTableName);
- } else {
- tableName.append(propertyName);
- }
-
- if (!changeCase) {
- return tableName.toString();
- }
- return uppercase ?
- toUppercase(tableName).toString() :
- toLowercase(tableName).toString();
-
- }
-
- /**
- * Converts column name to property name.
- */
- public String convertColumnNameToPropertyName(final String columnName) {
- final StringBuilder propertyName = new StringBuilder(columnName.length());
- final int len = columnName.length();
-
- if (splitCamelCase) {
- boolean toUpper = false;
- for (int i = 0; i < len; i++) {
- final char c = columnName.charAt(i);
- if (c == separatorChar) {
- toUpper = true;
- continue;
- }
- if (toUpper) {
- propertyName.append(Character.toUpperCase(c));
- toUpper = false;
- } else {
- propertyName.append(Character.toLowerCase(c));
- }
- }
- return propertyName.toString();
- }
- return columnName;
- }
-
- /**
- * Applies column naming strategy to given column name hint.
- * Returns full column name.
- */
- public String applyToColumnName(final String columnName) {
- final String propertyName = convertColumnNameToPropertyName(columnName);
-
- return convertPropertyNameToColumnName(propertyName);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/naming/TableNamingStrategy.java b/jodd-db/src/main/java/jodd/db/oom/naming/TableNamingStrategy.java
deleted file mode 100644
index 904ac37e9..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/naming/TableNamingStrategy.java
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.naming;
-
-import jodd.util.StringPool;
-import jodd.util.StringUtil;
-
-/**
- * Naming strategy for converting entity names
- * (i.e. class names) to database table names.
- */
-public class TableNamingStrategy extends BaseNamingStrategy {
-
- // ---------------------------------------------------------------- properties
-
- protected String prefix = StringPool.EMPTY;
- protected String suffix = StringPool.EMPTY;
- protected char entityNameTerminator = '$';
-
- public String getPrefix() {
- return prefix;
- }
-
- /**
- * Table prefix, may be null.
- */
- public void setPrefix(final String prefix) {
- this.prefix = prefix;
- }
-
- public String getSuffix() {
- return suffix;
- }
-
- /**
- * Table suffix, may be null.
- */
- public void setSuffix(final String suffix) {
- this.suffix = suffix;
- }
-
- public char getEntityNameTerminator() {
- return entityNameTerminator;
- }
-
- /**
- * Specifies the terminator character for entity names.
- * When some type is proxified, new class name usually contains
- * some special character, like '$'.
- */
- public void setEntityNameTerminator(final char entityNameTerminator) {
- this.entityNameTerminator = entityNameTerminator;
- }
-
- // ---------------------------------------------------------------- methods
-
- /**
- * Converts entity name to table name.
- * @see #convertEntityNameToTableName(String)
- */
- public String convertEntityNameToTableName(final Class type) {
- return convertEntityNameToTableName(type.getSimpleName());
- }
-
- /**
- * Converts entity (type) name to table name.
- */
- public String convertEntityNameToTableName(String entityName) {
- final int ndx = entityName.indexOf(entityNameTerminator);
- if (ndx != -1) {
- entityName = entityName.substring(0, ndx);
- }
-
- final StringBuilder tableName = new StringBuilder(entityName.length() * 2);
-
- if (prefix != null) {
- tableName.append(prefix);
- }
-
- if (splitCamelCase) {
- final String convertedTableName = StringUtil.fromCamelCase(entityName, separatorChar);
- tableName.append(convertedTableName);
- } else {
- tableName.append(entityName);
- }
-
- if (suffix != null) {
- tableName.append(suffix);
- }
-
- if (!changeCase) {
- return tableName.toString();
- }
- return uppercase ?
- toUppercase(tableName).toString() :
- toLowercase(tableName).toString();
-
- }
-
- /**
- * Converts table name to entity (type) name.
- */
- public String convertTableNameToEntityName(final String tableName) {
- final StringBuilder className = new StringBuilder(tableName.length());
- int len = tableName.length();
-
- int i = 0;
- if (prefix != null) {
- if (tableName.startsWith(prefix)) {
- i = prefix.length();
- }
- }
- if (suffix != null) {
- if (tableName.endsWith(suffix)) {
- len -= suffix.length();
- }
- }
-
- if (splitCamelCase) {
- boolean toUpper = true;
- for (; i < len; i++) {
- final char c = tableName.charAt(i);
- if (c == separatorChar) {
- toUpper = true;
- continue;
- }
- if (toUpper) {
- className.append(Character.toUpperCase(c));
- toUpper = false;
- } else {
- className.append(Character.toLowerCase(c));
- }
- }
- return className.toString();
- }
-
- return tableName.substring(i, len);
- }
-
- /**
- * Applies table naming strategy to given table name hint.
- * Returns full table name.
- */
- public String applyToTableName(final String tableName) {
- final String entityName = convertTableNameToEntityName(tableName);
-
- return convertEntityNameToTableName(entityName);
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/naming/package-info.java b/jodd-db/src/main/java/jodd/db/oom/naming/package-info.java
deleted file mode 100644
index bd33729d6..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/naming/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * DB OOM naming convention strategies.
- */
-package jodd.db.oom.naming;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/package-info.java b/jodd-db/src/main/java/jodd/db/oom/package-info.java
deleted file mode 100644
index 8b73c2d6d..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * DB OOM suite.
- */
-package jodd.db.oom;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbEntitySql.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbEntitySql.java
deleted file mode 100644
index 5f3db7b8c..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbEntitySql.java
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.bean.BeanUtil;
-import jodd.db.DbOom;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.DbOomConfig;
-import jodd.util.StringPool;
-
-import static jodd.db.oom.sqlgen.DbSqlBuilder.sql;
-import static jodd.util.StringPool.EQUALS;
-import static jodd.util.StringPool.SPACE;
-import static jodd.util.StringUtil.capitalize;
-import static jodd.util.StringUtil.uncapitalize;
-
-/**
- * Useful {@link DbSqlBuilder} generators.
- */
-public class DbEntitySql {
-
- private static final String DELETE_FROM = "delete from ";
- private static final String WHERE = " where ";
- private static final String UPDATE = "update ";
- private static final String SELECT = "select ";
- private static final String FROM = " from ";
- private static final String SET = " set ";
- private static final String SELECT_COUNT_1_FROM = "select count(*) from ";
-
- private final DbEntityManager entityManager;
- private final DbOomConfig dbOomConfig;
-
- public DbEntitySql(final DbOom dbOom) {
- this.entityManager = dbOom.entityManager();
- this.dbOomConfig = dbOom.config();
- }
-
- public DbEntitySql() {
- this(DbOom.get());
- }
-
- // ---------------------------------------------------------------- insert
-
- /**
- * Creates INSERT query for the entity.
- */
- public DbSqlBuilder insert(final Object entity) {
- return sql().insert(entity);
- }
-
- // ---------------------------------------------------------------- truncate
-
- /**
- * Creates DELETE query that truncates all table data.
- */
- public DbSqlBuilder truncate(final Object entity) {
- return sql().$(DELETE_FROM).table(entity, null);
- }
-
- // ---------------------------------------------------------------- update
-
- /**
- * Creates UPDATE query that updates all non-null values of an entity that is matched by id.
- */
- public DbSqlBuilder update(final Object entity) {
- String tableRef = createTableRefName(entity);
-
- if (!dbOomConfig.isUpdateAcceptsTableAlias()) {
- tableRef = null;
- }
-
- return sql().$(UPDATE).table(entity, tableRef).set(tableRef, entity).$(WHERE).matchIds(tableRef, entity);
- }
-
- /**
- * Creates UPDATE query that updates all values of an entity that is matched by id.
- */
- public DbSqlBuilder updateAll(final Object entity) {
- String tableRef = createTableRefName(entity);
-
- if (!dbOomConfig.isUpdateAcceptsTableAlias()) {
- tableRef = null;
- }
-
- return sql().$(UPDATE).table(entity, tableRef).setAll(tableRef, entity).$(WHERE).matchIds(tableRef, entity);
- }
-
- /**
- * Creates UPDATE query for single column of an entity that is matched by id.
- */
- public DbSqlBuilder updateColumn(final Object entity, final String columnRef, final Object value) {
- String tableRef = createTableRefName(entity);
-
- if (!dbOomConfig.isUpdateAcceptsTableAlias()) {
- tableRef = null;
- }
-
- return sql().$(UPDATE).table(entity, tableRef).$(SET).ref(null, columnRef).$(EQUALS).columnValue(value).$(WHERE).matchIds(tableRef, entity);
- }
-
- /**
- * Reads property value and updates the DB.
- */
- public DbSqlBuilder updateColumn(final Object entity, final String columnRef) {
- final Object value = BeanUtil.pojo.getProperty(entity, columnRef);
- return updateColumn(entity, columnRef, value);
- }
-
- // ---------------------------------------------------------------- delete
-
- /**
- * Creates DELETE query that deletes entity matched by non-null values.
- */
- public DbSqlBuilder delete(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(DELETE_FROM).table(entity, null, tableRef).$(WHERE).match(tableRef, entity);
- }
-
- /**
- * Creates DELETE query that deletes entity matched by all values.
- */
- public DbSqlBuilder deleteByAll(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(DELETE_FROM).table(entity, null, tableRef).$(WHERE).matchAll(tableRef, entity);
- }
-
- // ---------------------------------------------------------------- delete by id
-
- /**
- * Creates DELETE query that deletes entity by ID.
- */
- public DbSqlBuilder deleteById(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(DELETE_FROM).table(entity, null, tableRef).$(WHERE).matchIds(tableRef, entity);
- }
-
- /**
- * Creates DELETE query that deletes entity by ID.
- */
- public DbSqlBuilder deleteById(final Object entityType, final Object id) {
- final String tableRef = createTableRefName(entityType);
- return sql().
- $(DELETE_FROM).table(entityType, null, tableRef).
- $(WHERE).refId(tableRef).$(EQUALS).columnValue(id);
- }
-
- // ---------------------------------------------------------------- from
-
- /**
- * Creates 'SELECT all FROM entity' part of the SQL query that can be easily extended.
- * Entity is referred with its simple class name.
- */
- public DbSqlBuilder from(final Object entity) {
- return from(entity, createTableRefName(entity));
- }
-
- public DbSqlBuilder from(final Object entity, final String tableRef) {
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef).$(SPACE);
- }
-
- public DbSqlBuilder from(final Class entityType) {
- return from(entityType, createTableRefName(entityType));
- }
-
- public DbSqlBuilder from(final Class entityType, final String tableRef) {
- return sql().$(SELECT).column(tableRef).$(FROM).table(entityType, tableRef).$(SPACE);
- }
-
- // ---------------------------------------------------------------- find
-
- /**
- * Creates SELECT criteria for the entity matched by non-null values.
- */
- public DbSqlBuilder find(final Class target, final Object matchEntity) {
- final String tableRef = createTableRefName(target);
- return sql().$(SELECT).column(tableRef).$(FROM).table(target, tableRef).$(WHERE).match(tableRef, matchEntity);
- }
-
- /**
- * Creates SELECT criteria for the entity matched by non-null values.
- */
- public DbSqlBuilder find(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef).$(WHERE).match(tableRef, entity);
- }
-
- /**
- * Creates SELECT criteria for the entity matched by all values.
- */
- public DbSqlBuilder findByAll(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef).$(WHERE).matchAll(tableRef, entity);
- }
-
- /**
- * Creates SELECT criteria for the entity matched by column name
- */
- public DbSqlBuilder findByColumn(final Class entity, final String column, final Object value) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef).$(WHERE).ref(tableRef, column).$(EQUALS).columnValue(value);
- }
-
- /**
- * Creates SELECT criteria for the entity matched by foreign key.
- * Foreign key is created by concatenating foreign table name and column name.
- */
- public DbSqlBuilder findForeign(final Class entity, final Object value) {
- final String tableRef = createTableRefName(entity);
-
- final DbEntityDescriptor dedFk = entityManager.lookupType(value.getClass());
-
- final String tableName = dbOomConfig.getTableNames().convertTableNameToEntityName(dedFk.getTableName());
- final String columnName = dbOomConfig.getColumnNames().convertColumnNameToPropertyName(dedFk.getIdColumnName());
-
- final String fkColumn = uncapitalize(tableName) + capitalize(columnName);
- final Object idValue = BeanUtil.pojo.getProperty(value, dedFk.getIdPropertyName());
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef).$(WHERE).ref(tableRef, fkColumn).$(EQUALS).columnValue(idValue);
- }
-
- // ---------------------------------------------------------------- ALL
-
- /**
- * Returns all records for given type.
- */
- public DbSqlBuilder findAll(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef);
- }
-
-
- // ---------------------------------------------------------------- find by Id
-
- /**
- * Creates SELECT criteria for the entity matched by id.
- */
- public DbSqlBuilder findById(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT).column(tableRef).$(FROM).table(entity, tableRef).$(WHERE).matchIds(tableRef, entity);
- }
-
- /**
- * Creates SELECT criteria for the entity matched by id.
- */
- public DbSqlBuilder findById(final Object entityType, final Object id) {
- final String tableRef = createTableRefName(entityType);
- return sql().$(SELECT).column(tableRef).$(FROM).table(entityType, tableRef)
- .$(WHERE).refId(tableRef).$(EQUALS).columnValue(id);
- }
-
- // ---------------------------------------------------------------- count
-
- /**
- * Creates SELECT COUNT criteria for the entity matched by non-null values.
- */
- public DbSqlBuilder count(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT_COUNT_1_FROM).table(entity, tableRef).$(WHERE).match(tableRef, entity);
- }
-
- /**
- * Creates SELECT COUNT all query.
- */
- public DbSqlBuilder count(final Class entityType) {
- final String tableRef = createTableRefName(entityType);
- return sql().$(SELECT_COUNT_1_FROM).table(entityType, tableRef);
- }
-
-
- /**
- * Creates SELECT COUNT criteria for the entity matched by all values.
- */
- public DbSqlBuilder countAll(final Object entity) {
- final String tableRef = createTableRefName(entity);
- return sql().$(SELECT_COUNT_1_FROM).table(entity, tableRef).$(WHERE).matchAll(tableRef, entity);
- }
-
- // ---------------------------------------------------------------- increase
-
- /**
- * Creates UPDATE that increases/decreases column by some delta value.
- */
- public DbSqlBuilder increaseColumn(final Class entity, final Object id, final String columnRef, final Number delta, final boolean increase) {
- final String tableRef = createTableRefName(entity);
-
- return sql().$(UPDATE).table(entity, null, tableRef).$(SET)
- .ref(null, columnRef).$(EQUALS).ref(null, columnRef)
- .$(increase ? StringPool.PLUS : StringPool.DASH)
- .columnValue(delta).$(WHERE).refId(tableRef).$(EQUALS).columnValue(id);
- }
-
-
- // ---------------------------------------------------------------- resolve tableRef
-
- /**
- * Creates table reference name from entity type.
- * Always appends an underscore to reference name in order
- * to circumvent SQL compatibility issues when entity class name
- * equals to a reserved word.
- */
- protected static String createTableRefName(final Object entity) {
- Class type = entity.getClass();
- type = (type == Class.class ? (Class) entity : type);
- return (type.getSimpleName() + '_');
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbSqlBuilder.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbSqlBuilder.java
deleted file mode 100644
index 35996d9fa..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbSqlBuilder.java
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.db.DbOom;
-import jodd.db.DbSession;
-import jodd.db.oom.ColumnAliasType;
-import jodd.db.oom.ColumnData;
-import jodd.db.oom.DbOomQuery;
-import jodd.db.oom.DbSqlGenerator;
-import jodd.db.oom.sqlgen.chunks.ColumnValueChunk;
-import jodd.db.oom.sqlgen.chunks.ColumnsSelectChunk;
-import jodd.db.oom.sqlgen.chunks.InsertChunk;
-import jodd.db.oom.sqlgen.chunks.MatchChunk;
-import jodd.db.oom.sqlgen.chunks.RawSqlChunk;
-import jodd.db.oom.sqlgen.chunks.ReferenceChunk;
-import jodd.db.oom.sqlgen.chunks.SqlChunk;
-import jodd.db.oom.sqlgen.chunks.TableChunk;
-import jodd.db.oom.sqlgen.chunks.UpdateSetChunk;
-import jodd.db.oom.sqlgen.chunks.ValueChunk;
-import jodd.util.StringPool;
-
-import java.util.Map;
-
-/**
- * Nice SQL query generator that provides some automatic query generation.
- *
- * Query is built by appending 'chunks' - parts of the query. These chunks may be
- * very simple, as a simple string. However, the main reason of existence of this class are
- * chunks that auto-generate part of the query based on provided domain object. They can be
- * used to easily create some most common queries in an efficient way.
- *
- * Although it is not necessary, use of {@link jodd.db.oom.meta.DbId} annotation boost the functionality
- * of this query builder.
- *
- * Some chunks deals with relations between tables, so they must be aware of foreign key names. Here the
- * naming convention is used, and even users might have their own foreign key naming convention.
- *
- * Furthermore, if all queries are generated using just sql builder, it is possible to use dialects for various
- * database types.
- */
-public class DbSqlBuilder extends TemplateData implements DbSqlGenerator {
-
- private final DbOom dbOom;
-
- /**
- * Creates new SQL builder.
- */
- public DbSqlBuilder() {
- this(DbOom.get());
- }
-
- public DbSqlBuilder(final String template) {
- this(DbOom.get(), template);
- }
-
- public DbSqlBuilder(final DbOom dbOom) {
- super(dbOom);
- this.dbOom = dbOom;
- }
-
- public DbSqlBuilder(final DbOom dbOom, final String template) {
- super(dbOom);
- this.dbOom = dbOom;
- append(template);
- }
-
- /**
- * Template static constructor.
- */
- public static DbSqlBuilder sql() {
- return new DbSqlBuilder();
- }
-
- /**
- * Template static constructor.
- */
- public static DbSqlBuilder sql(final String template) {
- return new DbSqlBuilder().append(template);
- }
-
- /**
- * Resets the builder (soft reset), so it can be used again.
- * Configuration is preserved.
- * @see TemplateData#resetSoft()
- */
- public DbSqlBuilder reset() {
- resetSoft();
- return this;
- }
-
- /**
- * Hard reset of the builder, all configuration is reset.
- * @see TemplateData#resetHard()
- */
- public DbSqlBuilder resetAll() {
- resetHard();
- return this;
- }
-
- /**
- * Builds the query and returns parsed data.
- * Returned value can be cached or stored as a constant value
- * to prevent further parsing of the same code.
- */
- public ParsedSql parse() {
- return new ParsedSql(this);
- }
-
-
- // ---------------------------------------------------------------- settings
-
- /**
- * Specifies column alias type. May be null when column aliases are not used.
- */
- public DbSqlBuilder aliasColumnsAs(final ColumnAliasType aliasesType) {
- this.columnAliasType = aliasesType;
- return this;
- }
-
- /**
- * Defines object reference and an object.
- */
- public DbSqlBuilder use(final String name, final Object value) {
- setObjectReference(name, value);
- return this;
- }
-
-
- // ---------------------------------------------------------------- chunks
-
- protected SqlChunk firstChunk;
- protected SqlChunk lastChunk;
- protected int totalChunks;
- protected static final TemplateParser templateParser = new TemplateParser();
-
- /**
- * Appends chunk to the list. Chunks must be added using this method.
- */
- public DbSqlBuilder addChunk(final SqlChunk chunk) {
- if (lastChunk == null) {
- lastChunk = firstChunk = chunk;
- } else {
- chunk.insertChunkAfter(lastChunk);
- lastChunk = chunk;
- }
- totalChunks++;
- return this;
- }
-
- // ---------------------------------------------------------------- template
-
- /**
- * Parses provided text into the list of chunks and appends them to the list.
- */
- public DbSqlBuilder append(final String text) {
- templateParser.parse(this, text);
- return this;
- }
-
- /**
- * Simply adds text without parsing to the query.
- */
- public DbSqlBuilder appendRaw(final String text) {
- addChunk(new RawSqlChunk(entityManager, text));
- return this;
- }
-
- /**
- * User-friendly {@link #append(String)}.
- */
- public DbSqlBuilder $(final String text) {
- return append(text);
- }
-
- /**
- * Single space shortcut.
- */
- public DbSqlBuilder $() {
- return appendRaw(StringPool.SPACE);
- }
-
- public DbSqlBuilder $(final SqlChunk chunk) {
- return addChunk(chunk);
- }
-
- // ---------------------------------------------------------------- interface
-
- protected String generatedQuery;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String generateQuery() {
- reset();
-
- // initialization
- SqlChunk chunk = firstChunk;
- while (chunk != null) {
- chunk.init(this);
- chunk = chunk.getNextChunk();
- }
-
- // process
- StringBuilder query = new StringBuilder();
- chunk = firstChunk;
- try {
- while (chunk != null) {
- chunk.process(query);
- chunk = chunk.getNextChunk();
- }
- } catch (DbSqlBuilderException dsbex) {
- dsbex.setQueryString(query.toString());
- throw dsbex;
- }
-
- generatedQuery = query.toString();
-
- return generatedQuery;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Map getColumnData() {
- return columnData;
- }
-
- @Override
- public Map getQueryParameters() {
- return parameters;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String[] getJoinHints() {
- if (hints == null) {
- return null;
- }
- return hints.toArray(new String[0]);
- }
-
- // ---------------------------------------------------------------- table
-
- public DbSqlBuilder table(final String entityName) {
- return addChunk(new TableChunk(entityManager, entityName));
- }
-
- public DbSqlBuilder table(final String entityName, final String alias) {
- return addChunk(new TableChunk(entityManager, entityName, alias));
- }
-
- public DbSqlBuilder table(final Object entity, final String alias) {
- return addChunk(new TableChunk(entityManager, entity, alias));
- }
-
- public DbSqlBuilder table(final Object entity, final String alias, final String tableReference) {
- return addChunk(new TableChunk(entityManager, entity, alias, tableReference));
- }
-
- public DbSqlBuilder table(final Object entity) {
- return addChunk(new TableChunk(entityManager, entity));
- }
-
- // ---------------------------------------------------------------- columns
-
- public DbSqlBuilder column(final String reference) {
- return addChunk(new ColumnsSelectChunk(entityManager, dbOom.config().getColumnAliasSeparator(), reference));
- }
-
- public DbSqlBuilder column(final String tableRef, final String columnRef) {
- return addChunk(new ColumnsSelectChunk(entityManager, dbOom.config().getColumnAliasSeparator(), tableRef, columnRef));
- }
-
- public DbSqlBuilder columnsAll(final String tableRef) {
- return addChunk(new ColumnsSelectChunk(entityManager, dbOom.config().getColumnAliasSeparator(), tableRef, true));
- }
-
- public DbSqlBuilder columnsIds(final String tableRef) {
- return addChunk(new ColumnsSelectChunk(entityManager, dbOom.config().getColumnAliasSeparator(), tableRef, false));
- }
-
-
- // ---------------------------------------------------------------- reference
-
- public DbSqlBuilder ref(final String columnRef) {
- return addChunk(new ReferenceChunk(entityManager, columnRef));
- }
-
- public DbSqlBuilder ref(final String tableRef, final String columnRef) {
- return addChunk(new ReferenceChunk(entityManager, tableRef, columnRef, false));
- }
-
- public DbSqlBuilder refId(final String tableRef) {
- return addChunk(new ReferenceChunk(entityManager, tableRef, null, true));
- }
-
-
- // ---------------------------------------------------------------- match
-
- /**
- * Creates condition part of the query only for existing columns.
- */
- public DbSqlBuilder match(final String tableRef, final Object value) {
- return addChunk(new MatchChunk(entityManager, tableRef, value, SqlChunk.COLS_ONLY_EXISTING));
- }
-
- public DbSqlBuilder match(final String tableRef, final String objectRef) {
- return addChunk(new MatchChunk(entityManager, tableRef, objectRef, SqlChunk.COLS_ONLY_EXISTING));
- }
-
- /**
- * Creates condition part of the query for id columns
- */
- public DbSqlBuilder matchIds(final String tableRef, final Object value) {
- return addChunk(new MatchChunk(entityManager, tableRef, value, SqlChunk.COLS_ONLY_IDS));
- }
-
- public DbSqlBuilder matchIds(final String tableRef, final String objectRef) {
- return addChunk(new MatchChunk(entityManager, tableRef, objectRef, SqlChunk.COLS_ONLY_IDS));
- }
-
- /**
- * Creates condition part of the query for all columns, including the null values.
- */
- public DbSqlBuilder matchAll(final String tableRef, final Object value) {
- return addChunk(new MatchChunk(entityManager, tableRef, value, SqlChunk.COLS_ALL));
- }
-
- public DbSqlBuilder matchAll(final String tableRef, final String objectRef) {
- return addChunk(new MatchChunk(entityManager, tableRef, objectRef, SqlChunk.COLS_ALL));
- }
-
- public DbSqlBuilder match(final String expression) {
- return addChunk(new MatchChunk(entityManager, expression));
- }
-
-
- // ---------------------------------------------------------------- values
-
- public DbSqlBuilder value(final String name, final Object value) {
- return addChunk(new ValueChunk(entityManager, name, value));
- }
-
- public DbSqlBuilder value(final Object value) {
- return addChunk(new ValueChunk(entityManager, null, value));
- }
-
- public DbSqlBuilder valueRef(final String objectReference) {
- return addChunk(new ValueChunk(entityManager, objectReference));
- }
-
- public DbSqlBuilder columnValue(final String name, final Object value) {
- return addChunk(new ColumnValueChunk(entityManager, name, value));
- }
-
- public DbSqlBuilder columnValue(final Object value) {
- return addChunk(new ColumnValueChunk(entityManager, null, value));
- }
-
- public DbSqlBuilder columnValueRef(final String objectReference) {
- return addChunk(new ColumnValueChunk(entityManager, objectReference));
- }
-
- // ---------------------------------------------------------------- insert
-
- public DbSqlBuilder insert(final String entityName, final Object values) {
- return addChunk(new InsertChunk(entityManager, dbOom.config().isUpdateablePrimaryKey(), entityName, values));
- }
-
- public DbSqlBuilder insert(final Class entity, final Object values) {
- return addChunk(new InsertChunk(entityManager, dbOom.config().isUpdateablePrimaryKey(), entity, values));
- }
-
- public DbSqlBuilder insert(final Object values) {
- return addChunk(new InsertChunk(entityManager, dbOom.config().isUpdateablePrimaryKey(), values.getClass(), values));
- }
-
- // ---------------------------------------------------------------- update set
-
- public DbSqlBuilder set(final String tableRef, final Object values) {
- return addChunk(new UpdateSetChunk(dbOom, tableRef, values, SqlChunk.COLS_ONLY_EXISTING));
- }
-
- public DbSqlBuilder setAll(final String tableRef, final Object values) {
- return addChunk(new UpdateSetChunk(dbOom, tableRef, values, SqlChunk.COLS_ALL));
- }
-
- // ---------------------------------------------------------------- query factories
-
- /**
- * Returns {@link jodd.db.oom.DbOomQuery} instance for more fluent interface.
- */
- public DbOomQuery query() {
- return new DbOomQuery(dbOom, this);
- }
-
- public DbOomQuery query(final DbSession session) {
- return new DbOomQuery(dbOom, session, this);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbSqlBuilderException.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbSqlBuilderException.java
deleted file mode 100644
index 6bb131c85..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/DbSqlBuilderException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.db.oom.DbOomException;
-
-public class DbSqlBuilderException extends DbOomException {
-
- public DbSqlBuilderException(final String message) {
- super(message);
- }
-
- protected String queryString;
-
- public void setQueryString(final String queryString) {
- this.queryString = queryString;
- }
-
- @Override
- public String getMessage() {
- String message = super.getMessage();
- if (queryString != null) {
- message += " Generated query: " + queryString;
- }
- return message;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/ParameterValue.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/ParameterValue.java
deleted file mode 100644
index f26075451..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/ParameterValue.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.db.oom.DbEntityColumnDescriptor;
-
-/**
- * {@link TemplateData Template parameter} value.
- */
-public class ParameterValue {
- protected final Object value;
- protected final DbEntityColumnDescriptor dec;
-
- public ParameterValue(final Object value, final DbEntityColumnDescriptor dec) {
- this.value = value;
- this.dec = dec;
- }
-
- public Object getValue() {
- return value;
- }
-
- public DbEntityColumnDescriptor getColumnDescriptor() {
- return dec;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/ParsedSql.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/ParsedSql.java
deleted file mode 100644
index 498b4445e..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/ParsedSql.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.db.oom.ColumnData;
-import jodd.db.oom.DbSqlGenerator;
-
-import java.util.Map;
-
-/**
- * Simple holder of parsed SQL data. It occupies less memory and may be cached.
- * @see DbSqlBuilder#parse()
- */
-public class ParsedSql implements DbSqlGenerator {
-
- protected final String generatedQuery;
- protected final Map queryParameters;
- protected final Map columnData;
- protected final String[] joinHints;
-
- public ParsedSql(final DbSqlGenerator dbSqlGenerator) {
- generatedQuery = dbSqlGenerator.generateQuery();
- queryParameters = dbSqlGenerator.getQueryParameters();
- columnData = dbSqlGenerator.getColumnData();
- joinHints = dbSqlGenerator.getJoinHints();
- }
-
- @Override
- public String generateQuery() {
- return generatedQuery;
- }
-
- @Override
- public Map getQueryParameters() {
- return queryParameters;
- }
-
- @Override
- public Map getColumnData() {
- return columnData;
- }
-
- @Override
- public String[] getJoinHints() {
- return joinHints;
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/TemplateData.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/TemplateData.java
deleted file mode 100644
index b85e34ba5..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/TemplateData.java
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.db.DbOom;
-import jodd.db.oom.ColumnAliasType;
-import jodd.db.oom.ColumnData;
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.NamedValuesHashMap;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Template common data used during template parsing.
- * Extracted to super class for better visibility.
- */
-public abstract class TemplateData {
-
- private static final String COL_CODE_PREFIX = "col_";
- protected final DbEntityManager entityManager;
- protected final ColumnAliasType defaultColumnAliasType;
-
- protected TemplateData(final DbOom dbOom) {
- this.entityManager = dbOom.entityManager();
- this.columnAliasType = defaultColumnAliasType = dbOom.config().getDefaultColumnAliasType();
- }
-
- /**
- * Resets the builder so it can be used again. Not everything is reset:
- * object references and column alias type is not.
- */
- protected void resetSoft() {
- columnCount = 0;
- paramCount = 0;
- hintCount = 0;
-
- if (tableRefs != null) {
- tableRefs.clear();
- }
-// objectRefs = null;
- if (columnData != null) {
- columnData.clear();
- }
- if (parameters != null) {
- parameters.clear();
- }
- if (hints != null) {
- hints.clear();
- }
- //columnAliasType = defaultColumnAliasType;
- }
-
- protected void resetHard() {
- resetSoft();
- objectRefs = null;
- columnAliasType = defaultColumnAliasType;
- }
-
-
- // ---------------------------------------------------------------- object refs
-
- protected Map objectRefs; // used object references
-
- /**
- * Saves object reference.
- */
- public void setObjectReference(final String name, final Object object) {
- if (objectRefs == null) {
- objectRefs = new HashMap<>();
- }
- objectRefs.put(name, object);
- }
-
- /**
- * Returns object reference.
- */
- public Object getObjectReference(final String name) {
- if (objectRefs == null) {
- return null;
- }
- return objectRefs.get(name);
- }
-
- /**
- * Lookups for object reference and throws an exception if reference doesn't exist.
- */
- public Object lookupObject(final String ref) {
- Object value = getObjectReference(ref);
- if (value == null) {
- throw new DbSqlBuilderException("Invalid object reference: " + ref);
- }
- return value;
- }
-
- // ---------------------------------------------------------------- tables
-
- private static final class TableRefData {
- final String alias;
- final DbEntityDescriptor desc;
-
- private TableRefData(final DbEntityDescriptor desc, final String alias) {
- this.alias = alias;
- this.desc = desc;
- }
- }
-
- protected Map tableRefs;
-
- /**
- * Returns entity descriptor for provided table reference.
- */
- public DbEntityDescriptor getTableDescriptor(final String tableRef) {
- if (tableRefs == null) {
- return null;
- }
- TableRefData t = tableRefs.get(tableRef);
- return t == null ? null : t.desc;
- }
-
- /**
- * Finds entity descriptor of a table that contains provided column reference.
- */
- public DbEntityDescriptor findTableDescriptorByColumnRef(final String columnRef) {
- for (Map.Entry entry : tableRefs.entrySet()) {
- DbEntityDescriptor ded = entry.getValue().desc;
-
- if (ded.findByPropertyName(columnRef) != null) {
- return ded;
- }
- }
- return null;
- }
-
- /**
- * Returns table alias for provided table reference.
- */
- public String getTableAlias(final String tableRef) {
- if (tableRefs == null) {
- return null;
- }
- TableRefData t = tableRefs.get(tableRef);
- return t == null ? null : t.alias;
- }
-
- /**
- * Registers table reference for provided entity.
- */
- public void registerTableReference(final String tableReference, final DbEntityDescriptor ded, final String tableAlias) {
- if (tableRefs == null) {
- tableRefs = new HashMap<>();
- }
- TableRefData t = new TableRefData(ded, tableAlias);
- if (tableRefs.put(tableReference, t) != null) {
- throw new DbSqlBuilderException("Duplicated table reference: " + tableReference);
- }
- }
-
- // ---------------------------------------------------------------- column data
-
- /**
- * Column or table aliases.
- */
- protected Map columnData;
-
- /**
- * Column counter for COLUMN_CODE column alias type.
- */
- protected int columnCount;
-
-
- /**
- * Specifies column alias type. May be null when column aliases are not used.
- */
- protected ColumnAliasType columnAliasType;
-
- /**
- * Returns column alias type.
- */
- public ColumnAliasType getColumnAliasType() {
- return columnAliasType;
- }
-
-
- public void registerColumnDataForTableRef(final String tableRef, final String tableName) {
- if (columnData == null) {
- columnData = new NamedValuesHashMap<>();
- }
- columnData.put(tableRef, new ColumnData(tableName));
- }
-
- public String registerColumnDataForColumnCode(final String tableName, final String column) {
- if (columnData == null) {
- columnData = new NamedValuesHashMap<>();
- }
- String columnCode = COL_CODE_PREFIX + Integer.toString(columnCount++) + '_';
- columnData.put(columnCode, new ColumnData(tableName, column));
- return columnCode;
- }
-
-
- // ---------------------------------------------------------------- parameters
-
- protected Map parameters;
-
- protected int paramCount;
-
- /**
- * Returns the next auto-generated parameter name.
- */
- public String getNextParameterName() {
- return "p" + (paramCount++);
- }
-
- /**
- * Adds query parameter.
- */
- public void addParameter(final String name, final Object value, final DbEntityColumnDescriptor dec) {
- if (parameters == null) {
- parameters = new HashMap<>();
- }
- parameters.put(name, new ParameterValue(value, dec));
- }
-
-
- // ---------------------------------------------------------------- lookup
-
-
- /**
- * Lookups for entity name and throws exception if entity name not found.
- */
- protected DbEntityDescriptor lookupName(final String entityName) {
- DbEntityDescriptor ded = entityManager.lookupName(entityName);
- if (ded == null) {
- throw new DbSqlBuilderException("Entity name not registered: " + entityName);
- }
- return ded;
- }
-
- /**
- * Lookups for entity name and throws an exception if entity type is invalid.
- */
- protected DbEntityDescriptor lookupType(final Class entity) {
- DbEntityDescriptor ded = entityManager.lookupType(entity);
- if (ded == null) {
- throw new DbSqlBuilderException("Invalid or not-persistent entity type: " + entity.getName());
- }
- return ded;
- }
-
- /**
- * Lookups for table reference and throws an exception if table reference not found.
- */
- protected DbEntityDescriptor lookupTableRef(final String tableRef) {
- DbEntityDescriptor ded = getTableDescriptor(tableRef);
- if (ded == null) {
- throw new DbSqlBuilderException("Table reference not used in this query: " + tableRef);
- }
- return ded;
- }
-
- // ---------------------------------------------------------------- misc
-
- /**
- * Defines parameter with name and its value.
- */
- protected void defineParameter(final StringBuilder query, String name, final Object value) {
- if (name == null) {
- name = getNextParameterName();
- }
- query.append(':').append(name);
- addParameter(name, value, null);
- }
-
-
- // ---------------------------------------------------------------- hints
-
- protected int hintCount;
-
- protected List hints;
-
- /**
- * Registers a hint.
- */
- public void registerHint(final String hint) {
- if (hints == null) {
- hints = new ArrayList<>(hintCount);
- }
- hints.add(hint);
- }
-
- /**
- * Increments hints count.
- */
- public void incrementHintsCount() {
- hintCount++;
- }
-
- /**
- * Returns true if there are hints.
- */
- public boolean hasHints() {
- return hintCount > 0;
- }
-
-
- // ---------------------------------------------------------------- last column
-
- public DbEntityColumnDescriptor lastColumnDec;
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/TemplateParser.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/TemplateParser.java
deleted file mode 100644
index 4303bac94..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/TemplateParser.java
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen;
-
-import jodd.util.StringPool;
-import jodd.util.StringUtil;
-
-import static jodd.util.CharUtil.isAlpha;
-import static jodd.util.CharUtil.isDigit;
-
-/**
- * Internal template parser.
- */
-class TemplateParser {
-
- // ---------------------------------------------------------------- parsing
-
- protected static final char ESCAPE_CHARACTER = '\\';
- protected static final String MACRO_TABLE = "$T{";
- protected static final String MACRO_COLUMN = "$C{";
- protected static final String MACRO_MATCH = "$M{";
- protected static final String MACRO_VALUE = "$V{";
-
- /**
- * Parses template and returns generated sql builder.
- */
- public void parse(final DbSqlBuilder sqlBuilder, final String template) {
- int length = template.length();
- int last = 0;
- while (true) {
- int mark = template.indexOf('$', last);
- if (mark == -1) {
- if (last < length) {
- sqlBuilder.appendRaw(template.substring(last));
- }
- break;
- }
-
- int escapesCount = countEscapes(template, mark); // check if escaped
- if (escapesCount > 0) {
- boolean isEscaped = escapesCount % 2 != 0;
- int escapesToAdd = escapesCount >> 1;
- sqlBuilder.appendRaw(template.substring(last, mark - escapesCount + escapesToAdd) + '$');
- if (isEscaped) {
- last = mark + 1;
- continue;
- }
- } else {
- sqlBuilder.appendRaw(template.substring(last, mark));
- }
-
- int end;
-
- if (template.startsWith(MACRO_TABLE, mark)) {
- mark += MACRO_TABLE.length();
- end = findMacroEnd(template, mark);
- onTable(sqlBuilder, template.substring(mark, end));
- } else if (template.startsWith(MACRO_COLUMN, mark)) {
- mark += MACRO_COLUMN.length();
- end = findMacroEnd(template, mark);
- onColumn(sqlBuilder, template.substring(mark, end));
- } else if (template.startsWith(MACRO_MATCH, mark)) {
- mark += MACRO_MATCH.length();
- end = findMacroEnd(template, mark);
- onMatch(sqlBuilder, template.substring(mark, end));
- } else if (template.startsWith(MACRO_VALUE, mark)) {
- mark += MACRO_VALUE.length();
- end = findMacroEnd(template, mark);
- onValue(sqlBuilder, template.substring(mark, end));
- } else {
- mark++; // reference found
- end = mark; // find macro end
- while (end < length) {
- if (!isReferenceChar(template, end)) {
- break;
- }
- end++;
- }
- onReference(sqlBuilder, template.substring(mark, end));
- end--;
- }
- end++;
- last = end;
- }
- }
-
- protected static boolean isReferenceChar(final String template, final int index) {
- char c = template.charAt(index);
- if ((c == '+') && (template.charAt(index - 1) == '.')) {
- return true;
- }
- return isDigit(c) || isAlpha(c) || (c == '_') || (c == '.');
- }
-
-
-
- /**
- * Finds macros end.
- */
- protected int findMacroEnd(final String template, final int fromIndex) {
- int endIndex = template.indexOf('}', fromIndex);
- if (endIndex == -1) {
- throw new DbSqlBuilderException("Template syntax error, some macros are not closed. Error at: '..." + template.substring(fromIndex));
- }
- return endIndex;
- }
-
- /**
- * Count escapes to the left.
- */
- protected int countEscapes(final String template, int macroIndex) {
- macroIndex--;
- int escapeCount = 0;
- while (macroIndex >= 0) {
- if (template.charAt(macroIndex) != ESCAPE_CHARACTER) {
- break;
- }
- escapeCount++;
- macroIndex--;
- }
- return escapeCount;
- }
-
- // ---------------------------------------------------------------- handlers
-
- protected void onTable(final DbSqlBuilder sqlBuilder, final String allTables) {
- String[] tables = StringUtil.split(allTables, StringPool.COMMA);
- for (String table : tables) {
- sqlBuilder.table(table);
- }
- }
-
- protected void onColumn(final DbSqlBuilder sqlBuilder, final String allColumns) {
- int len = allColumns.length();
- int lastNdx = 0;
-
- for (int i = 0; i < len; i++) {
- char c = allColumns.charAt(i);
-
- if (c == ',') {
- sqlBuilder.column(allColumns.substring(lastNdx, i));
- lastNdx = i + 1;
- continue;
- }
-
- if (c == '[') {
- i = allColumns.indexOf(']', i) + 1;
- if (i == 0) {
- i = len;
- }
- }
- }
-
- sqlBuilder.column(allColumns.substring(lastNdx));
- }
-
- protected void onReference(final DbSqlBuilder sqlBuilder, final String reference) {
- sqlBuilder.ref(reference);
- }
-
- protected void onMatch(final DbSqlBuilder sqlBuilder, final String expression) {
- sqlBuilder.match(expression);
- }
-
- protected void onValue(final DbSqlBuilder sqlBuilder, final String expression) {
- sqlBuilder.columnValue(expression);
- }
-
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ColumnValueChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ColumnValueChunk.java
deleted file mode 100644
index 9805d33a1..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ColumnValueChunk.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityManager;
-
-/**
- * {@link ValueChunk Value} for the last column.
- */
-public class ColumnValueChunk extends ValueChunk {
-
- public ColumnValueChunk(final DbEntityManager dbEntityManager, final String name, final Object value) {
- this(dbEntityManager, name, value, null);
- }
-
- public ColumnValueChunk(final DbEntityManager dbEntityManager, final String objReference) {
- this(dbEntityManager, null, null, objReference);
- }
-
- private ColumnValueChunk(final DbEntityManager dbEntityManager, final String name, final Object value, final String objReference) {
- super(dbEntityManager, name, value, objReference);
- }
-
- // ---------------------------------------------------------------- define
- @Override
- protected void defineParameter(final StringBuilder query, final String name, final Object value, DbEntityColumnDescriptor dec) {
- if (dec == null) {
- dec = templateData.lastColumnDec;
- }
- super.defineParameter(query, name, value, dec);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ColumnsSelectChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ColumnsSelectChunk.java
deleted file mode 100644
index e7ecc427a..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ColumnsSelectChunk.java
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.ColumnAliasType;
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.sqlgen.DbSqlBuilderException;
-import jodd.db.oom.sqlgen.TemplateData;
-import jodd.util.ArraysUtil;
-import jodd.util.StringPool;
-import jodd.util.StringUtil;
-
-/**
- * Columns select chunk resolves entity column(s) from column references. Should be used for SELECT queries.
- *
- * Column reference is specified as: {@link TableChunk tableReference}.propertyName where property name is
- * a property of the entity references by table reference. Result is rendered as:
- * tableName.column or alias.column (if table has an alias).
- *
- * There are some special values for propertyName
- *
- *
wildcard (*), all table columns will be listed
- *
id sign (+), all table id columns will be listed
- *
- *
- * If previous chunk is also a column chunk, comma separator will be added in between.
- *
- * Note that column alias are appended to the column name (using 'as' construct).
- *
- * Macro rules:
- *
- *
$C{tableRef} is rendered as FOO.col1, FOO.col2,...
- *
$C{tableRef.*} is equal to above, renders all entity columns
- *
$C{tableRef.+} renders to only identity columns
- *
$C{tableRef.%} renders all but identity columns
- *
$C{tableRef.colRef} is rendered as FOO.column
- *
$C{tableRef.[colRef1,colRef2|...]} is rendered as FOO.column1, FOO.column2,..., support id sign (+)
- *
$C{entityRef.colRef} renders to FOO$column
- *
$C{hint.entityRef...} defines a hint
- *
$C{hint:entityRef...} defines a hint with custom name
- *
$C{.columName} renders as column name
- *
$C{hint:.columName} renders as column name and defines its hint
- *
- */
-public class ColumnsSelectChunk extends SqlChunk {
-
- private static final String AS = " as ";
- private static final char SPLIT = ',';
-
- protected final String tableRef;
- protected final String columnRef;
- protected final String[] columnRefArr;
- protected final int includeColumns;
- protected final String hint;
- protected final String columnAliasSeparator;
-
- private ColumnsSelectChunk(
- final DbEntityManager dbEntityManager,
- final String columnAliasSeparator,
- final String tableRef,
- final String columnRef,
- final String[] columnRefArr,
- final int includeColumns,
- final String hint) {
- super(dbEntityManager, CHUNK_SELECT_COLUMNS);
- this.columnAliasSeparator = columnAliasSeparator;
- this.tableRef = tableRef;
- this.columnRef = columnRef;
- this.columnRefArr = columnRefArr;
- this.includeColumns = includeColumns;
- this.hint = hint;
- }
-
- public ColumnsSelectChunk(final DbEntityManager dbEntityManager, final String columnAliasSeparator, final String tableRef, final String columnRef) {
- this(dbEntityManager, columnAliasSeparator, tableRef, columnRef, null, COLS_NA, null);
- }
-
- public ColumnsSelectChunk(final DbEntityManager dbEntityManager, final String columnAliasSeparator, final String tableRef, final String... columnRefArr) {
- this(dbEntityManager, columnAliasSeparator, tableRef, null, columnRefArr, COLS_NA_MULTI, null);
- }
-
- public ColumnsSelectChunk(final DbEntityManager dbEntityManager, final String columnAliasSeparator, final String tableRef, final boolean includeAll) {
- this(dbEntityManager, columnAliasSeparator, tableRef, null, null, includeAll ? COLS_ALL : COLS_ONLY_IDS, null);
- }
-
- public ColumnsSelectChunk(final DbEntityManager dbEntityManager, final String columnAliasSeparator, String reference) {
- super(dbEntityManager, CHUNK_SELECT_COLUMNS);
- reference = reference.trim();
- int dotNdx = reference.lastIndexOf('.');
- if (dotNdx == -1) {
- this.tableRef = reference;
- this.columnRef = null;
- this.columnRefArr = null;
- this.includeColumns = COLS_ALL;
- this.hint = null;
- } else {
-
- final String tref = reference.substring(0, dotNdx);
- reference = reference.substring(dotNdx + 1);
-
- // table
- dotNdx = tref.lastIndexOf('.');
- if (dotNdx == -1) {
- this.tableRef = tref;
- this.hint = null;
- } else {
- final int doubleColumnNdx = tref.indexOf(':');
- if (doubleColumnNdx == -1) {
- // no special hint
- this.tableRef = tref.substring(dotNdx + 1);
- this.hint = tref;
- } else {
- // hint is different
- this.tableRef = tref.substring(doubleColumnNdx + 1);
- this.hint = tref.substring(0, doubleColumnNdx);
- }
- }
-
- // column
- if (reference.equals(StringPool.STAR)) {
- this.columnRef = null;
- this.columnRefArr = null;
- this.includeColumns = COLS_ALL;
- } else if (reference.equals(StringPool.PLUS)) {
- this.columnRef = null;
- this.columnRefArr = null;
- this.includeColumns = COLS_ONLY_IDS;
- } else if (reference.equals(StringPool.PERCENT)) {
- this.columnRef = null;
- this.columnRefArr = null;
- this.includeColumns = COLS_ALL_BUT_ID;
- } else if (
- reference.length() != 0
- && reference.charAt(0) == '['
- && reference.charAt(reference.length() - 1) == ']') {
-
- this.columnRef = null;
- this.columnRefArr = StringUtil.splitc(reference.substring(1, reference.length() - 1), SPLIT);
- StringUtil.trimAll(this.columnRefArr);
- this.includeColumns = COLS_NA_MULTI;
- } else {
- this.columnRef = reference;
- this.columnRefArr = null;
- this.includeColumns = COLS_NA;
- }
- }
- this.columnAliasSeparator = columnAliasSeparator;
- }
-
- // ---------------------------------------------------------------- process
-
-
- /**
- * Counts actual real hints.
- */
- @Override
- public void init(final TemplateData templateData) {
- super.init(templateData);
- if (hint != null) {
- templateData.incrementHintsCount();
- }
- }
-
- @Override
- public void process(final StringBuilder out) {
- // hints
- if (templateData.hasHints()) {
- templateData.registerHint(hint == null ? tableRef : hint);
- }
-
- // columns
- separateByCommaOrSpace(out);
-
- // special case, only column name, no table ref/name
- if (tableRef.length() == 0) {
- out.append(columnRef);
- return;
- }
-
- boolean useTableReference = true;
- DbEntityDescriptor ded = lookupTableRef(tableRef, false);
- if (ded == null) {
- useTableReference = false;
- ded = lookupName(tableRef);
- }
-
- if (columnRef == null) {
- final DbEntityColumnDescriptor[] decList = ded.getColumnDescriptors();
- int count = 0;
- final boolean withIds = (columnRefArr != null) && ArraysUtil.contains(columnRefArr, StringPool.PLUS);
- for (final DbEntityColumnDescriptor dec : decList) {
- if ((includeColumns == COLS_ONLY_IDS) && (!dec.isId())) {
- continue;
- }
- if ((includeColumns == COLS_ALL_BUT_ID) && (dec.isId())) {
- continue;
- }
- if ((includeColumns == COLS_NA_MULTI)
- && (!withIds || (!dec.isId()))
- && (!ArraysUtil.contains(columnRefArr, dec.getPropertyName()))) {
- continue;
- }
- if (count > 0) {
- out.append(',').append(' ');
- }
- templateData.lastColumnDec = dec;
-
- if (useTableReference) {
- appendColumnName(out, ded, dec);
- } else {
- appendAlias(out, ded, dec);
- }
- count++;
- }
- } else {
- final DbEntityColumnDescriptor dec = ded.findByPropertyName(columnRef);
- if (dec == null) {
- throw new DbSqlBuilderException("Invalid column reference: [" + tableRef + '.' + columnRef + "]");
- }
-
- templateData.lastColumnDec = dec;
- if (useTableReference) {
- appendColumnName(out, ded, dec);
- } else {
- appendAlias(out, ded, dec);
- }
- }
- }
-
- /**
- * Appends alias.
- */
- protected void appendAlias(final StringBuilder query, final DbEntityDescriptor ded, final DbEntityColumnDescriptor dec) {
- final ColumnAliasType columnAliasType = templateData.getColumnAliasType();
-
- if (columnAliasType == null || columnAliasType == ColumnAliasType.TABLE_REFERENCE) {
- final String tableName = ded.getTableName();
- final String columnName = dec.getColumnNameForQuery();
- templateData.registerColumnDataForTableRef(tableRef, tableName);
- query.append(tableRef).append(columnAliasSeparator).append(columnName);
- } else
- if (columnAliasType == ColumnAliasType.COLUMN_CODE) {
- final String tableName = ded.getTableName();
- final String columnName = dec.getColumnName();
- final String code = templateData.registerColumnDataForColumnCode(tableName, columnName);
- query.append(code);
- } else
- if (columnAliasType == ColumnAliasType.TABLE_NAME) {
- final String tableName = ded.getTableNameForQuery();
- final String columnName = dec.getColumnNameForQuery();
- query.append(tableName).append(columnAliasSeparator).append(columnName);
- }
- }
-
- /**
- * Simply appends column name with optional table reference and alias.
- */
- protected void appendColumnName(final StringBuilder query, final DbEntityDescriptor ded, final DbEntityColumnDescriptor dec) {
- query.append(resolveTable(tableRef, ded)).append('.').append(dec.getColumnName());
-
- if (templateData.getColumnAliasType() != null) { // create column aliases
-
- query.append(AS);
-
- switch (templateData.getColumnAliasType()) {
- case TABLE_NAME: {
- final String tableName = ded.getTableNameForQuery();
- query.append(tableName).append(columnAliasSeparator).append(dec.getColumnNameForQuery());
- break;
- }
- case TABLE_REFERENCE: {
- final String tableName = ded.getTableName();
- templateData.registerColumnDataForTableRef(tableRef, tableName);
- query.append(tableRef).append(columnAliasSeparator).append(dec.getColumnNameForQuery());
- break;
- }
- case COLUMN_CODE: {
- final String tableName = ded.getTableName();
- final String code = templateData.registerColumnDataForColumnCode(tableName, dec.getColumnName());
- query.append(code);
- break;
- }
- }
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/InsertChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/InsertChunk.java
deleted file mode 100644
index 94b301033..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/InsertChunk.java
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.bean.BeanUtil;
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.util.StringUtil;
-
-/**
- * Renders complete INSERT statement. This chunk is a bit different than others since it renders a complete SQL
- * query for inserting.
- */
-public class InsertChunk extends SqlChunk {
-
- protected final String entityName;
- protected final Class entityType;
- protected final Object data;
- protected final boolean defaultIsUpdateablePrimaryKey;
-
- public InsertChunk(
- final DbEntityManager dbEntityManager,
- final boolean isUpdateablePrimaryKey,
- final String entityName,
- final Object data) {
- this(dbEntityManager, isUpdateablePrimaryKey, entityName, null, data);
- }
-
- public InsertChunk(
- final DbEntityManager dbEntityManager,
- final boolean isUpdateablePrimaryKey,
- final Class entityType,
- final Object data) {
- this(dbEntityManager, isUpdateablePrimaryKey, null, entityType, data);
- }
-
- private InsertChunk(
- final DbEntityManager dbEntityManager,
- final boolean isUpdateablePrimaryKey,
- final String entityName,
- final Class entityType,
- final Object data) {
- super(dbEntityManager, CHUNK_INSERT);
- this.defaultIsUpdateablePrimaryKey = isUpdateablePrimaryKey;
- this.entityName = entityName;
- this.entityType = entityType;
- this.data = data;
- }
-
- @Override
- public void process(final StringBuilder out) {
- final DbEntityDescriptor ded = entityName != null ? lookupName(entityName) : lookupType(entityType);
- final StringBuilder col = new StringBuilder();
- final StringBuilder val = new StringBuilder();
-
- final DbEntityColumnDescriptor[] decList = ded.getColumnDescriptors();
- final String typeName = StringUtil.uncapitalize(ded.getEntityName());
-
- int size = 0;
- for (final DbEntityColumnDescriptor dec : decList) {
- if (dec.isId() && !defaultIsUpdateablePrimaryKey) {
- continue;
- }
-
- final String property = dec.getPropertyName();
- final Object value = BeanUtil.declared.getProperty(data, property);
- if (value == null) {
- continue;
- }
-
- if (size > 0) {
- col.append(',').append(' ');
- val.append(',').append(' ');
- }
- size++;
- col.append(dec.getColumnNameForQuery());
-
- final String propertyName = typeName + '.' + property;
- defineParameter(val, propertyName, value, dec);
- }
-
- out.append("insert into ").append(ded.getTableNameForQuery()).append(" (")
- .append(col).append(") values (").append(val).append(')');
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java
deleted file mode 100644
index 6cffdfb3f..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.bean.BeanUtil;
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.sqlgen.DbSqlBuilderException;
-import jodd.util.StringUtil;
-
-/**
- * Renders condition part of the sql query based on values in provided entity object.
- * Conditions are defined by following expression: tableRef = objectRef.
- * Matching may be done for existing columns (non-null), all columns (including nulls)
- * and just for the identity columns.
- */
-public class MatchChunk extends SqlChunk {
-
- private static final String AND = " and ";
- private static final String DEFAULT = "1=1";
- private static final String DOT_STAR = ".*";
- private static final String DOT_PLUS = ".+";
-
- protected Object data;
- protected final String tableRef;
- protected final String objectRef;
- protected final int includeColumns;
-
- public MatchChunk(final DbEntityManager dbEntityManager, final String tableRef, final Object data, final int includeColumns) {
- this(dbEntityManager, tableRef, null, data, includeColumns);
- }
-
- public MatchChunk(final DbEntityManager dbEntityManager, final String tableRef, final String objectRef, final int includeColumns) {
- this(dbEntityManager, tableRef, objectRef, null, includeColumns);
- }
-
- private MatchChunk(
- final DbEntityManager dbEntityManager,
- final String tableRef,
- final String objectRef,
- final Object data,
- final int includeColumns) {
- super(dbEntityManager, CHUNK_MATCH);
- this.tableRef = tableRef;
- this.objectRef = objectRef;
- this.data = data;
- this.includeColumns = includeColumns;
- }
-
- public MatchChunk(final DbEntityManager dbEntityManager, String expression) {
- super(dbEntityManager, CHUNK_MATCH);
- expression = expression.trim();
- int lastNdx = expression.length();
- if (expression.endsWith(DOT_STAR)) {
- lastNdx -= 2;
- includeColumns = COLS_ALL;
- } else if (expression.endsWith(DOT_PLUS)) {
- lastNdx -= 2;
- includeColumns = COLS_ONLY_IDS;
- } else {
- includeColumns = COLS_ONLY_EXISTING;
- }
- final int eq = expression.indexOf('=');
- if (eq == -1) {
- throw new DbSqlBuilderException("Syntax error, expected 'match' equality: {tableRef=objectRef}.");
- }
- tableRef = expression.substring(0, eq).trim();
- objectRef = expression.substring(eq + 1, lastNdx).trim();
- }
-
- @Override
- public void process(final StringBuilder out) {
- if (objectRef != null) {
- data = templateData.lookupObject(objectRef);
- }
-
- final DbEntityDescriptor ded = tableRef != null ?
- lookupTableRef(tableRef) :
- lookupType(resolveClass(data));
-
- final String table = resolveTable(tableRef, ded);
- final DbEntityColumnDescriptor[] decList = ded.getColumnDescriptors();
- final String typeName = StringUtil.uncapitalize(ded.getEntityName());
-
- int count = 0;
- out.append('(');
- for (final DbEntityColumnDescriptor dec : decList) {
- if ((includeColumns == COLS_ONLY_IDS) && (!dec.isId())) {
- continue;
- }
- final String property = dec.getPropertyName();
-
- final Object value = BeanUtil.declaredSilent.getProperty(data, property);
-
- if ((includeColumns == COLS_ONLY_EXISTING) && (value == null)) {
- continue;
- }
-
- if (includeColumns == COLS_ONLY_EXISTING) {
- if (isEmptyColumnValue(dec, value)) {
- continue;
- }
- }
- if (count > 0) {
- out.append(AND);
- }
- count++;
- out.append(table).append('.').append(dec.getColumnNameForQuery()).append('=');
-
- String propertyName = objectRef != null ? objectRef : typeName;
- propertyName += '.' + property;
- defineParameter(out, propertyName, value, dec);
- }
- if (count == 0) {
- out.append(DEFAULT);
- }
- out.append(')');
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/RawSqlChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/RawSqlChunk.java
deleted file mode 100644
index 5621960e4..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/RawSqlChunk.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.DbEntityManager;
-
-/**
- * Simply holds hard-coded SQL string that will be appended to the result.
- */
-public class RawSqlChunk extends SqlChunk {
-
- protected final String sql;
-
- public RawSqlChunk(final DbEntityManager dbEntityManager, final String sql) {
- super(dbEntityManager, CHUNK_RAW);
- this.sql = sql;
- }
-
- @Override
- public void process(final StringBuilder out) {
- out.append(sql);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ReferenceChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ReferenceChunk.java
deleted file mode 100644
index 756d403a4..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ReferenceChunk.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.sqlgen.DbSqlBuilderException;
-import jodd.util.StringPool;
-
-/**
- * Resolves column and table references. Reference is given in format: tableRef.propertyName.
- * The propertyName may be '+' (e.g. tableRef.+), indicating the identity columns.
- * If property name is omitted (e.g. tableRef), only table name will be rendered.
- * If table reference is omitted (e.g. .propertyName), only property i.e. column name
- * will be rendered.
- */
-public class ReferenceChunk extends SqlChunk {
-
- protected final String tableRef;
- protected final String columnRef;
- protected final boolean onlyId;
-
- public ReferenceChunk(final DbEntityManager dbEntityManager, final String tableRef, final String columnRef) {
- this(dbEntityManager, tableRef, columnRef, false);
- }
-
- public ReferenceChunk(final DbEntityManager dbEntityManager, final String tableRef, final String columnRef, final boolean onlyId) {
- super(dbEntityManager, CHUNK_REFERENCE);
- this.tableRef = tableRef;
- this.columnRef = columnRef;
- this.onlyId = onlyId;
- }
-
- public ReferenceChunk(final DbEntityManager dbEntityManager, final String reference) {
- super(dbEntityManager, CHUNK_REFERENCE);
-
- final int dotNdx = reference.indexOf('.');
-
- if (dotNdx == -1) {
- this.tableRef = reference;
- this.columnRef = null;
- this.onlyId = false;
- } else {
- String ref = reference.substring(0, dotNdx);
- if (ref.length() == 0) {
- ref = null;
- }
- this.tableRef = ref;
-
- ref = reference.substring(dotNdx + 1);
- if (ref.length() == 0) {
- ref = null;
- }
- this.columnRef = ref;
- onlyId = columnRef != null && columnRef.equals(StringPool.PLUS);
- }
- }
-
- // ---------------------------------------------------------------- process
-
- @Override
- public void process(final StringBuilder out) {
-
- final DbEntityDescriptor ded;
-
- if (tableRef != null) {
- ded = lookupTableRef(tableRef);
-
- final String tableName = resolveTable(tableRef, ded);
-
- out.append(tableName);
- } else {
- ded = findColumnRef(columnRef);
- }
-
-
- if (onlyId) {
- if (tableRef != null) {
- out.append('.');
- }
- out.append(ded.getIdColumnName());
- } else if (columnRef != null) {
- final DbEntityColumnDescriptor dec = ded.findByPropertyName(columnRef);
- templateData.lastColumnDec = dec;
-
- if (dec == null) {
- throw new DbSqlBuilderException("Invalid column reference: [" + tableRef + '.' + columnRef + "]");
- }
-
- if (tableRef != null) {
- out.append('.');
- }
- out.append(dec.getColumnNameForQuery());
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/SqlChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/SqlChunk.java
deleted file mode 100644
index e2941b3af..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/SqlChunk.java
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.sqlgen.DbSqlBuilderException;
-import jodd.db.oom.sqlgen.TemplateData;
-import jodd.util.CharUtil;
-import jodd.util.StringUtil;
-
-/**
- * SQL chunk defines part of the SQL query that can be processed.
- */
-public abstract class SqlChunk {
-
- public static final int COLS_NA = 0; // using explicit reference.
- public static final int COLS_ONLY_EXISTING = 1; // using only existing columns i.e. that are not-null
- public static final int COLS_ONLY_IDS = 2; // using only identity columns
- public static final int COLS_ALL = 3; // using all available columns
- public static final int COLS_ALL_BUT_ID = 4; // using all available columns except the identity column
- public static final int COLS_NA_MULTI = 0; // using explicit reference.
-
- public static final int CHUNK_RAW = -1;
- public static final int CHUNK_SELECT_COLUMNS = 1;
- public static final int CHUNK_TABLE = 2;
- public static final int CHUNK_REFERENCE = 3;
- public static final int CHUNK_MATCH = 4;
- public static final int CHUNK_VALUE = 5;
- public static final int CHUNK_INSERT = 5;
- public static final int CHUNK_UPDATE = 6;
-
- private final int chunkType;
- private final DbEntityManager dbEntityManager;
-
- protected SqlChunk(final DbEntityManager dbEntityManager, final int chunkType) {
- this.dbEntityManager = dbEntityManager;
- this.chunkType = chunkType;
- }
-
- // ---------------------------------------------------------------- linked list
-
- protected SqlChunk previousChunk;
-
- /**
- * Returns previous chunk.
- */
- public SqlChunk getPreviousChunk() {
- return previousChunk;
- }
-
- protected SqlChunk nextChunk;
-
- /**
- * Returns next chunk.
- */
- public SqlChunk getNextChunk() {
- return nextChunk;
- }
-
- /**
- * Appends chunk to previous one and maintains the double-linked list of the previous chunk.
- * Current surrounding connections of this chunk will be cut-off.
- */
- public void insertChunkAfter(final SqlChunk previous) {
- final SqlChunk next = previous.nextChunk;
- previous.nextChunk = this;
- this.previousChunk = previous;
- if (next != null) {
- next.previousChunk = this;
- this.nextChunk = next;
- }
- }
-
- /**
- * Returns true if previous chunk is of provided type.
- */
- public boolean isPreviousChunkOfType(final int type) {
- if (previousChunk == null) {
- return false;
- }
- return previousChunk.chunkType == type;
- }
-
- /**
- * Returns true if previous chunk is of the same type.
- */
- public boolean isPreviousChunkOfSameType() {
- if (previousChunk == null) {
- return false;
- }
- return previousChunk.chunkType == chunkType;
- }
-
- /**
- * Returns true if previous chunk is not raw.
- */
- public boolean isPreviousMacroChunk() {
- if (previousChunk == null) {
- return false;
- }
- return previousChunk.chunkType != CHUNK_RAW;
- }
-
- public boolean isPreviousRawChunk() {
- if (previousChunk == null) {
- return false;
- }
- return previousChunk.chunkType == CHUNK_RAW;
- }
-
-
- // ---------------------------------------------------------------- process
-
- protected TemplateData templateData; // working template context
-
- /**
- * Initializes chunk. Assigns {@link jodd.db.oom.sqlgen.TemplateData} to chunk.
- * If chunk needs some pre-processing, they should be done here.
- */
- public void init(final TemplateData templateData) {
- this.templateData = templateData;
- }
-
- /**
- * Process the chunk and appends data to the output.
- */
- public abstract void process(StringBuilder out);
-
-
- // ---------------------------------------------------------------- lookup
-
- /**
- * Lookups for entity name and throws exception if entity name not found.
- */
- protected DbEntityDescriptor lookupName(final String entityName) {
- final DbEntityDescriptor ded = dbEntityManager.lookupName(entityName);
- if (ded == null) {
- throw new DbSqlBuilderException("Entity name not registered: " + entityName);
- }
- return ded;
- }
-
- /**
- * Lookups for entity name and throws an exception if entity type is invalid.
- */
- protected DbEntityDescriptor lookupType(final Class entity) {
- final DbEntityDescriptor ded = dbEntityManager.lookupType(entity);
- if (ded == null) {
- throw new DbSqlBuilderException("Invalid or not-persistent entity: " + entity.getName());
- }
- return ded;
- }
-
- /**
- * Lookups for table reference and throws an exception if table reference not found.
- */
- protected DbEntityDescriptor lookupTableRef(final String tableRef) {
- return lookupTableRef(tableRef, true);
- }
-
- /**
- * Lookups for table reference and optionally throws an exception if table reference not found.
- */
- protected DbEntityDescriptor lookupTableRef(final String tableRef, final boolean throwExceptionIfNotFound) {
- final DbEntityDescriptor ded = templateData.getTableDescriptor(tableRef);
- if (ded == null) {
- if (throwExceptionIfNotFound) {
- throw new DbSqlBuilderException("Invalid table reference: " + tableRef);
- }
- }
- return ded;
- }
-
- /**
- * Finds a table that contains given column.
- */
- protected DbEntityDescriptor findColumnRef(final String columnRef) {
- final DbEntityDescriptor ded = templateData.findTableDescriptorByColumnRef(columnRef);
- if (ded == null) {
- throw new DbSqlBuilderException("Invalid column reference: [" + columnRef + "]");
- }
- return ded;
- }
-
- // ---------------------------------------------------------------- misc
-
- /**
- * Resolves table name or alias that will be used in the query.
- */
- protected String resolveTable(final String tableRef, final DbEntityDescriptor ded) {
- final String tableAlias = templateData.getTableAlias(tableRef);
- if (tableAlias != null) {
- return tableAlias;
- }
- return ded.getTableNameForQuery();
- }
-
- /**
- * Defines parameter with name and its value.
- */
- protected void defineParameter(final StringBuilder query, String name, final Object value, final DbEntityColumnDescriptor dec) {
- if (name == null) {
- name = templateData.getNextParameterName();
- }
- query.append(':').append(name);
- templateData.addParameter(name, value, dec);
- }
-
- /**
- * Resolves object to a class.
- */
- protected static Class resolveClass(final Object object) {
- final Class type = object.getClass();
- return type == Class.class ? (Class) object : type;
- }
-
- /**
- * Returns true if a value is considered empty i.e. not existing.
- */
- protected boolean isEmptyColumnValue(final DbEntityColumnDescriptor dec, final Object value) {
- if (value == null) {
- return true;
- }
-
- // special case for ID column
- if (dec.isId() && value instanceof Number) {
- final double d = ((Number) value).doubleValue();
- if (d == 0.0d) {
- return true;
- }
- }
-
- // special case for primitives
- if (dec.getPropertyType().isPrimitive()) {
- if (char.class == dec.getPropertyType()) {
- final Character c = ((Character) value);
- if ('\u0000' == c.charValue()) {
- return true;
- }
- } else {
- final double d = ((Number) value).doubleValue();
- if (d == 0) {
- return true;
- }
- }
- }
-
- // special case for strings
- if (value instanceof CharSequence) {
- if (StringUtil.isBlank((CharSequence) value)) {
- return true;
- }
- }
-
- return false;
- }
-
-
- // ---------------------------------------------------------------- separation
-
- /**
- * Appends missing space if the output doesn't end with whitespace.
- */
- protected void appendMissingSpace(final StringBuilder out) {
- int len = out.length();
- if (len == 0) {
- return;
- }
- len--;
- if (!CharUtil.isWhitespace(out.charAt(len))) {
- out.append(' ');
- }
- }
-
- /**
- * Separates from previous chunk by comma if is of the same type.
- */
- protected void separateByCommaOrSpace(final StringBuilder out) {
- if (isPreviousChunkOfSameType()) {
- out.append(',').append(' ');
- } else {
- appendMissingSpace(out);
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/TableChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/TableChunk.java
deleted file mode 100644
index 13d7ea2ba..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/TableChunk.java
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.db.oom.DbEntityManager;
-import jodd.db.oom.sqlgen.TemplateData;
-
-/**
- * Table chunk resolves table name, optional table alias and defines table references.
- *
- * If previous chunk is also a table, comma separator will be added between two table definitions, otherwise,
- * regular space will be added if needed to separate from previous chunk.
- *
- * Tables must be processed first, before all other chunks processing, since other chunks depends on it.
- */
-public class TableChunk extends SqlChunk {
-
- protected final Class entity;
- protected final String entityName;
- protected final String tableAlias;
- protected final String tableReference;
-
- public TableChunk(final DbEntityManager dbEntityManager, final Object entity) {
- super(dbEntityManager, CHUNK_TABLE);
- this.entity = resolveClass(entity);
- this.entityName = null;
- this.tableAlias = this.entity.getSimpleName();
- this.tableReference = null;
- }
-
- public TableChunk(final DbEntityManager dbEntityManager, final Object entity, final String alias) {
- super(dbEntityManager, CHUNK_TABLE);
- this.entity = resolveClass(entity);
- this.entityName = null;
- this.tableAlias = alias;
- this.tableReference = null;
- }
-
- public TableChunk(final DbEntityManager dbEntityManager, final Object entity, final String alias, final String tableReference) {
- super(dbEntityManager, CHUNK_TABLE);
- this.entity = resolveClass(entity);
- this.entityName = null;
- this.tableAlias = alias;
- this.tableReference = tableReference;
- }
-
- public TableChunk(final DbEntityManager dbEntityManager, final String entityName, final String alias) {
- this(dbEntityManager, null, entityName, alias, null);
- }
-
- private TableChunk(final DbEntityManager dbEntityManager, final Class entity, final String entityName, final String tableAlias, final String tableReference) {
- super(dbEntityManager, CHUNK_TABLE);
- this.entity = entity;
- this.entityName = entityName;
- this.tableAlias = tableAlias;
- this.tableReference = tableReference;
- }
-
- public TableChunk(final DbEntityManager dbEntityManager, String tableRef) {
- super(dbEntityManager, CHUNK_TABLE);
- tableRef = tableRef.trim();
- int spaceNdx = tableRef.indexOf(' ');
- this.entity = null;
- if (spaceNdx != -1) {
- this.entityName = tableRef.substring(0, spaceNdx);
- String alias = tableRef.substring(spaceNdx + 1).trim();
- tableAlias = alias.length() == 0 ? null : alias;
- } else {
- this.entityName = tableRef;
- this.tableAlias = null;
- }
- this.tableReference = null;
- }
-
- // ---------------------------------------------------------------- process
-
- protected DbEntityDescriptor ded;
-
- /**
- * Resolves and registers table references.
- */
- @Override
- public void init(final TemplateData templateData) {
- super.init(templateData);
- if (entity != null) {
- ded = lookupType(entity);
- } else {
- Object object = templateData.getObjectReference(entityName);
- if (object != null) {
- ded = lookupType(resolveClass(object));
- } else {
- ded = lookupName(entityName);
- }
- }
- String tableReference = this.tableReference;
-
- if (tableReference == null) {
- tableReference = tableAlias;
- }
- if (tableReference == null) {
- tableReference = entityName;
- }
- if (tableReference == null) {
- tableReference = ded.getEntityName();
- }
- templateData.registerTableReference(tableReference, ded, tableAlias);
- }
-
- @Override
- public void process(final StringBuilder out) {
- separateByCommaOrSpace(out);
- out.append(ded.getTableNameForQuery());
- if (tableAlias != null) {
- out.append(' ').append(tableAlias);
- }
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/UpdateSetChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/UpdateSetChunk.java
deleted file mode 100644
index 169dd465c..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/UpdateSetChunk.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.bean.BeanUtil;
-import jodd.db.DbOom;
-import jodd.db.oom.DbEntityColumnDescriptor;
-import jodd.db.oom.DbEntityDescriptor;
-import jodd.util.StringUtil;
-
-/**
- * Generates the SET part of the UPDATE statement.
- * It may contains only non-null values, or all.
- */
-public class UpdateSetChunk extends SqlChunk {
-
- private static final String SET = "set ";
-
- protected final Object data;
- protected final String tableRef;
- protected final int includeColumns;
- protected final boolean isUpdateablePrimaryKey;
-
- public UpdateSetChunk(final DbOom dbOom, final String tableRef, final Object data, final int includeColumns) {
- super(dbOom.entityManager(), CHUNK_UPDATE);
- this.tableRef = tableRef;
- this.data = data;
- this.includeColumns = includeColumns;
- this.isUpdateablePrimaryKey = dbOom.config().isUpdateablePrimaryKey();
- }
-
- @Override
- public void process(final StringBuilder out) {
- if (isPreviousChunkOfType(CHUNK_TABLE)) {
- appendMissingSpace(out);
- }
-
- final DbEntityDescriptor ded = tableRef != null ?
- lookupTableRef(tableRef) :
- lookupType(resolveClass(data));
-
- out.append(SET);
-
- final DbEntityColumnDescriptor[] decList = ded.getColumnDescriptors();
- final String typeName = StringUtil.uncapitalize(ded.getEntityName());
- //String table = resolveTable(tableRef, ded);
-
- int size = 0;
- for (final DbEntityColumnDescriptor dec : decList) {
- if (dec.isId() && !isUpdateablePrimaryKey) {
- continue;
- }
-
- final String property = dec.getPropertyName();
- final Object value = BeanUtil.declared.getProperty(data, property);
-
- if (includeColumns == COLS_ONLY_EXISTING) {
- if (isEmptyColumnValue(dec, value)) {
- continue;
- }
- }
-
- if (size > 0) {
- out.append(',').append(' ');
- }
-
- size++;
-
-
- // do not add table reference in set
- // as only one table can be updated
- // also, Postgress database does not allow it (see #JODD-21)
-
- //out.append(table).append('.');
-
- out.append(dec.getColumnNameForQuery()).append('=');
-
- final String propertyName = typeName + '.' + property;
- defineParameter(out, propertyName, value, dec);
- }
- if (size > 0) {
- out.append(' ');
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ValueChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ValueChunk.java
deleted file mode 100644
index 01cfdc1a4..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/ValueChunk.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.oom.sqlgen.chunks;
-
-import jodd.db.oom.DbEntityManager;
-
-import java.util.Collection;
-
-/**
- * Defines SQL parameter and its value. Name may be null and will be
- * automatically generated. Collections are recognized and will be rendered into
- * the list of values.
- *
- * For the last value use {@link ColumnValueChunk}!
- */
-public class ValueChunk extends SqlChunk {
-
- protected final String name;
- protected Object value;
- protected final String objReference;
-
- public ValueChunk(final DbEntityManager dbEntityManager, final String name, final Object value) {
- this(dbEntityManager, name, value, null);
- }
-
- public ValueChunk(final DbEntityManager dbEntityManager, final String objReference) {
- this(dbEntityManager, null, null, objReference);
- }
-
- protected ValueChunk(final DbEntityManager dbEntityManager, final String name, final Object value, final String objReference) {
- super(dbEntityManager, CHUNK_VALUE);
- this.name = name;
- this.value = value;
- this.objReference = objReference;
- }
-
- @Override
- public void process(final StringBuilder out) {
- if (objReference != null) {
- value = templateData.lookupObject(objReference);
- }
- if (value != null) {
- if (value instanceof Collection) {
- Collection collection = (Collection) value;
- int counter = 0;
- for (Object obj : collection) {
- if (counter > 0) {
- out.append(',').append(' ');
- }
- defineParameter(out, name + counter, obj, null);
- counter++;
- }
- return;
- }
- }
- defineParameter(out, name, value, null);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/package-info.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/package-info.java
deleted file mode 100644
index 91604a7b3..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * DbSqlBuilder query chunks.
- */
-package jodd.db.oom.sqlgen.chunks;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/package-info.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/package-info.java
deleted file mode 100644
index fa5bbde3f..000000000
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Various query generators.
- */
-package jodd.db.oom.sqlgen;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/package-info.java b/jodd-db/src/main/java/jodd/db/package-info.java
deleted file mode 100644
index 77364293d..000000000
--- a/jodd-db/src/main/java/jodd/db/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Simple and safe database access.
- */
-package jodd.db;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/pool/CoreConnectionPool.java b/jodd-db/src/main/java/jodd/db/pool/CoreConnectionPool.java
deleted file mode 100644
index 67022ec67..000000000
--- a/jodd-db/src/main/java/jodd/db/pool/CoreConnectionPool.java
+++ /dev/null
@@ -1,483 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.pool;
-
-import jodd.db.DbSqlException;
-import jodd.db.connection.ConnectionProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-
-/**
- * A class for pre-allocating, recycling, and managing JDBC connections.
- *
- * It uses threads for opening a new connection. When no connection
- * available it will wait until a connection is released.
- */
-public class CoreConnectionPool implements Runnable, ConnectionProvider {
-
- private static final Logger log = LoggerFactory.getLogger(CoreConnectionPool.class);
-
- // ---------------------------------------------------------------- properties
-
- private static final String DEFAULT_VALIDATION_QUERY = "select 1";
-
- private String driver;
- private String url;
- private String user;
- private String password;
- private int maxConnections = 10;
- private int minConnections = 5;
- private boolean waitIfBusy;
- private boolean validateConnection = true;
- private long validationTimeout = 18000000L; // 5 hours
- private String validationQuery;
-
- public String getDriver() {
- return driver;
- }
-
- /**
- * Specifies driver class name.
- */
- public void setDriver(final String driver) {
- this.driver = driver;
- }
-
- public String getUrl() {
- return url;
- }
-
- /**
- * Specifies JDBC url.
- */
- public void setUrl(final String url) {
- this.url = url;
- }
-
- public String getUser() {
- return user;
- }
-
- /**
- * Specifies db username.
- */
- public void setUser(final String user) {
- this.user = user;
- }
-
- public String getPassword() {
- return password;
- }
-
- /**
- * Specifies db password.
- */
- public void setPassword(final String password) {
- this.password = password;
- }
-
- public int getMaxConnections() {
- return maxConnections;
- }
-
- /**
- * Sets max number of connections.
- */
- public void setMaxConnections(final int maxConnections) {
- this.maxConnections = maxConnections;
- }
-
- public int getMinConnections() {
- return minConnections;
- }
-
- /**
- * Sets minimum number of open connections.
- */
- public void setMinConnections(final int minConnections) {
- this.minConnections = minConnections;
- }
-
- public boolean isWaitIfBusy() {
- return waitIfBusy;
- }
-
- /**
- * Sets if pool should wait for connection to be freed when none
- * is available. If wait for busy is false
- * exception will be thrown when max connection is reached.
- */
- public void setWaitIfBusy(final boolean waitIfBusy) {
- this.waitIfBusy = waitIfBusy;
- }
-
- public long getValidationTimeout() {
- return validationTimeout;
- }
-
- /**
- * Specifies number of milliseconds from connection creation
- * when connection is considered as opened and valid.
- */
- public void setValidationTimeout(final long validationTimeout) {
- this.validationTimeout = validationTimeout;
- }
-
- public String getValidationQuery() {
- return validationQuery;
- }
-
- /**
- * Specifies query to be used for validating connections.
- * If set to null validation will be performed
- * by invoking Connection#isClosed method.
- */
- public void setValidationQuery(final String validationQuery) {
- this.validationQuery = validationQuery;
- }
-
- /**
- * Sets default validation query (select 1);
- */
- public void setDefaultValidationQuery() {
- this.validationQuery = DEFAULT_VALIDATION_QUERY;
- }
-
- public boolean isValidateConnection() {
- return validateConnection;
- }
-
- /**
- * Specifies if connections should be validated before returned.
- */
- public void setValidateConnection(final boolean validateConnection) {
- this.validateConnection = validateConnection;
- }
-
- // ---------------------------------------------------------------- init
-
- private ArrayList availableConnections, busyConnections;
- private boolean connectionPending;
- private boolean initialised;
-
- /**
- * {@inheritDoc}
- */
- @Override
- public synchronized void init() {
- if (initialised) {
- return;
- }
- if (log.isInfoEnabled()) {
- log.info("Core connection pool initialization");
- }
- try {
- Class.forName(driver);
- }
- catch (final ClassNotFoundException cnfex) {
- throw new DbSqlException("Database driver not found: " + driver, cnfex);
- }
-
- if (minConnections > maxConnections) {
- minConnections = maxConnections;
- }
- availableConnections = new ArrayList<>(maxConnections);
- busyConnections = new ArrayList<>(maxConnections);
-
- for (int i = 0; i < minConnections; i++) {
- try {
- final Connection conn = DriverManager.getConnection(url, user, password);
- availableConnections.add(new ConnectionData(conn));
- } catch (final SQLException sex) {
- throw new DbSqlException("No database connection", sex);
- }
- }
- initialised = true;
- }
-
- // ---------------------------------------------------------------- get/close
-
- /**
- * {@inheritDoc}
- */
- @Override
- public synchronized Connection getConnection() {
- if (availableConnections == null) {
- throw new DbSqlException("Connection pool is not initialized");
- }
- if (!availableConnections.isEmpty()) {
- final int lastIndex = availableConnections.size() - 1;
- final ConnectionData existingConnection = availableConnections.get(lastIndex);
- availableConnections.remove(lastIndex);
-
- // If conn on available list is closed (e.g., it timed out), then remove it from available list
- // and repeat the process of obtaining a conn. Also wake up threads that were waiting for a
- // conn because maxConnection limit was reached.
- final long now = System.currentTimeMillis();
- final boolean isValid = isConnectionValid(existingConnection, now);
- if (!isValid) {
- if (log.isDebugEnabled()) {
- log.debug("Pooled connection not valid, resetting");
- }
-
- notifyAll(); // freed up a spot for anybody waiting
- return getConnection();
- } else {
- if (log.isDebugEnabled()) {
- log.debug("Returning valid pooled connection");
- }
-
- busyConnections.add(existingConnection);
- existingConnection.lastUsed = now;
- return existingConnection.connection;
- }
- }
- if (log.isDebugEnabled()) {
- log.debug("No more available connections");
- }
-
- // no available connections
- if (((availableConnections.size() + busyConnections.size()) < maxConnections) && !connectionPending) {
- makeBackgroundConnection();
- } else if (!waitIfBusy) {
- throw new DbSqlException("Connection limit reached: " + maxConnections);
- }
- // wait for either a new conn to be established (if you called makeBackgroundConnection) or for
- // an existing conn to be freed up.
- try {
- wait();
- } catch (final InterruptedException ie) {
- // ignore
- }
- // someone freed up a conn, so try again.
- return getConnection();
- }
-
- /**
- * Checks if existing connection is valid and available. It may happens
- * that if connection is not used for a while it becomes inactive,
- * although not technically closed.
- */
- private boolean isConnectionValid(final ConnectionData connectionData, final long now) {
- if (!validateConnection) {
- return true;
- }
-
- if (now < connectionData.lastUsed + validationTimeout) {
- return true;
- }
-
- final Connection conn = connectionData.connection;
-
- if (validationQuery == null) {
- try {
- return !conn.isClosed();
- } catch (final SQLException sex) {
- return false;
- }
- }
-
- boolean valid = true;
- Statement st = null;
- try {
- st = conn.createStatement();
- st.execute(validationQuery);
- } catch (final SQLException sex) {
- valid = false;
- } finally {
- if (st != null) {
- try {
- st.close();
- } catch (final SQLException ignore) {
- }
- }
- }
- return valid;
- }
-
- /**
- * You can't just make a new conn in the foreground when none are
- * available, since this can take several seconds with a slow network
- * conn. Instead, start a thread that establishes a new conn,
- * then wait. You get woken up either when the new conn is established
- * or if someone finishes with an existing conn.
- */
- private void makeBackgroundConnection() {
- connectionPending = true;
- final Thread connectThread = new Thread(this);
- connectThread.start();
- }
-
- @Override
- public void run() {
- try {
- final Connection connection = DriverManager.getConnection(url, user, password);
- synchronized(this) {
- availableConnections.add(new ConnectionData(connection));
- connectionPending = false;
- notifyAll();
- }
- } catch (final Exception ex) {
- // give up on new conn and wait for existing one to free up.
- }
- }
-
- @Override
- public synchronized void closeConnection(final Connection connection) {
- final ConnectionData connectionData = new ConnectionData(connection);
- busyConnections.remove(connectionData);
- availableConnections.add(connectionData);
- notifyAll(); // wake up threads that are waiting for a conn
- }
-
-
- // ---------------------------------------------------------------- close
-
- /**
- * Close all the connections. Use with caution: be sure no connections are in
- * use before calling. Note that you are not required to call this
- * when done with a ConnectionPool, since connections are guaranteed to be
- * closed when garbage collected. But this method gives more control
- * regarding when the connections are closed.
- */
- @Override
- public synchronized void close() {
- if (log.isInfoEnabled()) {
- log.info("Core connection pool shutdown");
- }
- closeConnections(availableConnections);
- availableConnections = new ArrayList<>(maxConnections);
- closeConnections(busyConnections);
- busyConnections = new ArrayList<>(maxConnections);
- }
-
- private void closeConnections(final ArrayList connections) {
- if (connections == null) {
- return;
- }
- try {
- for (final ConnectionData connectionData : connections) {
- final Connection connection = connectionData.connection;
- if (!connection.isClosed()) {
- connection.close();
- }
- }
- } catch (final SQLException ignore) {
- // Ignore errors; garbage collect anyhow
- }
- }
-
- // ---------------------------------------------------------------- conn data
-
- /**
- * Connection data with last used timestamp.
- */
- class ConnectionData {
- final Connection connection;
- long lastUsed;
-
- ConnectionData(final Connection connection) {
- this.connection = connection;
- this.lastUsed = System.currentTimeMillis();
- }
-
- @Override
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- final ConnectionData that = (ConnectionData) o;
- return connection.equals(that.connection);
- }
-
- @Override
- public int hashCode() {
- return connection.hashCode();
- }
- }
-
- // ---------------------------------------------------------------- stats
-
- /**
- * Returns connection stats.
- */
- public synchronized SizeSnapshot getConnectionsCount() {
- return new SizeSnapshot(availableConnections.size(), busyConnections.size());
- }
-
- /**
- * Just a statistic class.
- */
- public static class SizeSnapshot {
- final int totalCount;
- final int availableCount;
- final int busyCount;
-
- SizeSnapshot(final int availableCount, final int busyCount) {
- this.totalCount = availableCount + busyCount;
- this.availableCount = availableCount;
- this.busyCount = busyCount;
- }
-
- /**
- * Returns total number of connections.
- */
- public int getTotalCount() {
- return totalCount;
- }
-
- /**
- * Returns number of available connections.
- */
- public int getAvailableCount() {
- return availableCount;
- }
-
- /**
- * Returns number of busy connections.
- */
- public int getBusyCount() {
- return busyCount;
- }
-
- @Override
- public String toString() {
- return "Connections count: {total=" + totalCount +
- ", available=" + availableCount +
- ", busy=" + busyCount + '}';
- }
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/pool/package-info.java b/jodd-db/src/main/java/jodd/db/pool/package-info.java
deleted file mode 100644
index 9dcc3ce12..000000000
--- a/jodd-db/src/main/java/jodd/db/pool/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Various custom database pool implementations.
- */
-package jodd.db.pool;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/querymap/DbPropsQueryMap.java b/jodd-db/src/main/java/jodd/db/querymap/DbPropsQueryMap.java
deleted file mode 100644
index 47ee33487..000000000
--- a/jodd-db/src/main/java/jodd/db/querymap/DbPropsQueryMap.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.querymap;
-
-import jodd.core.JoddCore;
-import jodd.exception.UncheckedException;
-import jodd.io.findfile.ClassScanner;
-import jodd.props.Props;
-import jodd.util.StringUtil;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * {@link jodd.db.querymap.QueryMap} implementation based on
- * {@link jodd.props.Props} properties files.
- * Scans for "*.sql.props" and "*.oom.props"
- * properties on class path.
- */
-public class DbPropsQueryMap implements QueryMap {
-
- protected final String[] patterns;
- protected Props props;
-
- public DbPropsQueryMap(final String... patterns) {
- this.patterns = patterns;
- reload();
- }
-
- public DbPropsQueryMap() {
- this("*.sql.props", "*.oom.props", "*.sql.properties", "*.oom.properties");
- }
-
- /**
- * Returns Props.
- */
- public Props props() {
- return props;
- }
-
- @Override
- public void reload() {
- props = new Props();
- loadFromClasspath(props, patterns);
- }
-
- @Override
- public int size() {
- return props.countTotalProperties();
- }
-
- // ---------------------------------------------------------------- sql
-
- /**
- * Returns query for given key.
- * In debug mode, props are reloaded every time before the lookup.
- */
- @Override
- public String getQuery(final String key) {
- return props.getValue(key);
- }
-
- private void loadFromClasspath(final Props props, final String... patterns) {
- ClassScanner.create()
- .registerEntryConsumer(entryData -> {
- String usedEncoding = JoddCore.encoding;
- if (StringUtil.endsWithIgnoreCase(entryData.name(), ".properties")) {
- usedEncoding = StandardCharsets.ISO_8859_1.name();
- }
-
- final String encoding = usedEncoding;
- UncheckedException.runAndWrapException(() -> props.load(entryData.openInputStream(), encoding));
- })
- .includeResources(true)
- .ignoreException(true)
- .excludeCommonJars()
- .excludeAllEntries(true)
- .includeEntries(patterns)
- .scanDefaultClasspath()
- .start();
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/querymap/EmptyQueryMap.java b/jodd-db/src/main/java/jodd/db/querymap/EmptyQueryMap.java
deleted file mode 100644
index 8c009c36b..000000000
--- a/jodd-db/src/main/java/jodd/db/querymap/EmptyQueryMap.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.querymap;
-
-/**
- * Void implementation of a query map.
- */
-public class EmptyQueryMap implements QueryMap {
-
- @Override
- public void reload() {
- }
-
- @Override
- public String getQuery(final String key) {
- return null;
- }
-
- @Override
- public int size() {
- return 0;
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/querymap/QueryMap.java b/jodd-db/src/main/java/jodd/db/querymap/QueryMap.java
deleted file mode 100644
index 41758d59e..000000000
--- a/jodd-db/src/main/java/jodd/db/querymap/QueryMap.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.querymap;
-
-/**
- * Storage of SQL queries.
- */
-public interface QueryMap {
-
- /**
- * Optionally reloads the query map, if implementation allows it.
- */
- void reload();
-
- /**
- * Returns query for given key. Returns null if query not found.
- */
- String getQuery(String key);
-
- /**
- * Returns total number of queries.
- */
- int size();
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/querymap/package-info.java b/jodd-db/src/main/java/jodd/db/querymap/package-info.java
deleted file mode 100644
index e52eeb6b7..000000000
--- a/jodd-db/src/main/java/jodd/db/querymap/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Storage for queries.
- */
-package jodd.db.querymap;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/servers/Db2DbServer.java b/jodd-db/src/main/java/jodd/db/servers/Db2DbServer.java
deleted file mode 100644
index 2283d9b94..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/Db2DbServer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * DB2.
- */
-public class Db2DbServer implements DbServer {
-
- private final String version;
-
- public Db2DbServer() {
- this.version = "(N/A)";
- }
-
- public Db2DbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: DB2 v" + version;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/servers/DbServer.java b/jodd-db/src/main/java/jodd/db/servers/DbServer.java
deleted file mode 100644
index ee13fccb4..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/DbServer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-import java.util.function.Consumer;
-
-public interface DbServer extends Consumer {
-
- @Override
- void accept(DbOomConfig dbOomConfig);
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/servers/DerbyDbServer.java b/jodd-db/src/main/java/jodd/db/servers/DerbyDbServer.java
deleted file mode 100644
index 68165aef0..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/DerbyDbServer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * Apache Derby.
- */
-public class DerbyDbServer implements DbServer {
-
- private final String version;
-
- public DerbyDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: Apache Derby v" + version;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/servers/GenericDbServer.java b/jodd-db/src/main/java/jodd/db/servers/GenericDbServer.java
deleted file mode 100644
index 0cf3da787..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/GenericDbServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * Generic database server, for any database that is not recognized.
- */
-public class GenericDbServer implements DbServer {
-
- private final String name;
- private final String version;
-
- public GenericDbServer() {
- this(null, null);
- }
-
- public GenericDbServer(String name, String version) {
- if (name == null) {
- name = "unknown server";
- }
- if (version == null) {
- version = "(N/A)";
- }
- this.name = name;
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- }
-
- @Override
- public String toString() {
- return "DbServer - Generic: " + name + " v" + version;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/servers/HsqlDbServer.java b/jodd-db/src/main/java/jodd/db/servers/HsqlDbServer.java
deleted file mode 100644
index 8db7919a2..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/HsqlDbServer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * HSQLDB.
- */
-public class HsqlDbServer implements DbServer {
-
- private final String version;
-
- public HsqlDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
-
- // When a database object is created with one of the CREATE statements or renamed with the ALTER statement,
- // if the name is enclosed in double quotes, the exact name is used as the case-normal form. But if it is
- // not enclosed in double quotes, the name is converted to uppercase and this uppercase version is stored
- // in the database as the case-normal form.
- dbOomConfig.getTableNames().setUppercase(true);
- dbOomConfig.getColumnNames().setUppercase(true);
-
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: HSQLDB v" + version;
- }
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/servers/InformixDbServer.java b/jodd-db/src/main/java/jodd/db/servers/InformixDbServer.java
deleted file mode 100644
index 41ceaccfe..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/InformixDbServer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * Informix.
- */
-public class InformixDbServer implements DbServer {
-
- private final String version;
-
- public InformixDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- }
-
- @Override
- public String toString() {
- return "DbServer: Informix v" + version;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/servers/MySqlDbServer.java b/jodd-db/src/main/java/jodd/db/servers/MySqlDbServer.java
deleted file mode 100644
index bf19383ae..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/MySqlDbServer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * MySQL.
- */
-public class MySqlDbServer implements DbServer {
-
- private final String version;
-
- public MySqlDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- // Database and table names are not case sensitive in Windows,
- // and case sensitive in most varieties of Unix. One notable exception is Mac OS X,
- // which is Unix-based but uses a default file system type (HFS+) that is not case sensitive.
- dbOomConfig.getTableNames().setLowercase(true);
-
- // Column and index names are not case sensitive on any platform, nor are column aliases.
- dbOomConfig.getColumnNames().setLowercase(true);
-
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('`');
- }
-
- @Override
- public String toString() {
- return "DbServer: MySQL v" + version;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/servers/OracleDbServer.java b/jodd-db/src/main/java/jodd/db/servers/OracleDbServer.java
deleted file mode 100644
index 11927f72a..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/OracleDbServer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * Oracle.
- */
-public class OracleDbServer implements DbServer {
-
- private final String version;
-
- public OracleDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: Oracle v" + version;
- }
-}
-
diff --git a/jodd-db/src/main/java/jodd/db/servers/PostgreSqlDbServer.java b/jodd-db/src/main/java/jodd/db/servers/PostgreSqlDbServer.java
deleted file mode 100644
index 8646b6db1..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/PostgreSqlDbServer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * Postgres.
- */
-public class PostgreSqlDbServer implements DbServer {
-
- private final String version;
-
- public PostgreSqlDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- // However, the standard says that unquoted identifiers should be
- // folded to uppercase but PostgreSQL folds them to lower case
- // (probably for historic reasons)
- dbOomConfig.getTableNames().setLowercase(true);
- dbOomConfig.getColumnNames().setLowercase(true);
-
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: Postgres v" + version;
- }
-}
-
diff --git a/jodd-db/src/main/java/jodd/db/servers/SQLiteDbServer.java b/jodd-db/src/main/java/jodd/db/servers/SQLiteDbServer.java
deleted file mode 100644
index 1dd37b5fe..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/SQLiteDbServer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * SQLite.
- */
-public class SQLiteDbServer implements DbServer {
-
- private final String version;
-
- public SQLiteDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- dbOomConfig.setUpdateAcceptsTableAlias(false);
-
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: SQLite v" + version;
- }
-}
-
diff --git a/jodd-db/src/main/java/jodd/db/servers/SqlServerDbServer.java b/jodd-db/src/main/java/jodd/db/servers/SqlServerDbServer.java
deleted file mode 100644
index 61cd8102e..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/SqlServerDbServer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * SQL Server.
- */
-public class SqlServerDbServer implements DbServer {
-
- private final String version;
-
- public SqlServerDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- dbOomConfig.setUpdateAcceptsTableAlias(false);
- dbOomConfig.setUpdateablePrimaryKey(false);
-
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: SQL Server v" + version;
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/servers/SybaseDbServer.java b/jodd-db/src/main/java/jodd/db/servers/SybaseDbServer.java
deleted file mode 100644
index 1bb35dd94..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/SybaseDbServer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.servers;
-
-import jodd.db.oom.DbOomConfig;
-
-/**
- * Sybase.
- */
-public class SybaseDbServer implements DbServer {
-
- private final String version;
-
- public SybaseDbServer(final String version) {
- this.version = version;
- }
-
- @Override
- public void accept(final DbOomConfig dbOomConfig) {
- // quote character
- dbOomConfig.getColumnNames().setQuoteChar('\"');
- }
-
- @Override
- public String toString() {
- return "DbServer: Sybase v" + version;
- }
-}
-
diff --git a/jodd-db/src/main/java/jodd/db/servers/package-info.java b/jodd-db/src/main/java/jodd/db/servers/package-info.java
deleted file mode 100644
index 6688a073d..000000000
--- a/jodd-db/src/main/java/jodd/db/servers/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Detected database servers.
- */
-package jodd.db.servers;
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/BigDecimalSqlType.java b/jodd-db/src/main/java/jodd/db/type/BigDecimalSqlType.java
deleted file mode 100644
index dd0f09a3d..000000000
--- a/jodd-db/src/main/java/jodd/db/type/BigDecimalSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-public class BigDecimalSqlType extends SqlType {
- /**
- * {@inheritDoc}
- */
- @Override
- public BigDecimal get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getBigDecimal(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final BigDecimal value, final int dbSqlType) throws SQLException {
- st.setBigDecimal(index, value);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/BigIntegerSqlType.java b/jodd-db/src/main/java/jodd/db/type/BigIntegerSqlType.java
deleted file mode 100644
index 3ec349836..000000000
--- a/jodd-db/src/main/java/jodd/db/type/BigIntegerSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.math.BigInteger;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-public class BigIntegerSqlType extends SqlType {
- /**
- * {@inheritDoc}
- */
- @Override
- public BigInteger get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return BigInteger.valueOf(rs.getLong(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final BigInteger value, final int dbSqlType) throws SQLException {
- st.setLong(index, value.longValue());
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/BlobSqlType.java b/jodd-db/src/main/java/jodd/db/type/BlobSqlType.java
deleted file mode 100644
index 23d203ee6..000000000
--- a/jodd-db/src/main/java/jodd/db/type/BlobSqlType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import java.sql.Blob;
-
-public class BlobSqlType extends SqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Blob get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getBlob(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Blob value, final int dbSqlType) throws SQLException {
- st.setBlob(index, value);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/BooleanSqlType.java b/jodd-db/src/main/java/jodd/db/type/BooleanSqlType.java
deleted file mode 100644
index a0bcb3e89..000000000
--- a/jodd-db/src/main/java/jodd/db/type/BooleanSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-public class BooleanSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Boolean get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Boolean.valueOf(rs.getBoolean(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Boolean value, final int dbSqlType) throws SQLException {
- st.setBoolean(index, value.booleanValue());
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/ByteArraySqlType.java b/jodd-db/src/main/java/jodd/db/type/ByteArraySqlType.java
deleted file mode 100644
index 3f197b614..000000000
--- a/jodd-db/src/main/java/jodd/db/type/ByteArraySqlType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class ByteArraySqlType extends SqlType {
- /**
- * {@inheritDoc}
- */
- @Override
- public byte[] get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getBytes(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final byte[] value, final int dbSqlType) throws SQLException {
- st.setBytes(index, value);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/ByteSqlType.java b/jodd-db/src/main/java/jodd/db/type/ByteSqlType.java
deleted file mode 100644
index b7207f572..000000000
--- a/jodd-db/src/main/java/jodd/db/type/ByteSqlType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-public class ByteSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Byte get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Byte.valueOf(rs.getByte(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Byte value, final int dbSqlType) throws SQLException {
- st.setByte(index, value.byteValue());
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/CharacterSqlType.java b/jodd-db/src/main/java/jodd/db/type/CharacterSqlType.java
deleted file mode 100644
index 654a72346..000000000
--- a/jodd-db/src/main/java/jodd/db/type/CharacterSqlType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import jodd.db.DbSqlException;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Char SQL type.
- */
-public class CharacterSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Character get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- if (TypesUtil.isIntegerType(dbSqlType)) {
- return Character.valueOf((char) rs.getInt(index));
- }
- String s = rs.getString(index);
- if (s == null) {
- return null;
- }
- if (s.length() > 1) {
- throw new DbSqlException("Char column size too long, should be 1");
- }
- return Character.valueOf(s.charAt(0));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Character value, final int dbSqlType) throws SQLException {
- if (TypesUtil.isIntegerType(dbSqlType)) {
- st.setInt(index, value.charValue());
- return;
- }
- st.setString(index, value.toString());
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/ClobSqlType.java b/jodd-db/src/main/java/jodd/db/type/ClobSqlType.java
deleted file mode 100644
index 0712d2085..000000000
--- a/jodd-db/src/main/java/jodd/db/type/ClobSqlType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.Clob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class ClobSqlType extends SqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Clob get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getClob(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Clob value, final int dbSqlType) throws SQLException {
- st.setClob(index, value);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/DateSqlType.java b/jodd-db/src/main/java/jodd/db/type/DateSqlType.java
deleted file mode 100644
index ea780fa3b..000000000
--- a/jodd-db/src/main/java/jodd/db/type/DateSqlType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Date;
-
-public class DateSqlType extends SqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Date get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getDate(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Date value, final int dbSqlType) throws SQLException {
- st.setTimestamp(index, new Timestamp(value.getTime()));
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/DoubleSqlType.java b/jodd-db/src/main/java/jodd/db/type/DoubleSqlType.java
deleted file mode 100644
index 9e9dfeb19..000000000
--- a/jodd-db/src/main/java/jodd/db/type/DoubleSqlType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class DoubleSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Double get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Double.valueOf(rs.getDouble(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Double value, final int dbSqlType) throws SQLException {
- st.setDouble(index, value.doubleValue());
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/FloatSqlType.java b/jodd-db/src/main/java/jodd/db/type/FloatSqlType.java
deleted file mode 100644
index e9adef72a..000000000
--- a/jodd-db/src/main/java/jodd/db/type/FloatSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-public class FloatSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Float get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Float.valueOf(rs.getFloat(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Float value, final int dbSqlType) throws SQLException {
- st.setFloat(index, value.floatValue());
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/IntegerSqlType.java b/jodd-db/src/main/java/jodd/db/type/IntegerSqlType.java
deleted file mode 100644
index 9f6b53f28..000000000
--- a/jodd-db/src/main/java/jodd/db/type/IntegerSqlType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class IntegerSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Integer get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Integer.valueOf(rs.getInt(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Integer value, final int dbSqlType) throws SQLException {
- st.setInt(index, value.intValue());
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/JulianDateSqlType.java b/jodd-db/src/main/java/jodd/db/type/JulianDateSqlType.java
deleted file mode 100644
index cdd1bd77a..000000000
--- a/jodd-db/src/main/java/jodd/db/type/JulianDateSqlType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import jodd.time.JulianDate;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-
-/**
- * JulianDate sql type stores JulianDate data as number of milliseconds passed from 1970.
- */
-public class JulianDateSqlType extends SqlType {
-
- @Override
- public void set(final PreparedStatement st, final int index, final JulianDate value, final int dbSqlType) throws SQLException {
- if (value == null) {
- st.setNull(index, dbSqlType);
- return;
- }
- if (dbSqlType == Types.TIMESTAMP) {
- st.setTimestamp(index, new Timestamp(value.toMilliseconds()));
- return;
- }
- st.setLong(index, value.toMilliseconds());
- }
-
- @Override
- public JulianDate get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- if (dbSqlType == Types.TIMESTAMP) {
- final Timestamp timestamp = rs.getTimestamp(index);
- if (timestamp == null) {
- return null;
- }
- return JulianDate.of(timestamp.getTime());
- }
- final long time = rs.getLong(index);
-
- if (time == 0 && rs.wasNull()) {
- return null;
- }
- return new JulianDate(time);
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/LocalDateSqlType.java b/jodd-db/src/main/java/jodd/db/type/LocalDateSqlType.java
deleted file mode 100644
index c25f03913..000000000
--- a/jodd-db/src/main/java/jodd/db/type/LocalDateSqlType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import jodd.time.TimeUtil;
-
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.time.LocalDate;
-
-public class LocalDateSqlType extends SqlType {
-
- @Override
- public void set(final PreparedStatement st, final int index, final LocalDate value, final int dbSqlType) throws SQLException {
- if (value == null) {
- st.setNull(index, dbSqlType);
- return;
- }
- if (dbSqlType == Types.TIMESTAMP) {
- st.setTimestamp(index, new Timestamp(TimeUtil.toMilliseconds(value)));
- return;
- }
- if (dbSqlType == Types.VARCHAR) {
- st.setString(index, value.toString());
- return;
- }
- if (dbSqlType == Types.INTEGER) {
- st.setLong(index, TimeUtil.toMilliseconds(value));
- }
-
- st.setObject(index, value);
- }
-
- @Override
- public LocalDate get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- if (dbSqlType == Types.TIMESTAMP) {
- Timestamp timestamp = rs.getTimestamp(index);
- if (timestamp == null) {
- return null;
- }
- return TimeUtil.fromMilliseconds(timestamp.getTime()).toLocalDate();
- }
- if (dbSqlType == Types.VARCHAR) {
- String string = rs.getString(index);
- if (string == null) {
- return null;
- }
- return LocalDate.parse(string);
- }
- if (dbSqlType == Types.INTEGER) {
- long time = rs.getLong(index);
-
- if (time == 0 && rs.wasNull()) {
- return null;
- }
- return TimeUtil.fromMilliseconds(time).toLocalDate();
- }
-
- Date date = (Date) rs.getObject(index);
-
- return TimeUtil.fromMilliseconds(date.getTime()).toLocalDate();
- }
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/LocalDateTimeSqlType.java b/jodd-db/src/main/java/jodd/db/type/LocalDateTimeSqlType.java
deleted file mode 100644
index 19157ce32..000000000
--- a/jodd-db/src/main/java/jodd/db/type/LocalDateTimeSqlType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import jodd.time.TimeUtil;
-
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.time.LocalDateTime;
-
-public class LocalDateTimeSqlType extends SqlType {
-
- @Override
- public void set(final PreparedStatement st, final int index, final LocalDateTime value, final int dbSqlType) throws SQLException {
- if (value == null) {
- st.setNull(index, dbSqlType);
- return;
- }
- if (dbSqlType == Types.TIMESTAMP) {
- st.setTimestamp(index, new Timestamp(TimeUtil.toMilliseconds(value)));
- return;
- }
- if (dbSqlType == Types.VARCHAR) {
- st.setString(index, value.toString());
- return;
- }
- if (dbSqlType == Types.INTEGER) {
- st.setLong(index, TimeUtil.toMilliseconds(value));
- }
-
- st.setObject(index, value);
- }
-
- @Override
- public LocalDateTime get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- if (dbSqlType == Types.TIMESTAMP) {
- Timestamp timestamp = rs.getTimestamp(index);
- if (timestamp == null) {
- return null;
- }
- return TimeUtil.fromMilliseconds(timestamp.getTime());
- }
- if (dbSqlType == Types.VARCHAR) {
- String string = rs.getString(index);
- if (string == null) {
- return null;
- }
- return LocalDateTime.parse(string);
- }
- if (dbSqlType == Types.INTEGER) {
- long time = rs.getLong(index);
-
- if (time == 0 && rs.wasNull()) {
- return null;
- }
- return TimeUtil.fromMilliseconds(time);
- }
-
- Date date = (Date) rs.getObject(index);
-
- return TimeUtil.fromMilliseconds(date.getTime());
- }
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/LocalTimeSqlType.java b/jodd-db/src/main/java/jodd/db/type/LocalTimeSqlType.java
deleted file mode 100644
index 0e72c497a..000000000
--- a/jodd-db/src/main/java/jodd/db/type/LocalTimeSqlType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.time.LocalTime;
-
-public class LocalTimeSqlType extends SqlType {
-
- @Override
- public void set(final PreparedStatement st, final int index, final LocalTime value, final int dbSqlType) throws SQLException {
- if (value == null) {
- st.setNull(index, dbSqlType);
- return;
- }
- if (dbSqlType == Types.VARCHAR) {
- st.setString(index, value.toString());
- return;
- }
- st.setLong(index, value.toSecondOfDay());
- }
-
- @Override
- public LocalTime get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- if (dbSqlType == Types.VARCHAR) {
- String string = rs.getString(index);
- if (string == null) {
- return null;
- }
- return LocalTime.parse(string);
- }
-
- long time = rs.getLong(index);
-
- if (time == 0 && rs.wasNull()) {
- return null;
- }
- return LocalTime.ofSecondOfDay(time);
- }
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/LongSqlType.java b/jodd-db/src/main/java/jodd/db/type/LongSqlType.java
deleted file mode 100644
index c2c17672f..000000000
--- a/jodd-db/src/main/java/jodd/db/type/LongSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class LongSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Long get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Long.valueOf(rs.getLong(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Long value, final int dbSqlType) throws SQLException {
- st.setLong(index, value.longValue());
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/NullAwareSqlType.java b/jodd-db/src/main/java/jodd/db/type/NullAwareSqlType.java
deleted file mode 100644
index 05be91db3..000000000
--- a/jodd-db/src/main/java/jodd/db/type/NullAwareSqlType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Null-aware {@link SqlType sql types}.
- */
-public abstract class NullAwareSqlType extends SqlType {
-
- /**
- * Detects if there was a null reading and returns null if it was.
- * Result set returns default value (e.g. 0) for many getters, therefore it detects if it was
- * a null reading or it is a real value.
- */
- @Override
- public E readValue(final ResultSet rs, final int index, final Class destinationType, final int dbSqlType) throws SQLException {
- T t = get(rs, index, dbSqlType);
- if ((t == null) || (rs.wasNull())) {
- return null;
- }
- return prepareGetValue(t, destinationType);
- }
-
- /**
- * Detects null before storing the value into the database.
- */
- @Override
- public void storeValue(final PreparedStatement st, final int index, final Object value, final int dbSqlType) throws SQLException {
- if (value == null) {
- st.setNull(index, dbSqlType);
- return;
- }
- super.storeValue(st, index, value, dbSqlType);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/ShortSqlType.java b/jodd-db/src/main/java/jodd/db/type/ShortSqlType.java
deleted file mode 100644
index 93f137f44..000000000
--- a/jodd-db/src/main/java/jodd/db/type/ShortSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-
-public class ShortSqlType extends NullAwareSqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Short get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return Short.valueOf(rs.getShort(index));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Short value, final int dbSqlType) throws SQLException {
- st.setShort(index, value.shortValue());
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/SqlArraySqlType.java b/jodd-db/src/main/java/jodd/db/type/SqlArraySqlType.java
deleted file mode 100644
index dc7f7978d..000000000
--- a/jodd-db/src/main/java/jodd/db/type/SqlArraySqlType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.Array;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class SqlArraySqlType extends SqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Array get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getArray(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Array value, final int dbSqlType) throws SQLException {
- st.setArray(index, value);
- }
-
-}
\ No newline at end of file
diff --git a/jodd-db/src/main/java/jodd/db/type/SqlDateSqlType.java b/jodd-db/src/main/java/jodd/db/type/SqlDateSqlType.java
deleted file mode 100644
index 9d0fdc5c7..000000000
--- a/jodd-db/src/main/java/jodd/db/type/SqlDateSqlType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class SqlDateSqlType extends SqlType{
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Date get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getDate(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Date value, final int dbSqlType) throws SQLException {
- st.setDate(index, value);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/SqlRefSqlType.java b/jodd-db/src/main/java/jodd/db/type/SqlRefSqlType.java
deleted file mode 100644
index 150214550..000000000
--- a/jodd-db/src/main/java/jodd/db/type/SqlRefSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class SqlRefSqlType extends SqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Ref get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getRef(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final Ref value, final int dbSqlType) throws SQLException {
- st.setRef(index, value);
- }
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/SqlType.java b/jodd-db/src/main/java/jodd/db/type/SqlType.java
deleted file mode 100644
index 5e40f52b9..000000000
--- a/jodd-db/src/main/java/jodd/db/type/SqlType.java
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import jodd.typeconverter.TypeConverterManager;
-import jodd.util.ClassUtil;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * SQL type.
- */
-public abstract class SqlType {
-
- /**
- * Indicator for not yet resolved DB SQL type.
- */
- public static final int DB_SQLTYPE_UNKNOWN = Integer.MAX_VALUE;
-
- /**
- * Indicator for unavailable DB SQL type. Used usually when sql type is not
- * available by JDBC meta data or when column can not be matched
- * (due to case-mismatching).
- */
- public static final int DB_SQLTYPE_NOT_AVAILABLE = Integer.MIN_VALUE;
-
-
- protected Class sqlType;
-
- @SuppressWarnings({"unchecked"})
- protected SqlType() {
- this.sqlType = ClassUtil.getGenericSupertype(this.getClass(), 0);
- }
-
- /**
- * Sets prepared statement value.
- */
- public abstract void set(PreparedStatement st, int index, T value, int dbSqlType) throws SQLException;
-
- /**
- * Returns value from result set.
- * @param rs result set
- * @param index column index
- * @param dbSqlType java.sql.Types hint
- */
- public abstract T get(ResultSet rs, int index, int dbSqlType) throws SQLException;
-
-
- /**
- * Stores value in database. Value is casted to sql type.
- */
- public void storeValue(final PreparedStatement st, final int index, final Object value, final int dbSqlType) throws SQLException {
- final T t = TypeConverterManager.get().convertType(value, sqlType);
- set(st, index, t, dbSqlType);
- }
-
- /**
- * Reads value from database. Value is casted to destination type.
- * @param rs result set
- * @param index database column index
- * @param destinationType property type
- * @param dbSqlType hint for column sql type value
- */
- public E readValue(final ResultSet rs, final int index, final Class destinationType, final int dbSqlType) throws SQLException {
- final T t = get(rs, index, dbSqlType);
- return prepareGetValue(t, destinationType);
- }
-
- /**
- * Once when value is read from result set, prepare it to match destination type.
- * @param t get value
- * @param destinationType destination type
- */
- @SuppressWarnings({"unchecked"})
- protected E prepareGetValue(final T t, final Class destinationType) {
- if (t == null) {
- return null;
- }
- if (destinationType == null) {
- return (E) t;
- }
- return TypeConverterManager.get().convertType(t, destinationType);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/SqlTypeManager.java b/jodd-db/src/main/java/jodd/db/type/SqlTypeManager.java
deleted file mode 100644
index 2ee2d02c8..000000000
--- a/jodd-db/src/main/java/jodd/db/type/SqlTypeManager.java
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import jodd.db.DbSqlException;
-import jodd.mutable.MutableBoolean;
-import jodd.mutable.MutableByte;
-import jodd.mutable.MutableDouble;
-import jodd.mutable.MutableFloat;
-import jodd.mutable.MutableInteger;
-import jodd.mutable.MutableLong;
-import jodd.mutable.MutableShort;
-import jodd.time.JulianDate;
-import jodd.util.ClassUtil;
-import jodd.util.TypeCache;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.Ref;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
-/**
- * Provides dynamic object conversion to a type.
- * Contains a map of registered converters. User may add new converter.
- */
-public class SqlTypeManager {
-
- private static final SqlTypeManager SQL_TYPE_MANAGER = new SqlTypeManager();
-
- /**
- * Returns default implementation of the {@code SqlTypeManager}.
- */
- public static SqlTypeManager get() {
- return SQL_TYPE_MANAGER;
- }
-
- private final TypeCache types = TypeCache.createDefault();
- private final TypeCache sqlTypes = TypeCache.createDefault();
-
- public SqlTypeManager() {
- registerDefaults();
- }
-
- /**
- * Unregisters all converters.
- */
- public void unregisterAll() {
- types.clear();
- }
-
- /**
- * Registers default set of SQL types.
- */
- public void registerDefaults() {
- register(Integer.class, IntegerSqlType.class);
- register(int.class, IntegerSqlType.class);
- register(MutableInteger.class, IntegerSqlType.class);
-
- register(Float.class, FloatSqlType.class);
- register(float.class, FloatSqlType.class);
- register(MutableFloat.class, FloatSqlType.class);
-
- register(Double.class, DoubleSqlType.class);
- register(double.class, DoubleSqlType.class);
- register(MutableDouble.class, DoubleSqlType.class);
-
- register(Byte.class, ByteSqlType.class);
- register(byte.class, ByteSqlType.class);
- register(MutableByte.class, ByteSqlType.class);
-
- register(Boolean.class, BooleanSqlType.class);
- register(boolean.class, BooleanSqlType.class);
- register(MutableBoolean.class, BooleanSqlType.class);
-
- register(Long.class, LongSqlType.class);
- register(long.class, LongSqlType.class);
- register(MutableLong.class, LongSqlType.class);
-
- register(Short.class, ShortSqlType.class);
- register(short.class, ShortSqlType.class);
- register(MutableShort.class, ShortSqlType.class);
-
- register(Character.class, CharacterSqlType.class);
- register(char.class, CharacterSqlType.class);
-
- register(BigDecimal.class, BigDecimalSqlType.class);
- register(BigInteger.class, BigIntegerSqlType.class);
-
- register(String.class, StringSqlType.class);
-
- register(LocalDateTime.class, LocalDateTimeSqlType.class);
- register(LocalDate.class, LocalDateSqlType.class);
- register(LocalTime.class, LocalTimeSqlType.class);
- register(Date.class, SqlDateSqlType.class);
- register(Timestamp.class, TimestampSqlType.class);
- register(Time.class, TimeSqlType.class);
- register(java.util.Date.class, DateSqlType.class);
- register(JulianDate.class, JulianDateSqlType.class);
-
- register(byte[].class, ByteArraySqlType.class);
- register(URL.class, URLSqlType.class);
-
- register(Blob.class, BlobSqlType.class);
- register(Clob.class, ClobSqlType.class);
- register(Array.class, SqlArraySqlType.class);
- register(Ref.class, SqlRefSqlType.class);
- }
-
- /**
- * Registers sql type for provided type.
- */
- public void register(final Class type, final Class sqlTypeClass) {
- types.put(type, lookupSqlType(sqlTypeClass));
- }
-
- /**
- * Unregisters some sql type.
- */
- public void unregister(final Class type) {
- types.remove(type);
- }
-
- // ---------------------------------------------------------------- lookup
-
- /**
- * Retrieves SQL type for provided type. All subclasses and interfaces are examined
- * for matching sql type.
- */
- public SqlType lookup(final Class clazz) {
- SqlType sqlType;
- for (Class x = clazz; x != null; x = x.getSuperclass()) {
- sqlType = types.get(clazz);
- if (sqlType != null) {
- return sqlType;
- }
- final Class[] interfaces = x.getInterfaces();
- for (final Class i : interfaces) {
- sqlType = types.get(i);
- if (sqlType != null) {
- return sqlType;
- }
- }
- }
- return null;
- }
-
- /**
- * Returns sql type instance. Instances are stored for better performances.
- */
- public SqlType lookupSqlType(final Class sqlTypeClass) {
- return sqlTypes.get(sqlTypeClass, t -> {
- try {
- return ClassUtil.newInstance(sqlTypeClass);
- } catch (final Exception ex) {
- throw new DbSqlException("SQL type not found: " + sqlTypeClass.getSimpleName(), ex);
- }
- });
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/StringSqlType.java b/jodd-db/src/main/java/jodd/db/type/StringSqlType.java
deleted file mode 100644
index a2dfeb299..000000000
--- a/jodd-db/src/main/java/jodd/db/type/StringSqlType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class StringSqlType extends SqlType {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String get(final ResultSet rs, final int index, final int dbSqlType) throws SQLException {
- return rs.getString(index);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void set(final PreparedStatement st, final int index, final String value, final int dbSqlType) throws SQLException {
- st.setString(index, value);
- }
-
-}
diff --git a/jodd-db/src/main/java/jodd/db/type/TimeSqlType.java b/jodd-db/src/main/java/jodd/db/type/TimeSqlType.java
deleted file mode 100644
index 4ab2f918a..000000000
--- a/jodd-db/src/main/java/jodd/db/type/TimeSqlType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-present, Jodd Team (http://jodd.org)
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-
-package jodd.db.type;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import java.sql.Time;
-
-public class TimeSqlType extends SqlType