adjust db interface

qyb · Mar 7, 2012 · 523e1cb · 523e1cb
1 parent 71d563c
commit 523e1cb
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 47 deletions.
diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/bucket/DELETE_BUCKET.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/bucket/DELETE_BUCKET.java
@@ -37,7 +37,7 @@ public APIResponse Invoke(APIRequest req) {
 		Map<String, String> resp_headers = resp.getHeaders();
 
         ScssBucket scssBucket=null;
-		scssBucket = ScssBucketDaoImpl.getInstance().getBucket(req.BucketName);
+		scssBucket = ScssBucketDaoImpl.getInstance().get(req.BucketName);
 
 		if(null!= scssBucket)
 		{
@@ -51,7 +51,7 @@ public APIResponse Invoke(APIRequest req) {
 			else
 			{
 				try {
-					ScssBucketDaoImpl.getInstance().deleteBucket(scssBucket);
+					ScssBucketDaoImpl.getInstance().delete(scssBucket);
 				} catch (SQLException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/bucket/GET_BUCKET.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/bucket/GET_BUCKET.java
@@ -54,7 +54,7 @@ public APIResponse Invoke(APIRequest req) {
 		// TODO: Use Bucket instead ScssBucket. temporary using.
 
 		ScssBucket bucket=null;
-		bucket = ScssBucketDaoImpl.getInstance().getBucket(req.BucketName);
+		bucket = ScssBucketDaoImpl.getInstance().get(req.BucketName);
 		if (null == bucket)
 			return ErrorResponse.NoSuchBucket(req);
 		List<ScssObject> bucket_objects=null;

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/object/DELETE_OBJECT.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/object/DELETE_OBJECT.java
@@ -36,7 +36,7 @@ public APIResponse Invoke(APIRequest req) {
 		APIResponse resp = new BucketAPIResponse();
 		Map<String, String> resp_headers = resp.getHeaders();
 
-        ScssBucket scssBucket=ScssBucketDaoImpl.getInstance().getBucket(req.BucketName) ;
+        ScssBucket scssBucket=ScssBucketDaoImpl.getInstance().get(req.BucketName) ;
 
 		if(null!=scssBucket)
 		{

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/ScssBucketDaoImpl.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/ScssBucketDaoImpl.java
@@ -21,7 +21,7 @@ public class ScssBucketDaoImpl implements IBucket{
 	private ScssBucketDaoImpl() {
 	}
 	@Override
-	public ScssBucket insertBucket(ScssBucket bucket) throws SameNameException,
+	public ScssBucket insert(ScssBucket bucket) throws SameNameException,
 			SQLException {
 		try {
 			bucket.setId((Long) sqlMap.insert("putBucket", bucket));
@@ -50,17 +50,17 @@ public ScssBucket get(ScssBucket sb) {
 		}
 		return null;
 	}
+//	@Override
+//	public List<ScssBucket> get() {
+//		try {
+//			return sqlMap.queryForList("getBuckets");
+//		} catch (SQLException e) {
+//			e.printStackTrace();
+//		}
+//		return null;
+//	}
 	@Override
-	public List<ScssBucket> get() {
-		try {
-			return sqlMap.queryForList("getBuckets");
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	@Override
-	public List<ScssBucket> getByUser(ScssUser user) {
+	public List<ScssBucket> getAll(ScssUser user) {
 		try {
 			return sqlMap.queryForList("getBucketsByUser", user);
 		} catch (SQLException e) {

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/ScssGroupDaoImpl.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/ScssGroupDaoImpl.java
@@ -26,7 +26,7 @@ public static ScssGroupDaoImpl getInstance() {
 	}
 
 	@Override
-	public ScssGroup getGroupById(Long groupId) {
+	public ScssGroup get(Long groupId) {
 		ScssGroup su = null;
 		try {
 			su = (ScssGroup) sqlMap.queryForObject("getGroupById", groupId);

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/ScssUserDaoImpl.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/ScssUserDaoImpl.java
@@ -43,7 +43,7 @@ public List getUserList() {
 	}
 
 	@Override
-	public void deleteUser(ScssUser user) throws DBException {
+	public void delete(ScssUser user) throws DBException {
 		try {
 			sqlMap.delete("deleteUser", user.getId());
 		} catch (SQLException e) {
@@ -52,7 +52,7 @@ public void deleteUser(ScssUser user) throws DBException {
 	}
 
 	@Override
-	public void deleteUser(Long id) throws DBException {
+	public void delete(Long id) throws DBException {
 		try {
 			sqlMap.delete("deleteUser", id);
 		} catch (SQLException e) {
@@ -61,7 +61,7 @@ public void deleteUser(Long id) throws DBException {
 	}
 
 	@Override
-	public ScssUser insertUser(ScssUser user) throws SameNameException {
+	public ScssUser insert(ScssUser user) throws SameNameException {
 		try {
 			user.setId((Long) sqlMap.insert("putUser", user));
 		} catch (com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException e) {
@@ -132,13 +132,13 @@ public List<ScssUser> getUsersByGroup(ScssGroup group) {
 		}
 		String[] split = userIds.split(",");
 		for (int i = 1; i < split.length; ++i) {
-			result.add(getUserById(Long.parseLong(split[i])));
+			result.add(get(Long.parseLong(split[i])));
 		}
 		return result;
 	}
 
 	@Override
-	public ScssUser getUserById(long id) {
+	public ScssUser get(long id) {
 		ScssUser su = null;
 		try {
 			su = (ScssUser) sqlMap.queryForObject("getUserById", id);
@@ -160,7 +160,7 @@ public ScssUser getUserBySohuId(String sohuId) {
 	}
 
 	@Override
-	public void updateUser(ScssUser scssUser) throws DBException {
+	public void update(ScssUser scssUser) throws DBException {
 		try {
 			sqlMap.update("updateUser", scssUser);
 		} catch (SQLException e) {

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/i/IBucket.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/i/IBucket.java
@@ -9,17 +9,15 @@
 
 public interface IBucket {
 
-	ScssBucket insertBucket(ScssBucket bucket) throws SameNameException,
+	ScssBucket insert(ScssBucket bucket) throws SameNameException,
 			SQLException;
 
 	ScssBucket get(Long id);
 
-	List<ScssBucket> getByUser(ScssUser user);
+	List<ScssBucket> getAll(ScssUser user);
 
 	ScssBucket get(ScssBucket sb);
 
-	List<ScssBucket> get();
-
 	void delete(ScssBucket sb) throws SQLException;
 
 	void update(ScssBucket sb) throws SQLException;

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/i/IGroup.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/i/IGroup.java
@@ -1,6 +1,5 @@
 package com.scss.db.dao.i;
 
-import java.sql.SQLException;
 import java.util.List;
 
 import com.scss.db.exception.DBException;
@@ -9,9 +8,10 @@
 
 public interface IGroup {
 
-	ScssGroup getGroupById(Long groupId);
+	ScssGroup get(Long groupId);
 
-	List<ScssGroup> getGroupByName(String name);
+	List<ScssGroup> getAll(Long user_id);
+	List<ScssGroup> getAll(String access_id);
 
 	ScssGroup insert(ScssGroup group);
 

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/i/IUser.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/dao/i/IUser.java
@@ -9,13 +9,13 @@
 
 public interface IUser {
 
-	List getUserList();
+	List<ScssUser> getUserList();
 
-	void deleteUser(ScssUser user) throws DBException;
+	void delete(ScssUser user) throws DBException;
 
-	void deleteUser(Long id) throws DBException;
+	void delete(Long id) throws DBException;
 
-	ScssUser insertUser(ScssUser user) throws SameNameException;
+	ScssUser insert(ScssUser user) throws SameNameException;
 
 	ScssUser getUserByAccessKey(String access_key);
 
@@ -25,10 +25,10 @@ public interface IUser {
 
 	List<ScssUser> getUsersByGroup(ScssGroup group);
 
-	ScssUser getUserById(long id);
+	ScssUser get(long id);
 
-	ScssUser getUserBySohuId(String sohuId);
+	List<ScssUser> getUsersBySohuId(String sohuId);
 
-	void updateUser(ScssUser scssUser) throws DBException;
+	void update(ScssUser scssUser) throws DBException;
 
 }
diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/ibatis/TestMain.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/ibatis/TestMain.java
@@ -39,23 +39,23 @@ public static void main(String args[]) throws SameNameException,
 		user.setSohuId("sohuId");
 		user.setAccessId("accessId");
 		user.setAccessKey("accessKey");
-		user = sud.insertUser(user);
+		user = sud.insert(user);
 		user.setAccessKey("aaaa&&&&&a");
-		sud.updateUser(user);
-		user = sud.getUserById(user.getId());
-		user = sud.getUserById(user.getId());
+		sud.update(user);
+		user = sud.get(user.getId());
+		user = sud.get(user.getId());
 		user = sud.getUserBySohuId("sohuId");
 		user = sud.getUserByAccessKey("aaaa&&&&&a");
 
 		// Test Group
 		ScssGroupDaoImpl sgd = ScssGroupDaoImpl.getInstance();
 		ScssGroup group = new ScssGroup();
-		group.setName("ÓÃ»§×é");
+		group.setName("�û���");
 		group.setOwnerId(user.getId());
 		group = sgd.insert(group);
 		List<ScssGroup> groups = sgd.getGroupByName(group.getName());
 		group = sgd.getGroupByName(group.getName(), user.getId());
-		group = sgd.getGroupById(group.getId());
+		group = sgd.get(group.getId());
 		group.setName(group.getName() + "1");
 		sgd.update(group);
 
@@ -67,14 +67,14 @@ public static void main(String args[]) throws SameNameException,
 
 		// Test Bucket
 		ScssBucketDaoImpl sbd = ScssBucketDaoImpl.getInstance();
-		List<ScssBucket> bucketsByUser = sbd.getByUser(user);
+		List<ScssBucket> bucketsByUser = sbd.getAll(user);
 		ScssBucket bucket = new ScssBucket();
 		bucket.setName("test_bucket");
 		bucket.setOwnerId(1l);
 		bucket.setMeta("Meta_test");
 		bucket.setDeleted((byte) 0);
 		bucket.setLoggingEnabled((byte) 1);
-		bucket = sbd.insertBucket(bucket);
+		bucket = sbd.insert(bucket);
 		bucket = sbd.get(bucket.getName());
 		bucket = sbd.get(bucket.getId());
 		bucket = sbd.get(bucket);
@@ -111,7 +111,7 @@ public static void main(String args[]) throws SameNameException,
 		sad.update(acl);
 		acl = sad.get(acl.getId());
 
-		// Test Log ÔÝÊ±²»²âÊÔ
+		// Test Log ��ʱ������
 		// ScssLogDaoImpl sld = ScssLogDaoImpl.getInstance();
 		// ScssLog log = new ScssLog();
 		// log
@@ -133,7 +133,7 @@ public static void main(String args[]) throws SameNameException,
 		sbld.delete(sbl);
 		sbd.delete(bucket);
 		sgd.delete(group);
-		sud.deleteUser(user);
+		sud.delete(user);
 		sad.delete(acl);
 
 	}

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/db/service/ScssUserServiceImpl.java b/src/StorageWorkspace/StorageAPI/src/com/scss/db/service/ScssUserServiceImpl.java
@@ -9,6 +9,6 @@ public class ScssUserServiceImpl implements ScssUserService {
 	private ScssUserDaoImpl sudi = ScssUserDaoImpl.getInstance();
 
 	public ScssUser putUser(ScssUser user) throws SameNameException {
-		return sudi.insertUser(user);
+		return sudi.insert(user);
 	}
 }