Merge remote-tracking branch 'remotes/origin/master' into ks-narrow-search-pointcut

This commit is contained in:
Ken Stevens 2019-10-03 13:09:37 -04:00
commit 6a2b62b3ea
1 changed files with 5 additions and 1 deletions

View File

@ -38,10 +38,14 @@ import java.util.Collection;
public class ResourceHistoryTable extends BaseHasResource implements Serializable { public class ResourceHistoryTable extends BaseHasResource implements Serializable {
public static final String IDX_RESVER_ID_VER = "IDX_RESVER_ID_VER"; public static final String IDX_RESVER_ID_VER = "IDX_RESVER_ID_VER";
/** /**
* @see ResourceEncodingEnum * @see ResourceEncodingEnum
*/ */
static final int ENCODING_COL_LENGTH = 5; // Don't reduce the visibility here, we reference this from Smile
@SuppressWarnings("WeakerAccess")
public static final int ENCODING_COL_LENGTH = 5;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@SequenceGenerator(name = "SEQ_RESOURCE_HISTORY_ID", sequenceName = "SEQ_RESOURCE_HISTORY_ID") @SequenceGenerator(name = "SEQ_RESOURCE_HISTORY_ID", sequenceName = "SEQ_RESOURCE_HISTORY_ID")