From ab1b58e6093c22ce1da287f1ce6194db792738ad Mon Sep 17 00:00:00 2001 From: dwebb Date: Wed, 13 Nov 2013 23:53:34 -0500 Subject: [PATCH] wip: Fixed Class Copyright blocks. --- .../data/cassandra/Constants.java | 22 +++++++++------ .../core/CassandraAdminOperations.java | 21 ++++++++++----- .../cassandra/core/CassandraOperations.java | 27 +++++++++++-------- .../data/cassandra/core/RowCallback.java | 21 ++++++++++----- .../exception/EntityWriterException.java | 25 ++++++++++------- .../CassandraOperationsTableTest.java | 21 ++++++++++----- .../template/CassandraOperationsTest.java | 21 ++++++++++----- 7 files changed, 102 insertions(+), 56 deletions(-) diff --git a/src/main/java/org/springframework/data/cassandra/Constants.java b/src/main/java/org/springframework/data/cassandra/Constants.java index ebaa2cf0c..fccd15066 100644 --- a/src/main/java/org/springframework/data/cassandra/Constants.java +++ b/src/main/java/org/springframework/data/cassandra/Constants.java @@ -1,14 +1,20 @@ -/** - * All BrightMove Code is Copyright 2004-2013 BrightMove Inc. - * Modification of code without the express written consent of - * BrightMove, Inc. is strictly forbidden. - * - * Author: David Webb (dwebb@brightmove.com) - * Created On: Nov 13, 2013 +/* + * Copyright 2011-2013 the original author or authors. + * + * Licensed 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.springframework.data.cassandra; - /** * @author David Webb (dwebb@brightmove.com) * diff --git a/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java b/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java index af72e08ac..94d256cd9 100644 --- a/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java +++ b/src/main/java/org/springframework/data/cassandra/core/CassandraAdminOperations.java @@ -1,10 +1,17 @@ -/** - * All BrightMove Code is Copyright 2004-2013 BrightMove Inc. - * Modification of code without the express written consent of - * BrightMove, Inc. is strictly forbidden. - * - * Author: David Webb (dwebb@brightmove.com) - * Created On: Nov 13, 2013 +/* + * Copyright 2011-2013 the original author or authors. + * + * Licensed 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.springframework.data.cassandra.core; diff --git a/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java b/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java index 5cd8057d8..6ba3a4bcf 100644 --- a/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java +++ b/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java @@ -79,28 +79,33 @@ public interface CassandraOperations { /** * Insert the given object to the table by id. * - * @param object + * @param entity */ T insert(T entity); /** * Insert the given object to the table by id. * - * @param object - */ - List insert(List entities); - - /** - * Insert the given object to the table by id. - * - * @param object + * @param entity + * @param tableName + * @return */ T insert(T entity, String tableName); /** - * Insert the given object to the table by id. + * Insert the given list of objects to the table by annotation table name. * - * @param object + * @param entities + * @return + */ + List insert(List entities); + + /** + * Insert the given list of objects to the table by name. + * + * @param entities + * @param tableName + * @return */ List insert(List entities, String tableName); diff --git a/src/main/java/org/springframework/data/cassandra/core/RowCallback.java b/src/main/java/org/springframework/data/cassandra/core/RowCallback.java index 464ccaa41..77127383d 100644 --- a/src/main/java/org/springframework/data/cassandra/core/RowCallback.java +++ b/src/main/java/org/springframework/data/cassandra/core/RowCallback.java @@ -1,10 +1,17 @@ -/** - * All BrightMove Code is Copyright 2004-2013 BrightMove Inc. - * Modification of code without the express written consent of - * BrightMove, Inc. is strictly forbidden. - * - * Author: David Webb (dwebb@brightmove.com) - * Created On: Nov 12, 2013 +/* + * Copyright 2011-2013 the original author or authors. + * + * Licensed 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.springframework.data.cassandra.core; diff --git a/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java b/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java index e7a50247c..380aaa0a5 100644 --- a/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java +++ b/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java @@ -1,10 +1,17 @@ -/** - * All BrightMove Code is Copyright 2004-2013 BrightMove Inc. - * Modification of code without the express written consent of - * BrightMove, Inc. is strictly forbidden. - * - * Author: David Webb (dwebb@brightmove.com) - * Created On: Nov 12, 2013 +/* + * Copyright 2011-2013 the original author or authors. + * + * Licensed 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.springframework.data.cassandra.exception; @@ -12,10 +19,10 @@ package org.springframework.data.cassandra.exception; * Exception to handle failing to write a PersistedEntity to a CQL String or Query object * * @author David Webb (dwebb@brightmove.com) - * + * */ public class EntityWriterException extends Exception { - + /** * @param message */ diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java index c9f799add..c2c8839d7 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java +++ b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTableTest.java @@ -1,10 +1,17 @@ -/** - * All BrightMove Code is Copyright 2004-2013 BrightMove Inc. - * Modification of code without the express written consent of - * BrightMove, Inc. is strictly forbidden. - * - * Author: David Webb (dwebb@brightmove.com) - * Created On: Nov 11, 2013 +/* + * Copyright 2011-2013 the original author or authors. + * + * Licensed 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.springframework.data.cassandra.template; diff --git a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java index da2c7d491..45af3ec0a 100644 --- a/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java +++ b/src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java @@ -1,10 +1,17 @@ -/** - * All BrightMove Code is Copyright 2004-2013 BrightMove Inc. - * Modification of code without the express written consent of - * BrightMove, Inc. is strictly forbidden. - * - * Author: David Webb (dwebb@brightmove.com) - * Created On: Nov 11, 2013 +/* + * Copyright 2011-2013 the original author or authors. + * + * Licensed 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.springframework.data.cassandra.template;