#4170

Committed 14 Nov 2024 03:14PM UTC coverage: 61.434% (+0.2%) from 61.2%

Build # #4170

Build Type

push

github

Committed by

oowekyala

Commit Message

Merge branch 'typeres-fix-inference-issue'

Run Details

17475 of 28027 branches covered (62.35%)

Branch coverage included in aggregate %.

3 of 3 new or added lines in 3 files covered. (100.0%)

2 existing lines in 1 file now uncovered.

39417 of 64580 relevant lines covered (61.04%)

0.62 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

81.08

/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaLanguageProcessor.java

/*
 * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
 */

package net.sourceforge.pmd.lang.java.internal;

import java.util.List;
import java.util.Objects;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import net.sourceforge.pmd.lang.LanguageVersionHandler;
import net.sourceforge.pmd.lang.ast.Parser;
import net.sourceforge.pmd.lang.impl.BatchLanguageProcessor;
import net.sourceforge.pmd.lang.java.ast.JavaParser;
import net.sourceforge.pmd.lang.java.internal.JavaLanguageProperties.InferenceLoggingVerbosity;
import net.sourceforge.pmd.lang.java.rule.xpath.internal.BaseContextNodeTestFun;
import net.sourceforge.pmd.lang.java.rule.xpath.internal.GetCommentOnFunction;
import net.sourceforge.pmd.lang.java.rule.xpath.internal.GetModifiersFun;
import net.sourceforge.pmd.lang.java.rule.xpath.internal.MatchesSignatureFunction;
import net.sourceforge.pmd.lang.java.rule.xpath.internal.MetricFunction;
import net.sourceforge.pmd.lang.java.rule.xpath.internal.NodeIsFunction;
import net.sourceforge.pmd.lang.java.types.TypeSystem;
import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger;
import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.SimpleLogger;
import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.VerboseLogger;
import net.sourceforge.pmd.lang.metrics.LanguageMetricsProvider;
import net.sourceforge.pmd.lang.rule.xpath.impl.XPathHandler;
import net.sourceforge.pmd.reporting.ViolationDecorator;
import net.sourceforge.pmd.reporting.ViolationSuppressor;
import net.sourceforge.pmd.util.designerbindings.DesignerBindings;

/**
 * @author Clément Fournier
 */
