Permalink
Browse files

Merge branch 'master' of git@github.com:j256/ormlite-core.git

  • Loading branch information...
2 parents 5896fc3 + b72b5c3 commit bdfcf050ab2f313e5ea4be262e45de62e75baffb @j256 committed Nov 20, 2016
@@ -78,7 +78,7 @@
protected ObjectFactory<T> objectFactory;
private boolean initialized;
- private ObjectCache objectCache;
+ ObjectCache objectCache;
private Map<DaoObserver, Object> daoObserverMap;
/**
@@ -1083,7 +1083,7 @@ protected void checkForInitialized() {
throw new IllegalArgumentException("Could not find a field named " + fieldName);
}
- private CloseableIterator<T> createIterator(int resultFlags) {
+ CloseableIterator<T> createIterator(int resultFlags) {
try {
SelectIterator<T, ID> iterator =
statementExecutor.buildIterator(this, connectionSource, resultFlags, objectCache);
@@ -1093,7 +1093,7 @@ protected void checkForInitialized() {
}
}
- private CloseableIterator<T> createIterator(PreparedQuery<T> preparedQuery, int resultFlags) throws SQLException {
+ CloseableIterator<T> createIterator(PreparedQuery<T> preparedQuery, int resultFlags) throws SQLException {
try {
SelectIterator<T, ID> iterator =
statementExecutor.buildIterator(this, connectionSource, preparedQuery, objectCache, resultFlags);
@@ -299,7 +299,7 @@ public int hashCode() {
return super.hashCode();
}
- private CloseableIterator<T> seperateIteratorThrow(int flags) throws SQLException {
+ CloseableIterator<T> seperateIteratorThrow(int flags) throws SQLException {
// check state to make sure we have a DAO in case we have a deserialized collection
if (dao == null) {
throw new IllegalStateException(
@@ -1156,6 +1156,10 @@ private void assignDataType(DatabaseType databaseType, DataPersister dataPersist
}
private static class LevelCounters {
+
+ LevelCounters() {
+ }
+
// current auto-refresh recursion level
int autoRefreshLevel;
// maximum auto-refresh recursion level
@@ -881,7 +881,7 @@ private void appendAlias(StringBuilder sb) {
/**
* Encapsulates our join information.
*/
- private class JoinInfo {
+ private static class JoinInfo {
final JoinType type;
final QueryBuilder<?, ?> queryBuilder;
FieldType localField;
@@ -944,7 +944,7 @@ public void appendStatementString(StringBuilder sb, List<ArgumentHolder> argList
// end
;
- private String sql;
+ final String sql;
private JoinType(String sql) {
this.sql = sql;
@@ -963,7 +963,7 @@ private JoinType(String sql) {
// end
;
- private WhereOperation whereOperation;
+ final WhereOperation whereOperation;
private JoinWhereOperation(WhereOperation whereOperation) {
this.whereOperation = whereOperation;
@@ -253,7 +253,7 @@ public boolean isOkForExecute() {
private final String statement;
private final List<ArgumentHolder> argList;
- private StatementInfo(String statement, List<ArgumentHolder> argList) {
+ StatementInfo(String statement, List<ArgumentHolder> argList) {
this.argList = argList;
this.statement = statement;
}
@@ -110,7 +110,7 @@
private int clauseStackLevel;
private NeedsFutureClause needsFuture = null;
- Where(TableInfo<T, ID> tableInfo, StatementBuilder<T, ID> statementBuilder, DatabaseType databaseType) {
+ protected Where(TableInfo<T, ID> tableInfo, StatementBuilder<T, ID> statementBuilder, DatabaseType databaseType) {
// limit the constructor scope
this.tableInfo = tableInfo;
this.statementBuilder = statementBuilder;

0 comments on commit bdfcf05

Please sign in to comment.