mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
No effective change - code cleanup - change return to void
This commit is contained in:
1 parent
ea504a93cf
commit
f06c1b83a9
21 files changed
+45
-72
No files matched your search
@@ -215,17 +215,16 @@ public final class DRawSqlSelectColumnsParser {
|
||||
return columnLabel.equalsIgnoreCase(prop.getDbColumn()) || columnLabel.equalsIgnoreCase(prop.getName());
|
||||
}
|
||||
|
||||
private int nextComma() {
|
||||
private void nextComma() {
|
||||
boolean inQuote = false;
|
||||
while (pos < end) {
|
||||
char c = sqlSelect.charAt(pos);
|
||||
if (c == '\'') {
|
||||
inQuote = !inQuote;
|
||||
} else if (!inQuote && c == ',') {
|
||||
return pos;
|
||||
return;
|
||||
}
|
||||
pos++;
|
||||
}
|
||||
return pos;
|
||||
}
|
||||
}
|
||||
@@ -103,7 +103,7 @@ public class DeployOrmXml {
|
||||
return ormXmlList;
|
||||
}
|
||||
|
||||
private boolean readOrmXml(String ormXmlName, ArrayList<Dnode> ormXmlList) {
|
||||
private void readOrmXml(String ormXmlName, ArrayList<Dnode> ormXmlList) {
|
||||
|
||||
try {
|
||||
Dnode ormXml = null;
|
||||
@@ -120,14 +120,10 @@ public class DeployOrmXml {
|
||||
if (ormXml != null) {
|
||||
ormXml.setAttribute("ebean.filename", ormXmlName);
|
||||
ormXmlList.add(ormXml);
|
||||
return true;
|
||||
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
} catch (IOException e) {
|
||||
logger.error("error reading orm xml deployment " + ormXmlName, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -183,12 +183,12 @@ public class DeployTableJoin {
|
||||
return copyInternal(inverse, true, tableName, true);
|
||||
}
|
||||
|
||||
public DeployTableJoin copyTo(DeployTableJoin destJoin, boolean reverse, String tableName) {
|
||||
return copyInternal(destJoin, reverse, tableName, true);
|
||||
public void copyTo(DeployTableJoin destJoin, boolean reverse, String tableName) {
|
||||
copyInternal(destJoin, reverse, tableName, true);
|
||||
}
|
||||
|
||||
public DeployTableJoin copyWithoutType(DeployTableJoin destJoin, boolean reverse, String tableName) {
|
||||
return copyInternal(destJoin, reverse, tableName, false);
|
||||
public void copyWithoutType(DeployTableJoin destJoin, boolean reverse, String tableName) {
|
||||
copyInternal(destJoin, reverse, tableName, false);
|
||||
}
|
||||
|
||||
private DeployTableJoin copyInternal(DeployTableJoin destJoin, boolean reverse, String tableName, boolean withType) {
|
||||
|
||||
@@ -78,7 +78,7 @@ public class DeployInherit {
|
||||
}
|
||||
}
|
||||
|
||||
private InheritInfo createFinalInfo(InheritInfo root, InheritInfo parent, DeployInheritInfo deploy) {
|
||||
private void createFinalInfo(InheritInfo root, InheritInfo parent, DeployInheritInfo deploy) {
|
||||
|
||||
InheritInfo node = new InheritInfo(root, parent, deploy);
|
||||
if (parent != null) {
|
||||
@@ -94,8 +94,6 @@ public class DeployInherit {
|
||||
for (DeployInheritInfo childDeploy : deploy.children()) {
|
||||
createFinalInfo(root, node, childDeploy);
|
||||
}
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -103,7 +103,7 @@ public class DeployUtil {
|
||||
return new DataEncryptSupport(encryptKeyManager, bytesEncryptor, table, column);
|
||||
}
|
||||
|
||||
public ScalarType<?> setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
|
||||
public void setEnumScalarType(Enumerated enumerated, DeployBeanProperty prop) {
|
||||
|
||||
Class<?> enumType = prop.getPropertyType();
|
||||
if (!enumType.isEnum()) {
|
||||
@@ -123,7 +123,6 @@ public class DeployUtil {
|
||||
}
|
||||
prop.setScalarType(scalarType);
|
||||
prop.setDbType(scalarType.getJdbcType());
|
||||
return scalarType;
|
||||
}
|
||||
|
||||
private ScalarType<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type, int dbType) {
|
||||
|
||||
Reference in new issue
Block a user