Merge pull request #129 from eclipse/use-model-mapping-semistructured

Use attributes from semitructured project
eclipse-jnosql · Jul 28, 2024 · cb121b6 · cb121b6
2 parents 14d92da + 2639d72
commit cb121b6
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 437 deletions.
diff --git a/jnosql-static-metamodel/jnosql-metamodel-processor/pom.xml b/jnosql-static-metamodel/jnosql-metamodel-processor/pom.xml
@@ -54,30 +54,6 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/classes/metadata/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/java/org/eclipse/jnosql/metamodel/</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/...osql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/BooleanAttribute.java b/...osql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/BooleanAttribute.java
diff --git a/...sql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/CriteriaAttribute.java b/...sql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/CriteriaAttribute.java
diff --git a/...jnosql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/NoSQLAttribute.java b/...jnosql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/NoSQLAttribute.java
diff --git a/...nosql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/StringAttribute.java b/...nosql-metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/StringAttribute.java
diff --git a/...metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/processor/EntityModel.java b/...metamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/processor/EntityModel.java
@@ -69,6 +69,18 @@ public String getSuperClass() {
         return superClass;
     }
 
+    public boolean containsStringAttribute() {
+        return this.fields.stream().anyMatch(FieldModel::isStringAttribute);
+    }
+
+    public boolean containsBooleanAttribute() {
+        return this.fields.stream().anyMatch(FieldModel::isBooleanAttribute);
+    }
+
+    public boolean containsCriteriaAttribute() {
+        return this.fields.stream().anyMatch(FieldModel::isCriteriaAttribute);
+    }
+
     @Override
     public String toString() {
         return "EntityModel{" +

diff --git a/...tamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/processor/FieldAnalyzer.java b/...tamodel-processor/src/main/java/org/eclipse/jnosql/metamodel/processor/FieldAnalyzer.java
@@ -34,6 +34,7 @@
 
 class FieldAnalyzer implements Supplier<List<FieldModel>> {
 
+
     private final Element field;
     private final ProcessingEnvironment processingEnv;
     private final TypeElement entity;
@@ -187,9 +188,9 @@ private boolean isBasicField(Entity fieldEntity, Embeddable embeddable) {
 
     private String className(String className) {
         return switch (className) {
-            case "java.lang.String" -> "org.eclipse.jnosql.metamodel.StringAttribute";
-            case "java.lang.Boolean", "boolean" -> "org.eclipse.jnosql.metamodel.BooleanAttribute";
-            default -> "org.eclipse.jnosql.metamodel.CriteriaAttribute";
+            case "java.lang.String" -> FieldModel.STRING_ATTRIBUTE;
+            case "java.lang.Boolean", "boolean" -> FieldModel.BOOLEAN_ATTRIBUTE;
+            default -> FieldModel.CRITERIA_ATTRIBUTE;
         };
     }