[Registry-dev] svn commit r9466 - in trunk/registry/modules:
core/src/main/java/org/wso2/registry/inmemory/ratings
core/src/main/java/org/wso2/registry/jdbc
core/src/main/java/org/wso2/registry/jdbc/dao
core/src/test/java/org/wso2/registry/inmemory
core/src/test/java/org/wso2/registry/jdbc
webapps/src/main/java/org/wso2/registry/web/actions
webapps/src/main/java/org/wso2/registry/web/actions/utils
svn at wso2.org
svn at wso2.org
Mon Nov 5 22:17:03 PST 2007
Author: chathura
Date: Mon Nov 5 22:16:59 2007
New Revision: 9466
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/RatingsManager.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/ResourceRating.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/inmemory/InMemoryRegistryTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
Log:
Adding the patch sent by Jonathan.
Tested the registry with the patch and it works fine.
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/RatingsManager.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/RatingsManager.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/RatingsManager.java Mon Nov 5 22:16:59 2007
@@ -54,9 +54,9 @@
resourceRating.addRating(rating);
}
- public int getAverageRating(String resourcePath) {
+ public float getAverageRating(String resourcePath) {
- int averageRating = 0;
+ float averageRating = 0;
ResourceRating resourceRating = (ResourceRating) ratings.get(resourcePath);
if (resourceRating != null) {
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/ResourceRating.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/ResourceRating.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/inmemory/ratings/ResourceRating.java Mon Nov 5 22:16:59 2007
@@ -29,7 +29,7 @@
ratingCount++;
}
- public int getAverageRating() {
+ public float getAverageRating() {
return (totalRating / ratingCount);
}
}
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java Mon Nov 5 22:16:59 2007
@@ -608,7 +608,7 @@
Connection conn = connectionFactory.getConnection();
- int rating = 0;
+ float rating = 0;
try {
rating = ratingsDAO.getAverageRating(resourcePath, conn);
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java Mon Nov 5 22:16:59 2007
@@ -79,7 +79,7 @@
return count == 1? true: false;
}
- public int getAverageRating(String path, Connection conn) throws SQLException {
+ public float getAverageRating(String path, Connection conn) throws SQLException {
String sql = "SELECT AVG(R.RATING) FROM RATINGS R, ARTIFACTS A WHERE A.PATH=? AND A.AID=R.AID";
@@ -88,9 +88,9 @@
ResultSet result = s.executeQuery();
- int averageRating = 0;
+ float averageRating = 0;
if (result.next()) {
- averageRating = result.getInt(1);
+ averageRating = result.getFloat(1);
}
return averageRating;
Modified: trunk/registry/modules/core/src/test/java/org/wso2/registry/inmemory/InMemoryRegistryTest.java
==============================================================================
--- trunk/registry/modules/core/src/test/java/org/wso2/registry/inmemory/InMemoryRegistryTest.java (original)
+++ trunk/registry/modules/core/src/test/java/org/wso2/registry/inmemory/InMemoryRegistryTest.java Mon Nov 5 22:16:59 2007
@@ -296,7 +296,7 @@
fail("Couldn't get the rating of the resource /d1/r1");
}
- assertEquals("Rating of the resource /d1/r1 should be 4.", (int)rating, 4);
+ assertEquals("Rating of the resource /d1/r1 should be 4.", rating, (float) 4.0, (float) 0.01);
try {
registry.delete("/d1");
} catch (RegistryException e) {
Modified: trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
==============================================================================
--- trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java (original)
+++ trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java Mon Nov 5 22:16:59 2007
@@ -541,7 +541,7 @@
fail("Couldn't get the rating of the resource /d1/r1");
}
- assertEquals("Rating of the resource /d1/r1 should be 4.",(int) rating, 4);
+ assertEquals("Rating of the resource /d1/r1 should be 4.", rating, (float) 4.0, (float) 0.01);
try {
registry.delete("/d1");
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java Mon Nov 5 22:16:59 2007
@@ -144,7 +144,7 @@
child.isDirectory()? ResourceData.COLLECTION : ResourceData.RESOURCE);
resourceData.setAuthorUserName(child.getAuthorUserName());
resourceData.setDescription(child.getDescription());
- resourceData.setRating(registry.getAverageRating(child.getPath()));
+ resourceData.setAverageRating(registry.getAverageRating(child.getPath()));
resourceData.setCreatedOn(child.getCreatedTime());
} catch (AuthorizationFailedException e) {
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java Mon Nov 5 22:16:59 2007
@@ -41,7 +41,7 @@
private List tags = new ArrayList();
private List comments = new ArrayList();
- private double rating = 0;
+ private float averageRating;
private List versionPaths = new ArrayList();
private String parentPath;
@@ -81,7 +81,7 @@
this.createdOn = artifact.getCreatedTime();
this.lastModified = artifact.getLastModified();
this.mediaType = artifact.getMediaType();
- this.rating = registry.getAverageRating(artifact.getPath());
+ this.averageRating = registry.getAverageRating(artifact.getPath());
Tag[] t = registry.getTags(artifact.getPath());
for (int i = 0; i < t.length; i++) {
@@ -195,12 +195,12 @@
this.properties = properties;
}
- public double getRating() {
- return rating;
+ public float getAverageRating() {
+ return averageRating;
}
- public void setRating(int rating) {
- this.rating = rating;
+ public void setAverageRating(float averageRating) {
+ this.averageRating = averageRating;
}
public List getTags() {
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchCollectionViewAction.java Mon Nov 5 22:16:59 2007
@@ -100,7 +100,7 @@
child.isDirectory()? ResourceData.COLLECTION : ResourceData.RESOURCE);
resourceData.setAuthorUserName(child.getAuthorUserName());
resourceData.setDescription(child.getDescription());
- resourceData.setRating(registry.getAverageRating(child.getPath()));
+ resourceData.setAverageRating(registry.getAverageRating(child.getPath()));
resourceData.setCreatedOn(child.getCreatedTime());
} catch (AuthorizationFailedException e) {
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java Mon Nov 5 22:16:59 2007
@@ -35,7 +35,7 @@
private String authorUserName;
private String description;
- private double rating;
+ private float averageRating;
private Date createdOn;
public String getName() {
@@ -78,12 +78,12 @@
this.description = description;
}
- public double getRating() {
- return rating;
+ public float getAverageRating() {
+ return averageRating;
}
- public void setRating(double rating) {
- this.rating = rating;
+ public void setAverageRating(float averageRating) {
+ this.averageRating = averageRating;
}
public Date getCreatedOn() {
More information about the Registry-dev
mailing list