From ff4c94985187ad0be762db47ced4677c306e1bb6 Mon Sep 17 00:00:00 2001 From: Lukas Fey Date: Tue, 17 Oct 2023 13:19:07 +0200 Subject: [PATCH 1/2] fully qualify Object as java.lang.Object --- .../xfctrl/deploystate/deployitem/TypeInterface.java | 2 +- .../gip/xyna/xprc/xfractwfe/formula/TypeInfo.java | 2 +- .../xfractwfe/generation/ModelledExpression.java | 2 +- .../xyna/xprc/xfractwfe/generation/StepFunction.java | 2 +- .../generation/XynaObjectCodeGenerator.java | 8 ++++---- .../serviceimpl/JavaServiceImplementation.java | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/src/com/gip/xyna/xfmg/xfctrl/deploystate/deployitem/TypeInterface.java b/server/src/com/gip/xyna/xfmg/xfctrl/deploystate/deployitem/TypeInterface.java index 6ce9fc8b2..e430619ca 100644 --- a/server/src/com/gip/xyna/xfmg/xfctrl/deploystate/deployitem/TypeInterface.java +++ b/server/src/com/gip/xyna/xfmg/xfctrl/deploystate/deployitem/TypeInterface.java @@ -302,7 +302,7 @@ public static TypeInterface of(TypeInfo typeInfo, boolean isList) { if (typeInfo.isModelledType()) { return TypeInterface.of(((StepBasedType)typeInfo.getModelledType()).getGenerationType().getOriginalFqName(), false, isList); } else { - if (typeInfo.getJavaName().equals("Object")) { + if (typeInfo.getJavaName().equals("java.lang.Object")) { return TypeInterface.anyType(); } else if (typeInfo.getJavaName().equals("List")) { return TypeInterface.anyType(); //FIXME diff --git a/server/src/com/gip/xyna/xprc/xfractwfe/formula/TypeInfo.java b/server/src/com/gip/xyna/xprc/xfractwfe/formula/TypeInfo.java index f91890d6d..37b47d667 100644 --- a/server/src/com/gip/xyna/xprc/xfractwfe/formula/TypeInfo.java +++ b/server/src/com/gip/xyna/xprc/xfractwfe/formula/TypeInfo.java @@ -171,7 +171,7 @@ public String getJavaName() { return "null"; } if (isAny()) { - return "Object"; + return "java.lang.Object"; } if (isList()) { return "List"; diff --git a/server/src/com/gip/xyna/xprc/xfractwfe/generation/ModelledExpression.java b/server/src/com/gip/xyna/xprc/xfractwfe/generation/ModelledExpression.java index 028a6fcaa..4a07975f6 100644 --- a/server/src/com/gip/xyna/xprc/xfractwfe/generation/ModelledExpression.java +++ b/server/src/com/gip/xyna/xprc/xfractwfe/generation/ModelledExpression.java @@ -820,7 +820,7 @@ public void variableStarts(Variable variable) { private Object transformation_prefix(TypeInfo toType) { if (toType == null || !toType.isBaseType()) { - return Functions.class.getName()+"."+Functions.ADJUST_VALUE_METHOD_NAME+"(Object.class, "; + return Functions.class.getName()+"."+Functions.ADJUST_VALUE_METHOD_NAME+"(java.lang.Object.class, "; } else { return Functions.class.getName()+"."+Functions.ADJUST_VALUE_METHOD_NAME+"("+toType.getJavaName()+".class, "; } diff --git a/server/src/com/gip/xyna/xprc/xfractwfe/generation/StepFunction.java b/server/src/com/gip/xyna/xprc/xfractwfe/generation/StepFunction.java index e9b502472..1d37a45ae 100644 --- a/server/src/com/gip/xyna/xprc/xfractwfe/generation/StepFunction.java +++ b/server/src/com/gip/xyna/xprc/xfractwfe/generation/StepFunction.java @@ -1402,7 +1402,7 @@ protected void appendExecuteInternallyForDOMRef(ServiceIdentification service, C } if (receiveVarIds.length == 0) { } else if (receiveVarIds.length == 1) { - cb.add("Object temp = "); + cb.add("java.lang.Object temp = "); } else { cb.add(Container.class.getSimpleName() + " c = "); } diff --git a/server/src/com/gip/xyna/xprc/xfractwfe/generation/XynaObjectCodeGenerator.java b/server/src/com/gip/xyna/xprc/xfractwfe/generation/XynaObjectCodeGenerator.java index e9164e306..171742870 100644 --- a/server/src/com/gip/xyna/xprc/xfractwfe/generation/XynaObjectCodeGenerator.java +++ b/server/src/com/gip/xyna/xprc/xfractwfe/generation/XynaObjectCodeGenerator.java @@ -1446,7 +1446,7 @@ public static void appendToXMLSnippetForObjectReferences(CodeBuffer cb) { public static void appendGeneralSetter(CodeBuffer cb, Set imports, List memberVars, boolean hasSuperClassWithGeneralGetter) { // allgemeiner setter - cb.addLine("public void set(String name, Object o) throws ", XDEV_PARAMETER_NAME_NOT_FOUND.class.getSimpleName(), " {"); + cb.addLine("public void set(String name, java.lang.Object o) throws ", XDEV_PARAMETER_NAME_NOT_FOUND.class.getSimpleName(), " {"); for (int i = 0; i < memberVars.size(); i++) { AVariable v = memberVars.get(i); if (i > 0) { @@ -1512,13 +1512,13 @@ public static void appendGeneralGetter(CodeBuffer cb, Set imports, List< cb.addLine(" * @param name variable name or path separated by \".\"."); cb.addLine(" */"); - cb.addLine("public Object get(String name) throws ", InvalidObjectPathException.class.getSimpleName(), " {"); + cb.addLine("public java.lang.Object get(String name) throws ", InvalidObjectPathException.class.getSimpleName(), " {"); cb.add("String[] varNames = new String[]{"); for (int i = 0; i < memberVars.size(); i++) { cb.addListElement("\"" + memberVars.get(i).getVarName() + "\""); } cb.add("};").addLB(); - cb.add("Object[] vars = new Object[]{"); + cb.add("java.lang.Object[] vars = new java.lang.Object[]{"); for (AVariable v : memberVars) { if (v.isList()) { //getter verwenden, um bei listen die versionsbewusste liste zu bekommen @@ -1528,7 +1528,7 @@ public static void appendGeneralGetter(CodeBuffer cb, Set imports, List< } } cb.add("};").addLB(); - cb.addLine("Object o = ", XOUtils.class.getSimpleName(), ".getIfNameIsInVarNames(varNames, vars, name)"); + cb.addLine("java.lang.Object o = ", XOUtils.class.getSimpleName(), ".getIfNameIsInVarNames(varNames, vars, name)"); cb.addLine("if (o == ", XOUtils.class.getSimpleName(), ".VARNAME_NOTFOUND) {"); if (hasSuperClassWithGeneralGetter) { cb.addLine("o = super.get(name)"); diff --git a/server/src/com/gip/xyna/xprc/xfractwfe/generation/serviceimpl/JavaServiceImplementation.java b/server/src/com/gip/xyna/xprc/xfractwfe/generation/serviceimpl/JavaServiceImplementation.java index 7eeea63df..c5e55bb7b 100644 --- a/server/src/com/gip/xyna/xprc/xfractwfe/generation/serviceimpl/JavaServiceImplementation.java +++ b/server/src/com/gip/xyna/xprc/xfractwfe/generation/serviceimpl/JavaServiceImplementation.java @@ -193,12 +193,12 @@ public String createDelegationImplCode() { } //helpermethode für konstruktoren - cb.addLine("private static Map setImpls(Map map, ", dom.getFqClassName(), " o) {"); + cb.addLine("private static Map setImpls(Map map, ", dom.getFqClassName(), " o) {"); if (!dom.isAbstract()) { boolean first = true; for (InterfaceVersion version : dom.getVersionsOfOperations(true)) { if (first) { - cb.add("Object "); + cb.add("java.lang.Object "); first = false; } cb.add("versionImpl = map.get(\"" + version.getNameCompatibleWithCurrentVersion() + "\")").addLB(); @@ -214,11 +214,11 @@ public String createDelegationImplCode() { //konstruktor 1: wird von datentyp.init methode aus aufgerufen (oder super-aufrufe von altem (< 5.1.3) generierten code) cb.addLine("public ", getDelegationImplSimpleClassName(), "(", dom.getFqClassName(), " o) {"); - cb.addLine("this(o, new HashMap())"); + cb.addLine("this(o, new HashMap())"); cb.addLine("}").addLB(); //konstruktor 2a: wird von abgeleiteter klasse aufgerufen - cb.addLine("public ", getDelegationImplSimpleClassName(), "(", dom.getFqClassName(), " o, Map implMap) {"); + cb.addLine("public ", getDelegationImplSimpleClassName(), "(", dom.getFqClassName(), " o, Map implMap) {"); if (dom.hasSuperTypeWithJavaImpl(true, null)) { cb.addLine("super(o, setImpls(implMap, o))"); } else { @@ -236,7 +236,7 @@ public String createDelegationImplCode() { //konstruktor 2b: für abwärtskompatibilität bezüglich generiertem code <= version 5.1.3 cb.addLine("public ", getDelegationImplSimpleClassName(), "(", getProjectNonStaticImplFQClassName(InterfaceVersion.BASE), " o) {"); cb.addLine("this(o == null ? null : ((", getSuperProxySimpleClassName(InterfaceVersion.BASE), /*protected methode in gleichem package*/ - ") o).getInstanceVar(), o == null ? new HashMap() : new HashMap(", + ") o).getInstanceVar(), o == null ? new HashMap() : new HashMap(", Collections.class.getName(), ".singletonMap(\"" + InterfaceVersion.BASE.getNameCompatibleWithCurrentVersion() + "\", o)))"); cb.addLine("}").addLB(); } @@ -245,7 +245,7 @@ public String createDelegationImplCode() { if (!dom.isAbstract()) { cb.addLine("public ", getDelegationImplSimpleClassName(), "() {"); if (dom.hasSuperTypeWithJavaImpl(true, null)) { - cb.addLine("super(null, new HashMap())"); + cb.addLine("super(null, new HashMap())"); } //else leerer super-aufruf for (InterfaceVersion version : dom.getVersionsOfOperations(true)) { From 732caa805097b89b28e6559339fb44b544073696 Mon Sep 17 00:00:00 2001 From: Lukas Fey Date: Fri, 20 Oct 2023 11:18:19 +0200 Subject: [PATCH 2/2] qualify Object in getPrimaryKey method of storables --- .../xnwh/persistence/xmom/generation/StorableCodeBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/gip/xyna/xnwh/persistence/xmom/generation/StorableCodeBuilder.java b/server/src/com/gip/xyna/xnwh/persistence/xmom/generation/StorableCodeBuilder.java index 21fb89579..fd6136b3f 100644 --- a/server/src/com/gip/xyna/xnwh/persistence/xmom/generation/StorableCodeBuilder.java +++ b/server/src/com/gip/xyna/xnwh/persistence/xmom/generation/StorableCodeBuilder.java @@ -203,7 +203,7 @@ protected void createStorable(XMOMStorableStructureInformation rootXMOMStorable, if (!currentStructure.hasSuper()) { //getprimarykey methode - cb.addLine("public Object getPrimaryKey() {"); + cb.addLine("public java.lang.Object getPrimaryKey() {"); cb.addLine("return ", currentStructure.getPrimaryKeyName()); cb.addLine("}").addLB(2); }