Revision: 4120
Author: seba.wagner
Date: Sun Aug 28 04:49:49 2011
Log: Change ErrorValues to have only the fieldvalues_id and no JPA
Object mapping (Fixes issue 1464).
http://code.google.com/p/openmeetings/source/detail?r=4120
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserWebService.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Thu Aug 18 11:34:11 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Sun Aug 28 04:49:49 2011
@@ -79,8 +79,7 @@
eValue.setErrorType(getErrorType(errortype_id));
eValue.setDeleted("false");
eValue.setStarttime(new Date());
- eValue.setFieldvalues(fieldmanagment
- .getFieldvaluesById(fieldvalues_id));
+ eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
return eValue.getErrorvalues_id();
} catch (Exception ex2) {
@@ -94,8 +93,7 @@
ErrorValues eValue = new ErrorValues();
eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
- eValue.setFieldvalues(fieldmanagment
- .getFieldvaluesById(fieldvalues_id));
+ eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Thu Aug 18 10:09:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Sun Aug 28 04:49:49 2011
@@ -3,9 +3,6 @@
import java.io.Serializable;
import java.util.Date;
-import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -20,78 +17,74 @@
private static final long serialVersionUID = -1892810463706968018L;
@Id
- @Column(name="errorvalues_id")
+ @Column(name = "errorvalues_id")
private Long errorvalues_id;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="errortype_id", updatable=false, insertable=false)
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "errortype_id", updatable = true, insertable = true)
private ErrorType errorType;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="fieldvalues_id", updatable=false, insertable=false)
- private Fieldvalues fieldvalues;
-
- @Column(name="starttime")
+ @Column(name = "fieldvalues_id")
+ private Long fieldvalues_id;
+ @Column(name = "starttime")
private Date starttime;
- @Column(name="updatetime")
+ @Column(name = "updatetime")
private Date updatetime;
- @Column(name="deleted")
+ @Column(name = "deleted")
private String deleted;
public Long getErrorvalues_id() {
return errorvalues_id;
}
+
public void setErrorvalues_id(Long errorvalues_id) {
this.errorvalues_id = errorvalues_id;
}
-
+
public Date getStarttime() {
return starttime;
}
+
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
-
+
public Date getUpdatetime() {
return updatetime;
}
+
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
-
+
public String getDeleted() {
return deleted;
}
+
public void setDeleted(String deleted) {
this.deleted = deleted;
}
- public Fieldvalues getFieldvalues() {
- return fieldvalues;
- }
- public void setFieldvalues(Fieldvalues fieldvalues) {
- this.fieldvalues = fieldvalues;
- }
-
public ErrorType getErrorType() {
return errorType;
}
+
public void setErrorType(ErrorType errorType) {
this.errorType = errorType;
}
-
+
public Long getFieldvalues_id() {
- return fieldvalues.getFieldvalues_id();
- }
-
+ return fieldvalues_id;
+ }
+
public void setFieldvalues_id(Long fieldvalues_id) {
- fieldvalues.setFieldvalues_id(fieldvalues_id);
- }
-
+ this.fieldvalues_id = fieldvalues_id;
+ }
+
public Long getErrortype_id() {
return errorType.getErrortype_id();
}
-
+
public void setErrortype_id(Long errortype_id) {
errorType.setErrortype_id(errortype_id);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Thu Aug 18 11:34:11 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Sun Aug 28 04:49:49 2011
@@ -43,15 +43,15 @@
ErrorValues eValues =
errorManagement.getErrorValuesById(-1
* errorid);
if (eValues != null) {
- log.debug("" + eValues.getFieldvalues());
+ log.debug("" + eValues.getFieldvalues_id());
//
log.debug(eValues.getFieldvalues().getFieldvalues_id());
// log.debug(eValues.getErrorType());
//
log.debug(eValues.getErrorType().getErrortype_id());
//
log.debug(eValues.getErrorType().getFieldvalues());
//
log.debug(eValues.getErrorType().getFieldvalues().getFieldvalues_id());
Fieldlanguagesvalues errorValue = fieldmanagment
-
.getFieldByIdAndLanguage(eValues.getFieldvalues()
-
.getFieldvalues_id(), language_id);
+
.getFieldByIdAndLanguage(eValues.getFieldvalues_id(),
+ language_id);
Fieldlanguagesvalues typeValue = fieldmanagment
.getFieldByIdAndLanguage(eValues.getErrorType()
.getFieldvalues_id(), language_id);
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
Thu Aug 18 10:09:12 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
Sun Aug 28 04:49:49 2011
@@ -1,5 +1,8 @@
package org.openmeetings.test.error;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+
import java.util.List;
import org.junit.Test;
@@ -11,7 +14,6 @@
import org.openmeetings.app.remote.LanguageService;
import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.springframework.beans.factory.annotation.Autowired;
-import static junit.framework.Assert.*;
public class TestErrorManagement extends AbstractOpenmeetingsSpringTest {
private static final long START_ERRORVALUES_ID = 666;
@@ -21,33 +23,39 @@
private ErrorManagement errorManagement;
@Autowired
private Fieldmanagment fieldmanagment;
-
+
private Long getAvailableErrorValuesId() {
ErrorValues ev = null;
long result = START_ERRORVALUES_ID;
- while(true) {
+ while (true) {
ev = errorManagement.getErrorValuesById(++result);
- System.err.println("result = " + result + "; ev == null ? " + (ev ==
null));
+ System.err.println("result = " + result + "; ev == null ?
"
+ + (ev == null));
if (ev == null) {
break;
}
}
return result;
}
-
+
@Test
public void createErrorValueAndTest() {
List<ErrorType> types = errorManagement.getErrorTypes();
- List<Fieldlanguagesvalues> flv =
fieldmanagment.getAllFieldsByLanguage(languageService.getDefaultLanguage().longValue());
+ List<Fieldlanguagesvalues> flv = fieldmanagment
+
.getAllFieldsByLanguage(languageService.getDefaultLanguage()
+ .longValue());
Long errorTypeId = types.get(0).getErrortype_id();
Long fieldValuesId = flv.get(0).getFieldvalues_id();
- Long errorValuesId =
errorManagement.addErrorValues(getAvailableErrorValuesId(), errorTypeId,
fieldValuesId);
+ Long errorValuesId = errorManagement.addErrorValues(
+ getAvailableErrorValuesId(), errorTypeId,
fieldValuesId);
assertNotNull("Errorvalues Id should persists", errorValuesId);
-
+
ErrorValues ev =
errorManagement.getErrorValuesById(errorValuesId);
assertNotNull("Error type should not be null",
ev.getErrorType());
- assertEquals("Error type should persists", errorTypeId,
ev.getErrortype_id());
- assertNotNull("Fieldvalues should not be null",
ev.getFieldvalues());
- assertEquals("Fieldvalues should persists", fieldValuesId,
ev.getFieldvalues_id());
+ assertEquals("Error type should persists", errorTypeId,
+ ev.getErrortype_id());
+ assertNotNull("Fieldvalues should not be null",
ev.getFieldvalues_id());
+ assertEquals("Fieldvalues should persists", fieldValuesId,
+ ev.getFieldvalues_id());
}
}
=======================================
---
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserWebService.java
Sun Aug 28 01:56:14 2011
+++
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserWebService.java
Sun Aug 28 04:49:49 2011
@@ -112,8 +112,8 @@
.getErrorValuesById(errorid *
(-1));
if (eValues != null) {
Fieldlanguagesvalues errorValue =
fieldmanagment
-
.getFieldByIdAndLanguage(eValues.getFieldvalues()
-
.getFieldvalues_id(), language_id);
+
.getFieldByIdAndLanguage(
+
eValues.getFieldvalues_id(), language_id);
Fieldlanguagesvalues typeValue =
fieldmanagment
.getFieldByIdAndLanguage(eValues.getErrorType()
.getFieldvalues_id(), language_id);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
