Changeset 7730


Ignore:
Timestamp:
Jun 17, 2019, 8:40:32 AM (2 years ago)
Author:
Nicklas Nordborg
Message:

References #2185: Upgrade to Hibernate 5.4.x

Remove some and add some @Deprecation and @SuppressWarnings annotations due to changes in Hibernate API:s.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/.classpath

    r7726 r7730  
    3535  <classpathentry kind="lib" path="lib/dist/poi-ooxml-4.0.1.jar"/>
    3636  <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"/>
     37  <classpathentry kind="lib" path="lib/dist/hibernate-core-5.4.3.Final.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/src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java

    r7522 r7730  
    7676 
    7777  @Override
    78   @Deprecated
    7978  public boolean isCallable()
    8079  {
     
    9089
    9190  @Override
    92   @Deprecated
    9391  public NativeQuery<R> addScalar(String columnAlias)
    9492  {
     
    9896
    9997  @Override
    100   @Deprecated
    10198  public NativeQuery<R> addScalar(String columnAlias, Type type)
    10299  {
     
    105102  }
    106103
    107   @Override
    108   @Deprecated
     104  @SuppressWarnings("deprecation")
     105  @Override
    109106  public RootReturn addRoot(String tableAlias, String entityName)
    110107  {
     
    112109  }
    113110
    114   @SuppressWarnings("rawtypes")
    115   @Override
    116   @Deprecated
     111  @SuppressWarnings({ "rawtypes", "deprecation" })
     112  @Override
    117113  public RootReturn addRoot(String tableAlias, Class entityType)
    118114  {
     
    121117
    122118  @Override
    123   @Deprecated
    124119  public NativeQuery<R> addEntity(String entityName)
    125120  {
     
    129124
    130125  @Override
    131   @Deprecated
    132126  public NativeQuery<R> addEntity(String tableAlias, String entityName)
    133127  {
     
    137131
    138132  @Override
    139   @Deprecated
    140133  public NativeQuery<R> addEntity(String tableAlias, String entityName, LockMode lockMode)
    141134  {
     
    146139  @SuppressWarnings("rawtypes")
    147140  @Override
    148   @Deprecated
    149141  public NativeQuery<R> addEntity(Class entityType)
    150142  {
     
    155147  @SuppressWarnings("rawtypes")
    156148  @Override
    157   @Deprecated
    158149  public NativeQuery<R> addEntity(String tableAlias, Class entityType)
    159150  {
     
    164155  @SuppressWarnings("rawtypes")
    165156  @Override
    166   @Deprecated
    167157  public NativeQuery<R> addEntity(String tableAlias, Class entityClass, LockMode lockMode)
    168158  {
     
    171161  }
    172162
    173   @Override
    174   @Deprecated
     163  @SuppressWarnings("deprecation")
     164  @Override
    175165  public FetchReturn addFetch(String tableAlias, String ownerTableAlias, String joinPropertyName)
    176166  {
     
    179169
    180170  @Override
    181   @Deprecated
    182171  public NativeQuery<R> addJoin(String tableAlias, String path)
    183172  {
     
    187176
    188177  @Override
    189   @Deprecated
    190178  public NativeQuery<R> addJoin(String tableAlias, String ownerTableAlias, String joinPropertyName)
    191179  {
     
    195183
    196184  @Override
    197   @Deprecated
    198185  public NativeQuery<R> addJoin(String tableAlias, String path, LockMode lockMode)
    199186  {
     
    203190
    204191  @Override
    205   @Deprecated
    206192  public NativeQuery<R> setHibernateFlushMode(FlushMode flushMode)
    207193  {
     
    211197
    212198  @Override
    213   @Deprecated
    214199  public NativeQuery<R> setFlushMode(FlushModeType flushMode)
    215200  {
     
    219204
    220205  @Override
    221   @Deprecated
    222206  public NativeQuery<R> setCacheMode(CacheMode cacheMode)
    223207  {
     
    227211
    228212  @Override
    229   @Deprecated
    230213  public NativeQuery<R> setCacheable(boolean cacheable)
    231214  {
     
    235218
    236219  @Override
    237   @Deprecated
    238220  public NativeQuery<R> setCacheRegion(String cacheRegion)
    239221  {
     
    243225
    244226  @Override
    245   @Deprecated
    246227  public NativeQuery<R> setTimeout(int timeout)
    247228  {
     
    251232
    252233  @Override
    253   @Deprecated
    254234  public NativeQuery<R> setFetchSize(int fetchSize)
    255235  {
     
    259239
    260240  @Override
    261   @Deprecated
    262241  public NativeQuery<R> setReadOnly(boolean readOnly)
    263242  {
     
    266245
    267246  @Override
    268   @Deprecated
    269247  public NativeQuery<R> setLockOptions(LockOptions lockOptions)
    270248  {
     
    274252
    275253  @Override
    276   @Deprecated
    277254  public NativeQuery<R> setLockMode(String alias, LockMode lockMode)
    278255  {
     
    282259
    283260  @Override
    284   @Deprecated
    285261  public NativeQuery<R> setComment(String comment)
    286262  {
     
    290266
    291267  @Override
    292   @Deprecated
    293268  public NativeQuery<R> addQueryHint(String hint)
    294269  {
     
    303278  }
    304279
    305   @Override
    306   @Deprecated
     280  @SuppressWarnings("deprecation")
     281  @Override
    307282  public NativeQuery<R> setFlushMode(FlushMode flushMode)
    308283  {
  • trunk/src/core/net/sf/basedb/core/hibernate/SessionWrapper.java

    r7726 r7730  
    174174  }
    175175
    176   @SuppressWarnings("deprecation")
    177   @Override
     176  @Override
     177  @Deprecated
    178178  public org.hibernate.Query<?> createFilter(Object collection, String queryString)
    179179    throws HibernateException
     
    206206    and cache it.
    207207  */
    208   @Override
    209   @Deprecated
     208  @SuppressWarnings("deprecation")
     209  @Override
    210210  public NativeQuery<?> createSQLQuery(String queryString)
    211211    throws HibernateException
     
    310310  }
    311311
    312   @Deprecated
    313312  @Override
    314313  public Object get(String entityName, Serializable id, LockMode lockMode)
     
    506505  }
    507506
    508   @Deprecated
    509507  @Override
    510508  public void lock(Object object, LockMode lockMode)
     
    514512  }
    515513
    516   @Deprecated
    517514  @Override
    518515  public void lock(String entityName, Object object, LockMode lockMode)
     
    557554  }
    558555
    559   @Deprecated
    560556  @Override
    561557  public void refresh(Object object, LockMode lockMode)
  • trunk/src/core/net/sf/basedb/core/hibernate/StatelessSessionWrapper.java

    r7726 r7730  
    213213  */
    214214  @Override
    215   public org.hibernate.query.Query<?> getNamedQuery(String queryName)
     215  public Query<?> getNamedQuery(String queryName)
    216216    throws HibernateException
    217217  {
    218     org.hibernate.query.Query<?> q = session.getNamedQuery(queryName);
    219     return q;
     218    return session.getNamedQuery(queryName);
    220219  }
    221220
Note: See TracChangeset for help on using the changeset viewer.