Merge pull request #104 from crysknife-io/v0.8_release

release 0.8
crysknife-io · Dec 27, 2024 · c23460e · c23460e
2 parents e5aead0 + ae831ed
commit c23460e
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 51 deletions.
diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.crysknife</groupId>
         <artifactId>crysknife-parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
     </parent>
 
     <artifactId>crysknife-annotations</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.crysknife</groupId>
     <artifactId>bom</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>pom</packaging>
 
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>crysknife-core</artifactId>
@@ -36,10 +36,6 @@
   </organization>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.jsinterop</groupId>
-      <artifactId>jsinterop-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.crysknife</groupId>
       <artifactId>crysknife-annotations</artifactId>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.crysknife.demo</groupId>
   <artifactId>demo</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -15,9 +15,9 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
-    <elemental2.version>1.2.1</elemental2.version>
-    <j2cl.maven.plugin.version>0.23.1</j2cl.maven.plugin.version>
-    <org.treblereel.j2cl.processors.version>0.7</org.treblereel.j2cl.processors.version>
+    <elemental2.version>1.2.3</elemental2.version>
+    <j2cl.maven.plugin.version>0.23.2</j2cl.maven.plugin.version>
+    <org.treblereel.j2cl.processors.version>0.8</org.treblereel.j2cl.processors.version>
   </properties>
 
   <dependencyManagement>

diff --git a/internal-bom/pom.xml b/internal-bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.crysknife</groupId>
     <artifactId>internal-bom</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>pom</packaging>
 
 
@@ -71,18 +71,17 @@
         <javax.inject.version>1</javax.inject.version>
         <freemarker.version>2.3.30</freemarker.version>
         <lesscss.version>1.10</lesscss.version>
-        <google.jsinterop.annotations.version>2.0.0</google.jsinterop.annotations.version>
         <google.guava.version>28.1-jre</google.guava.version>
         <classgraph.classgraph.version>4.8.156</classgraph.classgraph.version>
-        <org.treblereel.j2cl.processors.version>0.7</org.treblereel.j2cl.processors.version>
-        <gwt.jakarta.version>0.4</gwt.jakarta.version>
+        <org.treblereel.j2cl.processors.version>0.8</org.treblereel.j2cl.processors.version>
+        <gwt.jakarta.version>0.6</gwt.jakarta.version>
 
         <javaparser.core.version>3.25.5</javaparser.core.version>
-        <elemental2.version>1.2.1</elemental2.version>
-        <auto.common.version>1.2.1</auto.common.version>
-        <auto.service.version>1.0-rc7</auto.service.version>
+        <elemental2.version>1.2.3</elemental2.version>
+        <auto.common.version>1.2.2</auto.common.version>
+        <auto.service.version>1.1.1</auto.service.version>
         <mockito.core.version>4.6.1</mockito.core.version>
-        <junit.version>4.13.1</junit.version>
+        <junit.version>4.13.2</junit.version>
     </properties>
 
     <dependencyManagement>
