You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/12 07:30:20 UTC

[incubator-skywalking-oal-tool] branch master updated: Fix import bug.

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-oal-tool.git


The following commit(s) were added to refs/heads/master by this push:
     new c565d8b  Fix import bug.
c565d8b is described below

commit c565d8b03194584e9d11825becb2e767552742d5
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 12 15:30:15 2018 +0800

    Fix import bug.
---
 oal-parser/src/main/resources/code-templates/AllDispatcherTemplate.ftl   | 1 +
 .../src/main/resources/code-templates/EndpointDispatcherTemplate.ftl     | 1 +
 .../main/resources/code-templates/EndpointRelationDispatcherTemplate.ftl | 1 +
 .../src/main/resources/code-templates/ServiceDispatcherTemplate.ftl      | 1 +
 .../main/resources/code-templates/ServiceInstanceDispatcherTemplate.ftl  | 1 +
 .../resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl | 1 +
 .../resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl  | 1 +
 .../code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl        | 1 +
 .../code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl    | 1 +
 .../code-templates/ServiceInstanceRelationDispatcherTemplate.ftl         | 1 +
 .../main/resources/code-templates/ServiceRelationDispatcherTemplate.ftl  | 1 +
 11 files changed, 11 insertions(+)

diff --git a/oal-parser/src/main/resources/code-templates/AllDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/AllDispatcherTemplate.ftl
index d821002..95ff276 100644
--- a/oal-parser/src/main/resources/code-templates/AllDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/AllDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list allIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
index 657c769..468100a 100644
--- a/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list endpointIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/EndpointRelationDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/EndpointRelationDispatcherTemplate.ftl
index 18533d3..f697ef1 100644
--- a/oal-parser/src/main/resources/code-templates/EndpointRelationDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/EndpointRelationDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceRelationIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
index 077e04e..78b908d 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceDispatcherTemplate.ftl
index fb07928..9ea53a4 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl
index 6e0e2ea..d1d4913 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceJVMCPUIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
index da8992f..7ffb0b3 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceJVMGCIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
index 1ae2052..3df4b88 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceJVMMemoryIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
index 8f06142..505e35e 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceJVMMemoryPoolIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceRelationDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceRelationDispatcherTemplate.ftl
index 2af225a..c7a485a 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceRelationDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceRelationDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceInstanceRelationIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceRelationDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceRelationDispatcherTemplate.ftl
index 4d7ad66..42fd47e 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceRelationDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceRelationDispatcherTemplate.ftl
@@ -24,6 +24,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
     <#list serviceRelationIndicators as indicator>
         <#if indicator.filterExpressions??>
 import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
+            <#break>
         </#if>
     </#list>
 </#if>