Skip to content

Commit

Permalink
Merge pull request #300 from liangyuanpeng/dev_refactor_package
Browse files Browse the repository at this point in the history
[ISSUE #280]refactor runtime module package com.webank to org.apache
close #280
  • Loading branch information
xwm1992 authored Apr 21, 2021
2 parents 337fbce + 43a2c32 commit 6f14791
Show file tree
Hide file tree
Showing 145 changed files with 704 additions and 704 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.admin.controller;

import com.webank.eventmesh.runtime.boot.EventMeshTCPServer;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.group.ClientGroupWrapper;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.session.Session;
import com.webank.eventmesh.runtime.constants.EventMeshConstants;
import com.webank.eventmesh.common.protocol.tcp.UserAgent;
package org.apache.eventmesh.runtime.admin.controller;

import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientGroupWrapper;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.common.protocol.tcp.UserAgent;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.google.common.base.Preconditions;
import com.webank.eventmesh.runtime.core.protocol.http.async.AsyncContext;
import com.webank.eventmesh.runtime.core.protocol.http.processor.inf.HttpRequestProcessor;
import com.webank.eventmesh.runtime.util.EventMeshUtil;
import com.webank.eventmesh.runtime.util.RemotingHelper;
import com.webank.eventmesh.runtime.common.Pair;
import com.webank.eventmesh.runtime.constants.EventMeshConstants;
import com.webank.eventmesh.runtime.metrics.http.HTTPMetricsServer;
import com.webank.eventmesh.common.ThreadPoolFactory;
import com.webank.eventmesh.common.command.HttpCommand;
import com.webank.eventmesh.common.protocol.http.body.Body;
import com.webank.eventmesh.common.protocol.http.common.ProtocolKey;
import com.webank.eventmesh.common.protocol.http.common.ProtocolVersion;
import com.webank.eventmesh.common.protocol.http.common.EventMeshRetCode;
import com.webank.eventmesh.common.protocol.http.common.RequestCode;
import com.webank.eventmesh.common.protocol.http.header.Header;
import org.apache.eventmesh.runtime.core.protocol.http.async.AsyncContext;
import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.HttpRequestProcessor;
import org.apache.eventmesh.runtime.util.EventMeshUtil;
import org.apache.eventmesh.runtime.util.RemotingHelper;
import org.apache.eventmesh.runtime.common.Pair;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.metrics.http.HTTPMetricsServer;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.command.HttpCommand;
import org.apache.eventmesh.common.protocol.http.body.Body;
import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
import org.apache.eventmesh.common.protocol.http.common.EventMeshRetCode;
import org.apache.eventmesh.common.protocol.http.common.RequestCode;
import org.apache.eventmesh.common.protocol.http.header.Header;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.*;
import io.netty.channel.socket.SocketChannel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.webank.eventmesh.common.ThreadUtil;
import org.apache.eventmesh.common.ThreadUtil;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.google.common.eventbus.EventBus;
import com.webank.eventmesh.runtime.core.consumergroup.ConsumerGroupConf;
import com.webank.eventmesh.runtime.core.protocol.http.processor.*;
import com.webank.eventmesh.runtime.core.protocol.http.processor.inf.Client;
import com.webank.eventmesh.runtime.core.protocol.http.producer.ProducerManager;
import com.webank.eventmesh.runtime.core.protocol.http.consumer.ConsumerManager;
import com.webank.eventmesh.runtime.core.protocol.http.push.AbstractHTTPPushRequest;
import com.webank.eventmesh.runtime.core.protocol.http.retry.HttpRetryer;
import com.webank.eventmesh.runtime.common.ServiceState;
import com.webank.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import com.webank.eventmesh.runtime.metrics.http.HTTPMetricsServer;
import com.webank.eventmesh.common.ThreadPoolFactory;
import com.webank.eventmesh.common.protocol.http.common.RequestCode;
import org.apache.eventmesh.runtime.core.consumergroup.ConsumerGroupConf;
import org.apache.eventmesh.runtime.core.protocol.http.processor.*;
import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.Client;
import org.apache.eventmesh.runtime.core.protocol.http.producer.ProducerManager;
import org.apache.eventmesh.runtime.core.protocol.http.consumer.ConsumerManager;
import org.apache.eventmesh.runtime.core.protocol.http.push.AbstractHTTPPushRequest;
import org.apache.eventmesh.runtime.core.protocol.http.retry.HttpRetryer;
import org.apache.eventmesh.runtime.common.ServiceState;
import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import org.apache.eventmesh.runtime.metrics.http.HTTPMetricsServer;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.protocol.http.common.RequestCode;

import java.util.List;
import java.util.concurrent.BlockingQueue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.webank.eventmesh.runtime.common.ServiceState;
import com.webank.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
import com.webank.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import com.webank.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.common.ServiceState;
import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
//import org.apache.rocketmq.client.impl.consumer.ConsumeMessageConcurrentlyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.webank.eventmesh.common.config.ConfigurationWraper;
import com.webank.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
import com.webank.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import com.webank.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.common.config.ConfigurationWraper;
import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.google.common.util.concurrent.RateLimiter;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpConnectionHandler;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpExceptionHandler;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpMessageDispatcher;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
import com.webank.eventmesh.runtime.core.protocol.tcp.client.session.push.retry.EventMeshTcpRetryer;
import com.webank.eventmesh.runtime.util.EventMeshThreadFactoryImpl;
import com.webank.eventmesh.runtime.admin.controller.ClientManageController;
import com.webank.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
import com.webank.eventmesh.runtime.metrics.tcp.EventMeshTcpMonitor;
import com.webank.eventmesh.common.ThreadPoolFactory;
import com.webank.eventmesh.common.protocol.tcp.codec.Codec;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpConnectionHandler;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpExceptionHandler;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpMessageDispatcher;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.push.retry.EventMeshTcpRetryer;
import org.apache.eventmesh.runtime.util.EventMeshThreadFactoryImpl;
import org.apache.eventmesh.runtime.admin.controller.ClientManageController;
import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
import org.apache.eventmesh.runtime.metrics.tcp.EventMeshTcpMonitor;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.protocol.tcp.codec.Codec;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.webank.eventmesh.runtime.boot;
package org.apache.eventmesh.runtime.boot;

import com.webank.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.common;
package org.apache.eventmesh.runtime.common;

public class Pair<T1, T2> {
private T1 object1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.common;
package org.apache.eventmesh.runtime.common;

public enum ServiceState {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//
//package com.webank.runtime.configuration;
//
//import com.webank.eventmesh.common.ThreadPoolFactory;
//import org.apache.eventmesh.common.ThreadPoolFactory;
//import org.apache.commons.lang3.StringUtils;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.configuration;
package org.apache.eventmesh.runtime.configuration;

import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.RateLimiter;
import com.webank.eventmesh.common.config.CommonConfiguration;
import com.webank.eventmesh.common.config.ConfigurationWraper;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.config.ConfigurationWraper;
import org.apache.commons.lang3.StringUtils;

public class EventMeshHTTPConfiguration extends CommonConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.configuration;
package org.apache.eventmesh.runtime.configuration;

import com.google.common.base.Preconditions;
import com.webank.eventmesh.common.config.CommonConfiguration;
import com.webank.eventmesh.common.config.ConfigurationWraper;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.config.ConfigurationWraper;
import org.apache.commons.lang3.StringUtils;

public class EventMeshTCPConfiguration extends CommonConfiguration {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.webank.eventmesh.runtime.constants;
package org.apache.eventmesh.runtime.constants;

//TODO
public class DeFiBusConstant {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.constants;
package org.apache.eventmesh.runtime.constants;

public class EventMeshConstants {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.constants;
package org.apache.eventmesh.runtime.constants;

public class EventMeshVersion {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.consumergroup;
package org.apache.eventmesh.runtime.core.consumergroup;

import com.google.common.collect.Maps;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.consumergroup;
package org.apache.eventmesh.runtime.core.consumergroup;

import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.consumergroup;
package org.apache.eventmesh.runtime.core.consumergroup;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.consumergroup.event;
package org.apache.eventmesh.runtime.core.consumergroup.event;

public class ConsumerGroupInstanceChangeEvent {
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.consumergroup.event;
package org.apache.eventmesh.runtime.core.consumergroup.event;

import com.webank.eventmesh.runtime.core.consumergroup.ConsumerGroupConf;
import org.apache.eventmesh.runtime.core.consumergroup.ConsumerGroupConf;

public class ConsumerGroupStateEvent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.consumergroup.event;
package org.apache.eventmesh.runtime.core.consumergroup.event;

import com.webank.eventmesh.runtime.core.consumergroup.ConsumerGroupTopicConf;
import org.apache.eventmesh.runtime.core.consumergroup.ConsumerGroupTopicConf;

public class ConsumerGroupTopicConfChangeEvent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.plugin;
package org.apache.eventmesh.runtime.core.plugin;

import com.webank.eventmesh.api.AbstractContext;
import com.webank.eventmesh.api.consumer.MeshMQPushConsumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.consumer.MeshMQPushConsumer;
import io.openmessaging.api.AsyncMessageListener;
import io.openmessaging.api.Message;
import io.openmessaging.api.MessageListener;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.plugin;
package org.apache.eventmesh.runtime.core.plugin;

import com.webank.eventmesh.api.RRCallback;
import com.webank.eventmesh.api.producer.MeshMQProducer;
import org.apache.eventmesh.api.RRCallback;
import org.apache.eventmesh.api.producer.MeshMQProducer;
import io.openmessaging.api.Message;
import io.openmessaging.api.SendCallback;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.webank.eventmesh.runtime.core.plugin;
package org.apache.eventmesh.runtime.core.plugin;

import com.webank.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.commons.lang3.StringUtils;

import java.util.concurrent.atomic.AtomicBoolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.protocol.http.async;
package org.apache.eventmesh.runtime.core.protocol.http.async;

import com.google.common.base.Preconditions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.webank.eventmesh.runtime.core.protocol.http.async;
package org.apache.eventmesh.runtime.core.protocol.http.async;

public interface CompleteHandler<T> {
void onResponse(T t);
Expand Down
Loading

0 comments on commit 6f14791

Please sign in to comment.