mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Greg DiCristofaro 2023-09-01 08:19:26 -04:00
parent 18de6d9607
commit 10d27316a6
1 changed files with 91 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
release_scripts/APIUpdate/src/main/java/org/sleuthkit/autopsy/apiupdate/ChangeOutputGenerator.java
View File

@ -19,6 +19,7 @@ import static japicmp.util.GenericTemplateHelper.haveGenericTemplateInterfacesCh
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javassist.CtClass;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.sleuthkit.autopsy.apiupdate.ApiChangeDTO.FieldChangeDTO; import org.sleuthkit.autopsy.apiupdate.ApiChangeDTO.FieldChangeDTO;
import org.sleuthkit.autopsy.apiupdate.ApiChangeDTO.InterfaceChangeDTO; import org.sleuthkit.autopsy.apiupdate.ApiChangeDTO.InterfaceChangeDTO;
@ -260,22 +261,21 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
} }
private String getClassString(JApiClass clz, boolean oldClass) { private String getClassString(JApiClass clz, boolean oldClass) {
if (jApiClass.getChangeStatus() == NEW && oldClass || jApiClass.getChangeStatus() == REMOVED && !oldClass) { // TODO serial version id
return null; // TODO annotations
}
String accessModifier = str(get(clz.getAccessModifier(), oldClass).orElse(null)); String accessModifier = str(get(clz.getAccessModifier(), oldClass).orElse(null));
String abstractModifier = str(get(clz.getAbstractModifier(), oldClass).orElse(null)); String abstractModifier = str(get(clz.getAbstractModifier(), oldClass).orElse(null));
String staticModifier = str(get(clz.getStaticModifier(), oldClass).orElse(null)); String staticModifier = str(get(clz.getStaticModifier(), oldClass).orElse(null));
String finalModifier = str(get(clz.getFinalModifier(), oldClass).orElse(null)); String finalModifier = str(get(clz.getFinalModifier(), oldClass).orElse(null));
String syntheticModifier = str(get(clz.getSyntheticModifier(), oldClass).orElse(null)); String syntheticModifier = str(get(clz.getSyntheticModifier(), oldClass).orElse(null));
String type = str(clz.getClassType(), oldClass);
String name = clz.getFullyQualifiedName(); String name = clz.getFullyQualifiedName();
String genericModifier = strOpt(get(clz.getGenericTemplates(); String genericModifier = strGeneric(clz.getGenericTemplates(), oldClass);
String implementsModifier = TBD; String implementsModifier = strImplements(clz.getInterfaces(), oldClass);
String extendsModifier = TBD; String extendsModifier = str(clz.getSuperclass(), oldClass);
return Stream.of( return Stream.of(
accessModifier, accessModifier,
@ -283,7 +283,7 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
staticModifier, staticModifier,
finalModifier, finalModifier,
syntheticModifier, syntheticModifier,
"class", type,
name + (StringUtils.isBlank(genericModifier) ? "" : genericModifier), name + (StringUtils.isBlank(genericModifier) ? "" : genericModifier),
implementsModifier, implementsModifier,
extendsModifier) extendsModifier)
@ -291,12 +291,64 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
.collect(Collectors.joining(" ")); .collect(Collectors.joining(" "));
} }
// private List<GenericTemplateChangeDTO> getGenericTemplateChanges(JApiHasGenericTemplates jApiHasGenericTemplates) {
// return jApiHasGenericTemplates.getGenericTemplates().stream() private String str(JApiSuperclass supClz, boolean oldClass) {
// .filter(template -> template.getChangeStatus() != JApiChangeStatus.UNCHANGED) Optional<CtClass> ctClass = convert(oldClass ? supClz.getOldSuperclass() : supClz.getNewSuperclass());
// .map(template -> new GenericTemplateChangeDTO()) String supClassExt = ctClass.map(ctClz -> str(ctClz)).orElse(null);
// .collect(Collectors.toList()); return StringUtils.isBlank(supClassExt) ? null : "extends " + supClassExt;
}
private String strImplements(List<JApiImplementedInterface> interfaces, boolean oldClass) {
if (interfaces.isEmpty()) {
return null;
}
String interfaceStr = interfaces.stream()
.filter(i -> (oldClass && i.getChangeStatus() == NEW) || (!oldClass && i.getChangeStatus() == REMOVED))
.map(i -> str(i.getCtClass()))
.collect(Collectors.joining(", "));
return StringUtils.isNotBlank(interfaceStr) ? "implements " + interfaceStr : null;
}
private String str(CtClass ctClass) {
return ctClass.getName() + (StringUtils.isBlank(ctClass.getGenericSignature()) ? "" : "<" + ctClass.getGenericSignature() + ">");
}
private String str(JApiClassType classType, boolean oldClass) {
return Optional.ofNullable(classType)
.flatMap(ct -> convert(oldClass ? ct.getOldTypeOptional() : ct.getNewTypeOptional()))
.map(ct -> ct.name().toLowerCase())
.orElse("class");
}
private String strGeneric(List<JApiGenericTemplate> templates, boolean oldClass) {
if (templates.isEmpty()) {
return null;
}
String genericParams = templates.stream()
.map(t -> convert(oldClass ?
str(t.getName(), convert(t.getOldTypeOptional()), t.getOldInterfaceTypes()) :
str(t.getName(), convert(t.getNewTypeOptional()), t.getNewInterfaceTypes())
)
.filter(Optional::isPresent)
.map(t -> t.get())
.collect(Collectors.joining(", "));
return StringUtils.isBlank(genericParams)
? null
: "<" + genericParams + ">";
}
private String strGeneric(String name, Optional<String> mainType, List<JApiGenericType> genericType) {
}
// jApiGenericTemplate.getName() + ":" + interfaceTypes.join( "&")
// //
// private List<GenericTemplateChangeDTO> getGenericTemplateChanges(JApiHasGenericTemplates jApiHasGenericTemplates) {
// if (!genericTemplates.isEmpty()) { // if (!genericTemplates.isEmpty()) {
// sb.append(tabs(numberOfTabs)).append("GENERIC TEMPLATES: "); // sb.append(tabs(numberOfTabs)).append("GENERIC TEMPLATES: ");
// genericTemplates.sort(Comparator.comparing(JApiGenericTemplate::getName)); // genericTemplates.sort(Comparator.comparing(JApiGenericTemplate::getName));
@ -343,25 +395,24 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
// sb.append("\n"); // sb.append("\n");
// } // }
// } // }
// private void appendGenericTemplatesInterfaces(StringBuilder sb, JApiGenericTemplate jApiGenericTemplate, boolean printOld, boolean printNew) { private void appendGenericTemplatesInterfaces(StringBuilder sb, JApiGenericTemplate jApiGenericTemplate, boolean printOld, boolean printNew) {
// if (printOld) { if (printOld) {
// for (JApiGenericType jApiGenericType : jApiGenericTemplate.getOldInterfaceTypes()) { for (JApiGenericType jApiGenericType : jApiGenericTemplate.getOldInterfaceTypes()) {
// sb.append(" & "); sb.append(" & ");
// sb.append(jApiGenericType.getType()); sb.append(jApiGenericType.getType());
// appendGenericTypes(sb, false, jApiGenericType.getGenericTypes()); appendGenericTypes(sb, false, jApiGenericType.getGenericTypes());
// } }
// } }
// if (printNew) { if (printNew) {
// for (JApiGenericType jApiGenericType : jApiGenericTemplate.getNewInterfaceTypes()) { for (JApiGenericType jApiGenericType : jApiGenericTemplate.getNewInterfaceTypes()) {
// sb.append(" & "); sb.append(" & ");
// sb.append(jApiGenericType.getType()); sb.append(jApiGenericType.getType());
// appendGenericTypes(sb, false, jApiGenericType.getGenericTypes()); appendGenericTypes(sb, false, jApiGenericType.getGenericTypes());
// } }
// } }
// } }
// private String str(JApiHasGenericTemplates jApiHasGenericTemplates) {
// jApiHasGenericTemplates.getGenericTemplates().get(0).g
// }
private FieldChangeDTO getFieldChange(JApiField field) { private FieldChangeDTO getFieldChange(JApiField field) {
return new FieldChangeDTO( return new FieldChangeDTO(
field.getChangeStatus(), field.getChangeStatus(),
@ -370,15 +421,11 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
} }
private String getFieldString(JApiField field, boolean oldField) { private String getFieldString(JApiField field, boolean oldField) {
if (field.getChangeStatus() == NEW && oldField || field.getChangeStatus() == REMOVED && !oldField) {
return null;
}
String accessModifier = str(get(field.getAccessModifier(), oldField).orElse(null)); String accessModifier = str(get(field.getAccessModifier(), oldField).orElse(null));
String staticModifier = str(get(field.getStaticModifier(), oldField).orElse(null)); String staticModifier = str(get(field.getStaticModifier(), oldField).orElse(null));
String finalModifier = str(get(field.getFinalModifier(), oldField).orElse(null)); String finalModifier = str(get(field.getFinalModifier(), oldField).orElse(null));
String syntheticModifier = str(get(field.getSyntheticModifier(), oldField).orElse(null)); String syntheticModifier = str(get(field.getSyntheticModifier(), oldField).orElse(null));
String fieldType = strOpt(field.getType(), oldField).orElse(""); String fieldType = strOpt(field.getType(), oldField).orElse(null);
String name = field.getName(); String name = field.getName();
return Stream.of(accessModifier, staticModifier, finalModifier, syntheticModifier, fieldType, name) return Stream.of(accessModifier, staticModifier, finalModifier, syntheticModifier, fieldType, name)
@ -388,7 +435,7 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
private String str(AccessModifier modifier) { private String str(AccessModifier modifier) {
if (modifier == null || modifier == AccessModifier.PACKAGE_PROTECTED) { if (modifier == null || modifier == AccessModifier.PACKAGE_PROTECTED) {
return ""; return null;
} else { } else {
return modifier.name().toLowerCase(); return modifier.name().toLowerCase();
} }
@ -397,25 +444,25 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
private String str(StaticModifier modifier) { private String str(StaticModifier modifier) {
return (modifier == StaticModifier.STATIC) return (modifier == StaticModifier.STATIC)
? "static" ? "static"
: ""; : null;
} }
private String str(FinalModifier modifier) { private String str(FinalModifier modifier) {
return (modifier == FinalModifier.FINAL) return (modifier == FinalModifier.FINAL)
? "final" ? "final"
: ""; : null;
} }
private String str(SyntheticModifier modifier) { private String str(SyntheticModifier modifier) {
return (modifier == SyntheticModifier.SYNTHETIC) return (modifier == SyntheticModifier.SYNTHETIC)
? "synthetic" ? "synthetic"
: ""; : null;
} }
private String str(AbstractModifier modifier) { private String str(AbstractModifier modifier) {
return (modifier == AbstractModifier.ABSTRACT) return (modifier == AbstractModifier.ABSTRACT)
? "abstract" ? "abstract"
: ""; : null;
} }
private Optional<String> strOpt(JApiType tp, boolean oldField) { private Optional<String> strOpt(JApiType tp, boolean oldField) {
@ -611,4 +658,5 @@ public class ChangeOutputGenerator extends OutputGenerator<ApiChangeDTO> {
// } // }
// return "n.a."; // return "n.a.";
// } // }
} }