@@ -100,11 +99,6 @@
                 <version>${javax.inject.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>com.google.jsinterop</groupId>
-                <artifactId>jsinterop-annotations</artifactId>
-                <version>${google.jsinterop.annotations.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.elemental2</groupId>
                 <artifactId>elemental2-dom</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>pom</packaging>
 
     <name>crysknife parent</name>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>crysknife-processor</artifactId>

diff --git a/processor/src/main/java/io/crysknife/generator/ManagedBeanGenerator.java b/processor/src/main/java/io/crysknife/generator/ManagedBeanGenerator.java
@@ -154,7 +154,7 @@ private void privateMethods(BeanDefinition beanDefinition, ClassMetaInfo classMe
                     .methodsIn(MoreTypes.asTypeElement(beanDefinition.getType()).getEnclosedElements())
                     .stream().filter(method -> method.getModifiers().contains(Modifier.PRIVATE))
                     .filter(method -> !method.getModifiers().contains(Modifier.NATIVE))
-                    .map(method -> j2CLUtils.createDeclarationMethodDescriptor(method).getMangledName())
+                    .map(j2CLUtils::getMethodMangledName)
                     .collect(Collectors.toSet());
             if (!methods.isEmpty()) {
                 classMetaInfo.addImport(JsType.class);

diff --git a/processor/src/main/java/io/crysknife/generator/helpers/MethodCallGenerator.java b/processor/src/main/java/io/crysknife/generator/helpers/MethodCallGenerator.java
@@ -54,11 +54,11 @@ public String generate(TypeMirror parent, ExecutableElement method, List<String>
     if (isJre) {
       root.put("name", method.getSimpleName().toString());
       if (!args.isEmpty()) {
-        root.put("args", args.stream().collect(Collectors.joining(", ")));
+        root.put("args", String.join(", ", args));
       }
     } else {
       if (isPrivate) {
-        root.put("name", j2CLUtils.createDeclarationMethodDescriptor(method).getMangledName());
+        root.put("name", j2CLUtils.getMethodMangledName(method));
       } else {
         root.put("name", method.getSimpleName().toString());
       }

diff --git a/processor/src/main/java/io/crysknife/util/GenerationUtils.java b/processor/src/main/java/io/crysknife/util/GenerationUtils.java
@@ -125,7 +125,7 @@ public Expression getFieldAccessCallExpr(BeanDefinition beanDefinition, Variable
         "get").addArgument(
             new MethodCallExpr(new NameExpr(Reflect.class.getSimpleName()), "objectProperty")
                 .addArgument(
-                    new StringLiteralExpr(j2CLUtils.createFieldDescriptor(field).getMangledName()))
+                    new StringLiteralExpr(j2CLUtils.getVariableMangledName(field)))
                 .addArgument("instance"));
   }
 
@@ -228,8 +228,7 @@ public Statement generateMethodCall(TypeMirror parent, ExecutableElement method,
                                 new MethodCallExpr(new NameExpr(Reflect.class.getCanonicalName()),
                                     "objectProperty")
                                         .addArgument(new StringLiteralExpr(
-                                            j2CLUtils.createDeclarationMethodDescriptor(method)
-                                                .getMangledName()))
+                                            j2CLUtils.getMethodMangledName(method)))
                                         .addArgument("instance"))),
                 "bind").addArgument("instance");
 
