Merge pull request #158 from brharrington/rm-archaius1-binding

remove archaius configmap
Netflix · Jun 9, 2015 · 4d7bb2b · 4d7bb2b
2 parents d275d66 + 3c2025a
commit 4d7bb2b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 90 deletions.
diff --git a/spectator-nflx-plugin/src/main/java/com/netflix/spectator/nflx/ArchaiusConfigMap.java b/spectator-nflx-plugin/src/main/java/com/netflix/spectator/nflx/ArchaiusConfigMap.java
diff --git a/spectator-nflx-plugin/src/main/java/com/netflix/spectator/nflx/SpectatorModule.java b/spectator-nflx-plugin/src/main/java/com/netflix/spectator/nflx/SpectatorModule.java
@@ -67,13 +67,13 @@ public final class SpectatorModule extends AbstractModule {
   @Provides
   @Singleton
   ExtendedRegistry getExtendedRegistry() {
-      return Spectator.registry();
+    return Spectator.registry();
   }
 
   @Provides
   @Singleton
   Registry getRegistry() {
-      return Spectator.registry();
+    return Spectator.registry();
   }
 
   @Override public boolean equals(Object obj) {

diff --git a/...ator-nflx-plugin/src/main/resources/META-INF/services/com.netflix.spectator.api.ConfigMap b/...ator-nflx-plugin/src/main/resources/META-INF/services/com.netflix.spectator.api.ConfigMap
diff --git a/spectator-nflx-plugin/src/test/java/com/netflix/spectator/nflx/ArchaiusConfigMapTest.java b/spectator-nflx-plugin/src/test/java/com/netflix/spectator/nflx/ArchaiusConfigMapTest.java