public class JavaLanguageProcessor extends BatchLanguageProcessor<JavaLanguageProperties>
    implements LanguageVersionHandler {

    private static final Logger LOG = LoggerFactory.getLogger(JavaLanguageProcessor.class);

    private final LanguageMetricsProvider myMetricsProvider = new JavaMetricsProvider();
    private final JavaParser parser;
    private final JavaParser parserWithoutProcessing;
    private TypeSystem typeSystem;

    public JavaLanguageProcessor(JavaLanguageProperties properties, TypeSystem typeSystem) {
        super(properties);
        this.typeSystem = typeSystem;

        String suppressMarker = properties.getSuppressMarker();
        this.parser = new JavaParser(suppressMarker, this, true);
        this.parserWithoutProcessing = new JavaParser(suppressMarker, this, false);
    }

    public JavaLanguageProcessor(JavaLanguageProperties properties) {
        this(properties, TypeSystem.usingClassLoaderClasspath(properties.getAnalysisClassLoader()));
        LOG.debug("Using analysis classloader: {}", properties.getAnalysisClassLoader());
    }

    @Override
    public @NonNull LanguageVersionHandler services() {
        return this;
    }

    @Override
    public Parser getParser() {
        return parser;
    }

    public JavaParser getParserWithoutProcessing() {
        return parserWithoutProcessing;
    }

    public TypeSystem getTypeSystem() {
        return typeSystem;
    }

    TypeInferenceLogger newTypeInfLogger() {
        InferenceLoggingVerbosity verbosity = getProperties().getProperty(JavaLanguageProperties.INTERNAL_INFERENCE_LOGGING_VERBOSITY);
        if (verbosity == InferenceLoggingVerbosity.VERBOSE) {
            return new VerboseLogger(System.err);
        } else if (verbosity == InferenceLoggingVerbosity.SIMPLE) {
            return new SimpleLogger(System.err);
        } else {
            return TypeInferenceLogger.noop();
        }
    }

    @Override
    public DesignerBindings getDesignerBindings() {
        return JavaDesignerBindings.INSTANCE;
    }

    @Override
    public XPathHandler getXPathHandler() {
        return XPATH_HANDLER;
    }

    @Override
    public List<ViolationSuppressor> getExtraViolationSuppressors() {
        return AnnotationSuppressionUtil.ALL_JAVA_SUPPRESSORS;
    }

    @Override
    public ViolationDecorator getViolationDecorator() {
        return JavaViolationDecorator.INSTANCE;
    }

    @Override
    public LanguageMetricsProvider getLanguageMetricsProvider() {
        return myMetricsProvider;
    }

    private static final XPathHandler XPATH_HANDLER =
        XPathHandler.getHandlerForFunctionDefs(
            BaseContextNodeTestFun.TYPE_IS_EXACTLY,
            BaseContextNodeTestFun.TYPE_IS,
            BaseContextNodeTestFun.HAS_ANNOTATION,
            MatchesSignatureFunction.INSTANCE,
            NodeIsFunction.INSTANCE,
            GetModifiersFun.GET_EFFECTIVE,
            GetModifiersFun.GET_EXPLICIT,
            MetricFunction.INSTANCE,
            GetCommentOnFunction.INSTANCE
        );

    public void setTypeSystem(TypeSystem ts) {
        this.typeSystem = Objects.requireNonNull(ts);
    }

    @Override
    public void close() throws Exception {
        this.typeSystem.logStats();
        super.close();
    }
}

