You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/07/30 22:54:52 UTC
incubator-usergrid git commit: add fig singleton
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 5a20d2744 -> 64211b9b8
add fig singleton
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/64211b9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/64211b9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/64211b9b
Branch: refs/heads/two-dot-o-dev
Commit: 64211b9b8e9872c3516d8c9ccb31d7f8b2a4d7e9
Parents: 5a20d27
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Jul 30 14:54:49 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Jul 30 14:54:49 2015 -0600
----------------------------------------------------------------------
.../corepersistence/ApplicationIdCacheFig.java | 2 ++
.../corepersistence/ApplicationIdCacheImpl.java | 14 +++++++++-----
.../usergrid/corepersistence/EntityManagerFig.java | 4 +++-
.../usergrid/corepersistence/index/CoreIndexFig.java | 2 ++
.../corepersistence/index/IndexProcessorFig.java | 2 ++
.../persistence/collection/cache/EntityCacheFig.java | 2 ++
.../usergrid/persistence/core/rx/RxSchedulerFig.java | 2 ++
.../apache/usergrid/persistence/graph/GraphFig.java | 2 ++
8 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheFig.java
index f4181ac..eb56fe4 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheFig.java
@@ -21,12 +21,14 @@ package org.apache.usergrid.corepersistence;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
/**
* Application id cache fig
*/
+@FigSingleton
public interface ApplicationIdCacheFig extends GuicyFig {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheImpl.java
index 3563469..016629a 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/ApplicationIdCacheImpl.java
@@ -83,7 +83,6 @@ public class ApplicationIdCacheImpl implements ApplicationIdCache {
appCache.invalidate(applicationName.toLowerCase());
return Optional.absent();
}
- logger.debug("Returning for key {} value {}", applicationName, optionalUuid );
return optionalUuid;
} catch (Exception e) {
logger.debug("Returning for key {} value null", applicationName );
@@ -120,9 +119,10 @@ public class ApplicationIdCacheImpl implements ApplicationIdCache {
Id id = idObs.toBlocking().lastOrDefault(null);
if(id != null) {
value = id.getUuid();
- logger.debug("Loaded for key {} value {}", applicationName, value );
}else{
- logger.debug("Could not load value for key {} ", applicationName );
+ if(logger.isDebugEnabled()) {
+ logger.debug("Could not load value for key {} ", applicationName);
+ }
}
return value;
}
@@ -135,13 +135,17 @@ public class ApplicationIdCacheImpl implements ApplicationIdCache {
@Override
public void evictAppId( final String applicationName ) {
appCache.invalidate( applicationName.toLowerCase() );
- logger.debug("Invalidated key {}", applicationName.toLowerCase());
+ if(logger.isDebugEnabled()) {
+ logger.debug("Invalidated key {}", applicationName.toLowerCase());
+ }
}
@Override
public void evictAll() {
appCache.invalidateAll();
- logger.debug("Invalidated all keys");
+ if(logger.isDebugEnabled()) {
+ logger.debug("Invalidated all keys");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
index f5747af..45bebc6 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
@@ -20,12 +20,14 @@
package org.apache.usergrid.corepersistence;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
/**
- * Classy class class.
+ * em fig
*/
+@FigSingleton
public interface EntityManagerFig extends GuicyFig {
@Key( "usergrid.entitymanager_poll_timeout_ms" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
index 1e794e3..bf795cb 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
@@ -20,12 +20,14 @@
package org.apache.usergrid.corepersistence.index;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
/**
* configuration for index in core
*/
+@FigSingleton
public interface CoreIndexFig extends GuicyFig {
String ELASTICSEARCH_MANAGEMENT_NUMBER_OF_SHARDS = "elasticsearch.management_number_shards";
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
index 1be1842..2ffa374 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
@@ -20,6 +20,7 @@ package org.apache.usergrid.corepersistence.index;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
@@ -27,6 +28,7 @@ import org.safehaus.guicyfig.Key;
/**
* Application id cache fig
*/
+@FigSingleton
public interface IndexProcessorFig extends GuicyFig {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/cache/EntityCacheFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/cache/EntityCacheFig.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/cache/EntityCacheFig.java
index f62e713..3bd4c17 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/cache/EntityCacheFig.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/cache/EntityCacheFig.java
@@ -21,6 +21,7 @@ package org.apache.usergrid.persistence.collection.cache;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
@@ -28,6 +29,7 @@ import org.safehaus.guicyfig.Key;
/**
* The config for the entity cache
*/
+@FigSingleton
public interface EntityCacheFig extends GuicyFig {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/RxSchedulerFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/RxSchedulerFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/RxSchedulerFig.java
index bf0a904..4511518 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/RxSchedulerFig.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/RxSchedulerFig.java
@@ -21,6 +21,7 @@ package org.apache.usergrid.persistence.core.rx;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
@@ -28,6 +29,7 @@ import org.safehaus.guicyfig.Key;
/**
*
*/
+@FigSingleton
public interface RxSchedulerFig extends GuicyFig {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64211b9b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/GraphFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/GraphFig.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/GraphFig.java
index 2a153e2..28aab40 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/GraphFig.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/GraphFig.java
@@ -20,6 +20,7 @@ package org.apache.usergrid.persistence.graph;
import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
import org.safehaus.guicyfig.GuicyFig;
import org.safehaus.guicyfig.Key;
@@ -28,6 +29,7 @@ import org.safehaus.guicyfig.Key;
*
*
*/
+@FigSingleton
public interface GraphFig extends GuicyFig {