This is an automated email from the ASF dual-hosted git repository.
kunwp1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new f77d4286aa style: Remove Outdated edu.ics.uci Package Prefixes (#4056)
f77d4286aa is described below
commit f77d4286aa66e37880ed8b9397b029830d4994eb
Author: Chris <[email protected]>
AuthorDate: Fri Nov 14 16:16:34 2025 -0800
style: Remove Outdated edu.ics.uci Package Prefixes (#4056)
<!--
Thanks for sending a pull request (PR)! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
[Contributing to
Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md)
2. Ensure you have added or run the appropriate tests for your PR
3. If the PR is work in progress, mark it a draft on GitHub.
4. Please write your PR title to summarize what this PR proposes, we
are following Conventional Commits style for PR titles as well.
5. Be sure to keep the PR description updated to reflect all changes.
-->
### What changes were proposed in this PR?
<!--
Please clarify what changes you are proposing. The purpose of this
section
is to outline the changes. Here are some tips for you:
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
3. If it is a refactoring, clarify what has been changed.
3. It would be helpful to include a before-and-after comparison using
screenshots or GIFs.
4. Please consider writing useful notes for better and faster reviews.
-->
This PR removes the outdated `edu.ics.uci` package prefix from comments
and error messages. The prefix is no longer correct (the project now
uses `org.apache`), and recent directory changes mean hard-coded paths
can easily become outdated without being caught by the compiler.
Removing them prevents confusion and reduces maintenance issues. It also
avoids exposing package paths in user-facing error messages, which is
better for security.
### Any related issues, documentation, discussions?
<!--
Please use this section to link other resources if not mentioned
already.
1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves
#1234`
or `Closes #1234`. If it is only related, simply mention the issue
number.
2. If there is design documentation, please add the link.
3. If there is a discussion in the mailing list, please add the link.
-->
Fixes #3949
### How was this PR tested?
<!--
If tests were added, say they were added here. Or simply mention that if
the PR
is tested with existing test cases. Make sure to include/update test
cases that
check the changes thoroughly including negative and positive cases if
possible.
If it was tested in a way different from regular unit tests, please
clarify how
you tested step by step, ideally copy and paste-able, so that other
reviewers can
test and check, and descendants can verify in the future. If tests were
not added,
please describe why they were not added and/or why it was difficult to
add.
-->
Don't need to be tested as the changes are minimal and straightforward.
### Was this PR authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this
PR,
please include the phrase: 'Generated-by: ' followed by the name of the
tool
and its version. If no, write 'No'.
Please refer to the [ASF Generative Tooling
Guidance](https://www.apache.org/legal/generative-tooling.html) for
details.
-->
Yes.
---
.../main/scala/org/apache/amber/core/tuple/AttributeType.java | 10 +++++-----
.../src/main/scala/org/apache/amber/core/tuple/Tuple.scala | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java
b/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java
index 73314fba0b..472679f527 100644
---
a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java
+++
b/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/AttributeType.java
@@ -27,14 +27,14 @@ import java.sql.Timestamp;
public enum AttributeType implements Serializable {
/**
- * To add a new edu.ics.uci.amber.model.tuple.model.AttributeType, update
the following files to handle the new type:
+ * To add a new AttributeType, update the following files to handle the
new type:
* 1. AttributeTypeUtils
*
<code>src/main/scala/org/apache/texera/workflow/common/tuple/schema/AttributeTypeUtils.scala</code>
* Provide parsing, inferring, and casting logic between other
AttributeTypes.
* <p>
* 2. SQLSourceOpDesc
*
<code>src/main/scala/org/apache/texera/workflow/operators/source/sql/SQLSourceOpDesc</code>
- * Especially SQLSources will need to map the input schema to
Texera.Schema. edu.ics.uci.amber.model.tuple.model.AttributeType
+ * Especially SQLSources will need to map the input schema to
Texera.Schema. AttributeType
* needs to be converted from original source types accordingly.
* <p>
* 3. FilterPredicate
@@ -49,15 +49,15 @@ public enum AttributeType implements Serializable {
* <p>
* 5. SchemaPropagationService.SchemaAttribute
*
<code>src/app/workspace/service/dynamic-schema/schema-propagation/schema-propagation.service.ts</code>
- * Declare the frontend SchemaAttribute for the new
edu.ics.uci.amber.model.tuple.model.AttributeType.
+ * Declare the frontend SchemaAttribute for the new AttributeType.
* <p>
* 6. ArrowUtils (Java)
*
<code>src/main/scala/org/apache/amber/engine/architecture/pythonworker/ArrowUtils.scala</code>
- * Provide java-side conversion between ArrowType and
edu.ics.uci.amber.model.tuple.model.AttributeType.
+ * Provide java-side conversion between ArrowType and AttributeType.
* <p>
* 7. ArrowUtils (Python)
* <code>src/main/python/core/util/arrow_utils.py</code>
- * Provide python-side conversion between ArrowType and
edu.ics.uci.amber.model.tuple.model.AttributeType.
+ * Provide python-side conversion between ArrowType and AttributeType.
*/
diff --git
a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala
b/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala
index 14025e0f1f..7bee0a0fc5 100644
---
a/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala
+++
b/common/workflow-core/src/main/scala/org/apache/amber/core/tuple/Tuple.scala
@@ -152,7 +152,7 @@ object Tuple {
)
) {
throw new RuntimeException(
- s"edu.ics.uci.amber.model.tuple.model.Attribute ${attribute.getName}'s
type (${attribute.getType}) is different from field's type (${AttributeType
+ s"Attribute ${attribute.getName}'s type (${attribute.getType}) is
different from field's type (${AttributeType
.getAttributeType(field.getClass)})"
)
}
@@ -190,7 +190,7 @@ object Tuple {
}
def add(attribute: Attribute, field: Any): Builder = {
- require(attribute != null,
"edu.ics.uci.amber.model.tuple.model.Attribute cannot be null")
+ require(attribute != null, "Attribute cannot be null")
checkAttributeMatchesField(attribute, field)
if (!schema.containsAttribute(attribute.getName)) {
@@ -206,7 +206,7 @@ object Tuple {
def add(attributeName: String, attributeType: AttributeType, field: Any):
Builder = {
require(
attributeName != null && attributeType != null,
- "edu.ics.uci.amber.model.tuple.model.Attribute name and type cannot be
null"
+ "Attribute name and type cannot be null"
)
this.add(new Attribute(attributeName, attributeType), field)
this