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.

Sign up for GitHub

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

Add modularity model logic #9

Merged
merged 4 commits into from
Jul 30, 2024
Merged

Add modularity model logic #9

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb1e4b1
add modularity model logic
kelloggm Jul 30, 2024
5d0d644
also add model to test
kelloggm Jul 30, 2024
c0efcf2
adjust expected specimin commands for tests
kelloggm Jul 30, 2024
c4c97f9
make the test more robust, and don't add an extra space
kelloggm Jul 30, 2024
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
1 change: 1 addition & 0 deletions Keyvalue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ class JsonKeys(Enum):
BUG_TYPE = 'bug_type'
CHECKER_QUAL_REQURIED = 'checker_qual_required'
BUG_PATTERN = 'bug_pattern'
MODEL = 'model'
11 changes: 7 additions & 4 deletions TestMain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ def test_build_specimin_command(self):
targets = [{
"method": "getMode(ColumnMetadata, Map<String, String>)",
"file": "IndexMode.java",
"package": 'org.apache.cassandra.index.sasi.conf'
"package": 'org.apache.cassandra.index.sasi.conf',
"model": "cf"
}]

target_dir = '/user/ISSUES/cf-6077'
Expand All @@ -76,7 +77,8 @@ def test_build_specimin_command(self):
targets = [{
"method": "transform(String, byte[])",
"file": "Avro2Confluent.java",
"package": 'com.fillmore_labs.kafka.sensors.serde.confluent.interop'
"package": 'com.fillmore_labs.kafka.sensors.serde.confluent.interop',
"model" : "cf"
}]

target_dir = '/user/ISSUES/cf-6019'
Expand Down Expand Up @@ -109,7 +111,8 @@ def test_run_specimin(self):
targets = [{
"method": "bar()",
"file": "Simple.java",
"package": "com.example"
"package": "com.example",
"model" : "cf"
}]
target_dir = 'resources/onefilesimple'

Expand All @@ -121,4 +124,4 @@ def test_run_specimin(self):


