Added getCore() as default to interfaces instance and attribute to simplify core access

Author: studio42gmbh

src/main/java/de/s42/dl/DLAnnotation.java

@@ -62,7 +62,7 @@ public interface DLAnnotation extends DLEntity
 	}
 
 	public DLAnnotated getContainer();
-
+	
 	public boolean hasParameters();
 
 	public Object[] getFlatParameters();

src/main/java/de/s42/dl/DLAttribute.java

@@ -56,6 +56,11 @@ public interface DLAttribute extends DLEntity, DLAnnotated, DLValidatable
 
 	public DLType getContainer();
 
+	default public DLCore getCore()
+	{
+		return getContainer().getCore();
+	}
+
 	public Object getDefaultValue();
 
 	public DLType getType();
@@ -66,19 +71,22 @@ public interface DLAttribute extends DLEntity, DLAnnotated, DLValidatable
 	public List<DLAttributeValidator> getValidators();
 
 	public boolean validateValue(Object value, ValidationResult result);
-	
+
 	// FLAGS
 	public boolean isReadable();
 
 	public boolean isWritable();
 
 	/**
-	 * This method shall return true if the data represented by this attribute is equal (same type, same annnotations, ... but not same container)
+	 * This method shall return true if the data represented by this attribute is equal (same type, same annnotations,
+	 * ... but not same container)
+	 *
 	 * @param other
-	 * @return 
+	 *
+	 * @return
 	 */
 	public boolean equalDataType(DLAttribute other);
-	
+
 	public boolean equalOrMoreSpecificDataType(DLAttribute other);
-	
+
 }

src/main/java/de/s42/dl/DLInstance.java

@@ -52,6 +52,11 @@ default public boolean isUnnamed()
 	}
 
 	public DLType getType();
+	
+	default public DLCore getCore()
+	{
+		return getType().getCore();
+	}
 
 	// VALIDATION
 	public boolean addValidator(DLInstanceValidator validator);

src/main/java/de/s42/dl/annotations/instances/ExportDLAnnotation.java

@@ -46,6 +46,6 @@ public void bindToInstance(DLInstance instance) throws InvalidInstance
 		container = instance;
 		container.addAnnotation(this);
 
-		instance.getType().getCore().addExported(instance);
+		instance.getCore().addExported(instance);
 	}
 }

src/main/java/de/s42/dl/parser/DLHrfParsing.java

@@ -128,7 +128,7 @@ public static Object[] fetchStaticParameters(DLModule module, String annotationN
 			return new Object[0];
 		}
 
-		DLCore core = module.getType().getCore();
+		DLCore core = module.getCore();
 
 		DLAnnotationFactory annotationFactory = core.getAnnotationFactory(annotationName).orElseThrow(() -> {
 			return new InvalidAnnotation(createErrorMessage(module, "Annotation factory @" + annotationName + " is not defined", ctx));

src/main/java/de/s42/dl/parser/contracts/DLHrfContractParser.java

@@ -135,7 +135,7 @@ private static ContractExpression buildContract(DLModule module, AnnotationConte
 		try {
 			String annotationName = ctx.annotationName().getText();
 
-			DLCore core = module.getType().getCore();
+			DLCore core = module.getCore();
 
 			if (!core.hasAnnotationFactory(annotationName)) {
 				throw new DLHrfParsingException(

src/main/java/de/s42/dl/parser/expression/DLHrfExpressionParser.java

@@ -244,7 +244,7 @@ public static Object resolveReference(DLModule module, String refId, ParserRuleC
 		assert refId != null;
 		assert ctx != null;
 
-		DLCore core = module.getType().getCore();
+		DLCore core = module.getCore();
 
 		assert core != null;