You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2022/01/23 12:43:37 UTC
[empire-db] branch version3 updated: EMPIREDB-362 rename MiscellaneousErrorException to UnspecifiedErrorException
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/version3 by this push:
new 270dfbc EMPIREDB-362 rename MiscellaneousErrorException to UnspecifiedErrorException
270dfbc is described below
commit 270dfbcd355ceb98d05acf066a042135a9133525
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Sun Jan 23 13:43:36 2022 +0100
EMPIREDB-362 rename MiscellaneousErrorException to UnspecifiedErrorException
---
.../org/apache/empire/jsf2/pageelements/BeanListPageElement.java | 4 ++--
empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java | 4 ++--
.../src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java | 4 ++--
.../src/main/java/org/apache/empire/jsf2/pages/PageELResolver.java | 6 +++---
empire-db/src/main/java/org/apache/empire/db/DBCommand.java | 4 ++--
empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java | 4 ++--
empire-db/src/main/java/org/apache/empire/db/DBDatabase.java | 6 +++---
empire-db/src/main/java/org/apache/empire/db/DBReader.java | 6 +++---
...cellaneousErrorException.java => UnspecifiedErrorException.java} | 4 ++--
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
index 5ef9d65..c293f43 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
@@ -40,7 +40,7 @@ import org.apache.empire.db.DBRowSet;
import org.apache.empire.db.expr.order.DBOrderByExpr;
import org.apache.empire.exceptions.InternalException;
import org.apache.empire.exceptions.InvalidArgumentException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.exceptions.NotSupportedException;
import org.apache.empire.exceptions.ObjectNotValidException;
import org.apache.empire.exceptions.UnexpectedReturnValueException;
@@ -604,7 +604,7 @@ public class BeanListPageElement<T> extends ListPageElement<T> implements ListIt
{ // Bean Property Name
String propName = cols[i].getBeanPropertyName();
if (propName == null || propName.length() == 0)
- throw new MiscellaneousErrorException("Invalid Bean Property Name");
+ throw new UnspecifiedErrorException("Invalid Bean Property Name");
// Get Property value
try
{
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
index dd04c4d..7fc83f1 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
@@ -38,7 +38,7 @@ import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.EmpireException;
import org.apache.empire.exceptions.InternalException;
import org.apache.empire.exceptions.ItemNotFoundException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.jsf2.app.FacesUtils;
import org.apache.empire.jsf2.app.TextResolver;
import org.apache.empire.jsf2.app.WebApplication;
@@ -422,7 +422,7 @@ public abstract class Page // *Deprecated* implements Serializable
{
PageDefinition parentPage = getParentPage();
if (parentPage == null)
- throw new MiscellaneousErrorException("No Parent Page defined for " + getPageName());
+ throw new UnspecifiedErrorException("No Parent Page defined for " + getPageName());
if (redirect)
return parentPage.getRedirect(action);
else
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java
index 4316d4e..15adaa5 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java
@@ -22,7 +22,7 @@ import java.util.LinkedHashMap;
import org.apache.empire.commons.StringUtils;
import org.apache.empire.exceptions.ItemExistsException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.jsf2.impl.FacesImplementation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ public abstract class PageDefinitions // *Deprecated* implements Serializable
{
if (instance!=null)
{
- throw new MiscellaneousErrorException("PageDefintions alreday defined. Only one Instance allowed!");
+ throw new UnspecifiedErrorException("PageDefintions alreday defined. Only one Instance allowed!");
}
// init
instance = this;
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageELResolver.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageELResolver.java
index 36f11d0..3bf0086 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageELResolver.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageELResolver.java
@@ -27,7 +27,7 @@ import javax.el.ELResolver;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.jsf2.app.FacesUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ public class PageELResolver extends ELResolver
UIViewRoot vr = FacesContext.getCurrentInstance().getViewRoot();
if (vr==null)
{ // Error: No view root
- RuntimeException e = new MiscellaneousErrorException("ViewRoot not available. Unable to get Page Bean.");
+ RuntimeException e = new UnspecifiedErrorException("ViewRoot not available. Unable to get Page Bean.");
log.error(e.getMessage());
throw e;
}
@@ -78,7 +78,7 @@ public class PageELResolver extends ELResolver
Page page = (vmap!=null ? (Page)vmap.get("page") : null);
if (page==null)
{ // Error: No page bean
- RuntimeException e = new MiscellaneousErrorException("Page bean not available for current view.");
+ RuntimeException e = new UnspecifiedErrorException("Page bean not available for current view.");
log.error(e.getMessage());
throw e;
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
index 75ec274..eb8395b 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
@@ -39,7 +39,7 @@ import org.apache.empire.db.expr.set.DBSetExpr;
import org.apache.empire.exceptions.InternalException;
import org.apache.empire.exceptions.InvalidArgumentException;
import org.apache.empire.exceptions.ItemNotFoundException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.exceptions.ObjectNotValidException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +124,7 @@ public abstract class DBCommand extends DBCommandExpr
int index = cmdParams.indexOf(param);
if (index < paramUsageCount)
{ // Error: parameter probably used twice in statement!
- throw new MiscellaneousErrorException("A parameter may only be used once in a command.");
+ throw new UnspecifiedErrorException("A parameter may only be used once in a command.");
}
if (index > paramUsageCount)
{ // Correct parameter order
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java b/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
index d13a7f7..52ba39e 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
@@ -22,7 +22,7 @@ import org.apache.empire.commons.StringUtils;
import org.apache.empire.data.DataType;
import org.apache.empire.db.DBIndex.DBIndexType;
import org.apache.empire.exceptions.InvalidArgumentException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.exceptions.NotImplementedException;
import org.apache.empire.exceptions.NotSupportedException;
import org.slf4j.Logger;
@@ -172,7 +172,7 @@ public abstract class DBDDLGenerator<T extends DBDatabaseDriver>
break;
default:
// Error: Unable to append column of type UNKNOWN
- throw new MiscellaneousErrorException("Error: Unable to append column of type UNKNOWN");
+ throw new UnspecifiedErrorException("Error: Unable to append column of type UNKNOWN");
}
// done. Add more attributes (like e.g. NULLABLE or NOT NULL)
return true;
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java b/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
index 63fa6a4..4a01903 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
@@ -47,7 +47,7 @@ import org.apache.empire.db.expr.column.DBValueExpr;
import org.apache.empire.db.expr.compare.DBCompareExpr;
import org.apache.empire.exceptions.InvalidArgumentException;
import org.apache.empire.exceptions.ItemExistsException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.exceptions.NotSupportedException;
import org.apache.empire.exceptions.PropertyReadOnlyException;
import org.slf4j.Logger;
@@ -191,7 +191,7 @@ public abstract class DBDatabase extends DBObject
public synchronized void discard()
{
if (isOpen())
- throw new MiscellaneousErrorException("Database is open. Discard not possible.");
+ throw new UnspecifiedErrorException("Database is open. Discard not possible.");
// unregister
databaseMap.remove(this.instanceId);
this.instanceId = null;
@@ -386,7 +386,7 @@ public abstract class DBDatabase extends DBObject
// Set driver
if (this.driver!=null && this.driver!=ddlDriver && ddlDriver!=null)
{ // The database belongs to a different driver
- throw new MiscellaneousErrorException("The database is attached to a different driver.");
+ throw new UnspecifiedErrorException("The database is attached to a different driver.");
}
// Temporarily change driver
if (this.driver== null)
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBReader.java b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
index b580c0c..2a3cca6 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBReader.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
@@ -41,7 +41,7 @@ import org.apache.empire.db.exceptions.QueryNoResultException;
import org.apache.empire.db.expr.join.DBJoinExpr;
import org.apache.empire.exceptions.BeanInstantiationException;
import org.apache.empire.exceptions.InvalidArgumentException;
-import org.apache.empire.exceptions.MiscellaneousErrorException;
+import org.apache.empire.exceptions.UnspecifiedErrorException;
import org.apache.empire.exceptions.ObjectNotValidException;
import org.apache.empire.xml.XMLUtil;
import org.slf4j.Logger;
@@ -451,7 +451,7 @@ public class DBReader extends DBRecordData implements DBContextAware
else if (paramValues.length!=subqueryParamValues.size())
{ // number of params do not match
String msg = MessageFormat.format("Invalid number of parameters query: provided={0}, required={1}; query="+cmd.getSelect(), paramValues.length, subqueryParamValues.size());
- throw new MiscellaneousErrorException(msg);
+ throw new UnspecifiedErrorException(msg);
}
}
// Execute the query
@@ -1106,7 +1106,7 @@ public class DBReader extends DBRecordData implements DBContextAware
{
// check if enabled
if (trackOpenResultSets==false)
- throw new MiscellaneousErrorException("Open-ResultSet-Tracking has not been enabled. Use DBReader.enableOpenResultSetTracking() to enable or disable.");
+ throw new UnspecifiedErrorException("Open-ResultSet-Tracking has not been enabled. Use DBReader.enableOpenResultSetTracking() to enable or disable.");
// Check map
Map<DBReader, Exception> openResultSets = threadLocalOpenResultSets.get();
if (openResultSets != null && openResultSets.isEmpty() == false)
diff --git a/empire-db/src/main/java/org/apache/empire/exceptions/MiscellaneousErrorException.java b/empire-db/src/main/java/org/apache/empire/exceptions/UnspecifiedErrorException.java
similarity index 87%
rename from empire-db/src/main/java/org/apache/empire/exceptions/MiscellaneousErrorException.java
rename to empire-db/src/main/java/org/apache/empire/exceptions/UnspecifiedErrorException.java
index fb9daa3..3dea27d 100644
--- a/empire-db/src/main/java/org/apache/empire/exceptions/MiscellaneousErrorException.java
+++ b/empire-db/src/main/java/org/apache/empire/exceptions/UnspecifiedErrorException.java
@@ -20,13 +20,13 @@ package org.apache.empire.exceptions;
import org.apache.empire.commons.ErrorType;
-public class MiscellaneousErrorException extends EmpireException
+public class UnspecifiedErrorException extends EmpireException
{
private static final long serialVersionUID = 1L;
public static final ErrorType errorType = new ErrorType("error.internal", "Internal Error: {0}");
- public MiscellaneousErrorException(String errorMessage)
+ public UnspecifiedErrorException(String errorMessage)
{
super(errorType, new String[] { errorMessage });
}