You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ie...@apache.org on 2010/06/27 00:05:27 UTC
svn commit: r958292 - in /shindig/trunk/java/samples/src:
main/java/org/apache/shindig/social/opensocial/jpa/
main/java/org/apache/shindig/social/opensocial/jpa/hibernate/
main/java/org/apache/shindig/social/opensocial/jpa/openjpa/
test/java/org/apache...
Author: ieb
Date: Sat Jun 26 22:05:26 2010
New Revision: 958292
URL: http://svn.apache.org/viewvc?rev=958292&view=rev
Log:
Cleaned up unused imports and variables (in Samples).
Modified:
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/OrganizationAddressDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonAddressDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/SchemaOpenJPATestOff.java
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java Sat Jun 26 22:05:26 2010
@@ -21,7 +21,6 @@ import static javax.persistence.CascadeT
import static javax.persistence.GenerationType.IDENTITY;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.MapMaker;
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
@@ -29,7 +28,6 @@ import org.apache.shindig.social.opensoc
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
import javax.persistence.Basic;
import javax.persistence.Column;
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java Sat Jun 26 22:05:26 2010
@@ -21,15 +21,12 @@ import static javax.persistence.Generati
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
import org.apache.shindig.social.opensocial.model.ListField;
-import org.apache.shindig.social.opensocial.model.Person;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
import javax.persistence.MapKey;
import javax.persistence.OneToMany;
import javax.persistence.Table;
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/OrganizationAddressDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/OrganizationAddressDb.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/OrganizationAddressDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/OrganizationAddressDb.java Sat Jun 26 22:05:26 2010
@@ -26,10 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import javax.persistence.ManyToOne;
-import static javax.persistence.CascadeType.PERSIST;
-import static javax.persistence.CascadeType.MERGE;
-import static javax.persistence.CascadeType.REFRESH;
/**
* This object connects to a single Address, and to a single organization, defining the
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonAddressDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonAddressDb.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonAddressDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonAddressDb.java Sat Jun 26 22:05:26 2010
@@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import static javax.persistence.CascadeType.PERSIST;
-import static javax.persistence.CascadeType.MERGE;
-import static javax.persistence.CascadeType.REFRESH;
/**
*
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java Sat Jun 26 22:05:26 2010
@@ -128,6 +128,7 @@ public class PersonDb implements Person,
FilterOperation.startsWith };
private static final FilterOperation[] NUMERIC_FILTEROPTIONS = new FilterOperation[] {
FilterOperation.equals, FilterOperation.present };
+ @SuppressWarnings("unused")
private static final FilterOperation[] EQUALS_FILTEROPTIONS =
new FilterOperation[] { FilterOperation.equals };
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java Sat Jun 26 22:05:26 2010
@@ -41,12 +41,6 @@ public class Bootstrap {
private static final String DB_MIN_WRITE = "db.write.min";
private static final String DB_MIN_NUM_READ = "db.read.min";
private static final Logger LOG = Logger.getLogger(Boolean.class.getName());
- private String minWrite;
- private String minRead;
- private String dbPassword;
- private String dbUser;
- private String dbUrl;
- private String dbDriver;
private EntityManager entityManager;
@Inject
@@ -55,13 +49,6 @@ public class Bootstrap {
@Named(DB_PASSWORD) String dbPassword,
@Named(DB_MIN_NUM_READ) String minRead,
@Named(DB_MIN_WRITE) String minWrite) {
- this.dbDriver = dbDriver;
- this.dbUrl = dbUrl;
- this.dbUser = dbUser;
- this.dbPassword = dbPassword == null || dbPassword.length() == 0 ? " "
- : dbPassword;
- this.minRead = minRead;
- this.minWrite = minWrite;
}
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java Sat Jun 26 22:05:26 2010
@@ -36,12 +36,6 @@ public class Bootstrap {
private static final String DB_PASSWORD = "db.password";
private static final String DB_MIN_WRITE = "db.write.min";
private static final String DB_MIN_NUM_READ = "db.read.min";
- private String minWrite;
- private String minRead;
- private String dbPassword;
- private String dbUser;
- private String dbUrl;
- private String dbDriver;
private EntityManager entityManager;
@Inject
@@ -52,12 +46,6 @@ public class Bootstrap {
String dbPassword, @Named(DB_MIN_NUM_READ)
String minRead, @Named(DB_MIN_WRITE)
String minWrite) {
- this.dbDriver = dbDriver;
- this.dbUrl = dbUrl;
- this.dbUser = dbUser;
- this.dbPassword = dbPassword == null || dbPassword.length() == 0 ? " " : dbPassword;
- this.minRead = minRead;
- this.minWrite = minWrite;
}
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java Sat Jun 26 22:05:26 2010
@@ -25,7 +25,6 @@ import org.apache.shindig.protocol.model
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
-import org.apache.shindig.social.opensocial.spi.PersonService;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.apache.shindig.social.opensocial.spi.UserId.Type;
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java Sat Jun 26 22:05:26 2010
@@ -58,7 +58,6 @@ import java.util.Map;
import javax.persistence.EntityManager;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.MapMaker;
import com.google.inject.Inject;
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java Sat Jun 26 22:05:26 2010
@@ -52,7 +52,6 @@ import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java Sat Jun 26 22:05:26 2010
@@ -54,7 +54,6 @@ import org.apache.shindig.social.opensoc
import com.google.inject.AbstractModule;
import net.oauth.OAuthConsumer;
-import net.oauth.OAuthProblemException;
/**
* Provides component injection for tests
@@ -106,9 +105,6 @@ public class JpaTestGuiceModule extends
return null;
}
- public OAuthEntry generateRequestToken(String consumerKey) {
- throw new UnsupportedOperationException();
- }
public OAuthEntry convertToAccessToken(OAuthEntry entry) {
throw new UnsupportedOperationException();
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java Sat Jun 26 22:05:26 2010
@@ -246,6 +246,7 @@ public class PersonPopulate {
return list;
}
+ @SuppressWarnings("unused")
private Organization getDbOrganization(int i, String type) {
String targetOrg = "Organization_" + (i % 10);
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/SchemaOpenJPATestOff.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/SchemaOpenJPATestOff.java?rev=958292&r1=958291&r2=958292&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/SchemaOpenJPATestOff.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/SchemaOpenJPATestOff.java Sat Jun 26 22:05:26 2010
@@ -21,9 +21,6 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.jpa.openjpa.Bootstrap;
import org.apache.shindig.social.opensocial.model.Person;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;