[teiid-commits] teiid SVN: r4239 - in trunk: admin/src/test/java/org/teiid/adminapi/impl and 4 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Jul 16 13:47:36 EDT 2012
Author: shawkins
Date: 2012-07-16 13:47:35 -0400 (Mon, 16 Jul 2012)
New Revision: 4239
Modified:
trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java
trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java
trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/jboss-integration/src/test/java/org/teiid/adminapi/jboss/TestAdminObjectBuilder.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java
Log:
TEIID-2104 changing ValidationError to message, since it reflects a more generic purpose
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/ModelMetaData.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -30,7 +30,7 @@
import java.util.List;
import org.teiid.adminapi.Model;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
+import org.teiid.adminapi.impl.ModelMetaData.Message.Severity;
public class ModelMetaData extends AdminObjectImpl implements Model {
@@ -44,8 +44,8 @@
protected String description;
protected String path;
protected Boolean visible = true;
- protected List<ValidationError> validationErrors;
- protected transient List<ValidationError> runtimeErrors;
+ protected List<Message> messages;
+ protected transient List<Message> runtimeMessages;
protected String schemaSourceType;
protected String schemaText;
@@ -166,18 +166,15 @@
}
public synchronized boolean hasErrors() {
- if (this.validationErrors == null && this.runtimeErrors == null) {
- return false;
- }
- if (this.validationErrors != null) {
- for (ValidationError error : this.validationErrors) {
+ if (this.messages != null) {
+ for (Message error : this.messages) {
if (error.getSeverity() == Severity.ERROR) {
return true;
}
}
}
- if (this.runtimeErrors != null) {
- for (ValidationError error : this.runtimeErrors) {
+ if (this.runtimeMessages != null) {
+ for (Message error : this.runtimeMessages) {
if (error.getSeverity() == Severity.ERROR) {
return true;
}
@@ -186,65 +183,65 @@
return false;
}
- public synchronized List<ValidationError> getErrors(){
- return getErrors(true);
+ public synchronized List<Message> getMessages(){
+ return getMessages(true);
}
- public synchronized List<ValidationError> getErrors(boolean includeRuntime){
- if (this.validationErrors == null && this.runtimeErrors == null) {
+ public synchronized List<Message> getMessages(boolean includeRuntime){
+ if (this.messages == null && this.runtimeMessages == null) {
return Collections.emptyList();
}
- List<ValidationError> list = new ArrayList<ValidationError>();
- if (this.validationErrors != null) {
- list.addAll(validationErrors);
+ List<Message> list = new ArrayList<Message>();
+ if (this.messages != null) {
+ list.addAll(messages);
}
- if (includeRuntime && this.runtimeErrors != null) {
- list.addAll(runtimeErrors);
+ if (includeRuntime && this.runtimeMessages != null) {
+ list.addAll(runtimeMessages);
}
return list;
}
- public ValidationError addError(String severity, String message) {
- ValidationError ve = new ValidationError(Severity.valueOf(severity), message);
- addError(ve);
+ public Message addMessage(String severity, String message) {
+ Message ve = new Message(Severity.valueOf(severity), message);
+ addMessage(ve);
return ve;
}
- public synchronized boolean hasRuntimeErrors(){
- return this.runtimeErrors != null && !this.runtimeErrors.isEmpty();
+ public synchronized boolean hasRuntimeMessages(){
+ return this.runtimeMessages != null && !this.runtimeMessages.isEmpty();
}
- public synchronized ValidationError addRuntimeError(String message) {
- return addRuntimeError(Severity.ERROR, message);
+ public synchronized Message addRuntimeError(String message) {
+ return addRuntimeMessage(Severity.ERROR, message);
}
- public synchronized ValidationError addRuntimeError(Severity severity, String message) {
- ValidationError ve = new ValidationError(severity, message);
- if (this.runtimeErrors == null) {
- this.runtimeErrors = new LinkedList<ValidationError>();
+ public synchronized Message addRuntimeMessage(Severity severity, String message) {
+ Message ve = new Message(severity, message);
+ if (this.runtimeMessages == null) {
+ this.runtimeMessages = new LinkedList<Message>();
}
- this.runtimeErrors.add(ve);
- if (this.runtimeErrors.size() > DEFAULT_ERROR_HISTORY) {
- this.runtimeErrors.remove(0);
+ this.runtimeMessages.add(ve);
+ if (this.runtimeMessages.size() > DEFAULT_ERROR_HISTORY) {
+ this.runtimeMessages.remove(0);
}
return ve;
}
- public synchronized ValidationError addError(ValidationError ve) {
- if (this.validationErrors == null) {
- this.validationErrors = new LinkedList<ValidationError>();
+ public synchronized Message addMessage(Message ve) {
+ if (this.messages == null) {
+ this.messages = new LinkedList<Message>();
}
- this.validationErrors.add(ve);
+ this.messages.add(ve);
return ve;
}
- public synchronized void clearRuntimeErrors() {
- if (runtimeErrors != null) {
- runtimeErrors = null;
+ public synchronized void clearRuntimeMessages() {
+ if (runtimeMessages != null) {
+ runtimeMessages = null;
}
}
- public static class ValidationError implements Serializable{
+ public static class Message implements Serializable{
private static final long serialVersionUID = 2044197069467559527L;
public enum Severity {ERROR, WARNING, INFO};
@@ -253,9 +250,9 @@
protected Severity severity;
protected String path;
- public ValidationError() {};
+ public Message() {};
- public ValidationError(Severity severity, String msg) {
+ public Message(Severity severity, String msg) {
this.severity = severity;
this.value = msg;
}
@@ -292,7 +289,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- ValidationError other = (ValidationError) obj;
+ Message other = (Message) obj;
if (severity == null) {
if (other.severity != null)
return false;
@@ -326,9 +323,9 @@
@Override
public List<String> getValidityErrors() {
List<String> allErrors = new ArrayList<String>();
- List<ValidationError> errors = getErrors();
+ List<Message> errors = getMessages();
if (errors != null && !errors.isEmpty()) {
- for (ValidationError m:errors) {
+ for (Message m:errors) {
if (m.getSeverity() == Severity.ERROR) {
allErrors.add(m.getValue());
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -33,8 +33,8 @@
import org.teiid.adminapi.Model;
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.VDB;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
+import org.teiid.adminapi.impl.ModelMetaData.Message;
+import org.teiid.adminapi.impl.ModelMetaData.Message.Severity;
public class VDBMetaData extends AdminObjectImpl implements VDB {
@@ -154,9 +154,9 @@
public List<String> getValidityErrors(){
List<String> allErrors = new ArrayList<String>();
for (ModelMetaData model:this.models.values()) {
- List<ValidationError> errors = model.getErrors();
+ List<Message> errors = model.getMessages();
if (errors != null && !errors.isEmpty()) {
- for (ValidationError m:errors) {
+ for (Message m:errors) {
if (m.getSeverity() == Severity.ERROR) {
allErrors.add(m.getValue());
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataMapper.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -36,8 +36,8 @@
import org.teiid.adminapi.VDB.ConnectionType;
import org.teiid.adminapi.VDB.Status;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
+import org.teiid.adminapi.impl.ModelMetaData.Message;
+import org.teiid.adminapi.impl.ModelMetaData.Message.Severity;
public class VDBMetadataMapper implements MetadataMapper<VDBMetaData> {
private static final String VDBNAME = "vdb-name"; //$NON-NLS-1$
@@ -298,10 +298,10 @@
}
}
- List<ValidationError> errors = model.getErrors();
+ List<Message> errors = model.getMessages();
if (errors != null && !errors.isEmpty()) {
ModelNode errorsNode = node.get(VALIDITY_ERRORS);
- for (ValidationError error:errors) {
+ for (Message error:errors) {
errorsNode.add(ValidationErrorMapper.INSTANCE.wrap(error, new ModelNode()));
}
}
@@ -359,9 +359,9 @@
if (node.get(VALIDITY_ERRORS).isDefined()) {
List<ModelNode> errorNodes = node.get(VALIDITY_ERRORS).asList();
for(ModelNode errorNode:errorNodes) {
- ValidationError error = ValidationErrorMapper.INSTANCE.unwrap(errorNode);
+ Message error = ValidationErrorMapper.INSTANCE.unwrap(errorNode);
if (error != null) {
- model.addError(error);
+ model.addMessage(error);
}
}
}
@@ -458,7 +458,7 @@
/**
* validation error mapper
*/
- public static class ValidationErrorMapper implements MetadataMapper<ValidationError>{
+ public static class ValidationErrorMapper implements MetadataMapper<Message>{
private static final String ERROR_PATH = "error-path"; //$NON-NLS-1$
private static final String SEVERITY = "severity"; //$NON-NLS-1$
private static final String MESSAGE = "message"; //$NON-NLS-1$
@@ -466,7 +466,7 @@
public static ValidationErrorMapper INSTANCE = new ValidationErrorMapper();
- public ModelNode wrap(ValidationError error, ModelNode node) {
+ public ModelNode wrap(Message error, ModelNode node) {
if (error == null) {
return null;
}
@@ -480,12 +480,12 @@
return node;
}
- public ValidationError unwrap(ModelNode node) {
+ public Message unwrap(ModelNode node) {
if (node == null) {
return null;
}
- ValidationError error = new ValidationError();
+ Message error = new Message();
if (node.has(ERROR_PATH)) {
error.setPath(node.get(ERROR_PATH).asString());
}
Modified: trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java
===================================================================
--- trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/admin/src/main/java/org/teiid/adminapi/impl/VDBMetadataParser.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -49,8 +49,8 @@
import org.teiid.adminapi.Translator;
import org.teiid.adminapi.VDBImport;
import org.teiid.adminapi.impl.DataPolicyMetadata.PermissionMetaData;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
+import org.teiid.adminapi.impl.ModelMetaData.Message;
+import org.teiid.adminapi.impl.ModelMetaData.Message.Severity;
import org.teiid.core.types.XMLType;
import org.xml.sax.SAXException;
@@ -286,9 +286,9 @@
String msg = reader.getElementText();
String severity = validationProps.getProperty(Element.VALIDATION_SEVERITY_ATTR.getLocalName());
String path = validationProps.getProperty(Element.PATH.getLocalName());
- ValidationError ve = new ValidationError(Severity.valueOf(severity), msg);
+ Message ve = new Message(Severity.valueOf(severity), msg);
ve.setPath(path);
- model.addError(ve);
+ model.addMessage(ve);
break;
case METADATA:
Properties metdataProps = getAttributes(reader);
@@ -521,7 +521,7 @@
}
// model validation errors
- for (ValidationError ve:model.getErrors(false)) {
+ for (Message ve:model.getMessages(false)) {
writer.writeStartElement(Element.VALIDATION_ERROR.getLocalName());
writer.writeAttribute(Element.VALIDATION_SEVERITY_ATTR.getLocalName(), ve.getSeverity().name());
if (ve.getPath() != null) {
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java
===================================================================
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestModelMetaData.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -60,10 +60,10 @@
public void testErrors() {
ModelMetaData m = new ModelMetaData();
- m.addError("ERROR", "I am Error");
- m.addError("WARNING", "I am warning");
+ m.addMessage("ERROR", "I am Error");
+ m.addMessage("WARNING", "I am warning");
- assertFalse(m.getErrors().isEmpty());
- assertEquals(1, m.getErrors().size());
+ assertFalse(m.getMessages().isEmpty());
+ assertEquals(1, m.getMessages().size());
}
}
Modified: trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
===================================================================
--- trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/admin/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -151,7 +151,7 @@
modelOne.addProperty("model-prop", "model-value"); //$NON-NLS-1$ //$NON-NLS-2$
modelOne.addProperty("model-prop", "model-value-override"); //$NON-NLS-1$ //$NON-NLS-2$
modelOne.setVisible(false);
- modelOne.addError("ERROR", "There is an error in VDB"); //$NON-NLS-1$ //$NON-NLS-2$
+ modelOne.addMessage("ERROR", "There is an error in VDB"); //$NON-NLS-1$ //$NON-NLS-2$
modelOne.setDescription("model description");
vdb.addModel(modelOne);
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -55,7 +55,7 @@
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.adminapi.impl.VDBMetadataParser;
import org.teiid.adminapi.impl.VDBTranslatorMetaData;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
+import org.teiid.adminapi.impl.ModelMetaData.Message.Severity;
import org.teiid.common.buffer.BufferManager;
import org.teiid.core.TeiidException;
import org.teiid.deployers.CompositeVDB;
@@ -333,7 +333,7 @@
protected void loadMetadata(final VDBMetaData vdb, final ModelMetaData model, final ConnectorManagerRepository cmr, final MetadataRepository metadataRepo, final MetadataStore vdbMetadataStore, final AtomicInteger loadCount) {
String msg = IntegrationPlugin.Util.gs(IntegrationPlugin.Event.TEIID50029,vdb.getName(), vdb.getVersion(), model.getName(), SimpleDateFormat.getInstance().format(new Date()));
- model.addRuntimeError(Severity.INFO, msg);
+ model.addRuntimeMessage(Severity.INFO, msg);
LogManager.logInfo(LogConstants.CTX_RUNTIME, msg);
Runnable job = new Runnable() {
Modified: trunk/jboss-integration/src/test/java/org/teiid/adminapi/jboss/TestAdminObjectBuilder.java
===================================================================
--- trunk/jboss-integration/src/test/java/org/teiid/adminapi/jboss/TestAdminObjectBuilder.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/jboss-integration/src/test/java/org/teiid/adminapi/jboss/TestAdminObjectBuilder.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -55,7 +55,7 @@
modelOne.addProperty("model-prop", "model-value");
modelOne.addProperty("model-prop", "model-value-override");
modelOne.setVisible(false);
- modelOne.addError("ERROR", "There is an error in VDB");
+ modelOne.addMessage("ERROR", "There is an error in VDB");
modelOne.setDescription("model description");
vdb.addModel(modelOne);
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBStatusChecker.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -31,7 +31,7 @@
import org.teiid.adminapi.impl.SourceMappingMetadata;
import org.teiid.adminapi.impl.VDBMetaData;
import org.teiid.adminapi.impl.VDBTranslatorMetaData;
-import org.teiid.adminapi.impl.ModelMetaData.ValidationError.Severity;
+import org.teiid.adminapi.impl.ModelMetaData.Message.Severity;
import org.teiid.core.TeiidException;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
@@ -131,7 +131,7 @@
ConnectorManagerRepository cmr = vdb.getAttachment(ConnectorManagerRepository.class);
boolean usesResourse = false;
for (ModelMetaData model:vdb.getModelMetaDatas().values()) {
- if (!model.hasRuntimeErrors()) {
+ if (!model.hasRuntimeMessages()) {
continue;
}
@@ -174,10 +174,10 @@
String status = cm.getStausMessage();
if (status != null && status.length() > 0) {
Severity severity = vdb.getStatus() == Status.LOADING?Severity.WARNING:Severity.ERROR;
- model.addRuntimeError(severity, status);
+ model.addRuntimeMessage(severity, status);
LogManager.logInfo(LogConstants.CTX_RUNTIME, status);
} else if (vdb.getStatus() != Status.LOADING){
- model.clearRuntimeErrors();
+ model.clearRuntimeMessages();
}
}
}
@@ -195,7 +195,7 @@
if (cm.getExecutionFactory().isSourceRequired()) {
String msg = RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40012, vdb.getName(), vdb.getVersion(), resourceName);
Severity severity = vdb.getStatus() == Status.LOADING?Severity.WARNING:Severity.ERROR;
- model.addRuntimeError(severity, msg);
+ model.addRuntimeMessage(severity, msg);
LogManager.logInfo(LogConstants.CTX_RUNTIME, msg);
}
}
Modified: trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java 2012-07-15 11:25:56 UTC (rev 4238)
+++ trunk/runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java 2012-07-16 17:47:35 UTC (rev 4239)
@@ -157,7 +157,7 @@
factory.mergeInto(vdbMetadataStore);
//TODO: this is not quite correct, the source may be missing
- model.clearRuntimeErrors();
+ model.clearRuntimeMessages();
if (loadCount.decrementAndGet() == 0) {
getVDBRepository().finishDeployment(vdb.getName(), vdb.getVersion());
More information about the teiid-commits
mailing list