#365: renamed privateModifier() to notPublicModifier() in CtClassBuilder

siom79 · Oct 18, 2023 · b756a9f · b756a9f
1 parent fa5f391
commit b756a9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java b/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java
@@ -104,7 +104,7 @@ public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
 
 			@Override
 			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
-				CtClass ctClass = CtClassBuilder.create().privateModifier().name("japicmp.Test").addToClassPool(classPool);
+				CtClass ctClass = CtClassBuilder.create().notPublicModifier().name("japicmp.Test").addToClassPool(classPool);
 				return Collections.singletonList(ctClass);
 			}
 		});
@@ -416,7 +416,7 @@ public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
 
 			@Override
 			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
-				CtClass ctClass = CtClassBuilder.create().privateModifier().name("japicmp.Test").addToClassPool(classPool);
+				CtClass ctClass = CtClassBuilder.create().notPublicModifier().name("japicmp.Test").addToClassPool(classPool);
 				return Collections.singletonList(ctClass);
 			}
 		});
@@ -2205,7 +2205,7 @@ public void testPackagePrivateClassChangesToPublicClassWithMethodReturnTypeChang
 			@Override
 			public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
 				CtClass ctInterfaceF = CtInterfaceBuilder.create().name("F").addToClassPool(classPool);
-				CtClass ctClassC = CtClassBuilder.create().name("C").protectedModifier().addToClassPool(classPool);
+				CtClass ctClassC = CtClassBuilder.create().name("C").notPublicModifier().addToClassPool(classPool);
 				CtMethodBuilder.create().publicAccess().staticAccess().name("M").returnType(ctInterfaceF).addToClass(ctClassC);
 				return Arrays.asList(ctInterfaceF, ctClassC);
 			}
@@ -2214,7 +2214,7 @@ public List<CtClass> createOldClasses(ClassPool classPool) throws Exception {
 			public List<CtClass> createNewClasses(ClassPool classPool) throws Exception {
 				CtClass ctInterfaceF = CtInterfaceBuilder.create().name("F").addToClassPool(classPool);
 				CtClass ctClassFImpl = CtClassBuilder.create().name("FImpl").implementsInterface(ctInterfaceF).addToClassPool(classPool);
-				CtClass ctClassC = CtClassBuilder.create().name("C").protectedModifier().addToClassPool(classPool);
+				CtClass ctClassC = CtClassBuilder.create().name("C").notPublicModifier().addToClassPool(classPool);
 				CtMethodBuilder.create().publicAccess().staticAccess().name("M").returnType(ctClassFImpl).addToClass(ctClassC);
 				return Arrays.asList(ctInterfaceF, ctClassC);
 			}

diff --git a/japicmp/src/test/java/japicmp/util/CtClassBuilder.java b/japicmp/src/test/java/japicmp/util/CtClassBuilder.java
@@ -45,17 +45,9 @@ public CtClassBuilder finalModifier() {
 		return this;
 	}
 
-	public CtClassBuilder privateModifier() {
+	// class cannot be private or (package) protected (see https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.1)
+	public CtClassBuilder notPublicModifier() {
 		this.modifier = this.modifier & ~Modifier.PUBLIC;
-		this.modifier = this.modifier & ~Modifier.PROTECTED;
-		this.modifier |= Modifier.PRIVATE;
-		return this;
-	}
-
-	public CtClassBuilder protectedModifier() {
-		this.modifier = this.modifier & ~Modifier.PUBLIC;
-		this.modifier = this.modifier & ~Modifier.PRIVATE;
-		this.modifier |= Modifier.PROTECTED;
 		return this;
 	}