1	/*
2	* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
3	*/
4
5	package net.sourceforge.pmd.lang.java.internal;
6
7	import java.util.List;
8	import java.util.Objects;
9
10	import org.checkerframework.checker.nullness.qual.NonNull;
11	import org.slf4j.Logger;
12	import org.slf4j.LoggerFactory;
13
14	import net.sourceforge.pmd.lang.LanguageVersionHandler;
15	import net.sourceforge.pmd.lang.ast.Parser;
16	import net.sourceforge.pmd.lang.impl.BatchLanguageProcessor;
17	import net.sourceforge.pmd.lang.java.ast.JavaParser;
18	import net.sourceforge.pmd.lang.java.internal.JavaLanguageProperties.InferenceLoggingVerbosity;
19	import net.sourceforge.pmd.lang.java.rule.xpath.internal.BaseContextNodeTestFun;
20	import net.sourceforge.pmd.lang.java.rule.xpath.internal.GetCommentOnFunction;
21	import net.sourceforge.pmd.lang.java.rule.xpath.internal.GetModifiersFun;
22	import net.sourceforge.pmd.lang.java.rule.xpath.internal.MatchesSignatureFunction;
23	import net.sourceforge.pmd.lang.java.rule.xpath.internal.MetricFunction;
24	import net.sourceforge.pmd.lang.java.rule.xpath.internal.NodeIsFunction;
25	import net.sourceforge.pmd.lang.java.types.TypeSystem;
26	import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger;
27	import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.SimpleLogger;
28	import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.VerboseLogger;
29	import net.sourceforge.pmd.lang.metrics.LanguageMetricsProvider;
30	import net.sourceforge.pmd.lang.rule.xpath.impl.XPathHandler;
31	import net.sourceforge.pmd.reporting.ViolationDecorator;
32	import net.sourceforge.pmd.reporting.ViolationSuppressor;
33	import net.sourceforge.pmd.util.designerbindings.DesignerBindings;
34
35	/**
36	* @author Clément Fournier
37	*/
38	public class JavaLanguageProcessor extends BatchLanguageProcessor<JavaLanguageProperties>
39	implements LanguageVersionHandler {
40
41	private static final Logger LOG = LoggerFactory.getLogger(JavaLanguageProcessor.class);	1✔
42
43	private final LanguageMetricsProvider myMetricsProvider = new JavaMetricsProvider();	1✔
44	private final JavaParser parser;
45	private final JavaParser parserWithoutProcessing;
46	private TypeSystem typeSystem;
47
48	public JavaLanguageProcessor(JavaLanguageProperties properties, TypeSystem typeSystem) {
49	super(properties);	1✔
50	this.typeSystem = typeSystem;	1✔
51
52	String suppressMarker = properties.getSuppressMarker();	1✔
53	this.parser = new JavaParser(suppressMarker, this, true);	1✔
54	this.parserWithoutProcessing = new JavaParser(suppressMarker, this, false);	1✔
55	}	1✔
56
57	public JavaLanguageProcessor(JavaLanguageProperties properties) {
58	this(properties, TypeSystem.usingClassLoaderClasspath(properties.getAnalysisClassLoader()));	1✔
59	LOG.debug("Using analysis classloader: {}", properties.getAnalysisClassLoader());	1✔
60	}	1✔
61
62	@Override
63	public @NonNull LanguageVersionHandler services() {
64	return this;	1✔
65	}
66
67	@Override
68	public Parser getParser() {
69	return parser;	1✔
70	}
71
72	public JavaParser getParserWithoutProcessing() {
73	return parserWithoutProcessing;	1✔
74	}
75
76	public TypeSystem getTypeSystem() {
77	return typeSystem;	1✔
78	}
79
80	TypeInferenceLogger newTypeInfLogger() {
81	InferenceLoggingVerbosity verbosity = getProperties().getProperty(JavaLanguageProperties.INTERNAL_INFERENCE_LOGGING_VERBOSITY);	1✔
82	if (verbosity == InferenceLoggingVerbosity.VERBOSE) {	1!
83	return new VerboseLogger(System.err);	1✔
UNCOV 84	} else if (verbosity == InferenceLoggingVerbosity.SIMPLE) {	×
85	return new SimpleLogger(System.err);	×
86	} else {
UNCOV 87	return TypeInferenceLogger.noop();	×
88	}
89	}
90
91	@Override
92	public DesignerBindings getDesignerBindings() {
93	return JavaDesignerBindings.INSTANCE;	×
94	}
95
96	@Override
97	public XPathHandler getXPathHandler() {
98	return XPATH_HANDLER;	1✔
99	}
100
101	@Override
102	public List<ViolationSuppressor> getExtraViolationSuppressors() {
103	return AnnotationSuppressionUtil.ALL_JAVA_SUPPRESSORS;	1✔
104	}
105
106	@Override
107	public ViolationDecorator getViolationDecorator() {
108	return JavaViolationDecorator.INSTANCE;	1✔
109	}
110
111	@Override
112	public LanguageMetricsProvider getLanguageMetricsProvider() {
113	return myMetricsProvider;	1✔
114	}
115
116	private static final XPathHandler XPATH_HANDLER =	1✔
117	XPathHandler.getHandlerForFunctionDefs(	1✔
118	BaseContextNodeTestFun.TYPE_IS_EXACTLY,
119	BaseContextNodeTestFun.TYPE_IS,
120	BaseContextNodeTestFun.HAS_ANNOTATION,
121	MatchesSignatureFunction.INSTANCE,
122	NodeIsFunction.INSTANCE,
123	GetModifiersFun.GET_EFFECTIVE,
124	GetModifiersFun.GET_EXPLICIT,
125	MetricFunction.INSTANCE,
126	GetCommentOnFunction.INSTANCE
127	);
128
129	public void setTypeSystem(TypeSystem ts) {
130	this.typeSystem = Objects.requireNonNull(ts);	1✔
131	}	1✔
132
133	@Override
134	public void close() throws Exception {
135	this.typeSystem.logStats();	1✔
136	super.close();	1✔
137	}	1✔
138	}

pmd / pmd / #4170

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous