Skip to content

Commit 046ca48

Browse files
nidi3nidi3
committed
rename Java* classes
1 parent f279dc7 commit 046ca48

File tree

15 files changed

+127
-127
lines changed

15 files changed

+127
-127
lines changed

‎code-assert-gui/src/main/java/guru/nidi/codeassert/gui/Application.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import com.fasterxml.jackson.databind.Module;
1919
import com.fasterxml.jackson.databind.module.SimpleModule;
20-
import guru.nidi.codeassert.model.JavaClass;
21-
import guru.nidi.codeassert.model.JavaPackage;
20+
import guru.nidi.codeassert.model.CodeClass;
21+
import guru.nidi.codeassert.model.CodePackage;
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
2424
import org.springframework.context.annotation.Bean;
@@ -33,7 +33,7 @@ public static void main(String[] args) {
3333
@Bean
3434
Module jacksonModule() {
3535
return new SimpleModule()
36-
.addSerializer(new JavaPackageSerializer(JavaPackage.class))
37-
.addSerializer(new JavaClassSerializer(JavaClass.class));
36+
.addSerializer(new CodePackageSerializer(CodePackage.class))
37+
.addSerializer(new CodeClassSerializer(CodeClass.class));
3838
}
3939
}

‎code-assert-gui/src/main/java/guru/nidi/codeassert/gui/JavaClassSerializer.java‎ renamed to ‎code-assert-gui/src/main/java/guru/nidi/codeassert/gui/CodeClassSerializer.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@
1818
import com.fasterxml.jackson.core.JsonGenerator;
1919
import com.fasterxml.jackson.databind.SerializerProvider;
2020
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
21-
import guru.nidi.codeassert.model.JavaClass;
22-
import guru.nidi.codeassert.model.JavaPackage;
21+
import guru.nidi.codeassert.model.CodeClass;
22+
import guru.nidi.codeassert.model.CodePackage;
2323

2424
import java.io.IOException;
2525
import java.util.Map;
2626

