Skip to content

Various new features added #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sproket wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Various new features added #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

# $Id$

build.version=1.1.1
build.version=1.1.1-DH
36 changes: 21 additions & 15 deletions src/main/net/sf/persist/DefaultNameGuesser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,28 @@
*/
public final class DefaultNameGuesser implements NameGuesser {

/**
* Given a field or class name in the form CompoundName (for classes) or
* compoundName (for fields) will return a set of guessed names such as
* [compound_name, compound_names, compoundname, compoundnames].
*/
public Set<String> guessColumn(final String fieldOrClassName) {
/**
* Given a field or class name in the form CompoundName (for classes) or
* compoundName (for fields) will return a set of guessed names such as
* [compound_name, compound_names, compoundname, compoundnames].
*/
public Set<String> guessColumn(final String fieldOrClassName) {

final String nameUnderscore = fieldOrClassName.replaceAll("([A-Z])", "_$1").toLowerCase();
final String nameLowercase = fieldOrClassName.toLowerCase(Locale.ENGLISH);
final String nameUnderscore = fieldOrClassName.replaceAll("([A-Z])", "_$1").toLowerCase();
final String nameLowercase = fieldOrClassName.toLowerCase(Locale.ENGLISH);

final Set<String> names = new LinkedHashSet();
names.add(nameUnderscore);
names.add(nameLowercase);
names.add(nameUnderscore + "s");
names.add(nameLowercase + "s");
return names;
}
final Set<String> names = new LinkedHashSet();
names.add(nameUnderscore);
names.add(nameLowercase);
if (fieldOrClassName.endsWith("y")) {
// Handles Countries = Country and Categories = Category etc...
names.add(nameUnderscore.substring(0, nameUnderscore.length() - 1) + "ies");
names.add(nameLowercase.substring(0, nameLowercase.length() - 1) + "ies");
} else {
names.add(nameUnderscore + "s");
names.add(nameLowercase + "s");
}
return names;
}

}
319 changes: 163 additions & 156 deletions src/main/net/sf/persist/Log.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,161 +9,168 @@
*/
public final class Log {

// avoid instantiation
private Log() {
// do nothing
}

public static final String ENGINE = "persist.engine";
public static final String PROFILING = "persist.profiling";
public static final String RESULTS = "persist.results";
public static final String PARAMETERS = "persist.parameters";

private static boolean log4jAvailable = false;
static {
try {
Class.forName("org.apache.log4j.Logger");
log4jAvailable = true;
} catch (ClassNotFoundException e) {
log4jAvailable = false;
}
}

public static void trace(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).trace(message);
}
}

public static boolean isTraceEnabled(final String name) {
return log4jAvailable && Logger.getLogger(name).isTraceEnabled();
}

public static void debug(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).debug(message);
}
}

public static boolean isDebugEnabled(final String name) {
return log4jAvailable && Logger.getLogger(name).isDebugEnabled();
}

public static void info(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).info(message);
}
}

public static boolean isInfoEnabled(final String name) {
return log4jAvailable && Logger.getLogger(name).isInfoEnabled();
}

public static void error(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).error(message);
}
}

/**
* Converts types expected in prepared statement parameters to a suitable
* string to be added to log output.
*/
public static String objectToString(final Object obj) {

String str = null;

if (obj instanceof String) {
str = (String) obj;
} else if (obj instanceof byte[]) {
str = java.util.Arrays.toString((byte[]) obj);
str = str.substring(1, str.length() - 1);
} else if (obj instanceof Byte[]) {
str = java.util.Arrays.toString((Byte[]) obj);
str = str.substring(1, str.length() - 1);
} else if (obj instanceof char[]) {
str = java.util.Arrays.toString((char[]) obj);
str = str.substring(1, str.length() - 1);
} else if (obj instanceof Character[]) {
str = java.util.Arrays.toString((Character[]) obj);
str = str.substring(1, str.length() - 1);
} else {
str = obj == null ? "null" : obj.toString();
}

return (str.length() > 64) ? str.substring(0, 64) + "..." : str;
}

public static String sqlTypeToString(final int type) {

final String ret;

if (type == java.sql.Types.ARRAY) {
ret = "ARRAY";
} else if (type == java.sql.Types.BIGINT) {
ret = "BIGINT";
} else if (type == java.sql.Types.BINARY) {
ret = "BINARY";
} else if (type == java.sql.Types.BIT) {
ret = "BIT";
} else if (type == java.sql.Types.BLOB) {
ret = "BLOB";
} else if (type == java.sql.Types.BOOLEAN) {
ret = "BOOLEAN";
} else if (type == java.sql.Types.CHAR) {
ret = "CHAR";
} else if (type == java.sql.Types.CLOB) {
ret = "CLOB";
} else if (type == java.sql.Types.DATALINK) {
ret = "DATALINK";
} else if (type == java.sql.Types.DATE) {
ret = "DATE";
} else if (type == java.sql.Types.DECIMAL) {
ret = "DECIMAL";
} else if (type == java.sql.Types.DISTINCT) {
ret = "DISTINCT";
} else if (type == java.sql.Types.DOUBLE) {
ret = "DOUBLE";
} else if (type == java.sql.Types.FLOAT) {
ret = "FLOAT";
} else if (type == java.sql.Types.INTEGER) {
ret = "INTEGER";
} else if (type == java.sql.Types.JAVA_OBJECT) {
ret = "JAVA_OBJECT";
} else if (type == java.sql.Types.LONGVARBINARY) {
ret = "LONGVARBINARY";
} else if (type == java.sql.Types.LONGVARCHAR) {
ret = "LONGVARCHAR";
} else if (type == java.sql.Types.NULL) {
ret = "NULL";
} else if (type == java.sql.Types.NUMERIC) {
ret = "NUMERIC";
} else if (type == java.sql.Types.OTHER) {
ret = "OTHER";
} else if (type == java.sql.Types.REAL) {
ret = "REAL";
} else if (type == java.sql.Types.REF) {
ret = "REF";
} else if (type == java.sql.Types.SMALLINT) {
ret = "SMALLINT";
} else if (type == java.sql.Types.STRUCT) {
ret = "STRUCT";
} else if (type == java.sql.Types.TIME) {
ret = "TIME";
} else if (type == java.sql.Types.TIMESTAMP) {
ret = "TIMESTAMP";
} else if (type == java.sql.Types.TINYINT) {
ret = "TINYINT";
} else if (type == java.sql.Types.VARBINARY) {
ret = "VARBINARY";
} else if (type == java.sql.Types.VARCHAR) {
ret = "VARCHAR";
} else {
ret = "" + type;
}

return ret;

}
// avoid instantiation
private Log() {
// do nothing
}

