Changeset 7726


Ignore:
Timestamp:
Jun 14, 2019, 12:49:14 PM (2 years ago)
Author:
Nicklas Nordborg
Message:

References #2185: Upgrade to Hibernate 5.4.x

Hibernate was updated to 5.4.3. Some minor code changes due to deprecation and additions to interfaces. There is still a warning about a deprecation in Dialect that should be resolved.

Installation and TestAll seems to work as expected.

Location:
trunk
Files:
13 added
9 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/.classpath

    r7644 r7726  
    2525  <classpathentry kind="lib" path="lib/dist/commons-validator-1.6.jar"/>
    2626  <classpathentry kind="lib" path="lib/dist/postgresql-42.2.5.jar"/>
    27   <classpathentry kind="lib" path="lib/dist/hibernate-core-5.3.7.Final.jar"/>
    2827  <classpathentry kind="lib" path="lib/dist/javax.persistence-api-2.2.jar"/>
    2928  <classpathentry kind="lib" path="lib/dist/httpclient-4.5.6.jar"/>
     
    3635  <classpathentry kind="lib" path="lib/dist/poi-ooxml-4.0.1.jar"/>
    3736  <classpathentry kind="lib" path="lib/dist/poi-4.0.1.jar"/>
     37  <classpathentry kind="lib" path="lib/dist/hibernate-core-5.4.3.Final.jar" sourcepath="D:/Temp/Sys/.org.sf.feeling.decompiler1560490689756/source/hibernate-core-5.4.3.Final-sources.jar"/>
    3838  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
    3939    <attributes>
  • trunk/doc/3rd-party-components.txt

    r7712 r7726  
    4040
    4141More info : http://www.hibernate.org/
    42 Version   : 5.3.7
     42Version   : 5.4.3
    4343License   : LGPL (hibernate.license.txt)
    44 Jar files : hibernate-core-5.3.7.Final.jar, hibernate-commons-annotations-5.0.4.Final.jar,
     44Jar files : hibernate-core-5.4.3.Final.jar, hibernate-commons-annotations-5.1.0.Final.jar,
    4545            javax.persistence-api-2.2.jar,
    4646            antlr-2.7.7.jar, dom4j-2.1.1.jar, jandex-2.0.5.Final.jar,
    47             javassist-3.23.1-GA.jar, byte-buddy-1.18.17.jar, classmate-1.3.4.jar
     47            javassist-3.24.0-GA.jar, byte-buddy-1.9.10.jar, classmate-1.3.4.jar
    4848            jboss-logging-3.3.2.Final.jar, jboss-transaction-api_1.2_spec-1.1.1.Final.jar,
    49             c3p0-0.9.5.2.jar, hibernate-c3p0-5.3.7.Final.jar, mchange-commons-java-0.2.11.jar,
    50             ehcache-2.10.3.jar, hibernate-ehcache-5.3.7.Final.jar,
    51             slf4j-api.1.7.25.jar, slf4j-log4j12-1.7.25.jar
     49            c3p0-0.9.5.3.jar, hibernate-c3p0-5.4.3.Final.jar, mchange-commons-java-0.2.15.jar,
     50            ehcache-2.10.6.jar, hibernate-ehcache-5.4.3.Final.jar,
     51            slf4j-api.1.7.25.jar, slf4j-log4j12-1.7.25.jar,
     52            FastInfoset-1.2.15.jar, istack-commons-runtime-3.0.7.jar, stax-ex-1.8.jar,
     53            txw2-2.3.1.jar
    5254
    5355Note: Most of the jar files above are other 3rd-party components used by Hibernate.
  • trunk/src/core/net/sf/basedb/core/hibernate/QueryWrapper.java

    r7522 r7726  
    5757import org.hibernate.ScrollableResults;
    5858import org.hibernate.engine.spi.RowSelection;
     59import org.hibernate.graph.GraphSemantic;
     60import org.hibernate.graph.RootGraph;
    5961import org.hibernate.transform.ResultTransformer;
    6062import org.hibernate.type.Type;
     
    11041106  }
    11051107
     1108  @SuppressWarnings("rawtypes")
     1109  @Override
     1110  public Query<R> applyGraph(RootGraph graph, GraphSemantic semantic)
     1111  {
     1112    query.applyGraph(graph, semantic);
     1113    return this;
     1114  }
     1115
    11061116}
  • trunk/src/core/net/sf/basedb/core/hibernate/SessionWrapper.java

    r7522 r7726  
    5858import org.hibernate.TypeHelper;
    5959import org.hibernate.UnknownProfileException;
     60import org.hibernate.graph.RootGraph;
    6061import org.hibernate.jdbc.ReturningWork;
    6162import org.hibernate.jdbc.Work;
     
    911912
    912913  @Override
    913   public <T> EntityGraph<T> createEntityGraph(Class<T> rootType)
     914  public <T> RootGraph<T> createEntityGraph(Class<T> rootType)
    914915  {
    915916    return session.createEntityGraph(rootType);
     
    917918
    918919  @Override
    919   public EntityGraph<?> createEntityGraph(String graphName)
     920  public RootGraph<?> createEntityGraph(String graphName)
    920921  {
    921922    return session.createEntityGraph(graphName);
     
    990991
    991992  @Override
    992   public EntityGraph<?> getEntityGraph(String graphName)
     993  public RootGraph<?> getEntityGraph(String graphName)
    993994  {
    994995    return session.getEntityGraph(graphName);
  • trunk/src/core/net/sf/basedb/core/hibernate/StatelessSessionWrapper.java

    r7522 r7726  
    146146  */
    147147  @Override
    148   @SuppressWarnings("deprecation")
    149   public org.hibernate.Query<?> createQuery(String queryString)
     148  public org.hibernate.query.Query<?> createQuery(String queryString)
    150149    throws HibernateException
    151150  {
    152     org.hibernate.Query<?> q = session.createQuery(queryString);
     151    org.hibernate.query.Query<?> q = session.createQuery(queryString);
    153152    q.setFetchSize(HibernateUtil.getJdbcFetchSize());
    154153    return q;
     
    161160  */
    162161  @Override
    163   @Deprecated
    164   public org.hibernate.SQLQuery<?> createSQLQuery(String queryString)
     162  @SuppressWarnings("deprecation")
     163  public org.hibernate.query.NativeQuery<?> createSQLQuery(String queryString)
    165164    throws HibernateException
    166165  {
    167     org.hibernate.SQLQuery<?> q = session.createSQLQuery(queryString);
     166    org.hibernate.query.NativeQuery<?> q = session.createSQLQuery(queryString);
    168167    q.setFetchSize(HibernateUtil.getJdbcFetchSize());
    169168    return q;
     
    214213  */
    215214  @Override
    216   @SuppressWarnings("deprecation")
    217   public org.hibernate.Query<?> getNamedQuery(String queryName)
     215  public org.hibernate.query.Query<?> getNamedQuery(String queryName)
    218216    throws HibernateException
    219217  {
    220     org.hibernate.Query<?> q = session.getNamedQuery(queryName);
     218    org.hibernate.query.Query<?> q = session.getNamedQuery(queryName);
    221219    return q;
    222220  }
Note: See TracChangeset for help on using the changeset viewer.