Skip to content

Linnea Samila / Moya

Go to a project
Commit a47f872e by Juho Juopperi
Options

Rest API for metadata and SQL changes to fix Optimistic Locking Policy for JSON … 

…fields. Also fix Returning Policy to make SQL more performant.

BROKEN DDL generation (missing SERIAL fields now. Sorry. Eclipselink fought back!)
1 parent 1869d0d0
Inline Side-by-side
Showing with 668 additions and 415 deletions
code/MoyaDatabase/.settings/org.eclipse.jpt.core.prefs
eclipse.preferences.version=1
entitygen.DEFAULT_PACKAGE=model
org.eclipse.jpt.core.discoverAnnotatedClasses=true
org.eclipse.jpt.core.platform=eclipselink2_5
org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
......
code/MoyaDatabase/pom.xml
......@@ -60,7 +60,18 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.3-1100-jdbc41</version>
<version>9.3-1101-jdbc41</version>
</dependency>
<dependency>
<groupId>org.ancoron.postgresql</groupId>
<artifactId>org.postgresql.net</artifactId>
<version>9.1.901.jdbc4.1-rc9</version>
<exclusions>
<exclusion>
<artifactId>org.postgresql</artifactId>
<groupId>org.ancoron.postgresql</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaDatabase/src/META-INF/persistence.xml
......@@ -12,14 +12,13 @@
<property name="eclipselink.logging.logger" value="ServerLogger" />
<property name="eclipselink.jdbc.uppercase-columns" value="false" />
<property name="eclipselink.target-database"
value="fi.codecrew.moya.database.MoyaPostgreSQLPlatform" />
<property name="eclipselink.session-event-listener"
value="org.ancoron.postgresql.jpa.eclipselink.ConverterInitializer" />
<property name="eclipselink.descriptor.customizer"
value="fi.codecrew.moya.database.MoyaDescriptorCustomizer" />
<property name="eclipselink.create-ddl-jdbc-file-name" value="moyaCreateDDL.sql"/>
<property name="eclipselink.drop-ddl-jdbc-file-name" value="moyaDropDDL.sql"/>
value="fi.codecrew.moya.database.eclipselink.MoyaPostgreSQLPlatform" />
<property name="eclipselink.create-ddl-jdbc-file-name" value="moyaCreateDDL.sql" />
<property name="eclipselink.drop-ddl-jdbc-file-name" value="moyaDropDDL.sql" />
<property name="eclipselink.target-server" value="Glassfish" />
<property name="eclipselink.session.customizer"
value="fi.codecrew.moya.database.eclipselink.MoyaSessionCustomizer" />
</properties>
</persistence-unit>
</persistence>
code/MoyaDatabase/src/fi/codecrew/moya/database/eclipselink/MoyaChangedFieldsOptimisticLockingPolicy.java 0 → 100644
package fi.codecrew.moya.database.eclipselink;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.persistence.descriptors.ChangedFieldsLockingPolicy;
import org.eclipse.persistence.internal.helper.DatabaseField;
import org.eclipse.persistence.internal.helper.DatabaseTable;
import org.eclipse.persistence.internal.sessions.AbstractRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Filters out JSON fields from Optimistic Locking policy that checks changed
* fields. JSON fields in PostgreSQL cannot be compared.
*
* @author jkj
*
*/
public class MoyaChangedFieldsOptimisticLockingPolicy extends ChangedFieldsLockingPolicy {
private static final long serialVersionUID = -1951931955910848024L;
private static final Logger log = LoggerFactory.getLogger(MoyaChangedFieldsOptimisticLockingPolicy.class);
/**
* Skip PGobject from ChangedFieldsLockingPolicy. PostgreSQL does not now
* how to compare JSON column, and this was the easiest way to work around
* it.
*/
@Override
protected List<DatabaseField> getFieldsToCompare(DatabaseTable table, AbstractRecord transRow, AbstractRecord modifyRow) {
// log.info("getFieldsToCompare({}, {}, {})", table, transRow,
// modifyRow);
List<DatabaseField> changedFields = super.getFieldsToCompare(table, transRow, modifyRow);
ArrayList<DatabaseField> fieldsToCompare = new ArrayList<DatabaseField>(changedFields.size());
// Filter out JSON fields because they cannot be compared
for (DatabaseField f : changedFields) {
// log.info("Field with typeName={}: {}", f.toString(),
// f.getTypeName());
if (!f.getTypeName().equals("org.postgresql.util.PGobject")) {
log.debug("Ignoring a PGobject field from changed fields optimistic locking policy: {}", f);
fieldsToCompare.add(f);
}
}
return fieldsToCompare;
}
}
code/MoyaDatabase/src/fi/codecrew/moya/database/MoyaDescriptorCustomizer.java → code/MoyaDatabase/src/fi/codecrew/moya/database/eclipselink/MoyaDescriptorCustomizer.java
package fi.codecrew.moya.database;
package fi.codecrew.moya.database.eclipselink;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MoyaDescriptorCustomizer 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);
}
private static final Logger log = LoggerFactory.getLogger(MoyaDescriptorCustomizer.class);
@Override
public void customize(ClassDescriptor descriptor) throws Exception {
log.info("Customizing Descriptor: {}", descriptor);
// Optimistic locking policy
MoyaChangedFieldsOptimisticLockingPolicy changedFieldsLockingPolicy = new MoyaChangedFieldsOptimisticLockingPolicy();
// log.debug("Setting Optimistic Locking Policy: {}",
// changedFieldsLockingPolicy);
descriptor.setOptimisticLockingPolicy(changedFieldsLockingPolicy);
// ReturningPolicy
ReturningPolicy returningPolicy = new ReturningPolicy();
descriptor.setReturningPolicy(returningPolicy);
/*
* // generation strategy IDENTITY has sequence number field
* DatabaseField seqNumberField = descriptor.getSequenceNumberField();
* if (seqNumberField != null) {
* returningPolicy.addFieldForInsertReturnOnly(seqNumberField); }
*/
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); }
*/
// log.info("Set descriptor's RETURNING policy to: {}",
// returningPolicy);
}
}
code/MoyaDatabase/src/fi/codecrew/moya/database/MoyaPostgreSQLPlatform.java → code/MoyaDatabase/src/fi/codecrew/moya/database/eclipselink/MoyaPostgreSQLPlatform.java
package fi.codecrew.moya.database;
package fi.codecrew.moya.database.eclipselink;
import java.util.Hashtable;
import org.ancoron.postgresql.jpa.eclipselink.ExtendedPostgreSQLPlatform;
import org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
import org.eclipse.persistence.platform.database.PostgreSQLPlatform;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MoyaPostgreSQLPlatform extends PostgreSQLPlatform {
private static final long serialVersionUID = 6351395815598077327L;
/**
* Smarter defaults. Use TEXT for string columns and understand JSON fields.
* Also inherit ExtendedPostgreSQLPlatform which understand the Inet types.
*
* @author jkj
*
*/
public class MoyaPostgreSQLPlatform extends ExtendedPostgreSQLPlatform {
private static final long serialVersionUID = 6351395815598077327L;
private static final Logger log = LoggerFactory.getLogger(MoyaPostgreSQLPlatform.class);
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected Hashtable buildFieldTypes() {
Hashtable map = super.buildFieldTypes();
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected Hashtable buildFieldTypes() {
log.info("Customizing SQL Platform field types for Moya");
Hashtable map = super.buildFieldTypes();
map.put(String.class, new FieldTypeDefinition("TEXT", false));
map.put(java.sql.Timestamp.class, new FieldTypeDefinition("TIMESTAMPTZ", false));
map.put(javax.json.JsonObject.class, new FieldTypeDefinition("JSON", false));
map.put(String.class, new FieldTypeDefinition("TEXT", false));
map.put(java.sql.Timestamp.class, new FieldTypeDefinition("TIMESTAMPTZ", false));
map.put(javax.json.JsonObject.class, new FieldTypeDefinition("JSON", false));
return map;
}
return map;
}
}
code/MoyaDatabase/src/fi/codecrew/moya/database/eclipselink/MoyaSessionCustomizer.java 0 → 100644
package fi.codecrew.moya.database.eclipselink;
import org.eclipse.persistence.config.SessionCustomizer;
import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.sessions.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MoyaSessionCustomizer implements SessionCustomizer {
private static final Logger log = LoggerFactory.getLogger(MoyaSessionCustomizer.class);
@Override
public void customize(Session session) throws Exception {
log.info("Customizing session: {}", session);
MoyaDescriptorCustomizer customizer = new MoyaDescriptorCustomizer();
for (ClassDescriptor descriptor : session.getDescriptors().values()) {
// log.info("Looking into descriptor: {}", descriptor);
customizer.customize(descriptor);
}
}
}
code/MoyaDatabase/src/fi/codecrew/moya/model/AccountEvent.java
......@@ -17,9 +17,6 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Account event contains the money / credit traffic for the user. Each row
* references a Product entity.
......@@ -27,7 +24,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "account_events")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class AccountEvent extends GenericEntity {
private static final long serialVersionUID = 2588419823225148100L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ActionLogMessage.java
......@@ -18,15 +18,12 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
import fi.codecrew.moya.enums.ActionLogMessageState;
@Entity
@Table(name = "actionlog_messages")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
@Table(name = "actionlog_messages")
public class ActionLogMessage extends GenericEntity {
private static final long serialVersionUID = -2902547412412000488L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ActionLogMessageResponse.java
......@@ -12,14 +12,10 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.enums.ActionLogMessageState;
@Entity
@Table(name = "actionlog_message_responses")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
@Table(name = "actionlog_message_responses")
public class ActionLogMessageResponse extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ActionLogMessageTag.java
......@@ -5,13 +5,10 @@ import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
@Entity
@Table(name = "actionlog_message_tags")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class ActionLogMessageTag extends GenericEntity {
private static final long serialVersionUID = -2902547412412000488L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ApiApplication.java
......@@ -16,12 +16,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "api_applications")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class ApiApplication extends GenericEntity {
public static enum AuthType {
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ApplicationPermission.java
......@@ -8,15 +8,11 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.enums.BortalApplication;
import fi.codecrew.moya.enums.apps.IAppPermission;
@Entity
@Table(name = "application_permissions", uniqueConstraints = { @UniqueConstraint(columnNames = { ApplicationPermission.ROLE_ID_COLUMN, ApplicationPermission.APPLICATION_COLUMN, ApplicationPermission.PERMISSION_COLUMN }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class ApplicationPermission extends GenericEntity {
protected static final String APPLICATION_PERMISSION_CONVERTER = "application_permission_perm_typeconverter";
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Bill.java
......@@ -20,8 +20,6 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -34,7 +32,6 @@ import fi.codecrew.moya.utilities.BillUtils;
*/
@Entity
@Table(name = "bills", uniqueConstraints = { @UniqueConstraint(columnNames = { Bill.EVENT_ID_COLUMN, "bill_number" }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Bill extends GenericEntity {
/**
......
code/MoyaDatabase/src/fi/codecrew/moya/model/BillLine.java
......@@ -16,15 +16,11 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "bill_lines")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class BillLine extends GenericEntity {
private static final long serialVersionUID = 2L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CardCode.java
......@@ -5,12 +5,8 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "card_code")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class CardCode extends GenericEntity {
private static final long serialVersionUID = 307145499023412008L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CardTemplate.java
......@@ -15,15 +15,11 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* ID-card templates for the event.
*/
@Entity
@Table(name = "card_templates")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class CardTemplate extends GenericEntity {
private static final long serialVersionUID = -5754760238181167610L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Compo.java
......@@ -20,15 +20,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Competition to be held at the event.
*/
@Entity
@Table(name = "compos")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Compo extends GenericEntity {
private static final long serialVersionUID = 2L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CompoEntry.java
......@@ -20,15 +20,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "compo_entries")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class CompoEntry extends GenericEntity {
private static final long serialVersionUID = 2L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CompoEntryFile.java
......@@ -21,8 +21,6 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.apache.commons.codec.binary.Hex;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -31,7 +29,6 @@ import org.slf4j.LoggerFactory;
*/
@Entity
@Table(name = "compo_entry_files")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class CompoEntryFile extends GenericEntity {
private static final long serialVersionUID = 1L;
@Column(name = "mime_type")
......
code/MoyaDatabase/src/fi/codecrew/moya/model/CompoEntryParticipant.java
......@@ -10,15 +10,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "compo_entry_participations")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class CompoEntryParticipant extends GenericEntity {
private static final long serialVersionUID = 2L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/DBModel.java
......@@ -22,39 +22,38 @@ public class DBModel implements ModelInterface {
@Id
@Column(name = ID_COLUMN, nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
private Integer id;
@Column(name = "revision", nullable = false)
private Integer revision;
@Column(name = "revision", nullable = false)
private Integer revision;
@Column(name = "applied_at")
@Temporal(TemporalType.TIMESTAMP)
private Date appliedAt = new Date();
@Column(name = "applied_at")
@Temporal(TemporalType.TIMESTAMP)
private Date appliedAt = new Date();
@Override
public final Integer getId() {
return id;
}
@Override
public final Integer getId() {
return id;
}
@Override
public final void setId(Integer id) {
this.id = id;
}
@Override
public final void setId(Integer id) {
this.id = id;
}
public Date getAppliedAt() {
return appliedAt;
}
public Date getAppliedAt() {
return appliedAt;
}
public void setAppliedAt(Date appliedAt) {
this.appliedAt = appliedAt;
}
public void setAppliedAt(Date appliedAt) {
this.appliedAt = appliedAt;
}
public Integer getRevision() {
return revision;
}
public Integer getRevision() {
return revision;
}
public void setRevision(Integer revision) {
this.revision = revision;
}
public void setRevision(Integer revision) {
this.revision = revision;
}
}
code/MoyaDatabase/src/fi/codecrew/moya/model/DiscountInstance.java
......@@ -5,15 +5,11 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "discount_instances")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class DiscountInstance extends GenericEntity {
private static final long serialVersionUID = 2192672129232748522L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/EventMap.java
......@@ -12,8 +12,6 @@ import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
/**
......@@ -21,7 +19,6 @@ import org.eclipse.persistence.annotations.PrivateOwned;
*/
@Entity
@Table(name = "maps")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class EventMap extends GenericEntity {
private static final long serialVersionUID = 3411450245513673619L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/EventOrganiser.java
......@@ -9,15 +9,11 @@ import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "event_organiser")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class EventOrganiser extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/EventUser.java
......@@ -26,14 +26,10 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.enums.Gender;
@Entity
@Table(name = "event_users", uniqueConstraints = @UniqueConstraint(columnNames = { EventUser.USER_ID_COLUMN, EventUser.EVENT_ID_COLUMN }))
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class EventUser extends GenericEntity {
protected static final String USER_ID_COLUMN = "user_id";
......
code/MoyaDatabase/src/fi/codecrew/moya/model/FoodWave.java
......@@ -19,15 +19,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "food_waves")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class FoodWave extends GenericEntity {
private static final long serialVersionUID = 9221716203467295049L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/FoodWaveTemplate.java
......@@ -18,15 +18,11 @@ import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "food_wave_templates")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class FoodWaveTemplate extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/GameID.java
......@@ -6,8 +6,6 @@ import java.io.Serializable;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: GameID
......@@ -15,7 +13,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="game_ids")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class GameID extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/GenericEntity.java
......@@ -13,34 +13,34 @@ import fi.codecrew.moya.utilities.jpa.ModelInterface;
@MappedSuperclass
public class GenericEntity extends EntityEquals implements ModelInterface, EntityMeta {
private static final long serialVersionUID = -9041737052951021560L;
public static final String ID_COLUMN = "id";
@Id
@Column(name = ID_COLUMN, nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
private JsonObject meta;
@Override
public final Integer getId() {
return id;
}
@Override
public final void setId(Integer id) {
this.id = id;
}
@Override
public JsonObject getMeta() {
return meta;
}
@Override
public void setMeta(JsonObject meta) {
this.meta = meta;
}
private static final long serialVersionUID = -9041737052951021560L;
public static final String ID_COLUMN = "id";
@Id
@Column(name = ID_COLUMN, nullable = false, updatable = false)
private Integer id;
@Column(name = "meta", columnDefinition = "json")
private JsonObject meta;
@Override
public final Integer getId() {
return id;
}
@Override
public final void setId(Integer id) {
this.id = id;
}
@Override
public JsonObject getMeta() {
return meta;
}
@Override
public void setMeta(JsonObject meta) {
this.meta = meta;
}
}
code/MoyaDatabase/src/fi/codecrew/moya/model/GroupMembership.java
......@@ -16,9 +16,6 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
......@@ -26,7 +23,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
@Table(name = "group_memberships")
// , uniqueConstraints = { @UniqueConstraint(columnNames = {
// GroupMembership.EVENTUSER_ID, GroupMembership.GROUP_ID }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class GroupMembership extends GenericEntity {
/**
......
code/MoyaDatabase/src/fi/codecrew/moya/model/InventoryEvent.java
......@@ -10,12 +10,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "inventory_events")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
@Table(name = "inventory_events")
public class InventoryEvent extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LanEvent.java
......@@ -17,8 +17,6 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
import fi.codecrew.moya.enums.EventStatus;
......@@ -29,7 +27,6 @@ import fi.codecrew.moya.model.salespoint.Salespoint;
*/
@Entity
@Table(name = "events")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class LanEvent extends GenericEntity {
private static final long serialVersionUID = 179811358211927126L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LanEventDomain.java
......@@ -7,12 +7,8 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "event_domains")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class LanEventDomain extends GenericEntity {
public LanEventDomain() {
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LicenseCode.java
......@@ -14,15 +14,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "licensecodes")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class LicenseCode extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LicenseTarget.java
......@@ -15,15 +15,11 @@ import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "licensetargets")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class LicenseTarget extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Location.java
......@@ -13,9 +13,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
......@@ -26,7 +23,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
//
// @NamedQuery(name = "Location.findByLocationName", query =
// "SELECT l FROM Location l WHERE l.name = :name") })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Location extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LogEntry.java
......@@ -16,15 +16,11 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "event_log")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class LogEntry extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LogEntryType.java
......@@ -15,9 +15,6 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
......@@ -29,7 +26,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
@NamedQuery(name = "LogEntryType.findAll", query = "SELECT l FROM LogEntryType l"),
@NamedQuery(name = "LogEntryType.findByName", query = "SELECT l FROM LogEntryType l WHERE l.name = :name"),
@NamedQuery(name = "LogEntryType.findByDescription", query = "SELECT l FROM LogEntryType l WHERE l.description = :description") })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class LogEntryType extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/MenuNavigation.java
......@@ -17,8 +17,6 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
import fi.codecrew.moya.enums.BortalApplication;
......@@ -30,7 +28,6 @@ import fi.codecrew.moya.enums.apps.IAppPermission;
MenuNavigation.ITEM_COLUMN,
MenuNavigation.EVENT_COLUMN })
})
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class MenuNavigation extends GenericEntity implements Comparable<MenuNavigation> {
private static final long serialVersionUID = 1404769998091479699L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Menuitem.java
......@@ -9,13 +9,10 @@ import javax.persistence.Lob;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
@Entity
@Table(name = "menuitem")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Menuitem extends GenericEntity {
private static final long serialVersionUID = -3544095800802935237L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/NetworkAssociation.java
......@@ -11,14 +11,10 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.enums.NetworkAssociationStatus;
@Entity
@Table(name = "network_associations")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class NetworkAssociation extends GenericEntity {
private static final long serialVersionUID = -7621152614442737756L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/News.java
......@@ -11,16 +11,12 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
* @author jkj
*/
@Entity
@Table(name = "news")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class News extends GenericEntity {
private static final long serialVersionUID = 498925968565236275L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/NewsGroup.java
......@@ -18,8 +18,6 @@ import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
/**
......@@ -28,7 +26,6 @@ import org.eclipse.persistence.annotations.PrivateOwned;
*/
@Entity
@Table(name = "news_groups", uniqueConstraints = @UniqueConstraint(columnNames = { NewsGroup.EVENT_ID_COLUMN, NewsGroup.GROUP_NAME }))
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class NewsGroup extends GenericEntity {
protected static final String GROUP_NAME = "group_name";
......
code/MoyaDatabase/src/fi/codecrew/moya/model/OrgRole.java
......@@ -12,16 +12,12 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: OrganizationalRole
*
*/
@Entity
@Table(name = "org_roles", uniqueConstraints = { @UniqueConstraint(columnNames = { OrgRole.EVENTORG_ID_COLUMN, OrgRole.NAME_COLUMN }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class OrgRole extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/PageContent.java
......@@ -12,12 +12,8 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "site_page_content")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class PageContent extends GenericEntity {
private static final long serialVersionUID = 8359021214886290522L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Place.java
......@@ -13,15 +13,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "places")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Place extends GenericEntity {
/**
......
code/MoyaDatabase/src/fi/codecrew/moya/model/PlaceGroup.java
......@@ -20,15 +20,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "groups")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class PlaceGroup extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Poll.java
......@@ -18,16 +18,12 @@ import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.Temporal;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: Poll
*
*/
@Entity
@Table(name = "poll")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Poll extends GenericEntity {
/**
......
code/MoyaDatabase/src/fi/codecrew/moya/model/PollAnswer.java
......@@ -9,12 +9,8 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "poll_answer")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class PollAnswer extends GenericEntity implements Serializable {
/**
......
code/MoyaDatabase/src/fi/codecrew/moya/model/PollQuestion.java
......@@ -13,12 +13,8 @@ import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "poll_question")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class PollQuestion extends GenericEntity {
public PollQuestion() {
......
code/MoyaDatabase/src/fi/codecrew/moya/model/PossibleAnswer.java
......@@ -11,12 +11,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "possible_answer")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class PossibleAnswer extends GenericEntity {
public PossibleAnswer() {
......
code/MoyaDatabase/src/fi/codecrew/moya/model/PrintedCard.java
......@@ -25,9 +25,6 @@ import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.enums.CardState;
/**
......@@ -37,7 +34,6 @@ import fi.codecrew.moya.enums.CardState;
@Table(name = "printed_cards", uniqueConstraints = {
@UniqueConstraint(columnNames = { "event_id", "rfid_uid", }),
@UniqueConstraint(columnNames = { "event_id", "barcode" }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class PrintedCard extends GenericEntity {
private static final long serialVersionUID = 8603481931116401027L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Product.java
......@@ -27,8 +27,6 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
/**
......@@ -36,7 +34,6 @@ import org.eclipse.persistence.annotations.PrivateOwned;
*/
@Entity
@Table(name = "products")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Product extends GenericEntity {
private static final String PRODUCTFLAG_TABLE_PRODUCTID = "product_id";
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ProductLimitation.java
......@@ -11,12 +11,8 @@ import javax.persistence.Lob;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@Entity
@Table(name = "product_limitations")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class ProductLimitation extends GenericEntity {
/**
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Reader.java
......@@ -25,9 +25,6 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.model.salespoint.SalesEntity;
/**
......@@ -35,7 +32,6 @@ import fi.codecrew.moya.model.salespoint.SalesEntity;
*/
@Entity
@Table(name = "readers", uniqueConstraints = { @UniqueConstraint(columnNames = { "reader_ident", "event_id" }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Reader extends GenericEntity {
public Reader(LanEvent ev, String ident) {
......
code/MoyaDatabase/src/fi/codecrew/moya/model/ReaderEvent.java
......@@ -14,15 +14,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "reader_events")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class ReaderEvent extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Role.java
......@@ -14,8 +14,6 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
/**
......@@ -23,7 +21,6 @@ import org.eclipse.persistence.annotations.PrivateOwned;
*/
@Entity
@Table(name = "roles", uniqueConstraints = { @UniqueConstraint(columnNames = { Role.EVENT_ID_COLUMN, Role.NAME_COLUMN }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Role extends GenericEntity {
private static final long serialVersionUID = -4602863502464505404L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/SitePage.java
......@@ -12,13 +12,10 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
@Entity
@Table(name = "site_pages", uniqueConstraints = @UniqueConstraint(columnNames = { SitePage.EVENT_ID_COLUMN, "name" }))
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class SitePage extends GenericEntity {
private static final long serialVersionUID = -4333555423866132524L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Tournament.java
......@@ -9,8 +9,6 @@ import java.util.List;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: Tournament
......@@ -18,7 +16,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="tournaments")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Tournament extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentGame.java
......@@ -9,8 +9,6 @@ import java.util.List;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: Tournament
......@@ -18,7 +16,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="tournament_games")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class TournamentGame extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentMatch.java
......@@ -8,8 +8,6 @@ import java.util.List;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: Match
......@@ -17,7 +15,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="matches")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class TournamentMatch extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentMatchResult.java
......@@ -3,8 +3,6 @@ package fi.codecrew.moya.model;
import java.io.Serializable;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: MatchResult
......@@ -12,7 +10,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="match_results")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class TournamentMatchResult extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentParticipant.java
......@@ -6,8 +6,6 @@ import java.util.List;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: TournamentParticipant
......@@ -15,7 +13,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="tournament_participants")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class TournamentParticipant extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentRule.java
......@@ -9,8 +9,6 @@ import java.util.List;
import javax.persistence.*;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* Entity implementation class for Entity: Tournament
......@@ -18,7 +16,6 @@ import org.eclipse.persistence.annotations.OptimisticLockingType;
*/
@Entity
@Table(name="tournament_rules")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class TournamentRule extends GenericEntity implements Serializable {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentTeamMember.java
......@@ -10,14 +10,10 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.codecrew.moya.enums.TournamentTeamMemberRole;
@Entity
@Table(name="tournament_team_members")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class TournamentTeamMember extends GenericEntity implements Serializable {
private static final long serialVersionUID = 8511689754953929329L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/User.java
......@@ -22,8 +22,6 @@ import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
import org.eclipse.persistence.annotations.PrivateOwned;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -36,7 +34,6 @@ import fi.codecrew.moya.utilities.PasswordFunctions;
*/
@Entity
@Table(name = "users")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class User extends GenericEntity implements IUser {
// private static final Logger logger = LoggerFactory.getLogger(User.class);
......
code/MoyaDatabase/src/fi/codecrew/moya/model/UserImage.java
......@@ -19,15 +19,11 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
*
*/
@Entity
@Table(name = "user_images")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class UserImage extends GenericEntity {
private static final long serialVersionUID = 1L;
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Vote.java
......@@ -16,15 +16,11 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
/**
* A vote for a compo entry
*/
@Entity
@Table(name = "compo_votes", uniqueConstraints = { @UniqueConstraint(columnNames = { Vote.ENTRY_ID, Vote.VOTER_USER_ID }) })
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class Vote extends GenericEntity {
protected static final String VOTER_USER_ID = "voter_userevent_id";
......
code/MoyaDatabase/src/fi/codecrew/moya/model/converters/JsonAttributeConverter.java
......@@ -10,47 +10,62 @@ import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
import org.postgresql.util.PGobject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Converter(autoApply = true)
public class JsonAttributeConverter implements AttributeConverter<JsonObject, PGobject> {
private static final Logger log = LoggerFactory.getLogger(JsonAttributeConverter.class);
public PGobject convertToDatabaseColumn(JsonObject attribute) {
final PGobject dataValue = new PGobject();
dataValue.setType("json");
try {
if (attribute == null)
dataValue.setValue("null");
else
dataValue.setValue(attribute.toString());
} catch (SQLException e) {
// This will never run because PGobject.setValue() cannot really
// throw an SQLException. There is nothing but setting a property.
throw new RuntimeException("THIS SHOULD NEVER HAPPEN", e);
}
return dataValue;
}
public JsonObject convertToEntityAttribute(PGobject dbData) {
// Has any?
if (dbData == null) {
return null;
}
// Correct type of object?
if (dbData.getType().equals("json") == false) {
throw new RuntimeException("Expected JSON object from database");
}
if(!dbData.getValue().equals("null")) {
// Read as JSON object
final StringReader stringReader = new StringReader(dbData.getValue());
final JsonReader jsonReader = Json.createReader(stringReader);
return jsonReader.readObject();
} else {
return null;
}
}
/**
* JsonObject -> PGobject
*/
public PGobject convertToDatabaseColumn(JsonObject jsonObject) {
log.info("Converting JsonObject to PGobject. Original JsonObject: {}", jsonObject);
PGobject pgObject = new PGobject();
pgObject.setType("json");
try {
if (jsonObject != null) {
pgObject.setValue(jsonObject.toString());
} else {
pgObject.setValue(null);
}
} catch (SQLException e) {
log.warn("PGobject.setValue() threw an exception. Should not happen. Something is wrong.", e);
}
log.info("Converted JsonObject to PGobject: {}", pgObject);
return pgObject;
}
/**
* PGobject -> JsonObject
*/
public JsonObject convertToEntityAttribute(PGobject pgObject) {
log.info("Converting PGobject to JsonObject. Original PGobject: {}", pgObject);
// Convert null values to empty object
if (pgObject == null) {
log.info("PGobject was null. Retruning an empty JsonObject.");
return Json.createObjectBuilder().build();
}
// Correct type of object?
if (pgObject.getType().equals("json") == false) {
log.error("Expected to be converting JSON column, but got PGobject whose type is not json but {}", pgObject.getType());
throw new RuntimeException("Expected JSON object from database");
}
// Read the value as JSON
String stringValue = pgObject.getValue();
if (stringValue != null) {
JsonReader jsonReader = Json.createReader(new StringReader(stringValue));
JsonObject jsonObject = jsonReader.readObject();
log.info("Converted PGobject to JsonObject: {}", jsonObject);
return jsonObject;
} else {
log.info("Null value. Returning empty JsonObject");
return Json.createObjectBuilder().build();
}
}
}
code/MoyaEar/.settings/org.eclipse.wst.common.component
......@@ -26,7 +26,10 @@
<dependent-module archiveName="org.ancoron.postgresql.jpa-9.1.901.jdbc4.1-rc9.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/ancoron/postgresql/org.ancoron.postgresql.jpa/9.1.901.jdbc4.1-rc9/org.ancoron.postgresql.jpa-9.1.901.jdbc4.1-rc9.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="postgresql-9.3-1100-jdbc41.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/postgresql/postgresql/9.3-1100-jdbc41/postgresql-9.3-1100-jdbc41.jar">
<dependent-module archiveName="postgresql-9.3-1101-jdbc41.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/postgresql/postgresql/9.3-1101-jdbc41/postgresql-9.3-1101-jdbc41.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="org.postgresql.net-9.1.901.jdbc4.1-rc9.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/ancoron/postgresql/org.postgresql.net/9.1.901.jdbc4.1-rc9/org.postgresql.net-9.1.901.jdbc4.1-rc9.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="pdfjet-0.0.0-2013-08-19.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/fi/iudex/pdfjet/pdfjet/0.0.0-2013-08-19/pdfjet-0.0.0-2013-08-19.jar">
......
code/MoyaUtilities/src/main/java/fi/codecrew/moya/utilities/JsonUtils.java 0 → 100644
package fi.codecrew.moya.utilities;
import java.util.List;
import java.util.Map;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.JsonValue;
public class JsonUtils {
/**
* Gets a sub object from a JsonObject. Returns an empty object if not
* found.
*
* @param jsonObject
* @param path
* @return
*/
public static JsonObject getSubObject(JsonObject jsonObject,
List<String> path) {
JsonObject sub = jsonObject;
for (String s : path) {
sub = sub.getJsonObject(s);
if (sub == null)
break;
}
if (sub == null) {
sub = Json.createObjectBuilder().build();
}
return sub;
}
/**
* Adds or alters one key in JsonObject
*
* @param jsonObject
* @param key
* which key to add/alter
* @param value
* The value associate to the key
* @return JsonObject with the key:value pair added
*/
public static JsonObject assocJsonObject(JsonObject jsonObject, String key,
JsonValue value) {
JsonObjectBuilder builder = Json.createObjectBuilder();
// Copy all non conflicting json entries
for (Map.Entry<String, JsonValue> v : jsonObject.entrySet()) {
if (v.getKey() != key) {
builder = builder.add(v.getKey(), v.getValue());
}
}
// Add our new json entry
builder = builder.add(key, value);
return builder.build();
}
/**
* Goes into a json object and sets subobject assocInJsonObject("{}",
* ["foo", "bar"], "{\"a\":\"b\"}") => {\"foo\":{\"bar\":{\"a\":\"b\"}}}
*
* @param jsonObject
* @param keys
* path inside key hierarchy
* @param value
* @return JsonObject with the value added
*/
public static JsonObject assocInJsonObject(JsonObject jsonObject,
List<String> keys, JsonValue value) {
// Recurse?
if (keys.size() > 1) {
String firstKey = keys.get(0);
List<String> restKeys = keys.subList(0, keys.size());
JsonObject subObj = jsonObject.getJsonObject(firstKey);
return assocJsonObject(jsonObject, firstKey,
assocInJsonObject(subObj, restKeys, value));
}
// End?
String firstKey = keys.get(0);
return assocJsonObject(jsonObject, firstKey, value);
}
public static JsonObject alterSubObject(JsonObject jsonObject,
List<String> path, JsonObject subObject) {
return assocInJsonObject(jsonObject, path, subObject);
}
}
code/MoyaUtilities/src/main/java/fi/codecrew/moya/utilities/jpa/EntityEquals.java
......@@ -6,49 +6,45 @@ import java.util.Random;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType;
@MappedSuperclass
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public abstract class EntityEquals {
@Override
public final String toString() {
return new StringBuilder(this.getClass().getCanonicalName()).append("[").append(getId()).append("]").toString();
}
@Transient
private Integer rndid;
protected abstract Object getId();
@Override
public boolean equals(Object o) {
boolean ret = false;
if (this == o) {
ret = true;
} else if (o != null && o instanceof EntityEquals && this.getClass().getCanonicalName().equals(o.getClass().getCanonicalName())) {
EntityEquals oobj = (EntityEquals) o;
if (getId() == null) {
ret = (getRndid().equals(oobj.rndid));
} else {
ret = getId().equals(oobj.getId());
}
}
return ret;
}
private Integer getRndid() {
if (rndid == null) {
Random rng = new Random(new Date().getTime());
rndid = Integer.valueOf(rng.nextInt());
}
return rndid;
}
@Override
public final int hashCode() {
return ((rndid != null || getId() == null) ? getRndid() : getId().hashCode());
}
@Override
public final String toString() {
return new StringBuilder(this.getClass().getCanonicalName()).append("[").append(getId()).append("]").toString();
}
@Transient
private Integer rndid;
protected abstract Object getId();
@Override
public boolean equals(Object o) {
boolean ret = false;
if (this == o) {
ret = true;
} else if (o != null && o instanceof EntityEquals && this.getClass().getCanonicalName().equals(o.getClass().getCanonicalName())) {
EntityEquals oobj = (EntityEquals) o;
if (getId() == null) {
ret = (getRndid().equals(oobj.rndid));
} else {
ret = getId().equals(oobj.getId());
}
}
return ret;
}
private Integer getRndid() {
if (rndid == null) {
Random rng = new Random(new Date().getTime());
rndid = Integer.valueOf(rng.nextInt());
}
return rndid;
}
@Override
public final int hashCode() {
return ((rndid != null || getId() == null) ? getRndid() : getId().hashCode());
}
}
code/MoyaUtilsTest/.classpath 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MoyaUtilities"/>
<classpathentry kind="con" path="oracle.eclipse.tools.glassfish.lib.system">
<attributes>
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
code/MoyaUtilsTest/.project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>MoyaUtilitiesTest</name>
<comment></comment>
<projects>
<project>MoyaUtilities</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
code/MoyaUtilsTest/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaUtilsTest/.settings/org.eclipse.jdt.core.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
code/MoyaUtilsTest/.settings/org.eclipse.m2e.core.prefs 0 → 100644
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
code/MoyaUtilsTest/.settings/org.eclipse.wst.common.component 0 → 100644
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="MoyaUtilitiesTest">
<wb-resource deploy-path="/" source-path="/src"/>
</wb-module>
</project-modules>
code/MoyaUtilsTest/.settings/org.eclipse.wst.common.project.facet.core.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish 4.0"/>
<installed facet="java" version="1.7"/>
<installed facet="jst.utility" version="1.0"/>
</faceted-project>
code/MoyaUtilsTest/.settings/org.eclipse.wst.validation.prefs 0 → 100644
disabled=06target
eclipse.preferences.version=1
code/MoyaUtilsTest/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-utils-test</artifactId>
<version>0.0.1-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
code/MoyaUtilsTest/src/META-INF/MANIFEST.MF 0 → 100644
Manifest-Version: 1.0
Class-Path:
code/MoyaUtilsTest/src/fi/codecrew/moya/utilities/JsonUtilsTest.java 0 → 100644
package fi.codecrew.moya.utilities;
import java.io.StringReader;
import java.util.ArrayList;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class JsonUtilsTest {
private JsonObject jsonObject(String jsonText) {
JsonReader jsonReader = Json.createReader(new StringReader(jsonText));
JsonObject jsonObject = jsonReader.readObject();
jsonReader.close();
return jsonObject;
}
@Before
public void setUp() throws Exception {
}
@Test
public final void testGetSubObject() {
JsonObject meta = jsonObject("{\"foo\":\"bar\",\"baz\":{\"quuz\":\"plop\"}}");
JsonObject expected = jsonObject("{\"quuz\":\"plop\"}");
ArrayList<String> path = new ArrayList<String>();
path.add("baz");
JsonObject actual = JsonUtils.getSubObject(meta, path);
Assert.assertEquals(expected.toString(), actual.toString());
}
@Test
public final void testAlterSubObject() {
JsonObject meta = jsonObject("{\"foo\":\"bar\"}");
JsonObject newData = jsonObject("{\"quux\":\"plop\"}");
ArrayList<String> path = new ArrayList<String>();
path.add("baz");
JsonObject actual = JsonUtils.alterSubObject(meta, path, newData);
JsonObject expected = jsonObject("{\"foo\":\"bar\",\"baz\":{\"quux\":\"plop\"}}");
Assert.assertEquals(expected.toString(), actual.toString());
}
}
code/MoyaWeb/src/fi/codecrew/moya/rest/meta/PrintedCardRestView.java
package fi.codecrew.moya.rest.meta;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
......@@ -15,6 +20,7 @@ import javax.ws.rs.core.PathSegment;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.utilities.JsonUtils;
@RequestScoped
@Path("/meta/printedcard")
......@@ -26,6 +32,21 @@ public class PrintedCardRestView {
CardTemplateBeanLocal cardTemplateBeanLocal;
/**
* Convert List<PathSegment> to List<String>
*
* @param path
* List<PathSegment>
* @return List<String>
*/
public List<String> pathToStrings(List<PathSegment> path) {
ArrayList<String> stringList = new ArrayList<String>(path.size());
for (PathSegment s : path) {
stringList.add(s.getPath());
}
return stringList;
}
/**
* Metadata for entity.
*
* @param id
......@@ -35,10 +56,65 @@ public class PrintedCardRestView {
*/
@GET
@Path("/{id}/{keys:.*}")
@Produces(MediaType.APPLICATION_JSON)
public String getPrintedCardMeta(@PathParam("id") Integer id,
@PathParam("key") List<PathSegment> keys) {
@PathParam("keys") List<PathSegment> keys) {
// Get the card's metadata
PrintedCard printedCard = cardTemplateBeanLocal.findCard(id);
JsonObject meta = printedCard.getMeta();
return meta.toString() + "\n";
// Must be something
if (meta == null) {
meta = Json.createObjectBuilder().build();
}
// Remove lone empty string
if (keys.size() == 1 && keys.get(0).getPath().isEmpty()) {
keys = new ArrayList<PathSegment>();
}
// Get the subobject
JsonObject subObject = JsonUtils
.getSubObject(meta, pathToStrings(keys));
return subObject.toString() + "\n";
}
/**
* Alter metadata in one subproperty of the object.
*
* @param id
* @param keys
* @return
*/
@POST
@Path("/{id}/{keys:.*}")
@Consumes(MediaType.APPLICATION_JSON)
public String setPrintedCardMeta(@PathParam("id") Integer id,
@PathParam("keys") List<PathSegment> keys, String jsonData) {
// Get PrintedCard and it's metadata
PrintedCard printedCard = cardTemplateBeanLocal.findCard(id);
JsonObject meta = printedCard.getMeta();
// If no metadata yet, make empty metadata object
if (meta == null) {
meta = Json.createObjectBuilder().build();
}
// Parse the new json data to be inserted
JsonReader jsonReader = Json.createReader(new StringReader(jsonData));
JsonObject newData = jsonReader.readObject();
// Merge the new json data into existing metadata object
JsonObject alteredMeta = JsonUtils.alterSubObject(meta,
pathToStrings(keys), newData);
// Save the changed meta back to database
printedCard.setMeta(alteredMeta);
cardTemplateBeanLocal.saveCard(printedCard);
return null;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!