Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[guihttp] endpoint for modelledexpressions #641

Merged
merged 7 commits into from
Jan 23, 2024
+1,531 −6
Merged

[guihttp] endpoint for modelledexpressions #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f7c3da
modelled expressions endpoint - v1
LukasFey-GIP Jan 12, 2024
61b2f38
combine converters
LukasFey-GIP Jan 15, 2024
51a4688
clean up expression list assigners
LukasFey-GIP Jan 15, 2024
21e85ae
refactor + test
LukasFey-GIP Jan 16, 2024
8e1e6d0
set copyright header, update version in blackedition_lib.sh
LukasFey-GIP Jan 17, 2024
96f6f70
update reference to guihttp application
LukasFey-GIP Jan 17, 2024
21cb506
handle invalid expressions, remove debug output
LukasFey-GIP Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions blackedition/blackedition_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Copyright 2022 Xyna GmbH, Germany
# Copyright 2024 Xyna GmbH, Germany
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,7 +30,7 @@ ALL_DATAMODELTYPES=("mib","tr069","xsd");
#ACHTUNG: Version auch bei addRequirement zu default workspace berücksichtigen
ALL_APPLICATIONS="Base Processing"; #Default-Applications, die immer installiert sein sollten
APPMGMTVERSION=1.0.10
GUIHTTPVERSION=1.1.373
GUIHTTPVERSION=1.1.374
SNMPSTATVERSION=1.0.3
PROCESSINGVERSION=1.0.18
ALL_REPOSITORYACCESSES=("svn");
Expand Down
2 changes: 1 addition & 1 deletion modules/xmcp/gitIntegration/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>GuiHttp</ApplicationName>
<VersionName>1.1.373</VersionName>
<VersionName>1.1.374</VersionName>
</RuntimeContextRequirement>
</RuntimeContextRequirements>
</ApplicationInfo>
Expand Down
22 changes: 22 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/Expression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" IsAbstract="false" Label="Expression" TypeName="Expression" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
</DataType>
22 changes: 22 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/Expression1Arg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="Expression" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="true" Label="Expression1Arg" TypeName="Expression1Arg" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
</DataType>
29 changes: 29 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/Expression2Args.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="Expression" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="false" Label="Expression2Args" TypeName="Expression2Args" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="var1" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="var1"/>
<Data Label="var2" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="var2"/>
<Data Label="Operator" VariableName="operator">
<Meta>
<Type>String</Type>
</Meta>
</Data>
</DataType>
29 changes: 29 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/ExpressionVariable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" IsAbstract="false" Label="Expression Variable" TypeName="ExpressionVariable" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="Var Num" VariableName="varNum">
<Meta>
<Type>int</Type>
</Meta>
</Data>
<Data IsList="true" Label="Parts" ReferenceName="VariableAccessPart" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="parts"/>
<Data Label="Index Def" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="indexDef"/>
</DataType>
30 changes: 30 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/FunctionExpression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="Expression" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="false" Label="Function Expression" TypeName="FunctionExpression" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data IsList="true" Label="Sub Expressions" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="subExpressions"/>
<Data Label="Function" VariableName="function">
<Meta>
<Type>String</Type>
</Meta>
</Data>
<Data Label="Index Def" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="indexDef"/>
<Data IsList="true" Label="Parts" ReferenceName="VariableAccessPart" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="parts"/>
</DataType>
27 changes: 27 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/LiteralExpression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="Expression1Arg" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="false" Label="Literal Expression" TypeName="LiteralExpression" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="Value" VariableName="value">
<Meta>
<Type>String</Type>
</Meta>
</Data>
</DataType>
24 changes: 24 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/ModelledExpression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" IsAbstract="false" Label="Modelled Expression" TypeName="ModelledExpression" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="Source Expression" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="sourceExpression"/>
<Data Label="Target Expression" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="targetExpression"/>
</DataType>
23 changes: 23 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/NotExpression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="Expression1Arg" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="false" Label="Not Expression" TypeName="NotExpression" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="Expression" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="expression"/>
</DataType>
23 changes: 23 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/SingleVarExpression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="Expression1Arg" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="false" Label="Single Var Expression" TypeName="SingleVarExpression" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="Variable" ReferenceName="ExpressionVariable" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="variable"/>
</DataType>
28 changes: 28 additions & 0 deletions modules/xmcp/guihttp/XMOM/xmcp/processmodeller/datatypes/expression/VariableAccessPart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" IsAbstract="false" Label="Variable Access Part" TypeName="VariableAccessPart" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data Label="Name" VariableName="name">
<Meta>
<Type>String</Type>
</Meta>
</Data>
<Data Label="Index Def" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="indexDef"/>
</DataType>
23 changes: 23 additions & 0 deletions ...ttp/XMOM/xmcp/processmodeller/datatypes/expression/VariableInstanceFunctionIncovation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" BaseTypeName="VariableAccessPart" BaseTypePath="xmcp.processmodeller.datatypes.expression" IsAbstract="false" Label="Variable Instance Function Incovation" TypeName="VariableInstanceFunctionIncovation" TypePath="xmcp.processmodeller.datatypes.expression" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data IsList="true" Label="Function Parameter" ReferenceName="Expression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="functionParameter"/>
</DataType>
23 changes: 23 additions & 0 deletions ...p/guihttp/XMOM/xmcp/processmodeller/datatypes/response/GetModelledExpressionsResponse.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* Copyright 2024 Xyna GmbH, Germany
*
* Licensed 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.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--><DataType xmlns="http://www.gip.com/xyna/xdev/xfractmod" IsAbstract="false" Label="Get Modelled Expressions Response" TypeName="GetModelledExpressionsResponse" TypePath="xmcp.processmodeller.datatypes.response" Version="1.8">
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Data IsList="true" Label="Modelled Expressions" ReferenceName="ModelledExpression" ReferencePath="xmcp.processmodeller.datatypes.expression" VariableName="modelledExpressions"/>
</DataType>
Loading
Loading