Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor weird naming PackageName.getPackageName() #646

Merged
merged 1 commit into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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("/");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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('.');
}
}
Expand Down Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@
PackageName packageName = imports.get(typename);
return packageName == null
? identifierFactory.getType(typename)
: identifierFactory.getType(packageName.getPackageName() + "." + typename);
: identifierFactory.getType(packageName.getName() + "." + typename);

Check warning on line 46 in sootup.jimple.parser/src/main/java/sootup/jimple/parser/JimpleConverterUtil.java

View check run for this annotation

Codecov / codecov/patch

sootup.jimple.parser/src/main/java/sootup/jimple/parser/JimpleConverterUtil.java#L46

Added line #L46 was not covered by tests
}

public ClassType getClassType(String typename) {
typename = Jimple.unescape(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
Expand Down