optimisticlocking and returningpolicy

code/LanBortalDatabase/src/META-INF/persistence.xml

@@ -15,6 +15,8 @@
 				value="fi.insomnia.bortal.database.BortalPostgreSQLPlatform" />
 				value="fi.insomnia.bortal.database.BortalPostgreSQLPlatform" />
 			<property name="eclipselink.session-event-listener"
 			<property name="eclipselink.session-event-listener"
 				value="org.ancoron.postgresql.jpa.eclipselink.ConverterInitializer" />
 				value="org.ancoron.postgresql.jpa.eclipselink.ConverterInitializer" />
+			<property name="eclipselink.descriptor.customizer"
+				value="fi.insomnia.bortal.database.BortalDescriptorCustomizer" />
 		</properties>
 		</properties>
 
 
 	</persistence-unit>
 	</persistence-unit>

code/LanBortalDatabase/src/fi/insomnia/bortal/database/BortalDescriptorCustomizer.java

+package fi.insomnia.bortal.database;
+
+import java.util.List;
+
+import org.eclipse.persistence.config.DescriptorCustomizer;
+import org.eclipse.persistence.descriptors.ChangedFieldsLockingPolicy;
+import org.eclipse.persistence.descriptors.ClassDescriptor;
+import org.eclipse.persistence.descriptors.ReturningPolicy;
+import org.eclipse.persistence.internal.helper.DatabaseField;
+
+public class BortalDescriptorCustomizer implements DescriptorCustomizer {
+
+    @Override
+    public void customize(ClassDescriptor descriptor) throws Exception {
+
+        // Optimistic locking policy
+        ChangedFieldsLockingPolicy changedFieldsLockingPolicy = new ChangedFieldsLockingPolicy();
+        descriptor.setOptimisticLockingPolicy(changedFieldsLockingPolicy);
+
+        // Returningpolicy
+        ReturningPolicy returningPolicy = new ReturningPolicy();
+
+        List<DatabaseField> pkFields = descriptor.getPrimaryKeyFields();
+        for (final DatabaseField field : pkFields) {
+            returningPolicy.addFieldForInsertReturnOnly(field);
+            field.setUpdatable(false);
+            field.setInsertable(false);
+        }
+
+        for (final DatabaseField field : descriptor.getFields()) {
+
+            if (pkFields.contains(field))
+                continue;
+
+            returningPolicy.addFieldForInsert(field);
+            returningPolicy.addFieldForUpdate(field);
+        }
+
+        descriptor.setReturningPolicy(returningPolicy);
+    }
+}