Feature #54394. Merge branch 'rm52059-3.2' into release-3.2

(cherry picked from commit b70e5f445725186088fe7fd9af435ff2e65f645d)

Change-Id: I67da2b78cddd7ef7367267b19ed34f29369c16ca

BackEnd/Core/sailfish-common/build.gradle

@@ -8,15 +8,6 @@ ext {
     xsdDir			= "${mainResDir}/xsd"
 }
 
-// Change default project layout
-sourceSets {
-    main {
-        java {
-            srcDir genJavaDir
-        }
-    }
-}
-
 configurations {
     jamon
     jaxb
@@ -67,4 +58,4 @@ task templates {
     }
 }
 
-compileJava.dependsOn.add("templates")
+compileKotlin.dependsOn.add("templates")

BackEnd/Core/sailfish-common/src/main/java/com/exactpro/sf/common/impl/messages/BaseMessage.java

@@ -31,7 +31,7 @@ public BaseMessage(IMessage message)
 
 	public IMessage getMessage()
 	{
-		return this.msg;
+        return msg;
 	}
 
 	public boolean isAdmin(){
@@ -40,15 +40,12 @@ public boolean isAdmin(){
 
 	@Override
 	public BaseMessage clone() {
-		Constructor<? extends BaseMessage> ctor = null;
-		BaseMessage clone = null;
-		try {
-			ctor = this.getClass().getConstructor(IMessage.class);
-			clone = ctor.newInstance(this.msg.cloneMessage());
+        try {
+            Constructor<? extends BaseMessage> ctor = getClass().getConstructor(IMessage.class);
+            return ctor.newInstance(msg.cloneMessage());
 		} catch (Exception e) {
 			throw new EPSCommonException(e);
 		}
-		return clone;
-	}
+    }
 
 }

BackEnd/Core/sailfish-common/src/main/java/com/exactpro/sf/common/impl/messages/DefaultMessageFactory.java

@@ -21,16 +21,17 @@
 
 public class DefaultMessageFactory extends AbstractMessageFactory
 {
-	private static IMessageFactory factory = null;
+	private static IMessageFactory factory;
 
 	private DefaultMessageFactory() {}
 
 	public static IMessageFactory getFactory()
 	{
 		synchronized (DefaultMessageFactory.class)
 		{
-			if ( factory == null )
-				factory = new DefaultMessageFactory();
+            if(factory == null) {
+                factory = new DefaultMessageFactory();
+            }
 		}
 
 		return factory;