Revision: 4067
Author: solomax666
Date: Thu Aug 18 10:09:12 2011
Log: - ErrorManagement seems to be fixed
http://code.google.com/p/openmeetings/source/detail?r=4067
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorType.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/app/org/openmeetings/app/data/basic/ErrorManagement.java
Sat Aug 13 04:12:18 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Thu Aug 18 10:09:12 2011
@@ -13,15 +13,17 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class ErrorManagement {
- private static final Logger log = Red5LoggerFactory.getLogger(
- ErrorManagement.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(ErrorManagement.class,
ScopeApplicationAdapter.webAppRootKey);
@PersistenceContext
private EntityManager em;
+ @Autowired
+ private Fieldmanagment fieldmanagment;
public Long addErrorType(Long errortype_id, Long fieldvalues_id) {
try {
@@ -45,6 +47,7 @@
+ "WHERE c.deleted <> :deleted ";
Query query = em.createQuery(hql);
query.setParameter("deleted", "true");
+ @SuppressWarnings("unchecked")
List<ErrorType> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -53,20 +56,32 @@
return null;
}
- public Long addErrorValues(Long errorvalues_id, Long errortype_id,
- Long fieldvalues_id) {
+ public ErrorType getErrorType(Long errortype_id) {
+ try {
+ String hql = "select c from ErrorType as c "
+ + "WHERE c.deleted <> :deleted AND c.errortype_id =
:errortype_id";
+ Query query = em.createQuery(hql);
+ query.setParameter("deleted", "true");
+ query.setParameter("errortype_id", errortype_id);
+ return (ErrorType)query.getSingleResult();
+ } catch (Exception ex2) {
+ log.error("[getErrorType]", ex2);
+ }
+ return null;
+ }
+
+ public Long addErrorValues(Long errorvalues_id, Long errortype_id, Long
fieldvalues_id) {
try {
ErrorValues eValue = new ErrorValues();
eValue.setErrorvalues_id(errorvalues_id);
- eValue.setErrortype_id(errortype_id);
+ eValue.setErrorType(getErrorType(errortype_id));
eValue.setDeleted("false");
eValue.setStarttime(new Date());
- eValue.setFieldvalues_id(fieldvalues_id);
+
eValue.setFieldvalues(fieldmanagment.getFieldvaluesById(fieldvalues_id));
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
- return newerrorvalues_id;
+ return eValue.getErrorvalues_id();
} catch (Exception ex2) {
- log.error("[addErrorType]: " + ex2);
+ log.error("[addErrorValues]: ", ex2);
}
return null;
}
@@ -76,12 +91,12 @@
ErrorValues eValue = new ErrorValues();
eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
- eValue.setFieldvalues_id(fieldvalues_id);
+
eValue.setFieldvalues(fieldmanagment.getFieldvaluesById(fieldvalues_id));
eValue = em.merge(eValue);
Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
- log.error("[addErrorType]: " + ex2);
+ log.error("[getErrorValueById]: ", ex2);
}
return null;
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorType.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorType.java
Thu Aug 18 10:09:12 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;
@@ -14,14 +11,14 @@
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
+
@Entity
@Table(name = "errortypes")
public class ErrorType implements Serializable {
-
- private static final long serialVersionUID = 8014699369591094542L;
+ private static final long serialVersionUID = 1519570470483604258L;
@Id
-
@Column(name="errortype_id")
private Long errortype_id;
@@ -36,9 +33,6 @@
@Column(name="deleted")
private String deleted;
- @Column(name="fieldvalues_id")
- private Long fieldvalues_id;
-
public Long getErrortype_id() {
return errortype_id;
}
@@ -75,11 +69,10 @@
}
public Long getFieldvalues_id() {
- return fieldvalues_id;
- }
+ return fieldvalues.getFieldvalues_id();
+ }
+
public void setFieldvalues_id(Long fieldvalues_id) {
- this.fieldvalues_id = fieldvalues_id;
- }
-
-
-}
+ fieldvalues.setFieldvalues_id(fieldvalues_id);
+ }
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Thu Aug 18 10:09:12 2011
@@ -17,12 +17,9 @@
@Entity
@Table(name = "errorvalues")
public class ErrorValues implements Serializable {
-
-
- private static final long serialVersionUID = 5450434899598058182L;
+ private static final long serialVersionUID = -1892810463706968018L;
@Id
-
@Column(name="errorvalues_id")
private Long errorvalues_id;
@@ -41,11 +38,6 @@
@Column(name="deleted")
private String deleted;
- @Column(name="errortype_id")
- private Long errortype_id;
-
- @Column(name="fieldvalues_id")
- private Long fieldvalues_id;
public Long getErrorvalues_id() {
return errorvalues_id;
}
@@ -87,18 +79,20 @@
public void setErrorType(ErrorType errorType) {
this.errorType = errorType;
}
-
public Long getFieldvalues_id() {
- return fieldvalues_id;
- }
+ return fieldvalues.getFieldvalues_id();
+ }
+
public void setFieldvalues_id(Long fieldvalues_id) {
- this.fieldvalues_id = fieldvalues_id;
- }
+ fieldvalues.setFieldvalues_id(fieldvalues_id);
+ }
+
public Long getErrortype_id() {
- return errortype_id;
- }
+ return errorType.getErrortype_id();
+ }
+
public void setErrortype_id(Long errortype_id) {
- this.errortype_id = errortype_id;
+ errorType.setErrortype_id(errortype_id);
}
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Wed Aug 17 09:28:37 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Thu Aug 18 10:09:12 2011
@@ -16,8 +16,7 @@
*
*/
public class ErrorService {
- private static final Logger log = Red5LoggerFactory.getLogger(
- MainService.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(ErrorService.class,
ScopeApplicationAdapter.webAppRootKey);
@Autowired
private Fieldmanagment fieldmanagment;
@@ -40,30 +39,24 @@
if (errorid < 0) {
log.debug("errorid, language_id: " + errorid + "|" +
language_id);
- ErrorValues eValues =
errorManagement.getErrorValuesById(errorid
- * (-1));
+ ErrorValues eValues =
errorManagement.getErrorValuesById(-1 * errorid);
if (eValues != null) {
- // log.debug(eValues.getFieldvalues());
+ log.debug("" + eValues.getFieldvalues());
//
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);
- Fieldlanguagesvalues typeValue = fieldmanagment
-
.getFieldByIdAndLanguage(eValues.getErrorType()
-
.getFieldvalues().getFieldvalues_id(),
- language_id);
+ Fieldlanguagesvalues errorValue =
+
fieldmanagment.getFieldByIdAndLanguage(eValues.getFieldvalues().getFieldvalues_id(),
language_id);
+ Fieldlanguagesvalues typeValue =
+
fieldmanagment.getFieldByIdAndLanguage(eValues.getErrorType().getFieldvalues().getFieldvalues_id(),
language_id);
if (errorValue != null) {
- return new ErrorResult(errorid,
errorValue.getValue(),
- typeValue.getValue());
+ return new ErrorResult(errorid, errorValue.getValue(),
typeValue.getValue());
}
}
} else {
- return new ErrorResult(errorid,
- "Error ... please check your input",
"Error");
+ return new ErrorResult(errorid, "Error ... please check your
input", "Error");
}
return null;
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
Thu Aug 18 09:06:58 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/error/TestErrorManagement.java
Thu Aug 18 10:09:12 2011
@@ -24,10 +24,14 @@
private Long getAvailableErrorValuesId() {
ErrorValues ev = null;
- Long result = START_ERRORVALUES_ID;
- {
+ long result = START_ERRORVALUES_ID;
+ while(true) {
ev = errorManagement.getErrorValuesById(++result);
- } while(ev != null);
+ System.err.println("result = " + result + "; ev == null ? " + (ev ==
null));
+ if (ev == null) {
+ break;
+ }
+ }
return result;
}
@@ -35,10 +39,10 @@
public void createErrorValueAndTest() {
List<ErrorType> types = errorManagement.getErrorTypes();
List<Fieldlanguagesvalues> flv =
fieldmanagment.getAllFieldsByLanguage(languageService.getDefaultLanguage().longValue());
- Long errorValuesId = getAvailableErrorValuesId();
Long errorTypeId = types.get(0).getErrortype_id();
Long fieldValuesId = flv.get(0).getFieldvalues_id();
- assertEquals("Errorvalues Id should persists", errorValuesId,
errorManagement.addErrorValues(errorValuesId, 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());
--
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.