public static final String ENGINE = "persist.engine";
public static final String PROFILING = "persist.profiling";
public static final String RESULTS = "persist.results";
public static final String PARAMETERS = "persist.parameters";

private static boolean log4jAvailable = false;

static {
try {
Class.forName("org.apache.log4j.Logger");
log4jAvailable = true;
} catch (ClassNotFoundException e) {
log4jAvailable = false;
}
}

public static void trace(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).trace(message);
}
}

public static boolean isTraceEnabled(final String name) {
return log4jAvailable && Logger.getLogger(name).isTraceEnabled();
}

public static void debug(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).debug(message);
}
}

public static boolean isDebugEnabled(final String name) {
return log4jAvailable && Logger.getLogger(name).isDebugEnabled();
}

public static void info(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).info(message);
}
}

public static boolean isInfoEnabled(final String name) {
return log4jAvailable && Logger.getLogger(name).isInfoEnabled();
}

public static void error(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).error(message);
}
}

public static void warn(final String name, final Object message) {
if (log4jAvailable) {
Logger.getLogger(name).warn(message);
}
}

/**
* Converts types expected in prepared statement parameters to a suitable
* string to be added to log output.
*/
public static String objectToString(final Object obj) {

String str = null;

if (obj instanceof String) {
str = (String) obj;
} else if (obj instanceof byte[]) {
str = java.util.Arrays.toString((byte[]) obj);
str = str.substring(1, str.length() - 1);
} else if (obj instanceof Byte[]) {
str = java.util.Arrays.toString((Byte[]) obj);
str = str.substring(1, str.length() - 1);
} else if (obj instanceof char[]) {
str = java.util.Arrays.toString((char[]) obj);
str = str.substring(1, str.length() - 1);
} else if (obj instanceof Character[]) {
str = java.util.Arrays.toString((Character[]) obj);
str = str.substring(1, str.length() - 1);
} else {
str = obj == null ? "null" : obj.toString();
}

return (str.length() > 64) ? str.substring(0, 64) + "..." : str;
}

public static String sqlTypeToString(final int type) {

final String ret;

if (type == java.sql.Types.ARRAY) {
ret = "ARRAY";
} else if (type == java.sql.Types.BIGINT) {
ret = "BIGINT";
} else if (type == java.sql.Types.BINARY) {
ret = "BINARY";
} else if (type == java.sql.Types.BIT) {
ret = "BIT";
} else if (type == java.sql.Types.BLOB) {
ret = "BLOB";
} else if (type == java.sql.Types.BOOLEAN) {
ret = "BOOLEAN";
} else if (type == java.sql.Types.CHAR) {
ret = "CHAR";
} else if (type == java.sql.Types.CLOB) {
ret = "CLOB";
} else if (type == java.sql.Types.DATALINK) {
ret = "DATALINK";
} else if (type == java.sql.Types.DATE) {
ret = "DATE";
} else if (type == java.sql.Types.DECIMAL) {
ret = "DECIMAL";
} else if (type == java.sql.Types.DISTINCT) {
ret = "DISTINCT";
} else if (type == java.sql.Types.DOUBLE) {
ret = "DOUBLE";
} else if (type == java.sql.Types.FLOAT) {
ret = "FLOAT";
} else if (type == java.sql.Types.INTEGER) {
ret = "INTEGER";
} else if (type == java.sql.Types.JAVA_OBJECT) {
ret = "JAVA_OBJECT";
} else if (type == java.sql.Types.LONGVARBINARY) {
ret = "LONGVARBINARY";
} else if (type == java.sql.Types.LONGVARCHAR) {
ret = "LONGVARCHAR";
} else if (type == java.sql.Types.NULL) {
ret = "NULL";
} else if (type == java.sql.Types.NUMERIC) {
ret = "NUMERIC";
} else if (type == java.sql.Types.OTHER) {
ret = "OTHER";
} else if (type == java.sql.Types.REAL) {
ret = "REAL";
} else if (type == java.sql.Types.REF) {
ret = "REF";
} else if (type == java.sql.Types.SMALLINT) {
ret = "SMALLINT";
} else if (type == java.sql.Types.STRUCT) {
ret = "STRUCT";
} else if (type == java.sql.Types.TIME) {
ret = "TIME";
} else if (type == java.sql.Types.TIMESTAMP) {
ret = "TIMESTAMP";
} else if (type == java.sql.Types.TINYINT) {
ret = "TINYINT";
} else if (type == java.sql.Types.VARBINARY) {
ret = "VARBINARY";
} else if (type == java.sql.Types.VARCHAR) {
ret = "VARCHAR";
} else {
ret = "" + type;
}

return ret;

}

}
Loading