if __name__ == '__main__':
unittest.main()
unittest.main()
9 changes: 7 additions & 2 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def build_specimin_command(project_name: str,
project_name (str): Name of the target project. Example: daikon
target_base_dir (str): path of the target project directory. Ex: ISSUES/cf-1291
root_dir (str): A directory path relative to the project base directory where java package stored.
targets ({'method': '' or 'field': '', 'file': '', 'package': ''}) : target java file and method/field name data
targets ({'method': '' or 'field': '', 'file': '', 'package': '', 'model' : ''}) : target java file, modularity model, and method/field name data

Retruns:
command (str): The gradle command of SPECIMIN for the issue.
Expand Down Expand Up @@ -335,6 +335,7 @@ def build_specimin_command(project_name: str,
field_name = target.get(JsonKeys.FIELD_NAME.value)
file_name = target[JsonKeys.FILE_NAME.value]
package_name = target[JsonKeys.PACKAGE.value]
modularity_model = target[JsonKeys.MODEL.value]

dot_replaced_package_name = package_name.replace('.', '/')

Expand Down Expand Up @@ -380,7 +381,11 @@ def build_specimin_command(project_name: str,
if jar_path:
jar_path_subcommand = " --jarPath" + " " + f"\"{jar_path}\""

command_args = root_dir_subcommand + " " + output_dir_subcommand + " " + target_file_subcommand + " " + target_method_subcommand + target_field_subcommand + jar_path_subcommand
model_subcommand = ""
if modularity_model:
model_subcommand = " --modularityModel " + f"\"{modularity_model}\""

command_args = root_dir_subcommand + " " + output_dir_subcommand + " " + model_subcommand + " " + target_file_subcommand + " " + target_method_subcommand + target_field_subcommand + jar_path_subcommand


command = ""
Expand Down
99 changes: 65 additions & 34 deletions resources/test_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
{
"method": "executePureMethod(Method, Object, Object[])",
"file": "PureMethodInfo.java",
"package": "daikon.chicory"
"package": "daikon.chicory",
"model": "cf"
}
],
"version": "2.1.10",
Expand Down Expand Up @@ -40,7 +41,8 @@
{
"method": "setAccessible(AccessibleObject)",
"file": "ClassUtil.java",
"package": "net.openhft.chronicle.core.internal"
"package": "net.openhft.chronicle.core.internal",
"model": "cf"
}
],
"version": "3.40.0",
Expand All @@ -62,7 +64,8 @@
{
"method": "getMode(ColumnMetadata, Map<String, String>)",
"file": "IndexMode.java",
"package": "org.apache.cassandra.index.sasi.conf"
"package": "org.apache.cassandra.index.sasi.conf",
"model": "cf"
}
],
"version": "3.36.0",
Expand Down Expand Up @@ -90,7 +93,8 @@
{
"method": "spliterator()",
"file": "ResultQuery.java",
"package": "org.jooq"
"package": "org.jooq",
"model": "cf"
}
],
"version": "",
Expand All @@ -112,7 +116,8 @@
{
"method": "hasNext()",
"file": "SSTableScanner.java",
"package": "org.apache.cassandra.io.sstable.format"
"package": "org.apache.cassandra.io.sstable.format",
"model": "cf"
}
],
"version": "3.35.0",
Expand All @@ -134,7 +139,8 @@
{
"method": "transform(String, byte[])",
"file": "Avro2Confluent.java",
"package": "com.fillmore_labs.kafka.sensors.serde.confluent.interop"
"package": "com.fillmore_labs.kafka.sensors.serde.confluent.interop",
"model": "cf"
}
],
"version": "3.35.0",
Expand All @@ -157,7 +163,8 @@
{
"method": "method()",
"file": "Version.java",
"package": "net.mtu.eggplant.checker.parser_error"
"package": "net.mtu.eggplant.checker.parser_error",
"model": "cf"
}
],
"version": "3.12.0",
Expand Down Expand Up @@ -186,7 +193,8 @@
{
"method": "toPos(Iterable<? extends SqlNode>)",
"file": "SqlParserPos.java",
"package": "org.apache.calcite.sql.parser"
"package": "org.apache.calcite.sql.parser",
"model": "cf"
}
],
"version": "3.7.1",
Expand All @@ -209,7 +217,8 @@
"method": "arrayForOne(int[], int, IntConsumer)",
"file": "IncomparableTypes.java",
"package": "com.example.stream",
"inner_class": "Splitr"
"inner_class": "Splitr",
"model": "cf"
}
],
"version": "1.9.11",
Expand Down Expand Up @@ -243,7 +252,8 @@
"method": "expand(PCollection<BillingEvent>)",
"file": "InvoicingPipeline.java",
"package": "google.registry.beam.invoicing",
"inner_class": "GenerateInvoiceRows"
"inner_class": "GenerateInvoiceRows",
"model": "cf"
}
],
"version": "3.1.0",
Expand Down Expand Up @@ -272,7 +282,8 @@
{
"method": "equals(Object)",
"file": "ImmutableIntList.java",
"package": "org.apache.calcite.util"
"package": "org.apache.calcite.util",
"model": "cf"
}
],
"version": "3.6.0",
Expand All @@ -299,7 +310,8 @@
{
"method": "checkedEntry(Entry<Class<? extends B>, B>)",
"file": "MutableClassToInstanceMap.java",
"package": "com.google.common.collect"
"package": "com.google.common.collect",
"model": "cf"
}
],
"version": "3.0.1",
Expand Down Expand Up @@ -330,7 +342,8 @@
"method": "getBestValidator()",
"file": "FuturesGetChecked.java",
"package": "com.google.common.util.concurrent",
"inner_class": "GetCheckedTypeValidatorHolder"
"inner_class": "GetCheckedTypeValidatorHolder",
"model": "cf"
}
],
"version": "3.0.1",
Expand Down Expand Up @@ -359,7 +372,8 @@
"method": "wrapCollection(K, Collection<V>)",
"file": "Multimaps.java",
"package": "com.google.common.collect",
"inner_class": "CustomMultimap"
"inner_class": "CustomMultimap",
"model": "cf"
}
],
"version": "3.0.1",
Expand All @@ -386,11 +400,12 @@
"root_dir": "",
"targets": [
{
"method": "",
"method": "",
"field": "EMPTY_NAVIGABLE_SET",
"file": "Collections.java",
"package": "com.example",
"inner_class": "UnmodifiableNavigableSet"
"inner_class": "UnmodifiableNavigableSet",
"model": "cf"
}
],
"version": "1.9.13",
Expand Down Expand Up @@ -424,7 +439,8 @@
"file": "AbstractList.java",
"package": "com.example",
"inner_class": "",
"non_primary_class": "SubList"
"non_primary_class": "SubList",
"model": "cf"
}
],
"version": "1.9.13",
Expand Down Expand Up @@ -457,7 +473,8 @@
"method": "via(Contextful<Fn<UserT, OutputT>>, Contextful<Fn<DestinationT, Sink<OutputT>>>)",
"file": "FileIO.java",
"package": "org.apache.beam.sdk.io",
"inner_class": "Write"
"inner_class": "Write",
"model": "cf"
}
],
"version": "3.40.0",
Expand All @@ -481,7 +498,8 @@
"method": "difference(Map<? extends K, ? extends V>, Map<? extends K, ? extends V>, Equivalence<? super V>)",
"file": "Maps.java",
"package": "com.google.common.collect",
"inner_class": ""
"inner_class": "",
"model": "javac"
}
],
"version": "3.0.1",
Expand Down Expand Up @@ -512,7 +530,8 @@
"method": "create(Class<P>, Class<V>, String, PropertyMetadata<V>)",
"file": "PropertyFactoryManager.java",
"package": "io.github.mmm.property.factory",
"inner_class": ""
"inner_class": "",
"model": "javac"
}
],
"version": "",
Expand Down Expand Up @@ -541,7 +560,8 @@
"method": "simpleFieldValues(String, Class<T>, Iterable<?>)",
"file": "FieldSupport.java",
"package": "org.assertj.core.util.introspection",
"inner_class": ""
"inner_class": "",
"model": "javac"
}
],
"version": "",
Expand Down Expand Up @@ -572,7 +592,8 @@
"method": "toArray()",
"file": "ForwardingCollection.java",
"package": "com.google.common.collect",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"version": "0.2.2",
Expand All @@ -598,7 +619,8 @@
"method": "longAccumulate(long, LongBinaryOperator, boolean)",
"file": "Striped64.java",
"package": "java.util.concurrent.atomic",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -628,7 +650,8 @@
"method": "iterator()",
"file": "AbstractLinkedDeque.java",
"package": "com.github.benmanes.caffeine.cache",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -659,7 +682,8 @@
"method": "evictFromMain(int)",
"file": "BoundedLocalCache.java",
"package": "com.github.benmanes.caffeine.cache",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -690,7 +714,8 @@
"method": "setUp()",
"file": "UnitOfWorkAwareProxyFactoryTest.java",
"package": "io.dropwizard.hibernate",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -719,12 +744,13 @@
"method": "MutableClock(Instant, ZoneId)",
"file": "MutableClock.java",
"package": "com.cogvio.time",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
"file_pattern": "(\\w+\\.java)",
"error_pattern": "[NullAway] (.*)"
"error_pattern": "\\[NullAway\\] initializer (.*)"
},
"version": "0.7.3",
"java_version": "",
Expand All @@ -749,12 +775,13 @@
"method": "SignatureX(DSAPublicKey, int, byte[])",
"file": "SignatureX.java",
"package": "net.java.otr4j.messages",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
"file_pattern": "(\\w+\\.java)",
"error_pattern": "[NullAway] (.*)"
"error_pattern": "\\[NullAway\\] (.*)"
},
"version": "0.7.5",
"java_version": "",
Expand All @@ -779,7 +806,8 @@
"method": "getStatistics()",
"file": "ActionManagerFactoryImpl.java",
"package": "com.adobe.acs.commons.fam.impl",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -811,7 +839,8 @@
"field": "entrySet",
"file": "CaffeinatedGuavaCache.java",
"package": "com.github.benmanes.caffeine.guava",
"inner_class": "AsMapView"
"inner_class": "AsMapView",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -841,7 +870,8 @@
"method": "getEvictionListener(boolean)",
"file": "Caffeine.java",
"package": "com.github.benmanes.caffeine.cache",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down Expand Up @@ -872,7 +902,8 @@
"method": "getFeatures(List<Object>)",
"file": "NodeFactoryGenerator.java",
"package": "com.github.benmanes.caffeine.cache",
"inner_class": ""
"inner_class": "",
"model": "nullaway"
}
],
"bug_pattern": {
Expand Down
Loading