[plc4x-build-tools] branch develop updated: - Introduced a "NamedField" interface - Renamed the SwitchField getDiscriminatorNames to getDiscriminatorExpressions - Added a getTypeReference method to TypeDefinition to allow accessing a type reference for a given definition

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-build-tools.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5998a3c  - Introduced a "NamedField" interface - Renamed the SwitchField getDiscriminatorNames to getDiscriminatorExpressions - Added a getTypeReference method to TypeDefinition to allow accessing a type reference for a given definition
5998a3c is described below

commit 5998a3c83a89e28556b57bda2bf5ffefbe4727a4
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jun 15 11:31:13 2020 +0200

    - Introduced a "NamedField" interface
    - Renamed the SwitchField getDiscriminatorNames to getDiscriminatorExpressions
    - Added a getTypeReference method to TypeDefinition to allow accessing a type reference for a given definition
---
 .../types/definitions/TypeDefinition.java          |  4 ++++
 .../types/fields/DiscriminatorField.java           |  4 +---
 .../codegenerator/types/fields/ImplicitField.java  |  4 +---
 .../codegenerator/types/fields/NamedField.java     | 25 ++++++++++++++++++++++
 .../codegenerator/types/fields/PropertyField.java  |  4 +---
 .../codegenerator/types/fields/SwitchField.java    |  3 ++-
 6 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/TypeDefinition.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/TypeDefinition.java
index 08f5ea7..6b1eac5 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/TypeDefinition.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/definitions/TypeDefinition.java
@@ -19,6 +19,8 @@
 
 package org.apache.plc4x.plugins.codegenerator.types.definitions;
 
+import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
+
 public interface TypeDefinition {
 
     String getName();
@@ -29,4 +31,6 @@ public interface TypeDefinition {
 
     TypeDefinition getParentType();
 
+    TypeReference getTypeReference();
+
 }
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/DiscriminatorField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/DiscriminatorField.java
index c5c0552..84b51f1 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/DiscriminatorField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/DiscriminatorField.java
@@ -19,12 +19,10 @@
 
 package org.apache.plc4x.plugins.codegenerator.types.fields;
 
-public interface DiscriminatorField extends TypedField {
+public interface DiscriminatorField extends TypedField, NamedField{
 
     default String getTypeName() {
         return "discriminator";
     }
 
-    String getName();
-
 }
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ImplicitField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ImplicitField.java
index 0cbe414..b95db9d 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ImplicitField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ImplicitField.java
@@ -21,14 +21,12 @@ package org.apache.plc4x.plugins.codegenerator.types.fields;
 
 import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
 
-public interface ImplicitField extends TypedField {
+public interface ImplicitField extends TypedField, NamedField {
 
     default String getTypeName() {
         return "implicit";
     }
 
-    String getName();
-
     Term getSerializeExpression();
 
 }
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/NamedField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/NamedField.java
new file mode 100644
index 0000000..2fd2a2c
--- /dev/null
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/NamedField.java
@@ -0,0 +1,25 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package org.apache.plc4x.plugins.codegenerator.types.fields;
+
+public interface NamedField {
+
+    String getName();
+
+}
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/PropertyField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/PropertyField.java
index b336f4f..f6f011c 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/PropertyField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/PropertyField.java
@@ -19,8 +19,6 @@
 
 package org.apache.plc4x.plugins.codegenerator.types.fields;
 
-public interface PropertyField extends TypedField {
-
-    String getName();
+public interface PropertyField extends TypedField, NamedField {
 
 }
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java
index a6b4df7..c28a8ce 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java
@@ -20,6 +20,7 @@
 package org.apache.plc4x.plugins.codegenerator.types.fields;
 
 import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
 
 import java.util.List;
 
@@ -29,7 +30,7 @@ public interface SwitchField extends Field {
         return "switch";
     }
 
-    String[] getDiscriminatorNames();
+    Term[] getDiscriminatorExpressions();
 
     List<DiscriminatedComplexTypeDefinition> getCases();