cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r962798 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne: access/jdbc/ access/trans/ merge/
Date Sat, 10 Jul 2010 09:31:36 GMT
Author: aadamchik
Date: Sat Jul 10 09:31:36 2010
New Revision: 962798

URL: http://svn.apache.org/viewvc?rev=962798&view=rev
Log:
javadocs warnings cleanup

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DefaultBatchQueryBuilderFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerToken.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DefaultBatchQueryBuilderFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DefaultBatchQueryBuilderFactory.java?rev=962798&r1=962797&r2=962798&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DefaultBatchQueryBuilderFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DefaultBatchQueryBuilderFactory.java
Sat Jul 10 09:31:36 2010
@@ -1,44 +1,44 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-package org.apache.cayenne.access.jdbc;
-
-import org.apache.cayenne.access.trans.BatchQueryBuilder;
-import org.apache.cayenne.access.trans.DeleteBatchQueryBuilder;
-import org.apache.cayenne.access.trans.InsertBatchQueryBuilder;
-import org.apache.cayenne.access.trans.UpdateBatchQueryBuilder;
-import org.apache.cayenne.dba.DbAdapter;
-
-/**
- * Default implementation of {@link #BatchQueryBuilderFactory}
- */
-public class DefaultBatchQueryBuilderFactory implements BatchQueryBuilderFactory {
-
-    public BatchQueryBuilder createDeleteQueryBuilder(DbAdapter adapter) {
-        return new DeleteBatchQueryBuilder(adapter);
-    }
-
-    public BatchQueryBuilder createInsertQueryBuilder(DbAdapter adapter) {
-        return new InsertBatchQueryBuilder(adapter);
-    }
-
-    public BatchQueryBuilder createUpdateQueryBuilder(DbAdapter adapter) {
-        return new UpdateBatchQueryBuilder(adapter);
-    }
-    
-}
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.access.jdbc;
+
+import org.apache.cayenne.access.trans.BatchQueryBuilder;
+import org.apache.cayenne.access.trans.DeleteBatchQueryBuilder;
+import org.apache.cayenne.access.trans.InsertBatchQueryBuilder;
+import org.apache.cayenne.access.trans.UpdateBatchQueryBuilder;
+import org.apache.cayenne.dba.DbAdapter;
+
+/**
+ * Default implementation of {@link BatchQueryBuilderFactory}.
+ */
+public class DefaultBatchQueryBuilderFactory implements BatchQueryBuilderFactory {
+
+    public BatchQueryBuilder createDeleteQueryBuilder(DbAdapter adapter) {
+        return new DeleteBatchQueryBuilder(adapter);
+    }
+
+    public BatchQueryBuilder createInsertQueryBuilder(DbAdapter adapter) {
+        return new InsertBatchQueryBuilder(adapter);
+    }
+
+    public BatchQueryBuilder createUpdateQueryBuilder(DbAdapter adapter) {
+        return new UpdateBatchQueryBuilder(adapter);
+    }
+    
+}

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilder.java?rev=962798&r1=962797&r2=962798&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilder.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilder.java
Sat Jul 10 09:31:36 2010
@@ -30,31 +30,33 @@ import org.apache.cayenne.map.DbAttribut
 import org.apache.cayenne.query.BatchQuery;
 
 /**
- * Implementation of {@link #DeleteBatchQueryBuilder}, which uses 'soft' delete
- * (runs UPDATE and sets 'deleted' field to true instead-of running SQL DELETE)
+ * Implementation of {@link DeleteBatchQueryBuilder}, which uses 'soft' delete (runs
+ * UPDATE and sets 'deleted' field to true instead-of running SQL DELETE)
  */
 public class SoftDeleteBatchQueryBuilder extends DeleteBatchQueryBuilder {
+
     private String deletedFieldName;
 
     public SoftDeleteBatchQueryBuilder(DbAdapter adapter, String deletedFieldName) {
         super(adapter);
         this.deletedFieldName = deletedFieldName;
     }
-    
+
     @Override
     public String createSqlString(BatchQuery batch) throws IOException {
         if (!needSoftDelete(batch)) {
             return super.createSqlString(batch);
         }
-        
-        boolean status = batch.getDbEntity().getDataMap() != null 
-            && batch.getDbEntity().getDataMap().isQuotingSQLIdentifiers();
-        
+
+        boolean status = batch.getDbEntity().getDataMap() != null
+                && batch.getDbEntity().getDataMap().isQuotingSQLIdentifiers();
+
         QuotingStrategy strategy = getAdapter().getQuotingStrategy(status);
-       
+
         StringBuffer query = new StringBuffer("UPDATE ");
         query.append(strategy.quoteFullyQualifiedName(batch.getDbEntity()));
-        query.append(" SET ").append(strategy.quoteString(deletedFieldName)).append(" = ?");
+        query.append(" SET ").append(strategy.quoteString(deletedFieldName)).append(
+                " = ?");
 
         applyQualifier(query, batch);
 
@@ -65,28 +67,24 @@ public class SoftDeleteBatchQueryBuilder
     protected int getFirstParameterIndex(BatchQuery query) {
         return needSoftDelete(query) ? 2 : 1;
     }
-    
+
     @Override
     public void bindParameters(PreparedStatement statement, BatchQuery query)
             throws SQLException, Exception {
         if (needSoftDelete(query)) {
-            //binding first parameter (which is 'deleted') as true
-            adapter.bindParameter(
-                    statement,
-                    true,
-                    1,
-                    Types.BOOLEAN,
-                    -1);
+            // binding first parameter (which is 'deleted') as true
+            adapter.bindParameter(statement, true, 1, Types.BOOLEAN, -1);
         }
-        
+
         super.bindParameters(statement, query);
     }
-    
+
     /**
      * @return whether 'soft' deletion should be used
      */
     protected boolean needSoftDelete(BatchQuery query) {
-        DbAttribute attr = (DbAttribute) query.getDbEntity().getAttribute(deletedFieldName);
+        DbAttribute attr = (DbAttribute) query.getDbEntity().getAttribute(
+                deletedFieldName);
         return attr != null && attr.getType() == Types.BOOLEAN;
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java?rev=962798&r1=962797&r2=962798&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QueryAssemblerHelper.java
Sat Jul 10 09:31:36 2010
@@ -369,10 +369,6 @@ public abstract class QueryAssemblerHelp
      * Appends SQL code to the query buffer to handle <code>val</code> as a parameter
to
      * the PreparedStatement being built. Adds <code>val</code> into QueryAssembler
      * parameter list.
-     * 
-     * @param buf query buffer
-     * @param val object that should be appended as a literal to the query. Must be of one
-     *            of "standard JDBC" types. Can not be null.
      */
     protected void appendLiteralDirect(
             Object val,

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerToken.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerToken.java?rev=962798&r1=962797&r2=962798&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerToken.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerToken.java
Sat Jul 10 09:31:36 2010
@@ -18,7 +18,6 @@
  ****************************************************************/
 package org.apache.cayenne.merge;
 
-
 public interface MergerToken {
 
     public String getTokenName();
@@ -35,7 +34,7 @@ public interface MergerToken {
      * Create a token with the reverse direction. AddColumn in one direction becomes
      * DropColumn in the other direction.
      * <p>
-     * Not all tokens are reversible. See {@link #reversible()}
+     * Not all tokens are reversible.
      */
     public MergerToken createReverse(MergerFactory factory);
 



Mime
View raw message