Fixed override jar and location value (#166)

* Avoid override jar and location value

Author: tuteng

mesh-worker-service/src/main/java/io/functionmesh/compute/rest/api/FunctionsImpl.java

@@ -311,7 +311,12 @@ private void upsertFunction(final String tenant,
                         v1alpha1Function.getSpec().setVolumeMounts(volumeMountsList);
                     }
                     if (functionsWorkerServiceCustomConfigs.get("extraDependenciesDir") != null) {
-                        V1alpha1FunctionSpecJava v1alpha1FunctionSpecJava = new V1alpha1FunctionSpecJava();
+                        V1alpha1FunctionSpecJava v1alpha1FunctionSpecJava;
+                        if (v1alpha1Function.getSpec() != null && v1alpha1Function.getSpec().getJava() != null) {
+                            v1alpha1FunctionSpecJava = v1alpha1Function.getSpec().getJava();
+                        } else {
+                            v1alpha1FunctionSpecJava = new V1alpha1FunctionSpecJava();
+                        }
                         v1alpha1FunctionSpecJava.setExtraDependenciesDir(
                                 (String)functionsWorkerServiceCustomConfigs.get("extraDependenciesDir"));
                         v1alpha1Function.getSpec().setJava(v1alpha1FunctionSpecJava);

mesh-worker-service/src/main/java/io/functionmesh/compute/rest/api/SinksImpl.java

@@ -346,8 +346,14 @@ private void upsertSink(final String tenant,
                             .getWorkerConfig().getFunctionsWorkerServiceCustomConfigs();
                     Object volumes = functionsWorkerServiceCustomConfigs.get("volumes");
                     if (functionsWorkerServiceCustomConfigs.get("extraDependenciesDir") != null) {
-                        V1alpha1SinkSpecJava v1alpha1SinkSpecJava = new V1alpha1SinkSpecJava();
-                        v1alpha1SinkSpecJava.setExtraDependenciesDir((String)functionsWorkerServiceCustomConfigs.get("extraDependenciesDir"));
+                        V1alpha1SinkSpecJava v1alpha1SinkSpecJava;
+                        if (v1alpha1Sink.getSpec() != null && v1alpha1Sink.getSpec().getJava() != null) {
+                            v1alpha1SinkSpecJava = v1alpha1Sink.getSpec().getJava();
+                        } else {
+                            v1alpha1SinkSpecJava = new V1alpha1SinkSpecJava();
+                        }
+                        v1alpha1SinkSpecJava.setExtraDependenciesDir(
+                                (String)functionsWorkerServiceCustomConfigs.get("extraDependenciesDir"));
                         v1alpha1Sink.getSpec().setJava(v1alpha1SinkSpecJava);
                     }
                     if (volumes != null) {

mesh-worker-service/src/main/java/io/functionmesh/compute/rest/api/SourcesImpl.java

@@ -320,7 +320,12 @@ private void upsertSource(final String tenant,
                         v1alpha1Source.getSpec().getPod().setVolumes(volumesList);
                     }
                     if (functionsWorkerServiceCustomConfigs.get("extraDependenciesDir") != null) {
-                        V1alpha1SourceSpecJava v1alpha1SourceSpecJava = new V1alpha1SourceSpecJava();
+                        V1alpha1SourceSpecJava v1alpha1SourceSpecJava;
+                        if (v1alpha1Source.getSpec() != null && v1alpha1Source.getSpec().getJava() != null) {
+                            v1alpha1SourceSpecJava = v1alpha1Source.getSpec().getJava();
+                        } else {
+                            v1alpha1SourceSpecJava = new V1alpha1SourceSpecJava();
+                        }
                         v1alpha1SourceSpecJava.setExtraDependenciesDir(
                                 (String)functionsWorkerServiceCustomConfigs.get("extraDependenciesDir"));
                         v1alpha1Source.getSpec().setJava(v1alpha1SourceSpecJava);