Skip to content

Commit 19e24b4

Browse files
authored
Merge branch 'master' into yyang/bundle-catalog
2 parents 7079b74 + c0673db commit 19e24b4

7 files changed

Lines changed: 6 additions & 11 deletions

File tree

mesh-worker-service/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ functionsWorkerServiceNarPackage: /YOUR-NAR-PATH/mesh-worker-service-1.0-SNAPSHO
1717
```
1818
Replace the `YOUR-NAR-PATH` variable with your real path.
1919

20-
#### Start pulsar service
21-
22-
```$xslt
23-
./bin/pulsar standalone -a 127.0.0.1 -nss
24-
```
2520

2621
### Configuring the development environment
2722

mesh-worker-service/src/main/java/io/functionmesh/compute/models/CustomRuntimeOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package io.functionmesh.proxy.models;
19+
package io.functionmesh.compute.models;
2020

2121
import lombok.Data;
2222

mesh-worker-service/src/main/java/io/functionmesh/compute/util/FunctionsUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package io.functionmesh.compute.util;
2020

2121
import io.functionmesh.compute.functions.models.*;
22-
import io.functionmesh.proxy.models.CustomRuntimeOptions;
22+
import io.functionmesh.compute.models.CustomRuntimeOptions;
2323
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2424
import org.apache.commons.lang3.StringUtils;
2525
import org.apache.pulsar.common.functions.ConsumerConfig;

mesh-worker-service/src/main/java/io/functionmesh/compute/util/SinksUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.functionmesh.compute.sinks.models.V1alpha1SinkSpecJava;
2626
import io.functionmesh.compute.sinks.models.V1alpha1SinkSpecPulsar;
2727
import io.functionmesh.compute.sinks.models.V1alpha1SinkSpecResources;
28-
import io.functionmesh.proxy.models.CustomRuntimeOptions;
28+
import io.functionmesh.compute.models.CustomRuntimeOptions;
2929
import io.kubernetes.client.openapi.models.V1ObjectMeta;
3030
import org.apache.commons.io.FileUtils;
3131
import org.apache.commons.lang.StringUtils;

mesh-worker-service/src/main/java/io/functionmesh/compute/util/SourcesUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import io.functionmesh.compute.sources.models.V1alpha1SourceSpecOutputProducerConfCryptoConfig;
2828
import io.functionmesh.compute.sources.models.V1alpha1SourceSpecPulsar;
2929
import io.functionmesh.compute.sources.models.V1alpha1SourceSpecResources;
30-
import io.functionmesh.proxy.models.CustomRuntimeOptions;
30+
import io.functionmesh.compute.models.CustomRuntimeOptions;
3131
import io.kubernetes.client.openapi.models.V1ObjectMeta;
3232
import org.apache.commons.io.FileUtils;
3333
import org.apache.commons.lang.StringUtils;

mesh-worker-service/src/test/java/io/functionmesh/compute/testdata/Generate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package io.functionmesh.compute.testdata;
2020

2121
import io.functionmesh.compute.util.FunctionsUtil;
22-
import io.functionmesh.proxy.models.CustomRuntimeOptions;
22+
import io.functionmesh.compute.models.CustomRuntimeOptions;
2323
import org.apache.pulsar.common.functions.ConsumerConfig;
2424
import org.apache.pulsar.common.functions.FunctionConfig;
2525
import org.apache.pulsar.common.functions.Resources;

mesh-worker-service/src/test/java/io/functionmesh/compute/util/FunctionsUtilTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.functionmesh.compute.functions.models.V1alpha1FunctionSpecOutput;
2626
import io.functionmesh.compute.functions.models.V1alpha1FunctionSpecPulsar;
2727
import io.functionmesh.compute.functions.models.V1alpha1FunctionSpecResources;
28-
import io.functionmesh.proxy.models.CustomRuntimeOptions;
28+
import io.functionmesh.compute.models.CustomRuntimeOptions;
2929
import io.kubernetes.client.openapi.models.V1ObjectMeta;
3030
import org.apache.pulsar.common.functions.ConsumerConfig;
3131
import org.apache.pulsar.common.functions.FunctionConfig;

0 commit comments

Comments
 (0)