This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 969d8063 EMPIREDB-431 TagEncodingHelper: improve readonly and
mandatory for bean objects
969d8063 is described below
commit 969d806340d1b611a4bd6a81916eeb1a1038c882
Author: Rainer Döbele <[email protected]>
AuthorDate: Wed Oct 23 20:11:28 2024 +0200
EMPIREDB-431
TagEncodingHelper: improve readonly and mandatory for bean objects
---
.../empire/jakarta/app/FacesConfiguration.java | 17 +++++++++-
.../org/apache/empire/jakarta/utils/BeanScope.java | 36 ++++++++++++++++++++++
.../empire/jakarta/utils/TagEncodingHelper.java | 8 ++++-
.../apache/empire/jsf2/app/FacesConfiguration.java | 17 +++++++++-
.../org/apache/empire/jsf2/utils/BeanScope.java | 36 ++++++++++++++++++++++
.../empire/jsf2/utils/TagEncodingHelper.java | 8 ++++-
6 files changed, 118 insertions(+), 4 deletions(-)
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/FacesConfiguration.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/FacesConfiguration.java
index 4caa5f94..172c6357 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/FacesConfiguration.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/FacesConfiguration.java
@@ -33,6 +33,7 @@ import
org.apache.empire.jakarta.impl.FacesImplementation.BeanStorageProvider;
import org.apache.empire.jakarta.pages.PageNavigationHandler;
import org.apache.empire.jakarta.pages.PagePhaseListener;
import org.apache.empire.jakarta.pages.PagesELResolver;
+import org.apache.empire.jakarta.utils.BeanScope;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -369,10 +370,24 @@ public class FacesConfiguration
application.addComponent(type, clazz.getName());
}
- protected void addManagedBean(String beanName, Class<?> beanClass, String
scope)
+ protected void addManagedBean(String beanName, Class<?> beanClass,
BeanScope beanScope)
{
+ String scope = beanScope.name().toLowerCase();
facesImpl.registerManagedBean(beanName, beanClass.getName(), scope);
}
+
+ protected void addManagedBean(Class<?> beanClass, BeanScope scope)
+ {
+ // check
+ if (beanClass==null || scope==null)
+ throw new InvalidArgumentException("beanClass|scope", null);
+ // detect name
+ String className = beanClass.getName();
+ int nameIndex = className.lastIndexOf('.')+1;
+ String beanName = className.substring(nameIndex,
nameIndex+1).toLowerCase() + className.substring(nameIndex+1);
+ // register now
+ addManagedBean(beanName, beanClass, scope);
+ }
protected void replaceComponent(String componentType, Class<? extends
UIComponent> overrideComponent)
{
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/BeanScope.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/BeanScope.java
new file mode 100644
index 00000000..aa67e492
--- /dev/null
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/BeanScope.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.empire.jakarta.utils;
+
+/**
+ * BeanScope
+ */
+public enum BeanScope
+{
+ Application,
+ Session,
+ View,
+ Request;
+
+ @Override
+ public String toString()
+ {
+ return name();
+ }
+}
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
index e6216700..c26c08cd 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
@@ -924,7 +924,7 @@ public class TagEncodingHelper implements NamingContainer
if (!(record instanceof Record))
return true;
}
- else if (!hasValueExpression())
+ else if (record==null && !hasValueExpression())
{ // No Value expression given
return true;
}
@@ -1030,6 +1030,12 @@ public class TagEncodingHelper implements NamingContainer
Record r = (Record) record;
return r.isValid() && r.isFieldRequired(getColumn());
}
+ else if (this.recordTag!=null)
+ { // for a normal bean, check record Tag
+ mandatory = recordTag.getAttributes().get("mandatory");
+ if (mandatory!=null)
+ return ObjectUtils.getBoolean(mandatory);
+ }
// Required
return getColumn().isRequired();
}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesConfiguration.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesConfiguration.java
index a3a142f6..07abbc3c 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesConfiguration.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesConfiguration.java
@@ -51,6 +51,7 @@ import
org.apache.empire.jsf2.impl.FacesImplementation.BeanStorageProvider;
import org.apache.empire.jsf2.pages.PageNavigationHandler;
import org.apache.empire.jsf2.pages.PagePhaseListener;
import org.apache.empire.jsf2.pages.PagesELResolver;
+import org.apache.empire.jsf2.utils.BeanScope;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -369,10 +370,24 @@ public class FacesConfiguration
application.addComponent(type, clazz.getName());
}
- protected void addManagedBean(String beanName, Class<?> beanClass, String
scope)
+ protected void addManagedBean(String beanName, Class<?> beanClass,
BeanScope beanScope)
{
+ String scope = beanScope.name().toLowerCase();
facesImpl.registerManagedBean(beanName, beanClass.getName(), scope);
}
+
+ protected void addManagedBean(Class<?> beanClass, BeanScope scope)
+ {
+ // check
+ if (beanClass==null || scope==null)
+ throw new InvalidArgumentException("beanClass|scope", null);
+ // detect name
+ String className = beanClass.getName();
+ int nameIndex = className.lastIndexOf('.')+1;
+ String beanName = className.substring(nameIndex,
nameIndex+1).toLowerCase() + className.substring(nameIndex+1);
+ // register now
+ addManagedBean(beanName, beanClass, scope);
+ }
protected void replaceComponent(String componentType, Class<? extends
UIComponent> overrideComponent)
{
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/BeanScope.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/BeanScope.java
new file mode 100644
index 00000000..91870b15
--- /dev/null
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/BeanScope.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.empire.jsf2.utils;
+
+/**
+ * BeanScope
+ */
+public enum BeanScope
+{
+ Application,
+ Session,
+ View,
+ Request;
+
+ @Override
+ public String toString()
+ {
+ return name();
+ }
+}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index 1ef6e550..2ef35f63 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -924,7 +924,7 @@ public class TagEncodingHelper implements NamingContainer
if (!(record instanceof Record))
return true;
}
- else if (!hasValueExpression())
+ else if (record==null && !hasValueExpression())
{ // No Value expression given
return true;
}
@@ -1030,6 +1030,12 @@ public class TagEncodingHelper implements NamingContainer
Record r = (Record) record;
return r.isValid() && r.isFieldRequired(getColumn());
}
+ else if (this.recordTag!=null)
+ { // for a normal bean, check record Tag
+ mandatory = recordTag.getAttributes().get("mandatory");
+ if (mandatory!=null)
+ return ObjectUtils.getBoolean(mandatory);
+ }
// Required
return getColumn().isRequired();
}