27-
public class JavaClassSerializer extends StdSerializer<JavaClass> {
28-
protected JavaClassSerializer(Class<JavaClass> t) {
27+
public class CodeClassSerializer extends StdSerializer<CodeClass> {
28+
protected CodeClassSerializer(Class<CodeClass> t) {
2929
super(t);
3030
}
3131

3232
@Override
33-
public void serialize(JavaClass value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
33+
public void serialize(CodeClass value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
3434
gen.writeStartObject();
3535
gen.writeStringField("name", value.getName());
3636
gen.writeStringField("package", value.getPackage().getName());
3737
gen.writeNumberField("size", value.getTotalSize());
3838
gen.writeArrayFieldStart("usePackages");
39-
for (final JavaPackage pack : value.usedPackages()) {
39+
for (final CodePackage pack : value.usedPackages()) {
4040
gen.writeString(pack.getName());
4141
}
4242
gen.writeEndArray();
4343
gen.writeObjectFieldStart("useClasses");
44-
for (final Map.Entry<JavaClass, Integer> entry : value.usedClassCounts().entrySet()) {
44+
for (final Map.Entry<CodeClass, Integer> entry : value.usedClassCounts().entrySet()) {
4545
gen.writeNumberField(entry.getKey().getName(), entry.getValue());
4646
}
4747
gen.writeEndObject();

‎code-assert-gui/src/main/java/guru/nidi/codeassert/gui/JavaPackageSerializer.java‎ renamed to ‎code-assert-gui/src/main/java/guru/nidi/codeassert/gui/CodePackageSerializer.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818
import com.fasterxml.jackson.core.JsonGenerator;
1919
import com.fasterxml.jackson.databind.SerializerProvider;
2020
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
21-
import guru.nidi.codeassert.model.JavaClass;
22-
import guru.nidi.codeassert.model.JavaPackage;
21+
import guru.nidi.codeassert.model.CodeClass;
22+
import guru.nidi.codeassert.model.CodePackage;
2323

2424
import java.io.IOException;
2525

26-
public class JavaPackageSerializer extends StdSerializer<JavaPackage> {
27-
protected JavaPackageSerializer(Class<JavaPackage> t) {
26+
public class CodePackageSerializer extends StdSerializer<CodePackage> {
27+
protected CodePackageSerializer(Class<CodePackage> t) {
2828
super(t);
2929
}
3030

3131
@Override
32-
public void serialize(JavaPackage value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
32+
public void serialize(CodePackage value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
3333
gen.writeStartObject();
3434
gen.writeStringField("name", value.getName());
3535
gen.writeArrayFieldStart("classes");
36-
for (final JavaClass clazz : value.getClasses()) {
36+
for (final CodeClass clazz : value.getClasses()) {
3737
gen.writeString(clazz.getName());
3838
}
3939
gen.writeEndArray();
4040
gen.writeArrayFieldStart("uses");
41-
for (final JavaPackage pack : value.uses()) {
41+
for (final CodePackage pack : value.uses()) {
4242
gen.writeString(pack.getName());
4343
}
4444
gen.writeEndArray();

‎code-assert/src/main/java/guru/nidi/codeassert/dependency/JavaElement.java‎ renamed to ‎code-assert/src/main/java/guru/nidi/codeassert/dependency/CodeElement.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import guru.nidi.codeassert.model.UsingElement;
2121
import guru.nidi.codeassert.model.UsingElementMatcher;
2222

23-
public class JavaElement implements UsingElementMatcher {
23+
public class CodeElement implements UsingElementMatcher {
2424
final LocationMatcher pattern;
2525
final boolean allowAll;
2626

27-
JavaElement(String pattern, boolean allowAll) {
27+
CodeElement(String pattern, boolean allowAll) {
2828
final int starPos = pattern.indexOf('*');
2929
if (starPos >= 0 && starPos != pattern.length() - 1) {
3030
throw new IllegalArgumentException("Wildcard * is only allowed at the end (e.g. java*)");

‎code-assert/src/main/java/guru/nidi/codeassert/dependency/DependencyRule.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import static guru.nidi.codeassert.dependency.RuleAccessor.*;
2525

26-
public class DependencyRule extends JavaElement {
26+
public class DependencyRule extends CodeElement {
2727
final Usage use = new Usage();
2828
final Usage usedBy = new Usage();
2929
boolean optional;
@@ -40,32 +40,32 @@ public static DependencyRule denyAll(String name) {
4040
return new DependencyRule(name, false);
4141
}
4242

43-
public DependencyRule mustUse(JavaElement... rules) {
43+
public DependencyRule mustUse(CodeElement... rules) {
4444
use.must(rules);
4545
return this;
4646
}
4747

48-
public DependencyRule mayUse(JavaElement... rules) {
48+
public DependencyRule mayUse(CodeElement... rules) {
4949
use.may(rules);
5050
return this;
5151
}
5252

53-
public DependencyRule mustNotUse(JavaElement... rules) {
53+
public DependencyRule mustNotUse(CodeElement... rules) {
5454
use.mustNot(rules);
5555
return this;
5656
}
5757

58-
public DependencyRule mustBeUsedBy(JavaElement... rules) {
58+
public DependencyRule mustBeUsedBy(CodeElement... rules) {
5959
usedBy.must(rules);
6060
return this;
6161
}
6262

63-
public DependencyRule mayBeUsedBy(JavaElement... rules) {
63+
public DependencyRule mayBeUsedBy(CodeElement... rules) {
6464
usedBy.may(rules);
6565
return this;
6666
}
6767

68-
public DependencyRule mustNotBeUsedBy(JavaElement... rules) {
68+
public DependencyRule mustNotBeUsedBy(CodeElement... rules) {
6969
usedBy.mustNot(rules);
7070
return this;
7171
}

‎code-assert/src/main/java/guru/nidi/codeassert/dependency/DependencyRules.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ private List<DependencyRule> initFields(String basePackage, DependencyRuler rule
174174
final List<DependencyRule> ruleFields = new ArrayList<>();
175175
for (final Field f : ruler.getClass().getDeclaredFields()) {
176176
f.setAccessible(true);
177-
if (f.getType() == JavaElement.class) {
177+
if (f.getType() == CodeElement.class) {
178178
ruleFields.add(initField(basePackage, ruler, f));
179179
}
180180
if (f.getType() == DependencyRule.class) {

‎code-assert/src/main/java/guru/nidi/codeassert/dependency/Usage.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ public Usage copy() {
3333
return u;
3434
}
3535

36-
public void must(JavaElement... rules) {
37-
for (final JavaElement rule : rules) {
36+
public void must(CodeElement... rules) {
37+
for (final CodeElement rule : rules) {
3838
must.add(rule.pattern);
3939
}
4040
}
4141

42-
public void may(JavaElement... rules) {
43-
for (final JavaElement rule : rules) {
42+
public void may(CodeElement... rules) {
43+
for (final CodeElement rule : rules) {
4444
may.add(rule.pattern);
4545
}
4646
}
4747

48-
public void mustNot(JavaElement... rules) {
49-
for (final JavaElement rule : rules) {
48+
public void mustNot(CodeElement... rules) {
49+
for (final CodeElement rule : rules) {
5050
mustNot.add(rule.pattern);
5151
}
5252
}

‎code-assert/src/main/java/guru/nidi/codeassert/model/ClassFileParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ class ClassFileParser {
3636
private CountingInputStream counter;
3737
private DataInputStream in;
3838

39-
public JavaClass parse(File file, Model model) throws IOException {
39+
public CodeClass parse(File file, Model model) throws IOException {
4040
try (final InputStream in = new FileInputStream(file)) {
4141
return parse(in, model);
4242
}
4343
}
4444

45-
public JavaClass parse(InputStream is, Model model) throws IOException {
45+
public CodeClass parse(InputStream is, Model model) throws IOException {
4646
counter = new CountingInputStream(is);
4747
in = new DataInputStream(counter);
4848

@@ -61,7 +61,7 @@ public JavaClass parse(InputStream is, Model model) throws IOException {
6161
final List<MemberInfo> methods = parseMembers();
6262
final List<AttributeInfo> attributes = parseAttributes();
6363

64-
return new JavaClassBuilder(className, model, constantPool)
64+
return new CodeClassBuilder(className, model, constantPool)
6565
.addClassConstantReferences()
6666
.addFlags(flags)
6767
.addSuperClass(superClassName)

‎code-assert/src/main/java/guru/nidi/codeassert/model/JavaClass.java‎ renamed to ‎code-assert/src/main/java/guru/nidi/codeassert/model/CodeClass.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
* @author <b>Mike Clark</b>
2828
* @author Clarkware Consulting, Inc.
2929
*/
30-
public class JavaClass extends UsingElement<JavaClass> {
30+
public class CodeClass extends UsingElement<CodeClass> {
3131
private final String name;
32-
private final JavaPackage pack;
33-
private final CountSet<JavaPackage> usedPackages;
34-
private final CountSet<JavaClass> usedClasses;
35-
private final Set<JavaClass> annotations;
32+
private final CodePackage pack;
33+
private final CountSet<CodePackage> usedPackages;
34+
private final CountSet<CodeClass> usedClasses;
35+
private final Set<CodeClass> annotations;
3636
final List<MemberInfo> fields = new ArrayList<>();
3737
final List<MemberInfo> methods = new ArrayList<>();
3838
String sourceFile;
3939
int codeSize;
4040
int totalSize;
4141
boolean concrete;
4242

43-
JavaClass(String name, JavaPackage pack) {
43+
CodeClass(String name, CodePackage pack) {
4444
this.name = name;
4545
this.pack = pack;
4646
usedPackages = new CountSet<>();
@@ -53,15 +53,15 @@ public String getName() {
5353
return name;
5454
}
5555

56-
public JavaPackage getPackage() {
56+
public CodePackage getPackage() {
5757
return pack;
5858
}
5959

6060
public String getSourceFile() {
6161
return sourceFile;
6262
}
6363

64-
public Set<JavaClass> getAnnotations() {
64+
public Set<CodeClass> getAnnotations() {
6565
return annotations;
6666
}
6767

@@ -86,38 +86,38 @@ public boolean isConcrete() {
8686
}
8787

8888
@Override
89-
public JavaClass self() {
89+
public CodeClass self() {
9090
return this;
9191
}
9292

93-
public Collection<JavaPackage> usedForeignPackages() {
94-
final Set<JavaPackage> res = new HashSet<>(usedPackages());
93+
public Collection<CodePackage> usedForeignPackages() {
94+
final Set<CodePackage> res = new HashSet<>(usedPackages());
9595
res.remove(pack);
9696
return res;
9797
}
9898

99-
public Collection<JavaPackage> usedPackages() {
99+
public Collection<CodePackage> usedPackages() {
100100
return usedPackages.asSet();
101101
}
102102

103-
public Map<JavaPackage, Integer> usedPackageCounts() {
103+
public Map<CodePackage, Integer> usedPackageCounts() {
104104
return usedPackages.asMap();
105105
}
106106

107-
public Collection<JavaClass> usedClasses() {
107+
public Collection<CodeClass> usedClasses() {
108108
return usedClasses.asSet();
109109
}
110110

111-
public Map<JavaClass, Integer> usedClassCounts() {
111+
public Map<CodeClass, Integer> usedClassCounts() {
112112
return usedClasses.asMap();
113113
}
114114

115-
public boolean uses(JavaPackage pack) {
115+
public boolean uses(CodePackage pack) {
116116
return usedPackages.contains(pack);
117117
}
118118

119119
@Override
120-
public Collection<JavaClass> uses() {
120+
public Collection<CodeClass> uses() {
121121
return usedClasses();
122122
}
123123

@@ -127,7 +127,7 @@ public String getPackageName() {
127127
}
128128

129129
@Override
130-
public Collection<String> usedVia(UsingElement<JavaClass> other) {
130+
public Collection<String> usedVia(UsingElement<CodeClass> other) {
131131
return Collections.emptyList();
132132
}
133133

@@ -139,7 +139,7 @@ public boolean isMatchedBy(LocationMatcher matcher) {
139139
void addImport(String type, Model model) {
140140
if (!name.equals(type)) {
141141
final String packName = Model.packageOf(type);
142-
final JavaPackage p = model.getOrCreatePackage(packName);
142+
final CodePackage p = model.getOrCreatePackage(packName);
143143
usedPackages.add(p);
144144
pack.addEfferent(p);
145145
usedClasses.add(model.getOrCreateClass(type));
@@ -152,8 +152,8 @@ void addAnnotation(String type, Model model) {
152152
}
153153

154154
public boolean equals(Object other) {
155-
if (other instanceof JavaClass) {
156-
final JavaClass otherClass = (JavaClass) other;
155+
if (other instanceof CodeClass) {
156+
final CodeClass otherClass = (CodeClass) other;
157157
return otherClass.getName().equals(getName());
158158
}
159159
return false;

0 commit comments

Comments
 (0)