add allow circular dependency config to Microserver annotation also

aol · Mar 18, 2015 · 6610661 · 6610661
1 parent 87f7577
commit 6610661
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/micro-core/src/main/java/com/aol/micro/server/config/Microserver.java b/micro-core/src/main/java/com/aol/micro/server/config/Microserver.java
@@ -49,5 +49,10 @@
 	String[] properties() default {};
 
 
+	/**
+	 * @return true if the spring context should allow circular dependencies
+	 * We recommend not to allow circular dependencies
+	 */
+	boolean allowCircularDependencies() default false;
 
 }
diff --git a/micro-core/src/main/java/com/aol/micro/server/config/MicroserverConfigurer.java b/micro-core/src/main/java/com/aol/micro/server/config/MicroserverConfigurer.java
@@ -22,7 +22,9 @@ public Config buildConfig(Class class1) {
 		Map<String, String> properties = buildProperties(microserver);
 
 		return Config.instance().withEntityScan(microserver.entityScan()).withClasses(ImmutableSet.copyOf(classes))
-				.withPropertiesName(microserver.propertiesName()).withProperties(ImmutableMap.copyOf(properties)).set();
+				.withPropertiesName(microserver.propertiesName())
+				.withAllowCircularReferences(microserver.allowCircularDependencies())
+				.withProperties(ImmutableMap.copyOf(properties)).set();
 	}
 
 	private Map<String, String> buildProperties(Microserver microserver) {