@@ -282,7 +281,7 @@ private TryStmt generatePrivateJREMethodCall(ExecutableElement method, Expressio
   }
 
   private Statement generatePrivateJ2CLMethodCall(ExecutableElement method, Expression[] args) {
-    String mangleName = j2CLUtils.createDeclarationMethodDescriptor(method).getMangledName();
+    String mangleName = j2CLUtils.getMethodMangledName(method);
     TypeMirror parent =
         context.getGenerationContext().getTypes().erasure(method.getEnclosingElement().asType());
     String factoryName = TypeUtils.getQualifiedFactoryName(parent);
@@ -341,7 +340,7 @@ public Expression getFieldAccessorExpression(InjectableVariableDefinition fieldP
     }
 
     String jsFieldName =
-        j2CLUtils.createFieldDescriptor(fieldPoint.getVariableElement()).getMangledName();
+        j2CLUtils.getVariableMangledName(fieldPoint.getVariableElement());
     MethodCallExpr reflect =
         new MethodCallExpr(new NameExpr(Reflect.class.getSimpleName()), "objectProperty")
             .addArgument(new StringLiteralExpr(jsFieldName))

diff --git a/tests/j2cl-tests/pom.xml b/tests/j2cl-tests/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.crysknife.tests</groupId>
     <artifactId>j2cl-tests</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <description>J2CL tests</description>
 
     <properties>

diff --git a/tests/jre-tests/cdi/pom.xml b/tests/jre-tests/cdi/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>jre-cdi-tests</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/tests/jre-tests/pom.xml b/tests/jre-tests/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jre-parent</artifactId>
     <groupId>io.crysknife.tests</groupId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>pom</packaging>
     <name>Crysknife :: Tests :: JRE</name>
 

diff --git a/tests/jre-tests/reduces-classpath/app/pom.xml b/tests/jre-tests/reduces-classpath/app/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>reduces-classpath-app</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/tests/jre-tests/reduces-classpath/dep/pom.xml b/tests/jre-tests/reduces-classpath/dep/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>reduces-classpath-dep</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/tests/jre-tests/reduces-classpath/pom.xml b/tests/jre-tests/reduces-classpath/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife</groupId>
     <artifactId>reduces-classpath-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/tests/jre-tests/simple/pom.xml b/tests/jre-tests/simple/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.crysknife.tests</groupId>
     <artifactId>jre-simple-tests</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>tests-parent</artifactId>
   <groupId>io.crysknife.tests</groupId>
-  <version>0.7</version>
+  <version>0.8</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/ui/core/pom.xml b/ui/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife.ui</groupId>
     <artifactId>parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>crysknife-ui-core</artifactId>

diff --git a/ui/generator/pom.xml b/ui/generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife.ui</groupId>
     <artifactId>parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <artifactId>crysknife-ui-generator</artifactId>

diff --git a/ui/generator/src/main/java/io/crysknife/ui/templates/generator/TemplateGenerator.java b/ui/generator/src/main/java/io/crysknife/ui/templates/generator/TemplateGenerator.java
@@ -178,7 +178,7 @@ private void maybeHasNotGetMethod(BeanDefinition beanDefinition,
             if (executableElement.isPresent()) {
                 templateDefinition.setInitRootElement(true);
                 String mangledName =
-                        j2CLUtils.createDeclarationMethodDescriptor(executableElement.get()).getMangledName();
+                        j2CLUtils.getMethodMangledName(executableElement.get());
                 templateDefinition.setRootElementPropertyName(mangledName);
             }
         }
@@ -280,7 +280,7 @@ private void processDataFields(TemplateContext templateContext,
                         "resolveElement").addArgument(instance)
                         .addArgument(new StringLiteralExpr(element.getName()));
             }
-            String mangleName = j2CLUtils.createFieldDescriptor(element.getField()).getMangledName();
+            String mangleName = j2CLUtils.getVariableMangledName(element.getField());
             MethodCallExpr fieldSetCallExpr =
                     new MethodCallExpr(
                             new MethodCallExpr(new NameExpr(Js.class.getSimpleName()), "asPropertyMap")
@@ -321,8 +321,7 @@ private void processEventHandlers(BeanDefinition beanDefinition, TemplateContext
                             .getAnnotation(ForEvent.class).value();
                     String clazz = iocContext.getGenerationContext().getTypes()
                             .erasure(eventHandlerInfo.getMethod().getParameters().get(0).asType()).toString();
-                    String mangleName = j2CLUtils.createFieldDescriptor(eventHandlerInfo.getInfo().getField(),
-                            beanDefinition.getType()).getMangledName();
+                    String mangleName = j2CLUtils.getVariableMangledName(eventHandlerInfo.getInfo().getField());
                     String call = methodCallGenerator.generate(beanDefinition.getType(),
                             eventHandlerInfo.getMethod(), List.of("e"));
                     Event event = new Event(eventTypes, mangleName, clazz, call);
@@ -530,7 +529,7 @@ public MethodCallExpr getFieldAccessCallExpr(DataElementInfo info) {
     }
 
     public MethodCallExpr getFieldAccessCallExpr(VariableElement field) {
-        String mangleName = j2CLUtils.createFieldDescriptor(field).getMangledName();
+        String mangleName = j2CLUtils.getVariableMangledName(field);
 
         return new MethodCallExpr(
                 new MethodCallExpr(new NameExpr(Js.class.getSimpleName()), "asPropertyMap")

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.crysknife</groupId>
     <artifactId>crysknife-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8</version>
   </parent>
 
   <groupId>io.crysknife.ui</groupId>