Skip to content

Commit af05181

Browse files
xwm1992xwm1992
committed
runtime update (apache#612)
* update java sdk * fix compile error * fix sdk error * 1.remove the openmessage from connector-api 2.fix the standalone connector
1 parent dae9632 commit af05181

File tree

37 files changed

+527
-1156
lines changed

37 files changed

+527
-1156
lines changed

‎docs/cn/features/spi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public class RocketMQProducerImpl implements MeshMQProducer {
101101
```
102102

103103
同时，还需要在eventmesh-connector-rocketmq模块中resource/META-INF/eventmesh目录下创建文件名为SPI接口全限定名的文件
104-
org.apache.eventmesh.api.producer.MeshMQProducer
104+
org.apache.eventmesh.api.producer.Producer
105105

106106
文件内容为扩展实例名和对应的实例全类名
107107

‎docs/en/features/spi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public class RocketMQProducerImpl implements MeshMQProducer {
105105
At the same time, we need to create a file with the full qualified name of the SPI interface under the resource/META-INF/eventmesh directory
106106
in the eventmesh-connector-rocketmq module.
107107

108-
org.apache.eventmesh.api.producer.MeshMQProducer
108+
org.apache.eventmesh.api.producer.Producer
109109

110110
The content of the file is the extension instance name and the corresponding instance full class name
111111

‎eventmesh-connector-plugin/eventmesh-connector-api/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
implementation project(":eventmesh-spi")
2020
implementation project(":eventmesh-common")
2121
api 'io.cloudevents:cloudevents-core'
22-
api 'io.openmessaging:openmessaging-api'
22+
// api 'io.openmessaging:openmessaging-api'
2323
api 'io.dropwizard.metrics:metrics-core'
2424
api "io.dropwizard.metrics:metrics-healthchecks"
2525
api "io.dropwizard.metrics:metrics-annotation"

‎eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RRCallback.java

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*/
17-
18-
package org.apache.eventmesh.api;
19-
20-
import io.openmessaging.api.Message;
21-
22-
public interface RRCallback {
23-
24-
public void onSuccess(Message msg);
25-
26-
public void onException(Throwable e);
27-
28-
}
1+
///*
2+
// * Licensed to the Apache Software Foundation (ASF) under one or more
3+
// * contributor license agreements. See the NOTICE file distributed with
4+
// * this work for additional information regarding copyright ownership.
5+
// * The ASF licenses this file to You under the Apache License, Version 2.0
6+
// * (the "License"); you may not use this file except in compliance with
7+
// * the License. You may obtain a copy of the License at
8+
// *
9+
// * http://www.apache.org/licenses/LICENSE-2.0
10+
// *
11+
// * Unless required by applicable law or agreed to in writing, software
12+
// * distributed under the License is distributed on an "AS IS" BASIS,
13+
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// * See the License for the specific language governing permissions and
15+
// * limitations under the License.
16+
// */
17+
//
18+
//package org.apache.eventmesh.api;
19+
//
20+
//import io.openmessaging.api.Message;
21+
//
22+
//public interface RRCallback {
23+
//
24+
// public void onSuccess(Message msg);
25+
//
26+
// public void onException(Throwable e);
27+
//
28+
//}

‎eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/consumer/MeshMQPushConsumer.java

+40-44
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*/
17-
18-
package org.apache.eventmesh.api.consumer;
19-
20-
import java.util.List;
21-
import java.util.Properties;
22-
23-
import io.openmessaging.api.AsyncMessageListener;
24-
import io.openmessaging.api.Consumer;
25-
import io.openmessaging.api.Message;
26-
27-
import org.apache.eventmesh.api.AbstractContext;
28-
import org.apache.eventmesh.spi.EventMeshExtensionType;
29-
import org.apache.eventmesh.spi.EventMeshSPI;
30-
31-
@EventMeshSPI(isSingleton = false, eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
32-
public interface MeshMQPushConsumer extends Consumer {
33-
34-
void init(Properties keyValue) throws Exception;
35-
36-
void updateOffset(List<Message> msgs, AbstractContext context);
37-
38-
// void registerMessageListener(MessageListenerConcurrently messageListenerConcurrently);
39-
40-
void subscribe(String topic, final AsyncMessageListener listener) throws Exception;
41-
42-
@Override
43-
void unsubscribe(String topic);
44-
}
1+
///*
2+
// * Licensed to the Apache Software Foundation (ASF) under one or more
3+
// * contributor license agreements. See the NOTICE file distributed with
4+
// * this work for additional information regarding copyright ownership.
5+
// * The ASF licenses this file to You under the Apache License, Version 2.0
6+
// * (the "License"); you may not use this file except in compliance with
7+
// * the License. You may obtain a copy of the License at
8+
// *
9+
// * http://www.apache.org/licenses/LICENSE-2.0
10+
// *
11+
// * Unless required by applicable law or agreed to in writing, software
12+
// * distributed under the License is distributed on an "AS IS" BASIS,
13+
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// * See the License for the specific language governing permissions and
15+
// * limitations under the License.
16+
// */
17+
//
18+
//package org.apache.eventmesh.api.consumer;
19+
//
20+
//import java.util.List;
21+
//import java.util.Properties;
22+
//
23+
//import org.apache.eventmesh.api.AbstractContext;
24+
//import org.apache.eventmesh.spi.EventMeshExtensionType;
25+
//import org.apache.eventmesh.spi.EventMeshSPI;
26+
//
27+
//@EventMeshSPI(isSingleton = false, eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
28+
//public interface MeshMQPushConsumer extends Consumer {
29+
//
30+
// void init(Properties keyValue) throws Exception;
31+
//
32+
// void updateOffset(List<Message> msgs, AbstractContext context);
33+
//
34+
//// void registerMessageListener(MessageListenerConcurrently messageListenerConcurrently);
35+
//
36+
// void subscribe(String topic, final AsyncMessageListener listener) throws Exception;
37+
//
38+
// @Override
39+
// void unsubscribe(String topic);
40+
//}

‎eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/MeshMQProducer.java

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*/
17-
18-
package org.apache.eventmesh.api.producer;
19-
20-
import java.util.Properties;
21-
22-
import io.openmessaging.api.Message;
23-
import io.openmessaging.api.Producer;
24-
import io.openmessaging.api.SendCallback;
25-
26-
import org.apache.eventmesh.api.RRCallback;
27-
import org.apache.eventmesh.spi.EventMeshExtensionType;
28-
import org.apache.eventmesh.spi.EventMeshSPI;
29-
30-
@EventMeshSPI(isSingleton = false, eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
31-
public interface MeshMQProducer extends Producer {
32-
33-
void init(Properties properties) throws Exception;
34-
35-
void send(Message message, SendCallback sendCallback) throws Exception;
36-
37-
void request(Message message, RRCallback rrCallback, long timeout) throws Exception;
38-
39-
boolean reply(final Message message, final SendCallback sendCallback) throws Exception;
40-
41-
void checkTopicExist(String topic) throws Exception;
42-
43-
void setExtFields();
44-
45-
}
1+
///*
2+
// * Licensed to the Apache Software Foundation (ASF) under one or more
3+
// * contributor license agreements. See the NOTICE file distributed with
4+
// * this work for additional information regarding copyright ownership.
5+
// * The ASF licenses this file to You under the Apache License, Version 2.0
6+
// * (the "License"); you may not use this file except in compliance with
7+
// * the License. You may obtain a copy of the License at
8+
// *
9+
// * http://www.apache.org/licenses/LICENSE-2.0
10+
// *
11+
// * Unless required by applicable law or agreed to in writing, software
12+
// * distributed under the License is distributed on an "AS IS" BASIS,
13+
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// * See the License for the specific language governing permissions and
15+
// * limitations under the License.
16+
// */
17+
//
18+
//package org.apache.eventmesh.api.producer;
19+
//
20+
//import java.util.Properties;
21+
//
22+
//import io.openmessaging.api.Message;
23+
//import io.openmessaging.api.Producer;
24+
//import io.openmessaging.api.SendCallback;
25+
//
26+
//import org.apache.eventmesh.api.RRCallback;
27+
//import org.apache.eventmesh.spi.EventMeshExtensionType;
28+
//import org.apache.eventmesh.spi.EventMeshSPI;
29+
//
30+
//@EventMeshSPI(isSingleton = false, eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
31+
//public interface MeshMQProducer extends Producer {
32+
//
33+
// void init(Properties properties) throws Exception;
34+
//
35+
// void send(Message message, SendCallback sendCallback) throws Exception;
36+
//
37+
// void request(Message message, RRCallback rrCallback, long timeout) throws Exception;
38+
//
39+
// boolean reply(final Message message, final SendCallback sendCallback) throws Exception;
40+
//
41+
// void checkTopicExist(String topic) throws Exception;
42+
//
43+
// void setExtFields();
44+
//
45+
//}

‎eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/producer/Producer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.eventmesh.api.producer;
1919

2020
import org.apache.eventmesh.api.LifeCycle;
21-
import org.apache.eventmesh.api.RRCallback;
2221
import org.apache.eventmesh.api.RequestReplyCallback;
2322
import org.apache.eventmesh.api.SendCallback;
2423
import org.apache.eventmesh.api.SendResult;
@@ -45,7 +44,7 @@ public interface Producer extends LifeCycle {
4544

4645
void sendAsync(final CloudEvent cloudEvent, final SendCallback sendCallback);
4746

48-
void request(CloudEvent cloudEvent, RRCallback rrCallback, long timeout) throws Exception;
47+
// void request(CloudEvent cloudEvent, RRCallback rrCallback, long timeout) throws Exception;
4948

5049
void request(CloudEvent cloudEvent, RequestReplyCallback rrCallback, long timeout) throws Exception;
5150

0 commit comments

Comments
 (0)