From b756a9fa74731683e1294d8bddb36ea5b4f3d821 Mon Sep 17 00:00:00 2001 From: Martin Mois Date: Wed, 18 Oct 2023 16:53:26 +0200 Subject: [PATCH] #365: renamed privateModifier() to notPublicModifier() in CtClassBuilder --- .../japicmp/compat/CompatibilityChangesTest.java | 8 ++++---- .../src/test/java/japicmp/util/CtClassBuilder.java | 12 ++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java b/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java index 05847b2af..9363ba8a2 100755 --- a/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java +++ b/japicmp/src/test/java/japicmp/compat/CompatibilityChangesTest.java @@ -104,7 +104,7 @@ public List createOldClasses(ClassPool classPool) throws Exception { @Override public List 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 createOldClasses(ClassPool classPool) throws Exception { @Override public List 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 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 createOldClasses(ClassPool classPool) throws Exception { public List 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 index a9e2d947a..7741f7d11 100644 --- 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; }