You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/02 21:32:05 UTC

git commit: javadocs errors that are failing Java 8 build

Repository: cayenne
Updated Branches:
  refs/heads/master 8f16b6072 -> 0c7ba3f1c


javadocs errors that are failing Java 8 build


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0c7ba3f1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0c7ba3f1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0c7ba3f1

Branch: refs/heads/master
Commit: 0c7ba3f1cbfb8380a10df122e2f7655c13e6d2b9
Parents: 8f16b60
Author: aadamchik <aa...@apache.org>
Authored: Sun Nov 2 23:31:57 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Nov 2 23:31:57 2014 +0300

----------------------------------------------------------------------
 .../cayenne/exp/parser/PatternMatchNode.java    |   4 +-
 .../org/apache/cayenne/log/JdbcEventLogger.java | 100 +++++++++----------
 2 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/0c7ba3f1/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
index a5181a8..c9e5cae 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/PatternMatchNode.java
@@ -53,7 +53,7 @@ public abstract class PatternMatchNode extends ConditionNode {
     /**
      * <p>This method will return an escape character for the like
      * clause.  The escape character will eventually end up in the
-     * query as <code>...(t0.foo LIKE ? {escape '|'})</code> where the
+     * query as <code>...(t0.foo LIKE ? &#123;escape '|'&#125;)</code> where the
      * pipe symbol is the escape character.</p>
      * <p/>
      * <p>Note that having no escape character is represented as
@@ -68,7 +68,7 @@ public abstract class PatternMatchNode extends ConditionNode {
      * <p>This method allows the setting of the escape character.
      * The escape character can be used in a LIKE clause.  The
      * character 0 signifies no escape character.  The escape
-     * characyer '?' is disallowed.</p>
+     * character '?' is disallowed.</p>
      */
 
     public void setEscapeChar(char value) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0c7ba3f1/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
index adbc8eb..59e3f1e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
@@ -31,72 +31,72 @@ import org.apache.cayenne.map.DbAttribute;
  */
 public interface JdbcEventLogger {
 
-    /**
-     * Logs an arbitrary message.
-     */
-    void log(String message);
+	/**
+	 * Logs an arbitrary message.
+	 */
+	void log(String message);
 
-    /**
-     * Logs database connection event using container data source.
-     */
-    void logConnect(String dataSource);
+	/**
+	 * Logs database connection event using container data source.
+	 */
+	void logConnect(String dataSource);
 
-    void logConnect(String url, String userName, String password);
+	void logConnect(String url, String userName, String password);
 
-    /**
-     * Logs database connection event.
-     */
-    void logPoolCreated(DataSourceInfo dsi);
+	/**
+	 * Logs database connection event.
+	 */
+	void logPoolCreated(DataSourceInfo dsi);
 
-    void logConnectSuccess();
+	void logConnectSuccess();
 
-    void logConnectFailure(Throwable th);
+	void logConnectFailure(Throwable th);
 
-    void logGeneratedKey(DbAttribute attribute, Object value);
+	void logGeneratedKey(DbAttribute attribute, Object value);
 
-    void logQuery(String sql, List<?> params);
+	void logQuery(String sql, List<?> params);
 
-    void logQuery(String sql, List<DbAttribute> attrs, List<?> params, long time);
+	void logQuery(String sql, List<DbAttribute> attrs, List<?> params, long time);
 
-    /**
-     * @since 4.0
-     */
-    void logQueryParameters(String label, BatchParameterBinding[] bindings);
+	/**
+	 * @since 4.0
+	 */
+	void logQueryParameters(String label, BatchParameterBinding[] bindings);
 
-    /**
-     * @deprecated since 4.0 in favor of
-     *             {@link #logQueryParameters(String, List)}
-     */
-    @Deprecated
-    void logQueryParameters(String label, List<DbAttribute> attrs, List<Object> parameters, boolean isInserting);
+	/**
+	 * @deprecated since 4.0 in favor of
+	 *             {@link #logQueryParameters(String, BatchParameterBinding[])}
+	 */
+	@Deprecated
+	void logQueryParameters(String label, List<DbAttribute> attrs, List<Object> parameters, boolean isInserting);
 
-    void logSelectCount(int count, long time);
+	void logSelectCount(int count, long time);
 
-    /**
-     * 
-     * @param count
-     * @param time
-     *            (milliseconds) time query took to run
-     * @param sql
-     *            SQL that was executed, printed when time exceeds timeThreshold
-     * 
-     * @since 4.0
-     */
-    void logSelectCount(int count, long time, String sql);
+	/**
+	 * 
+	 * @param count
+	 * @param time
+	 *            (milliseconds) time query took to run
+	 * @param sql
+	 *            SQL that was executed, printed when time exceeds timeThreshold
+	 * 
+	 * @since 4.0
+	 */
+	void logSelectCount(int count, long time, String sql);
 
-    void logUpdateCount(int count);
+	void logUpdateCount(int count);
 
-    void logBeginTransaction(String transactionLabel);
+	void logBeginTransaction(String transactionLabel);
 
-    void logCommitTransaction(String transactionLabel);
+	void logCommitTransaction(String transactionLabel);
 
-    void logRollbackTransaction(String transactionLabel);
+	void logRollbackTransaction(String transactionLabel);
 
-    void logQueryError(Throwable th);
+	void logQueryError(Throwable th);
 
-    /**
-     * Returns true if current thread default log level is high enough to
-     * generate output.
-     */
-    boolean isLoggable();
+	/**
+	 * Returns true if current thread default log level is high enough to
+	 * generate output.
+	 */
+	boolean isLoggable();
 }