From 08a21a0385d66e0ed6ffe4c9e233c72db095e460 Mon Sep 17 00:00:00 2001 From: Markus Schmidt Date: Sat, 15 Jul 2023 13:28:18 +0200 Subject: [PATCH] refactor weird naming; current use is set to deprecated to not change the api for now --- .../src/main/java/sootup/core/signatures/PackageName.java | 6 ++++++ .../inputlocation/JrtFileSystemAnalysisInputLocation.java | 3 +-- .../main/java/sootup/java/core/JavaIdentifierFactory.java | 2 +- .../sootup/java/core/signatures/ModulePackageName.java | 4 ++-- .../main/java/sootup/java/core/types/JavaClassType.java | 8 ++++---- .../main/java/sootup/java/core/views/JavaModuleView.java | 4 ++-- .../core/signatures/JavaModuleIdentifierFactoryTest.java | 2 +- .../java/sootup/jimple/parser/JimpleConverterUtil.java | 4 ++-- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sootup.core/src/main/java/sootup/core/signatures/PackageName.java b/sootup.core/src/main/java/sootup/core/signatures/PackageName.java index 48e6bfb705..56cbf6eed1 100644 --- a/sootup.core/src/main/java/sootup/core/signatures/PackageName.java +++ b/sootup.core/src/main/java/sootup/core/signatures/PackageName.java @@ -52,10 +52,16 @@ public PackageName(final String packageName) { /** The name of the package. */ @Nonnull + @Deprecated // "use getName()" public String getPackageName() { return packageName; } + @Nonnull + public String getName() { + return packageName; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java index 6adc7520cc..898f5c7d4c 100644 --- a/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java +++ b/sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocation.java @@ -214,8 +214,7 @@ private JavaClassType fromPath( if (identifierFactory instanceof JavaModuleIdentifierFactory) { return ((JavaModuleIdentifierFactory) identifierFactory) - .getClassType( - sig.getClassName(), sig.getPackageName().getPackageName(), moduleDir.toString()); + .getClassType(sig.getClassName(), sig.getPackageName().getName(), moduleDir.toString()); } // if we are using the normal signature factory, then trim the module from the path diff --git a/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java b/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java index d292734fdc..bda893da40 100644 --- a/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java +++ b/sootup.java.core/src/main/java/sootup/java/core/JavaIdentifierFactory.java @@ -77,7 +77,7 @@ public static JavaIdentifierFactory getInstance() { JavaIdentifierFactory() { /* Represents the default package. */ - packages.put(PackageName.DEFAULT_PACKAGE.getPackageName(), PackageName.DEFAULT_PACKAGE); + packages.put(PackageName.DEFAULT_PACKAGE.getName(), PackageName.DEFAULT_PACKAGE); // initialize primitive map primitiveTypeMap.put( diff --git a/sootup.java.core/src/main/java/sootup/java/core/signatures/ModulePackageName.java b/sootup.java.core/src/main/java/sootup/java/core/signatures/ModulePackageName.java index 82bd4f5aef..5fbb4ac172 100644 --- a/sootup.java.core/src/main/java/sootup/java/core/signatures/ModulePackageName.java +++ b/sootup.java.core/src/main/java/sootup/java/core/signatures/ModulePackageName.java @@ -56,7 +56,7 @@ public boolean equals(Object o) { } ModulePackageName that = (ModulePackageName) o; return Objects.equal(moduleSignature, that.moduleSignature) - && Objects.equal(getPackageName(), that.getPackageName()); + && Objects.equal(getName(), that.getName()); } @Override @@ -73,7 +73,7 @@ public ModuleSignature getModuleSignature() { public String toString() { StringBuilder sb = new StringBuilder(); String moduleSignatureStr = getModuleSignature().toString(); - String pckgStr = getPackageName(); + String pckgStr = getName(); if (!moduleSignatureStr.isEmpty()) { sb.append(moduleSignatureStr).append("/"); } diff --git a/sootup.java.core/src/main/java/sootup/java/core/types/JavaClassType.java b/sootup.java.core/src/main/java/sootup/java/core/types/JavaClassType.java index 7462ac244b..e45b87f503 100644 --- a/sootup.java.core/src/main/java/sootup/java/core/types/JavaClassType.java +++ b/sootup.java.core/src/main/java/sootup/java/core/types/JavaClassType.java @@ -86,8 +86,8 @@ public int hashCode() { */ public String getFullyQualifiedName() { StringBuilder sb = new StringBuilder(); - if (!packageName.getPackageName().isEmpty()) { - sb.append(packageName.getPackageName()); + if (!packageName.getName().isEmpty()) { + sb.append(packageName.getName()); sb.append('.'); } sb.append(className); @@ -100,7 +100,7 @@ public String toString() { String packageNameStr = packageName.toString(); if (!packageNameStr.isEmpty()) { sb.append(packageName); - if (!packageName.getPackageName().isEmpty()) { + if (!packageName.getName().isEmpty()) { sb.append('.'); } } @@ -128,6 +128,6 @@ public boolean isBuiltInClass() { String moduleName = ((ModulePackageName) packageName).getModuleSignature().toString(); return moduleName.startsWith("java.") || moduleName.startsWith("jdk."); } - return LIBRARY_CLASS_PATTERN.matcher(packageName.getPackageName()).find(); + return LIBRARY_CLASS_PATTERN.matcher(packageName.getName()).find(); } } diff --git a/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java b/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java index 3f80b44e80..c434e537f5 100644 --- a/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java +++ b/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java @@ -426,8 +426,8 @@ private boolean isProvidedInterfaceImplementation(@Nonnull JavaClassType type) { for (JavaModuleInfo.InterfaceReference provides : moduleInfo.provides()) { JavaClassType interfaceType = provides.getInterfaceType(); - String packageName1 = interfaceType.getPackageName().getPackageName(); - String packageName2 = type.getPackageName().getPackageName(); + String packageName1 = interfaceType.getPackageName().getName(); + String packageName2 = type.getPackageName().getName(); if (packageName1.equals(packageName2)) { if (interfaceType.getClassName().equals(type.getClassName())) { return true; diff --git a/sootup.java.core/src/test/java/sootup/java/core/signatures/JavaModuleIdentifierFactoryTest.java b/sootup.java.core/src/test/java/sootup/java/core/signatures/JavaModuleIdentifierFactoryTest.java index 0ad5a6c959..a52111a933 100644 --- a/sootup.java.core/src/test/java/sootup/java/core/signatures/JavaModuleIdentifierFactoryTest.java +++ b/sootup.java.core/src/test/java/sootup/java/core/signatures/JavaModuleIdentifierFactoryTest.java @@ -80,7 +80,7 @@ public void getModulePackageSignatureDiffModule() { assertNotSame(packageSignature1, packageSignature2); assertNotSame(packageSignature1.getModuleSignature(), packageSignature2.getModuleSignature()); - assertSame(packageSignature1.getPackageName(), packageSignature2.getPackageName()); + assertSame(packageSignature1.getName(), packageSignature2.getName()); assertNotEquals(packageSignature1, packageSignature2); } diff --git a/sootup.jimple.parser/src/main/java/sootup/jimple/parser/JimpleConverterUtil.java b/sootup.jimple.parser/src/main/java/sootup/jimple/parser/JimpleConverterUtil.java index 676ae4e6e3..fe01543387 100644 --- a/sootup.jimple.parser/src/main/java/sootup/jimple/parser/JimpleConverterUtil.java +++ b/sootup.jimple.parser/src/main/java/sootup/jimple/parser/JimpleConverterUtil.java @@ -43,7 +43,7 @@ public Type getType(String typename) { PackageName packageName = imports.get(typename); return packageName == null ? identifierFactory.getType(typename) - : identifierFactory.getType(packageName.getPackageName() + "." + typename); + : identifierFactory.getType(packageName.getName() + "." + typename); } public ClassType getClassType(String typename) { @@ -51,7 +51,7 @@ public ClassType getClassType(String typename) { PackageName packageName = this.imports.get(typename); return packageName == null ? this.identifierFactory.getClassType(typename) - : this.identifierFactory.getClassType(typename, packageName.getPackageName()); + : this.identifierFactory.getClassType(typename, packageName.getName()); } @Nonnull