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.

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

[gen][go] mocks implementation extends qualified mocker identifier #103

Merged
merged 2 commits into from
Nov 28, 2024
Merged
Changes from all commits
Commits
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 Dockerfile-go
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ INCLUDE+ Dockerfile-base
FROM openjdk:16-alpine AS jvm
COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /soft.generator.go/
WORKDIR /soft.generator.go
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.9.2.jar > java.modules \
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.10.0.jar > java.modules \
&& jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator

# Build result stage
FROM alpine
COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /usr/share/soft.generator.go/
COPY --from=jvm /java-generator /usr/lib/jvm/java-generator

ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.9.2.jar"]
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.10.0.jar"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ packages := go ts cpp common
soft.generators.version := 1.6.0
soft.generator.common.version := 1.4.1
soft.generator.cpp.version := 1.2.4
soft.generator.go.version := 1.9.2
soft.generator.go.version := 1.10.0
soft.generator.ts.version := 1.5.4

export DOCKER_BUILDKIT=1
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.go/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-Name: Soft Generator Go
Bundle-SymbolicName: soft.generator.go
Bundle-Version: 1.9.2
Bundle-Version: 1.10.0
Export-Package: soft.generator.go,soft.generator.go.lib,soft.generator
.go.lib.factory,soft.generator.go.lib.pack,soft.generator.go.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.go/pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<version>1.6.0</version>
</parent>
<artifactId>soft.generator.go</artifactId>
<version>1.9.2</version>
<version>1.10.0</version>
<dependencies>
<dependency>
<groupId>soft.generators</groupId>
Original file line number Diff line number Diff line change
@@ -26,14 +26,17 @@
[query public getMockExtends(aClass : EClass ) : Sequence(String) =
let extendsClass : EClass = aClass.getClassExtendsClass() in
if ( extendsClass.oclIsUndefined() ) then
let aPackage : EPackage = aClass.ePackage in
let ecore : EPackage = getEcorePackage() in
if ( aClass.isMapEntry() ) then
Sequence{ ecore.getQualifiedInterfaceIdentifier('MockEObjectInternal'), ecore.getQualifiedInterfaceIdentifier('MockEMapEntry')}
else if ( aClass.name = 'EObject' ) then
if ( aClass.name = 'EObject' ) then
Sequence{ecore.getQualifiedInterfaceIdentifier('MockENotifier')}
else if ( aPackage.hasPackageProperty('rootExtendsMock') ) then
aPackage.getPackageProperty('rootExtendsMock')
else if ( aClass.isMapEntry() ) then
Sequence{ ecore.getQualifiedMockIdentifier('MockEObjectInternal'), ecore.getQualifiedInterfaceIdentifier('MockEMapEntry')}
else
Sequence{ecore.getQualifiedInterfaceIdentifier('MockEObjectInternal')}
endif endif
Sequence{ecore.getQualifiedMockIdentifier('MockEObjectInternal')}
endif endif endif
else
Sequence{ extendsClass.getQualifiedMockIdentifier()}
endif