Skip to content

4835 improve error handling guava #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hendrik7889 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

4835 improve error handling guava #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad676d0
replace Log::errorIfNull and Objects::requireNonNull with their repec…
Hendrik7889 Oct 23, 2025
94a1d48
Update ASTClassDeclaration.java
Hendrik7889 Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 26 additions & 39 deletions javaDSL/src/test/resources/de/monticore/java/parser/ASTClassDeclaration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,8 @@ protected ASTClassDeclaration (/* generated by template ast.ConstructorParamete

public void accept(de.monticore.javadsl.javadsl._visitor.JavaDSLVisitor visitor)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(visitor);
{
Preconditions.checkNotNull(visitor);

/* generated by template ast.additionalmethods.Accept*/

Expand All @@ -95,9 +94,8 @@ public void accept(de.monticore.javadsl.javadsl._visitor.JavaDSLVisitor visitor

public boolean deepEquals(Object o)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(o);
{
Preconditions.checkNotNull(o);

/* generated by template ast.additionalmethods.DeepEquals*/

Expand Down Expand Up @@ -144,9 +142,8 @@ public boolean deepEquals(Object o)

public boolean deepEquals(Object o,boolean forceSameOrder)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(o);
{
Preconditions.checkNotNull(o);

return deepEquals(o);

Expand All @@ -156,9 +153,8 @@ public boolean deepEquals(Object o,boolean forceSameOrder)

public boolean deepEqualsWithComments(Object o)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(o);
{
Preconditions.checkNotNull(o);

/* generated by template ast.additionalmethods.DeepEqualsWithComments*/

Expand Down Expand Up @@ -204,9 +200,8 @@ public boolean deepEqualsWithComments(Object o)

public boolean deepEqualsWithComments(Object o,boolean forceSameOrder)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(o);
{
Preconditions.checkNotNull(o);

return deepEqualsWithComments(o);

Expand All @@ -216,9 +211,8 @@ public boolean deepEqualsWithComments(Object o,boolean forceSameOrder)

public boolean equalAttributes(Object o)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(o);
{
Preconditions.checkNotNull(o);

/* generated by template ast.additionalmethods.EqualAttributes*/

Expand Down Expand Up @@ -252,9 +246,8 @@ public boolean equalAttributes(Object o)

public boolean equalsWithComments(Object o)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(o);
{
Preconditions.checkNotNull(o);

/* generated by template ast.additionalmethods.EqualsWithComments*/

Expand Down Expand Up @@ -318,9 +311,8 @@ public de.monticore.ast.ASTNode get_Children(){

public void remove_Child(de.monticore.ast.ASTNode child)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(child);
{
Preconditions.checkNotNull(child);

/* generated by template ast.additionalmethods.RemoveChild*/

Expand Down Expand Up @@ -368,9 +360,8 @@ public ASTClassDeclaration deepClone()

public ASTClassDeclaration deepClone(ASTClassDeclaration result)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(result);
{
Preconditions.checkNotNull(result);

/* generated by template ast.additionalmethods.DeepCloneWithParameters*/

Expand Down Expand Up @@ -515,9 +506,8 @@ public Optional<? extends Scope> getEnclosingScope()

public void setModifiers(de.monticore.javadsl.javadsl._ast.ASTModifierList modifiers)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(modifiers);
{
Preconditions.checkNotNull(modifiers);

/* generated by template ast.additionalmethods.Set*/

Expand All @@ -529,9 +519,8 @@ public void setModifiers(de.monticore.javadsl.javadsl._ast.ASTModifierList modi

public void setName(String name)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(name);
{
Preconditions.checkNotNull(name);

/* generated by template ast.additionalmethods.Set*/

Expand Down Expand Up @@ -589,9 +578,8 @@ public boolean superClassIsPresent()

public void setImplementedInterfaces(de.monticore.types.types._ast.ASTTypeList implementedInterfaces)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(implementedInterfaces);
{
Preconditions.checkNotNull(implementedInterfaces);

/* generated by template ast.additionalmethods.Set*/

Expand All @@ -603,9 +591,8 @@ public void setImplementedInterfaces(de.monticore.types.types._ast.ASTTypeList

public void setClassBody(de.monticore.javadsl.javadsl._ast.ASTClassBody classBody)

{
/* generated by template ast.ErrorIfNull*/
Log.errorIfNull(classBody);
{
Preconditions.checkNotNull(classBody);

/* generated by template ast.additionalmethods.Set*/

Expand Down
3 changes: 2 additions & 1 deletion javaDSL/src/test/resources/typeSystemTestModels/monticore/invalid/Symbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import de.monticore.symboltable.modifiers.AccessModifier;
import de.se_rwth.commons.SourcePosition;
import de.se_rwth.commons.logging.Log;
import com.google.common.base.Verify;

import java.util.Optional;

Expand All @@ -24,7 +25,7 @@ public interface Symbol {
SymbolKind getKind();

// default boolean isKindOf(SymbolKind kind) {
// return this.getKind().isKindOf((SymbolKind) Log.errorIfNull(kind));
// return this.getKind().isKindOf((SymbolKind) Verify.verifyNotNull(kind));
// }

// default AccessModifier getAccessModifier() {
Expand Down
3 changes: 2 additions & 1 deletion javaDSL/src/test/resources/typeSystemTestModels/monticore/valid/Symbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import de.monticore.symboltable.modifiers.AccessModifier;
import de.se_rwth.commons.SourcePosition;
import de.se_rwth.commons.logging.Log;
import com.google.common.base.Verify;

import java.util.Optional;

Expand All @@ -22,7 +23,7 @@ public interface Symbol {
SymbolKind getKind();

// default boolean isKindOf(SymbolKind kind) {
// return this.getKind().isKindOf((SymbolKind) Log.errorIfNull(kind));
// return this.getKind().isKindOf((SymbolKind) Verify.verifyNotNull(kind));
// }

// default AccessModifier getAccessModifier() {
Expand Down