Skip to content

Commit

Permalink
Change package structure
Browse files Browse the repository at this point in the history
  • Loading branch information
mkacct committed Apr 18, 2024
1 parent 2159e22 commit b88f172
Show file tree
Hide file tree
Showing 39 changed files with 170 additions and 57 deletions.
4 changes: 2 additions & 2 deletions src/main/java/domain/Check.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ public abstract class Check {
/**
* @param name The check's name, in camelCase, for identification in the configuration file
*/
Check(String name) {
protected Check(String name) {
this(name, true);
}

/**
* @param name The check's name, in camelCase, for identification in the configuration file
* @param isEnabledByDefault Whether the check is enabled by default (true for general checks, false for specialized tools and such)
*/
Check(String name, boolean isEnabledByDefault) {
protected Check(String name, boolean isEnabledByDefault) {
if (name == null) {throw new IllegalArgumentException("Check name cannot be null");}
this.name = name;
this.isEnabledByDefault = isEnabledByDefault;
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/domain/CheckRoster.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
package domain;

import domain.checks.AdapterPatternCheck;
import domain.checks.ConstantInterfaceCheck;
import domain.checks.ImmutableExceptionsCheck;
import domain.checks.InformationHidingCheck;
import domain.checks.LowCouplingCheck;
import domain.checks.MethodLengthCheck;
import domain.checks.NamingConventionsCheck;
import domain.checks.NoGlobalVariablesCheck;
import domain.checks.ObserverPatternCheck;
import domain.checks.ParameterCountCheck;
import domain.checks.PlantUMLGenerator;
import domain.checks.ProgramToInterfaceNotImplementationCheck;
import domain.checks.RequiredOverridesCheck;
import domain.checks.StrategyPatternCheck;
import domain.checks.UnusedAbstractionsCheck;

public class CheckRoster {
/**
* Array of all linter checks, in the order they should be displayed.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package domain;
package domain.checks;

import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package domain;
package domain.checks;

import java.util.HashSet;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.ClassType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package domain;
package domain.checks;

import datasource.Configuration;
import domain.Message;
import domain.MessageLevel;

import java.text.MessageFormat;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package domain;
package domain.checks;

import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.ClassGraph;
import domain.Message;
import domain.javadata.ClassDataCollection;

public abstract class GraphCheck extends Check {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.FieldData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package domain;
package domain.checks;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -7,6 +7,9 @@
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.AccessModifier;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.*;

import datasource.Configuration;
import domain.ClassGraphIterator;
import domain.Message;
import domain.MessageLevel;

public class LowCouplingCheck extends GraphCheck {
private int maxInDegree;
Expand Down Expand Up @@ -145,4 +148,4 @@ public int compareTo(IntegerAndDegree o) {
return Integer.compare(this.inDegree, o.inDegree);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.InstrData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package domain;
package domain.checks;

import java.util.function.Function;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.ClassType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.FieldData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package domain;
package domain.checks;

import java.util.HashSet;
import java.util.Set;

import datasource.Configuration;
import domain.ClassGraph;
import domain.ClassGraphIterator;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassType;

Expand Down Expand Up @@ -182,4 +186,4 @@ private boolean isConcreteClass(ClassGraphIterator it, ClassGraphIterator it2, i
return j != it2.getCurrent() && ClassGraph.checkHasA(graph.getWeight(j, it.getCurrent())) && (ClassGraph.checkImplement(graph.getWeight(j, it2.getCurrent())) || ClassGraph.checkExtend(graph.getWeight(j, it2.getCurrent())));
}

}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.MethodData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package domain;
package domain.checks;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.Charset;
Expand All @@ -8,6 +8,10 @@
import datasource.Configuration;
import datasource.DataPrinter;
import datasource.FullFilePrinter;
import domain.ClassGraph;
import domain.Message;
import domain.MessageLevel;
import domain.PackageStructure;
import domain.javadata.AccessModifier;
import domain.javadata.ClassData;
import domain.javadata.ClassType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package domain;
package domain.checks;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.ClassType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package domain;
package domain.checks;

import java.util.HashSet;
import java.util.List;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.MethodData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package domain;
package domain.checks;

import java.util.ArrayList;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.ClassType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package domain;
package domain.checks;

import java.text.MessageFormat;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;

import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.FieldData;
import domain.javadata.MethodData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package domain;
package domain.checks;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;

import datasource.Configuration;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.javadata.ClassData;
import domain.javadata.ClassDataCollection;
import domain.javadata.ClassType;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/cli/CliSystemTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import datasource.Configuration;
import datasource.DirLoader;
import domain.Check;
import domain.MethodLengthCheck;
import domain.NamingConventionsCheck;
import domain.NoGlobalVariablesCheck;
import domain.ParameterCountCheck;
import domain.checks.MethodLengthCheck;
import domain.checks.NamingConventionsCheck;
import domain.checks.NoGlobalVariablesCheck;
import domain.checks.ParameterCountCheck;

public class CliSystemTest {
private static final String TEST_RESOURCES_DIR_PATH = "src/test/resources/cli-system-test";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package domain;
package domain.checks;

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand All @@ -12,6 +12,10 @@
import datasource.Configuration;
import datasource.DirLoader;
import datasource.FilesLoader;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.TestUtility;
import domain.javadata.ClassDataCollection;

public class AdapterPatternCheckTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package domain;
package domain.checks;

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand All @@ -12,6 +12,10 @@
import datasource.Configuration;
import datasource.DirLoader;
import datasource.FilesLoader;
import domain.Check;
import domain.Message;
import domain.MessageLevel;
import domain.TestUtility;
import domain.javadata.ClassDataCollection;

public class ConstantInterfaceCheckTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package domain;
package domain.checks;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
Expand All @@ -8,6 +8,8 @@
import org.junit.jupiter.api.Test;

import datasource.Configuration;
import domain.Message;
import domain.MessageLevel;

public class CountCheckPropertyValidatorTest {
private static final String KEY = "key";
Expand Down
Loading

0 comments on commit b88f172

Please sign in to comment.