Skip to content

Commit 07cdb63

Browse files
committed
no need for fields for setters/getters
1 parent c5a1a14 commit 07cdb63

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

src/main/java/zzzank/probejs/lang/transpiler/transformation/impl/InjectBeans.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,15 @@ private void fromMethod(ClassDecl classDecl, Set<String> excludedGetterNames) {
3838
if (method.params.size() == 1) {
3939
val beanName = extractBeanName(name, "set");
4040
if (beanName != null) {
41-
classDecl.ensureSetters().add(
42-
beanName,
43-
new BeanDecl.Setter(name, method.params.get(0).type)
44-
);
41+
classDecl.bodyCode.add(new BeanDecl.Setter(name, method.params.get(0).type));
4542
}
4643
} else if (method.params.isEmpty()) {
4744
var beanName = extractBeanName(name, "get");
4845
if (beanName == null) {
4946
beanName = extractBeanName(name, "is");
5047
}
5148
if (beanName != null && !excludedGetterNames.contains(beanName)) {
52-
classDecl.ensureGetters().put(beanName, new BeanDecl.Getter(beanName, method.returnType));
49+
classDecl.bodyCode.add(new BeanDecl.Getter(beanName, method.returnType));
5350
excludedGetterNames.add(beanName);
5451
}
5552
}
@@ -75,14 +72,14 @@ private void fromField(ClassDecl clazzDecl, Set<String> excludedGetterNames) {
7572
if (!excludedGetterNames.contains(field.name)) {
7673
val getter = new BeanDecl.Getter(field.name, field.type);
7774
getter.comments.addAll(field.comments);
78-
clazzDecl.ensureGetters().put(getter.name, getter);
75+
clazzDecl.bodyCode.add(getter);
7976
excludedGetterNames.add(field.name);
8077
}
8178

8279
if (!field.isFinal) {
8380
val setter = new BeanDecl.Setter(field.name, field.type);
8481
setter.comments.addAll(field.comments);
85-
clazzDecl.ensureSetters().add(setter.name, setter);
82+
clazzDecl.bodyCode.add(setter);
8683
}
8784
}
8885
clazzDecl.fields.clear();

src/main/java/zzzank/probejs/lang/typescript/code/member/ClassDecl.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import zzzank.probejs.lang.typescript.code.type.ts.TSVariableType;
1111
import zzzank.probejs.lang.typescript.refer.ImportInfos;
1212
import zzzank.probejs.utils.CollectUtils;
13-
import zzzank.probejs.utils.collect.MultiMap;
14-
import zzzank.probejs.utils.collect.TreeMultiMap;
1513

1614
import java.util.*;
1715
import java.util.function.Consumer;
@@ -32,8 +30,6 @@ public class ClassDecl extends CommentableCode {
3230
public final List<FieldDecl> fields = new ArrayList<>();
3331
public final List<ConstructorDecl> constructors = new ArrayList<>();
3432
public final List<MethodDecl> methods = new ArrayList<>();
35-
public Map<String, BeanDecl.Getter> getters = null;
36-
public MultiMap<String, BeanDecl.Setter> setters = null;
3733

3834
/**
3935
* Reserved field to inject custom code body
@@ -67,20 +63,6 @@ public ImportInfos getImportInfos() {
6763
return infos;
6864
}
6965

70-
public Map<String, BeanDecl.Getter> ensureGetters() {
71-
if (getters == null) {
72-
getters = new TreeMap<>();
73-
}
74-
return getters;
75-
}
76-
77-
public MultiMap<String, BeanDecl.Setter> ensureSetters() {
78-
if (setters == null) {
79-
setters = new TreeMultiMap<>();
80-
}
81-
return setters;
82-
}
83-
8466
@Override
8567
public List<String> formatRaw(Declaration declaration) {
8668
// Format head - export abstract (class / interface) name<T> extends ... implements ... {

0 commit comments

Comments
 (0)