phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deleted the façade

Browse Source
This commit is contained in:
Clément Fournier
2017-09-06 23:33:24 +02:00
parent 7464705cf7
commit e2d8076f9e
10 changed files with 17 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ClassMirror.java
View File

@ -11,6 +11,7 @@ import net.sourceforge.pmd.lang.java.multifile.signature.JavaOperationSigMask;
* Represents a class for signature matching.
*
* @author Clément Fournier
* @since 6.0.0
*/
interface ClassMirror {

1
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ClassStats.java
View File

@ -26,6 +26,7 @@ import net.sourceforge.pmd.lang.java.multifile.signature.JavaOperationSignature;
* QualifiedNames anymore, only Strings.
*
* @author Clément Fournier
* @since 6.0.0
*/
final class ClassStats implements ClassMirror {

38
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/MultifileFacade.java
View File

@ -1,38 +0,0 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.java.multifile;
/**
* Facade class for multi-file analysis. Stores an instance of a ProjectMirror.
*
* @author Clément Fournier
*/
final class MultifileFacade {
private static final MultifileFacadeBacker FACADE = new MultifileFacadeBacker();
private MultifileFacade() {
}
/** Resets the entire data structure. Used for tests. */
static void reset() {
FACADE.reset();
}
/**
* Gets the PackageStats instance representing the currently analysed project.
*
* @return The project mirror
*/
static PackageStats getTopLevelPackageStats() {
return FACADE.getTopLevelPackageStats();
}
}

26
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/MultifileFacadeBacker.java
View File

@ -1,26 +0,0 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.java.multifile;
/**
* @author Clément Fournier
*/
final class MultifileFacadeBacker {
private final PackageStats topLevelPackageStats = new PackageStats();
/** Resets the data structure. Used for tests. */
void reset() {
topLevelPackageStats.reset();
}
PackageStats getTopLevelPackageStats() {
return topLevelPackageStats;
}
}

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/MultifileVisitor.java
View File

@ -12,7 +12,10 @@ import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration;
import net.sourceforge.pmd.lang.java.ast.JavaParserVisitorReducedAdapter;
/**
* Fills the PackageStats.
*
* @author Clément Fournier
* @since 6.0.0
*/
public class MultifileVisitor extends JavaParserVisitorReducedAdapter {

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/MultifileVisitorFacade.java
View File

@ -9,11 +9,12 @@ import net.sourceforge.pmd.lang.java.ast.JavaParserVisitorAdapter;
/**
* @author Clément Fournier
* @since 6.0.0
*/
public final class MultifileVisitorFacade extends JavaParserVisitorAdapter {
public void initializeWith(ASTCompilationUnit rootNode) {
PackageStats projectMirror = MultifileFacade.getTopLevelPackageStats();
PackageStats projectMirror = PackageStats.INSTANCE;
MultifileVisitor visitor = new MultifileVisitor(projectMirror);
rootNode.jjtAccept(visitor, null);
}

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/PackageStats.java
View File

@ -19,9 +19,12 @@ import net.sourceforge.pmd.lang.java.multifile.signature.JavaOperationSigMask;
*
* @author Clément Fournier
* @see ClassStats
* @since 6.0.0
*/
final class PackageStats implements ProjectMirror {
static final PackageStats INSTANCE = new PackageStats();
private final Map<String, PackageStats> subPackages = new HashMap<>();
private final Map<String, ClassStats> classes = new HashMap<>();

1
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ProjectMirror.java
View File

@ -12,6 +12,7 @@ import net.sourceforge.pmd.lang.java.multifile.signature.JavaOperationSigMask;
* Represents the analysed project to provide all rules with info about other classes.
*
* @author Clément Fournier
* @since 6.0.0
*/
interface ProjectMirror {

4
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/multifile/ClassStatsTest.java
View File

@ -24,7 +24,7 @@ public class ClassStatsTest {
@Before
public void resetMultifile() {
MultifileFacade.reset();
PackageStats.INSTANCE.reset();
}
@ -33,7 +33,7 @@ public class ClassStatsTest {
JavaMultifileVisitorTest.parseAndVisitForClass(SignatureCountTestData.class);
final ProjectMirror toplevel = MultifileFacade.getTopLevelPackageStats();
final ProjectMirror toplevel = PackageStats.INSTANCE;
final ClassMirror classMirror = toplevel.getClassMirror(JavaQualifiedName.ofClass(SignatureCountTestData.class));

8
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/multifile/JavaMultifileVisitorTest.java
View File

@ -31,13 +31,13 @@ public class JavaMultifileVisitorTest {
@Test
public void testPackageStatsNotNull() {
assertNotNull(MultifileFacade.getTopLevelPackageStats());
assertNotNull(PackageStats.INSTANCE);
}
@After
public void resetMultifile() {
MultifileFacade.reset();
PackageStats.INSTANCE.reset();
}
@ -45,7 +45,7 @@ public class JavaMultifileVisitorTest {
public void testOperationsAreThere() {
ASTCompilationUnit acu = parseAndVisitForClass(MultifileVisitorTestData.class);
final ProjectMirror toplevel = MultifileFacade.getTopLevelPackageStats();
final ProjectMirror toplevel = PackageStats.INSTANCE;
final JavaOperationSigMask opMask = new JavaOperationSigMask();
@ -64,7 +64,7 @@ public class JavaMultifileVisitorTest {
public void testFieldsAreThere() {
parseAndVisitForClass(MultifileVisitorTestData.class);
final ProjectMirror toplevel = MultifileFacade.getTopLevelPackageStats();
final ProjectMirror toplevel = PackageStats.INSTANCE;
final JavaFieldSigMask fieldSigMask = new JavaFieldSigMask();