refactor(code): clean code

issue #34
bsorrentino · Oct 15, 2021 · 9d1bfba · 9d1bfba
1 parent 23a671f
commit 9d1bfba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/core/src/main/java/org/bsc/java2typescript/Java2TSConverter.java b/core/src/main/java/org/bsc/java2typescript/Java2TSConverter.java
@@ -128,20 +128,6 @@ public final boolean isRhino() {
         return options.compatibility == Compatibility.RHINO;
     }
 
-    /**
-     * @param tstype
-     * @param declaredTypeMap
-     * @return
-     */
-    public String javaClass2StaticDefinitionTransformer(TSType tstype, java.util.Map<String, TSType> declaredTypeMap) {
-
-        final TSConverterContext ctx = TSConverterContext.of(tstype, declaredTypeMap, options);
-
-        return JavaClass2StaticDefinitionTransformer
-                .apply(ctx)
-                .toString();
-    }
-
     /**
      * @param m
      * @param type
@@ -156,6 +142,17 @@ public <E extends Executable> String getMethodParametersAndReturnDecl(E m, TSTyp
                 .getMethodParametersAndReturnDecl(m, packageResolution);
     }
 
+    /**
+     * @param tstype
+     * @param declaredTypeMap
+     * @return
+     */
+    public String javaClass2StaticDefinitionTransformer(TSType tstype, java.util.Map<String, TSType> declaredTypeMap) {
+
+        return TSConverterContext.of(tstype, declaredTypeMap, options)
+                .apply( JavaClass2StaticDefinitionTransformer )
+                .toString();
+    }
 
     /**
      * @param level
@@ -165,12 +162,9 @@ public <E extends Executable> String getMethodParametersAndReturnDecl(E m, TSTyp
      */
     public String javaClass2DeclarationTransformer(int level, TSType tstype, java.util.Map<String, TSType> declaredTypeMap) {
 
-        final TSConverterContext ctx = TSConverterContext.of(tstype, declaredTypeMap, options);
-
-        return javaClass2DeclarationTransformer
-                        .apply(ctx)
-                        .toString();
-
+        return TSConverterContext.of(tstype, declaredTypeMap, options)
+                .apply(javaClass2DeclarationTransformer)
+                .toString();
 
     }
 

diff --git a/core/src/main/java/org/bsc/java2typescript/TSConverterContext.java b/core/src/main/java/org/bsc/java2typescript/TSConverterContext.java
@@ -6,9 +6,10 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public class TSConverterContext extends TSConverterStatic implements Cloneable {
+public class TSConverterContext extends TSConverterStatic implements Cloneable, Function<TSTransformer,TSConverterContext> {
     public final TSType type;
     public final java.util.Map<String, TSType> declaredTypeMap;
     public final Java2TSConverter.Options options;
@@ -35,6 +36,11 @@ private TSConverterContext(TSType type, Map<String, TSType> declaredClassMap, Ja
         this.options = options;
     }
 
+    @Override
+    public TSConverterContext apply(TSTransformer transformer) {
+        return transformer.apply(this);
+    }
+
     /**
      *
      * @return