Consistency with compilationUnit getClassByName()

javaparser · Jul 21, 2016 · aea60bf · aea60bf
1 parent e299888
commit aea60bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
@@ -202,7 +202,7 @@ public default BlockStmt addStaticInitializer() {
      * @param name the name of the method
      * @return the methods found (multiple in case of polymorphism)
      */
-    public default List<MethodDeclaration> getMethodsWithName(String name) {
+    public default List<MethodDeclaration> getMethodsByName(String name) {
         return getMembers().stream()
                 .filter(m -> m instanceof MethodDeclaration && ((MethodDeclaration) m).getName().equals(name))
                 .map(m -> (MethodDeclaration) m).collect(Collectors.toList());
@@ -229,7 +229,7 @@ public default List<MethodDeclaration> getMethodsWithParameterTypes(String... pa
      * @param name the name of the field
      * @return null if not found, the FieldDeclaration otherwise
      */
-    public default FieldDeclaration getFieldWithName(String name) {
+    public default FieldDeclaration getFieldByName(String name) {
         return (FieldDeclaration) getMembers().stream()
                 .filter(m -> m instanceof FieldDeclaration && ((FieldDeclaration) m).getVariables().stream()
                         .anyMatch(var -> var.getId().getName().equals(name)))

diff --git a/...ting/src/test/java/com/github/javaparser/junit/builders/FieldDeclarationBuildersTest.java b/...ting/src/test/java/com/github/javaparser/junit/builders/FieldDeclarationBuildersTest.java
@@ -52,7 +52,7 @@ public void testCreateGetterInAClass() {
 		testClass.addPrivateField(int.class, "myField").createGetter();
 		assertEquals(2, testClass.getMembers().size());
 		assertEquals(MethodDeclaration.class, testClass.getMembers().get(1).getClass());
-		List<MethodDeclaration> methodsWithName = testClass.getMethodsWithName("getMyField");
+		List<MethodDeclaration> methodsWithName = testClass.getMethodsByName("getMyField");
 		assertEquals(1, methodsWithName.size());
 		MethodDeclaration getter = methodsWithName.get(0);
 		assertEquals("getMyField", getter.getName());
@@ -65,7 +65,7 @@ public void testCreateSetterInAClass() {
 		testClass.addPrivateField(int.class, "myField").createSetter();
 		assertEquals(2, testClass.getMembers().size());
 		assertEquals(MethodDeclaration.class, testClass.getMembers().get(1).getClass());
-		List<MethodDeclaration> methodsWithName = testClass.getMethodsWithName("setMyField");
+		List<MethodDeclaration> methodsWithName = testClass.getMethodsByName("setMyField");
 		assertEquals(1, methodsWithName.size());
 		MethodDeclaration setter = methodsWithName.get(0);
 		assertEquals("setMyField", setter.getName());
@@ -79,7 +79,7 @@ public void testCreateGetterInEnum() {
 		testEnum.addPrivateField(int.class, "myField").createGetter();
 		assertEquals(2, testEnum.getMembers().size());
 		assertEquals(MethodDeclaration.class, testEnum.getMembers().get(1).getClass());
-		List<MethodDeclaration> methodsWithName = testEnum.getMethodsWithName("getMyField");
+		List<MethodDeclaration> methodsWithName = testEnum.getMethodsByName("getMyField");
 		assertEquals(1, methodsWithName.size());
 		MethodDeclaration getter = methodsWithName.get(0);
 		assertEquals("getMyField", getter.getName());
@@ -92,7 +92,7 @@ public void testCreateSetterInEnum() {
 		testEnum.addPrivateField(int.class, "myField").createSetter();
 		assertEquals(2, testEnum.getMembers().size());
 		assertEquals(MethodDeclaration.class, testEnum.getMembers().get(1).getClass());
-		List<MethodDeclaration> methodsWithName = testEnum.getMethodsWithName("setMyField");
+		List<MethodDeclaration> methodsWithName = testEnum.getMethodsByName("setMyField");
 		assertEquals(1, methodsWithName.size());
 		MethodDeclaration setter = methodsWithName.get(0);
 		assertEquals("setMyField", setter.getName());

diff --git a/...g/src/test/java/com/github/javaparser/junit/builders/NodeWithAnnotationsBuildersTest.java b/...g/src/test/java/com/github/javaparser/junit/builders/NodeWithAnnotationsBuildersTest.java
@@ -71,17 +71,4 @@ public void testGetAnnotationByClass() {
 		NormalAnnotationExpr annotation = testClass.addAnnotation(hey.class);
 		assertEquals(annotation, testClass.getAnnotationByClass(hey.class));
 	}
-	/*
-	NodeWithAnnotations
-	
-	public default T addMarkerAnnotation(String name) {
-	public default T addMarkerAnnotation(Class<? extends Annotation> clazz) {
-	public default T addSingleMemberAnnotation(String name, String value) {
-	public default T addSingleMemberAnnotation(Class<? extends Annotation> clazz,
-	public default boolean isAnnotationPresent(String annotationName) {
-	public default boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-	public default AnnotationExpr getAnnotationByName(String annotationName) {
-	public default AnnotationExpr getAnnotationByName(Class<? extends Annotation> annotationClass) {
-	*/
-
 }