Rename java proxy to mesh worker service (#138)

Fixed #134

Author: tuteng

.github/workflows/release.yml

@@ -91,21 +91,21 @@ jobs:
           password: ${{ secrets.IMAGE_GITHUB_TOKEN }}
 
       - name: Auto generate crd model 
-        run: cd java-proxy && ./tool/generate-crd.sh
+        run: cd mesh-worker-service && ./tool/generate-crd.sh
 
       - name: Format license
-        run: cd java-proxy && mvn license:format
+        run: cd mesh-worker-service && mvn license:format
 
-      - name: Run mesh proxy unit test
+      - name: Run mesh worker service unit test
         run: |
-          cd java-proxy
+          cd mesh-worker-service
           mvn clean install
 
-      - name: Upload java proxy nar package to release
+      - name: Upload mesh worker service nar package to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: java-proxy/target/java-proxy-${{ github.event.release.tag_name }}.nar
-          asset_name: java-proxy-${{ github.event.release.tag_name }}.nar
+          file: mesh-worker-service/target/mesh-worker-service-${{ github.event.release.tag_name }}.nar
+          asset_name: mesh-worker-service-${{ github.event.release.tag_name }}.nar
           tag: ${{ github.ref }}
-          overwrite: true
+          overwrite: true

…b/workflows/test-function-mesh-proxy.yml …b/workflows/test-mesh-worker-service.yml.github/workflows/test-function-mesh-proxy.yml renamed to .github/workflows/test-mesh-worker-service.yml .github/workflows/test-function-mesh-proxy.yml renamed to .github/workflows/test-mesh-worker-service.yml

@@ -35,11 +35,11 @@ jobs:
           password: ${{ secrets.IMAGE_GITHUB_TOKEN }}
 
       - name: Auto generate crd model
-        run: cd java-proxy && ./tool/generate-crd.sh
+        run: cd mesh-worker-service && ./tool/generate-crd.sh
 
       - name: Format license
-        run: cd java-proxy && mvn license:format
+        run: cd mesh-worker-service && mvn license:format
 
       - name: Run mesh proxy unit test
-        run: cd java-proxy && mvn clean install
+        run: cd mesh-worker-service && mvn clean install
 

java-proxy/src/main/resources/META-INF/services/pulsar-functions-worker-service.yml

@@ -37,6 +37,6 @@ data/
 **/*.versionsBackup
 
 # ignore all crd file by auto generated
-src/main/java/io/functionmesh/functions/*
-src/main/java/io/functionmesh/sources/*
-src/main/java/io/functionmesh/sinks/*
+src/main/java/io/functionmesh/compute/functions/*
+src/main/java/io/functionmesh/compute/sources/*
+src/main/java/io/functionmesh/compute/sinks/*

java-proxy/.gitignore mesh-worker-service/.gitignorejava-proxy/.gitignore renamed to mesh-worker-service/.gitignore

@@ -1,4 +1,4 @@
-## Java Proxy
+## Mesh Worker Service
 
 This is a proxy that is used to forward requests to the k8s.
 
@@ -13,7 +13,7 @@ This is a proxy that is used to forward requests to the k8s.
 Add the following configuration to the `functions_worker.yml` configuration file:
 
 ```$xslt
-functionsWorkerServiceNarPackage: /YOUR-NAR-PATH/java-proxy-1.0-SNAPSHOT.nar
+functionsWorkerServiceNarPackage: /YOUR-NAR-PATH/mesh-worker-service-1.0-SNAPSHOT.nar
 ```
 Replace the `YOUR-NAR-PATH` variable with your real path.
 

java-proxy/LICENSE mesh-worker-service/LICENSEjava-proxy/LICENSE renamed to mesh-worker-service/LICENSE

@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.functionmesh.proxy</groupId>
-    <artifactId>java-proxy</artifactId>
+    <artifactId>mesh-worker-service</artifactId>
     <version>0.1.4-SNAPSHOT</version>
 
     <properties>

java-proxy/README.md mesh-worker-service/README.mdjava-proxy/README.md renamed to mesh-worker-service/README.md

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.functionmesh.proxy;
+package io.functionmesh.compute;
 
 import io.netty.util.concurrent.DefaultThreadFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -43,7 +43,7 @@
  * This class for test.
  */
 @Slf4j
-public class FunctionMeshProxyWorker {
+public class MeshWorker {
 
     private ZooKeeperClientFactory zkClientFactory = null;
     private final OrderedExecutor orderedExecutor = OrderedExecutor.newBuilder().numThreads(8).name("zk-cache-ordered").build();
@@ -57,9 +57,9 @@ public class FunctionMeshProxyWorker {
     private WorkerServer server;
 
 
-    public FunctionMeshProxyWorker(WorkerConfig workerConfig) {
+    public MeshWorker(WorkerConfig workerConfig) {
         this.workerConfig = workerConfig;
-        this.workerService = new FunctionMeshProxyService();
+        this.workerService = new MeshWorkerService();
         this.errorNotifier = ErrorNotifier.getDefaultImpl();
     }
 

java-proxy/header.txt mesh-worker-service/header.txtjava-proxy/header.txt renamed to mesh-worker-service/header.txt

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.functionmesh.proxy;
+package io.functionmesh.compute;
 
-import io.functionmesh.proxy.rest.api.FunctionsImpl;
-import io.functionmesh.proxy.rest.api.SinksImpl;
-import io.functionmesh.proxy.rest.api.SourcesImpl;
+import io.functionmesh.compute.rest.api.FunctionsImpl;
+import io.functionmesh.compute.rest.api.SinksImpl;
+import io.functionmesh.compute.rest.api.SourcesImpl;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.apis.CustomObjectsApi;
@@ -50,23 +50,23 @@
  */
 @Slf4j
 @Getter
-public class FunctionMeshProxyService implements WorkerService {
+public class MeshWorkerService implements WorkerService {
 
     private volatile boolean isInitialized = false;
 
     private WorkerConfig workerConfig;
-    private Functions<FunctionMeshProxyService> functions;
-    private FunctionsV2<FunctionMeshProxyService> functionsV2;
-    private Sinks<FunctionMeshProxyService> sinks;
-    private Sources<FunctionMeshProxyService> sources;
+    private Functions<MeshWorkerService> functions;
+    private FunctionsV2<MeshWorkerService> functionsV2;
+    private Sinks<MeshWorkerService> sinks;
+    private Sources<MeshWorkerService> sources;
     private CoreV1Api coreV1Api;
     private CustomObjectsApi customObjectsApi;
     private ApiClient apiClient;
 
     private AuthenticationService authenticationService;
     private AuthorizationService authorizationService;
 
-    public FunctionMeshProxyService() {
+    public MeshWorkerService() {
 
     }
 
@@ -86,9 +86,9 @@ public void initInBroker(ServiceConfiguration brokerConfig,
     public void init(WorkerConfig workerConfig) throws Exception {
         this.workerConfig = workerConfig;
         this.initKubernetesClient();
-        this.functions = new FunctionsImpl(() -> FunctionMeshProxyService.this);
-        this.sources = new SourcesImpl(() -> FunctionMeshProxyService.this);
-        this.sinks = new SinksImpl(() -> FunctionMeshProxyService.this);
+        this.functions = new FunctionsImpl(() -> MeshWorkerService.this);
+        this.sources = new SourcesImpl(() -> MeshWorkerService.this);
+        this.sinks = new SinksImpl(() -> MeshWorkerService.this);
     }
 
     private void initKubernetesClient() throws IOException {