Fixing bugs found by IntelliJ inspection, and others.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2ed57133 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2ed57133 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2ed57133 Branch: refs/heads/master Commit: 2ed571334c61b7b905ade429bddeb36e3f9e380d Parents: 1dd4e68 Author: Dave Johnson <[email protected]> Authored: Fri Dec 4 14:19:00 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Fri Dec 4 14:19:00 2015 -0500 ---------------------------------------------------------------------- .../org/apache/usergrid/tools/AppAudit.java | 2 +- .../org/apache/usergrid/tools/ExportAdmins.java | 6 ++-- .../org/apache/usergrid/tools/ToolBase.java | 1 + stack/tools/src/main/resources/log4j.properties | 34 +++++--------------- .../apache/usergrid/tools/ExportAppTest.java | 18 +++++++---- 5 files changed, 23 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ed57133/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java b/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java index 8604bec..92e72da 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java @@ -113,7 +113,7 @@ public class AppAudit extends ToolBase { r = em.searchCollection( rootAppRef, "groups", query ); for ( Entity entity : r.getEntities() ) { - collectionOrgs.remove( entity.getProperty( "path" ) ); + collectionOrgs.remove( entity.getProperty( "path" ).toString() ); } query.setCursor( r.getCursor() ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ed57133/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java index 4f285ce..479d740 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java @@ -146,12 +146,10 @@ public class ExportAdmins extends ExportingToolBase { // start read queue workers BlockingQueue<UUID> readQueue = new LinkedBlockingQueue<UUID>(); - List<AdminUserReader> readers = new ArrayList<AdminUserReader>(); for (int i = 0; i < readThreadCount; i++) { AdminUserReader worker = new AdminUserReader( readQueue, writeQueue ); Thread readerThread = new Thread( worker, "AdminUserReader-" + i ); readerThread.start(); - readers.add( worker ); } logger.debug( readThreadCount + " read worker threads started" ); @@ -207,7 +205,7 @@ public class ExportAdmins extends ExportingToolBase { logger.info( "Building org map" ); - ExecutorService execService = Executors.newFixedThreadPool( this.readThreadCount ); + ExecutorService execService = Executors.newFixedThreadPool( readThreadCount ); EntityManager em = emf.getEntityManager( CpNamingUtils.MANAGEMENT_APPLICATION_ID ); String queryString = "select *"; @@ -387,7 +385,7 @@ public class ExportAdmins extends ExportingToolBase { task.orgNamesByUuid = managementService.getOrganizationsForAdminUser( task.adminUser.getUuid() ); - List<Org> orgs = userToOrgsMap.get( task.adminUser.getProperty( "username" ).toString().toLowerCase() ); + List<Org> orgs = userToOrgsMap.get( task.adminUser.getUuid() ); if ( orgs != null && task.orgNamesByUuid.size() < orgs.size() ) { http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ed57133/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java index a78143b..c9fee00 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java @@ -101,6 +101,7 @@ public abstract class ToolBase { System.setProperty( "cassandra.url", line.getOptionValue( "host" ) ); System.setProperty( "elasticsearch.hosts", line.getOptionValue( "eshost" ) ); System.setProperty( "elasticsearch.cluster_name", line.getOptionValue( "escluster" ) ); + System.setProperty( "usergrid.cluster_name", "usergrid" ); } try { http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ed57133/stack/tools/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/resources/log4j.properties b/stack/tools/src/main/resources/log4j.properties index 0afec4a..cebf385 100644 --- a/stack/tools/src/main/resources/log4j.properties +++ b/stack/tools/src/main/resources/log4j.properties @@ -26,31 +26,12 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) [%c] - %m%n -<<<<<<< HEAD -log4j.category.org.apache.usergrid.tools=TRACE -log4j.category.org.apache.usergrid=ERROR +log4j.category.org.apache.usergrid.tools=DEBUG +log4j.category.org.apache.usergrid=WARN +#log4j.logger.org.apache.usergrid.management.cassandra=DEBUG +#log4j.logger.org.apache.usergrid.tools=INFO +#log4j.logger.org.apache.usergrid=INFO -log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout -log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout -log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout -log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout -log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout -log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout -log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout -log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout -log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout -#log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout -#log4j.logger.org.apache.usergrid.persistence.hector.CountingMutator=INFO, stdout -log4j.logger.org.apache.usergrid.tools=DEBUG - -log4j.logger.org.apache.usergrid.management.cassandra=DEBUB -log4j.logger.org.apache.usergrid.tools=INFO -======= -log4j.logger.org.apache.usergrid=INFO -log4j.logger.org.apache.usergrid.tools=DEBUG ->>>>>>> master - -log4j.logger.org.apache.usergrid.management.cassandra=WARN log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN @@ -60,15 +41,16 @@ log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR + #log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout -log4j.logger.org.apache.usergrid.persistence.hector.CountingMutator=INFO +#log4j.logger.org.apache.usergrid.persistence.hector.CountingMutator=INFO #log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG, stdout #log4j.logger.org.apache.usergrid.corepersistence=INFO #log4j.logger.org.apache.usergrid.corepersistence.CpSetup=INFO -log4j.logger.org.apache.usergrid.corepersistence.CpEntityManagerFactory=DEBUG +#log4j.logger.org.apache.usergrid.corepersistence.CpEntityManagerFactory=DEBUG #log4j.logger.org.apache.usergrid.corepersistence.CpEntityManager=DEBUG #log4j.logger.org.apache.usergrid.corepersistence.CpRelationManager=DEBUG http://git-wip-us.apache.org/repos/asf/usergrid/blob/2ed57133/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java index 7b7272e..62d7676 100644 --- a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java +++ b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java @@ -56,11 +56,11 @@ public class ExportAppTest { ExportDataCreator creator = new ExportDataCreator(); creator.startTool( new String[] { - "-organization", orgName, - "-application", appName, - "-host", "localhost:9120", - "-eshost", "localhost:9200", - "-escluster", "usergrid" + "-organization", orgName, + "-application", appName, + "-host", "localhost:9120", + "-eshost", "localhost:9200", + "-escluster", "elasticsearch" }, false); long start = System.currentTimeMillis(); @@ -68,10 +68,12 @@ public class ExportAppTest { String directoryName = "target/export" + rand; ExportApp exportApp = new ExportApp(); - exportApp.startTool( new String[]{ + exportApp.startTool( new String[] { "-application", orgName + "/" + appName, "-writeThreads", "100", "-host", "localhost:9120", + "-eshost", "localhost:9200", + "-escluster", "elasticsearch", "-outputDir", directoryName }, false ); @@ -84,10 +86,12 @@ public class ExportAppTest { assertTrue( getFileCount( exportDir, "connections" ) <= 100 ); File exportDir1 = new File(directoryName + "1"); - exportApp.startTool( new String[]{ + exportApp.startTool( new String[] { "-application", orgName + "/" + appName, "-writeThreads", "1", "-host", "localhost:9120", + "-eshost", "localhost:9200", + "-escluster", "elasticsearch", "-outputDir", directoryName + "1" }, false );
