Fixed some format problems of the generated code.
diff --git a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
index ce18bbf..5c0be3e 100644
--- a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
@@ -31,7 +31,6 @@
*/
public class EndpointDispatcher implements SourceDispatcher<Endpoint> {
-
@Override public void dispatch(Endpoint source) {
<#list endpointIndicators as indicator>
do${indicator.metricName}(source);
@@ -49,5 +48,6 @@
indicator.${indicator.entryMethod.methodName}(<#list indicator.entryMethod.argsExpressions as arg>${arg}<#if arg_has_next>, </#if></#list>);
IndicatorProcess.INSTANCE.in(indicator);
}
+
</#list>
}
diff --git a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl
index 56a161c..16e3cc1 100644
--- a/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl
+++ b/oal-parser/src/main/resources/code-templates/IndicatorImplementor.ftl
@@ -56,7 +56,6 @@
return result;
}
-
@Override public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -78,7 +77,6 @@
return true;
}
-
@Override public RemoteData.Builder serialize() {
RemoteData.Builder remoteBuilder = RemoteData.newBuilder();
<#list serializeFields.stringFields as field>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
index 3dc7e21..a7b8239 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
@@ -30,6 +30,7 @@
* @author Observability Analysis Language code generator
*/
public class ServiceDispatcher implements SourceDispatcher<Service> {
+
@Override public void dispatch(Service source) {
<#list serviceIndicators as indicator>
do${indicator.metricName}(source);
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl
index d34a19e..bf6635c 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl
@@ -30,8 +30,7 @@
* @author Observability Analysis Language code generator
*/
public class ServiceInstanceJVMCPUDispatcher implements SourceDispatcher<ServiceInstanceJVMCPU> {
-
-
+
@Override public void dispatch(ServiceInstanceJVMCPU source) {
<#list serviceInstanceJVMCPUIndicators as indicator>
do${indicator.metricName}(source);
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
index aeabf99..48ef241 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
@@ -31,7 +31,6 @@
*/
public class ServiceInstanceJVMGCDispatcher implements SourceDispatcher<ServiceInstanceJVMGC> {
-
@Override public void dispatch(ServiceInstanceJVMGC source) {
<#list serviceInstanceJVMGCIndicators as indicator>
do${indicator.metricName}(source);
@@ -50,4 +49,4 @@
IndicatorProcess.INSTANCE.in(indicator);
}
</#list>
- }
+}
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
index 2afa991..60a6680 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
@@ -31,7 +31,6 @@
*/
public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher<ServiceInstanceJVMMemory> {
-
@Override public void dispatch(ServiceInstanceJVMMemory source) {
<#list serviceInstanceJVMMemoryIndicators as indicator>
do${indicator.metricName}(source);
@@ -50,4 +49,4 @@
IndicatorProcess.INSTANCE.in(indicator);
}
</#list>
- }
+}
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
index 58c4129..ce71046 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
@@ -31,7 +31,6 @@
*/
public class ServiceInstanceJVMMemoryPoolDispatcher implements SourceDispatcher<ServiceInstanceJVMMemoryPool> {
-
@Override public void dispatch(ServiceInstanceJVMMemoryPool source) {
<#list serviceInstanceJVMMemoryPoolIndicators as indicator>
do${indicator.metricName}(source);
@@ -50,4 +49,4 @@
IndicatorProcess.INSTANCE.in(indicator);
}
</#list>
- }
+}
