Merge pull request aol#73 from earlzero/master

johnmcclean · johnmcclean · commit e6be020ad1cd · 2015-11-23T15:32:17.000Z
Unused spring-orm reference removed. Method name modified.
diff --git a/micro-core/src/main/java/com/aol/micro/server/MicroserverApp.java b/micro-core/src/main/java/com/aol/micro/server/MicroserverApp.java
@@ -53,7 +53,7 @@ public MicroserverApp(Module... modules) {
 		Class c =extractClass();
 		springContext = new SpringContextFactory(new MicroserverConfigurer().buildConfig(
 				c), extractClass(),
-				new MicroserverConfigurer().vetClasses(c,modules[0].getSpringConfigurationClasses()))
+				new MicroserverConfigurer().getClasses(c,modules[0].getSpringConfigurationClasses()))
 				.createSpringContext();
 
 	}
@@ -72,7 +72,7 @@ public MicroserverApp(Class c, Module... modules) {
 		this.modules = Arrays.asList(modules);
 		springContext = new SpringContextFactory(
 				new MicroserverConfigurer().buildConfig(c), c,
-				new MicroserverConfigurer().vetClasses(c,modules[0].getSpringConfigurationClasses()))
+				new MicroserverConfigurer().getClasses(c,modules[0].getSpringConfigurationClasses()))
 				.createSpringContext();
 
 	}
@@ -154,4 +154,4 @@ private void join(Thread thread) {
 		}
 	}
 
-}
+}
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
@@ -61,7 +61,7 @@ private List<Class> buildClasses(Class class1, Microserver microserver) {
 		return classes.stream().filter(clazz -> !blackList.contains(clazz)).collect(Collectors.toList());
 	}
 
-	public Set<Class> vetClasses(Class class1,Set<Class> coreClasses) {
+	public Set<Class> getClasses(Class class1,Set<Class> coreClasses) {
 		Microserver microserver = (Microserver) class1.getAnnotation(Microserver.class);
 		if(microserver==null)
 			return coreClasses;
diff --git a/micro-hibernate/build.gradle b/micro-hibernate/build.gradle
@@ -6,6 +6,7 @@ dependencies {
 	}
 	compile group: 'org.hibernate', name: 'hibernate-core', version:hibernateVersion
 	compile group: 'org.hibernate', name: 'hibernate-entitymanager', version:hibernateVersion
+	compile group: 'org.springframework', name: 'spring-orm', version:"${springVersion}"
 	
 	compile 'com.zaxxer:HikariCP:2.4.0'
 	compile project(':micro-jdbc')
diff --git a/micro-jdbc/build.gradle b/micro-jdbc/build.gradle
@@ -2,7 +2,6 @@ description = 'micro-jdbc'
 dependencies {
 	compile 'org.springframework.data:spring-data-jpa:'+springDataJPA
 	compile group: 'org.springframework', name: 'spring-jdbc', version:"${springVersion}"
-	compile group: 'org.springframework', name: 'spring-orm', version:"${springVersion}"
 
 	
 	compile 'com.zaxxer:HikariCP:2.4.0'

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public MicroserverApp(Module... modules) {`
`53`	`53`	`Class c =extractClass();`
`54`	`54`	`springContext = new SpringContextFactory(new MicroserverConfigurer().buildConfig(`
`55`	`55`	`c), extractClass(),`
`56`		`- new MicroserverConfigurer().vetClasses(c,modules[0].getSpringConfigurationClasses()))`
	`56`	`+ new MicroserverConfigurer().getClasses(c,modules[0].getSpringConfigurationClasses()))`
`57`	`57`	`.createSpringContext();`
`58`	`58`
`59`	`59`	`}`
`@@ -72,7 +72,7 @@ public MicroserverApp(Class c, Module... modules) {`
`72`	`72`	`this.modules = Arrays.asList(modules);`
`73`	`73`	`springContext = new SpringContextFactory(`
`74`	`74`	`new MicroserverConfigurer().buildConfig(c), c,`
`75`		`- new MicroserverConfigurer().vetClasses(c,modules[0].getSpringConfigurationClasses()))`
	`75`	`+ new MicroserverConfigurer().getClasses(c,modules[0].getSpringConfigurationClasses()))`
`76`	`76`	`.createSpringContext();`
`77`	`77`
`78`	`78`	`}`
`@@ -154,4 +154,4 @@ private void join(Thread thread) {`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`-}`
	`157`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private List<Class> buildClasses(Class class1, Microserver microserver) {`
`61`	`61`	`return classes.stream().filter(clazz -> !blackList.contains(clazz)).collect(Collectors.toList());`
`62`	`62`	`}`
`63`	`63`
`64`		`- public Set<Class> vetClasses(Class class1,Set<Class> coreClasses) {`
	`64`	`+ public Set<Class> getClasses(Class class1,Set<Class> coreClasses) {`
`65`	`65`	`Microserver microserver = (Microserver) class1.getAnnotation(Microserver.class);`
`66`	`66`	`if(microserver==null)`
`67`	`67`	`return coreClasses;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ dependencies {`
`6`	`6`	`}`
`7`	`7`	`compile group: 'org.hibernate', name: 'hibernate-core', version:hibernateVersion`
`8`	`8`	`compile group: 'org.hibernate', name: 'hibernate-entitymanager', version:hibernateVersion`
	`9`	`+ compile group: 'org.springframework', name: 'spring-orm', version:"${springVersion}"`
`9`	`10`
`10`	`11`	`compile 'com.zaxxer:HikariCP:2.4.0'`
`11`	`12`	`compile project(':micro-jdbc')`