Sep 13, 2023 · Sep 14, 2023 · Sep 17, 2023 · Sep 19, 2023 · Sep 21, 2023 · Sep 21, 2023
diff --git a/Are you sure you want to change the base? b/Are you sure you want to change the base?
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,17 +53,17 @@ public enum DiscoveryTransfer {
		* @param discoveryUpstreamData discoveryUpstreamData
		* @return DiscoveryUpstreamDO
		*/
		public DiscoveryUpstreamDO mapToDo(final DiscoveryUpstreamData discoveryUpstreamData) {
		return DiscoveryUpstreamDO.builder()
		.discoveryHandlerId(discoveryUpstreamData.getDiscoveryHandlerId())
		.id(discoveryUpstreamData.getId())
		.protocol(discoveryUpstreamData.getProtocol())
		.status(discoveryUpstreamData.getStatus())
		.weight(discoveryUpstreamData.getWeight())
		.props(discoveryUpstreamData.getProps())
		.url(discoveryUpstreamData.getUrl())
		.dateUpdated(discoveryUpstreamData.getDateUpdated())
		.dateCreated(discoveryUpstreamData.getDateCreated()).build();
		public DiscoveryUpstreamDO mapToDo(DiscoveryUpstreamData discoveryUpstreamData) {
		return Optional.ofNullable(discoveryUpstreamData).map(data -> DiscoveryUpstreamDO.builder()
		.discoveryHandlerId(data.getDiscoveryHandlerId())
		.id(data.getId())
		.protocol(data.getProtocol())
		.status(data.getStatus())
		.weight(data.getWeight())
		.props(data.getProps())
		.url(data.getUrl())
		.dateUpdated(data.getDateUpdated())
		.dateCreated(data.getDateCreated()).build()).orElse(null);
		}

		/**
Expand All		@@ -72,19 +72,22 @@ public DiscoveryUpstreamDO mapToDo(final DiscoveryUpstreamData discoveryUpstream
		* @param discoveryUpstreamDO discoveryUpstreamDO
		* @return DiscoveryUpstreamVO
		*/
		public DiscoveryUpstreamVO mapToVo(final DiscoveryUpstreamDO discoveryUpstreamDO) {
		DiscoveryUpstreamVO vo = new DiscoveryUpstreamVO();
		vo.setId(discoveryUpstreamDO.getId());
		vo.setDiscoveryHandlerId(discoveryUpstreamDO.getDiscoveryHandlerId());
		vo.setProtocol(discoveryUpstreamDO.getProtocol());
		vo.setUrl(discoveryUpstreamDO.getUrl());
		vo.setStatus(discoveryUpstreamDO.getStatus());
		vo.setWeight(discoveryUpstreamDO.getWeight());
		vo.setProps(discoveryUpstreamDO.getProps());
		vo.setStartupTime(String.valueOf(discoveryUpstreamDO.getDateCreated().getTime()));
		return vo;
		public DiscoveryUpstreamVO mapToVo(DiscoveryUpstreamDO discoveryUpstreamDO) {
		return Optional.ofNullable(discoveryUpstreamDO).map(data -> {
		DiscoveryUpstreamVO vo = new DiscoveryUpstreamVO();
		vo.setId(data.getId());
		vo.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
		vo.setProtocol(data.getProtocol());
		vo.setUrl(data.getUrl());
		vo.setStatus(data.getStatus());
		vo.setWeight(data.getWeight());
		vo.setProps(data.getProps());
		vo.setStartupTime(String.valueOf(data.getDateCreated().getTime()));
		return vo;
		}).orElse(null);
		}


		public DiscoveryRelVO mapToVo(DiscoveryRelDO discoveryRelDO) {
		return Optional.ofNullable(discoveryRelDO).map(data -> {
		DiscoveryRelVO discoveryRelVO = new DiscoveryRelVO();
Expand Down Expand Up		@@ -156,18 +159,20 @@ public DiscoveryHandlerVO mapToVo(DiscoveryHandlerDO discoveryDO) {
		* @param discoveryUpstreamDO discoveryUpstreamDO
		* @return DiscoveryUpstreamData
		*/
		public DiscoveryUpstreamData mapToData(final DiscoveryUpstreamDO discoveryUpstreamDO) {
		DiscoveryUpstreamData discoveryUpstreamData = new DiscoveryUpstreamData();
		discoveryUpstreamData.setId(discoveryUpstreamDO.getId());
		discoveryUpstreamData.setProtocol(discoveryUpstreamDO.getProtocol());
		discoveryUpstreamData.setUrl(discoveryUpstreamDO.getUrl());
		discoveryUpstreamData.setStatus(discoveryUpstreamDO.getStatus());
		discoveryUpstreamData.setDiscoveryHandlerId(discoveryUpstreamDO.getDiscoveryHandlerId());
		discoveryUpstreamData.setWeight(discoveryUpstreamDO.getWeight());
		discoveryUpstreamData.setProps(discoveryUpstreamDO.getProps());
		discoveryUpstreamData.setDateUpdated(discoveryUpstreamDO.getDateUpdated());
		discoveryUpstreamData.setDateCreated(discoveryUpstreamDO.getDateCreated());
		return discoveryUpstreamData;
		public DiscoveryUpstreamData mapToData(DiscoveryUpstreamDO discoveryUpstreamDO) {
		return Optional.ofNullable(discoveryUpstreamDO).map(data -> {
		DiscoveryUpstreamData discoveryUpstreamData = new DiscoveryUpstreamData();
		discoveryUpstreamData.setId(data.getId());
		discoveryUpstreamData.setProtocol(data.getProtocol());
		discoveryUpstreamData.setUrl(data.getUrl());
		discoveryUpstreamData.setStatus(data.getStatus());
		discoveryUpstreamData.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
		discoveryUpstreamData.setWeight(data.getWeight());
		discoveryUpstreamData.setProps(data.getProps());
		discoveryUpstreamData.setDateUpdated(data.getDateUpdated());
		discoveryUpstreamData.setDateCreated(data.getDateCreated());
		return discoveryUpstreamData;
		}).orElse(null);
		}

		/**
Expand All		@@ -176,18 +181,20 @@ public DiscoveryUpstreamData mapToData(final DiscoveryUpstreamDO discoveryUpstre
		* @param discoveryUpstreamDTO discoveryUpstreamDTO
		* @return DiscoveryUpstreamData
		*/
		public DiscoveryUpstreamData mapToData(final DiscoveryUpstreamDTO discoveryUpstreamDTO) {
		DiscoveryUpstreamData discoveryUpstreamData = new DiscoveryUpstreamData();
		discoveryUpstreamData.setId(discoveryUpstreamDTO.getId());
		discoveryUpstreamData.setProtocol(discoveryUpstreamDTO.getProtocol());
		discoveryUpstreamData.setUrl(discoveryUpstreamDTO.getUrl());
		discoveryUpstreamData.setStatus(discoveryUpstreamDTO.getStatus());
		discoveryUpstreamData.setDiscoveryHandlerId(discoveryUpstreamDTO.getDiscoveryHandlerId());
		discoveryUpstreamData.setWeight(discoveryUpstreamDTO.getWeight());
		discoveryUpstreamData.setProps(discoveryUpstreamDTO.getProps());
		discoveryUpstreamData.setDateCreated(discoveryUpstreamDTO.getDateCreated());
		discoveryUpstreamData.setDateUpdated(discoveryUpstreamDTO.getDateUpdated());
		return discoveryUpstreamData;
		public DiscoveryUpstreamData mapToData(DiscoveryUpstreamDTO discoveryUpstreamDTO) {
		return Optional.ofNullable(discoveryUpstreamDTO).map(data -> {
		DiscoveryUpstreamData discoveryUpstreamData = new DiscoveryUpstreamData();
		discoveryUpstreamData.setId(data.getId());
		discoveryUpstreamData.setProtocol(data.getProtocol());
		discoveryUpstreamData.setUrl(data.getUrl());
		discoveryUpstreamData.setStatus(data.getStatus());
		discoveryUpstreamData.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
		discoveryUpstreamData.setWeight(data.getWeight());
		discoveryUpstreamData.setProps(data.getProps());
		discoveryUpstreamData.setDateCreated(data.getDateCreated());
		discoveryUpstreamData.setDateUpdated(data.getDateUpdated());
		return discoveryUpstreamData;
		}).orElse(null);
		}

		/**
Expand All		@@ -196,17 +203,19 @@ public DiscoveryUpstreamData mapToData(final DiscoveryUpstreamDTO discoveryUpstr
		* @param proxySelectorDTO proxySelectorDTO
		* @return ProxySelectorData
		*/
		public ProxySelectorData mapToData(final ProxySelectorDTO proxySelectorDTO) {
		ProxySelectorData proxySelectorData = new ProxySelectorData();
		proxySelectorData.setId(proxySelectorDTO.getId());
		proxySelectorData.setName(proxySelectorDTO.getName());
		proxySelectorData.setPluginName(proxySelectorDTO.getPluginName());
		proxySelectorData.setType(proxySelectorDTO.getType());
		proxySelectorData.setForwardPort(proxySelectorDTO.getForwardPort());
		String props = proxySelectorDTO.getProps();
		Properties properties = GsonUtils.getInstance().fromJson(props, Properties.class);
		proxySelectorData.setProps(properties);
		return proxySelectorData;
		public ProxySelectorData mapToData(ProxySelectorDTO proxySelectorDTO) {
		return Optional.ofNullable(proxySelectorDTO).map(data -> {
		ProxySelectorData proxySelectorData = new ProxySelectorData();
		proxySelectorData.setId(data.getId());
		proxySelectorData.setName(data.getName());
		proxySelectorData.setPluginName(data.getPluginName());
		proxySelectorData.setType(data.getType());
		proxySelectorData.setForwardPort(data.getForwardPort());
		String props = data.getProps();
		Properties properties = GsonUtils.getInstance().fromJson(props, Properties.class);
		proxySelectorData.setProps(properties);
		return proxySelectorData;
		}).orElse(null);
		}

		/**
Expand All		@@ -215,17 +224,19 @@ public ProxySelectorData mapToData(final ProxySelectorDTO proxySelectorDTO) {
		* @param proxySelectorDO proxySelectorDO
		* @return ProxySelectorData
		*/
		public ProxySelectorData mapToData(final ProxySelectorDO proxySelectorDO) {
		ProxySelectorData proxySelectorData = new ProxySelectorData();
		proxySelectorData.setId(proxySelectorDO.getId());
		proxySelectorData.setName(proxySelectorDO.getName());
		proxySelectorData.setPluginName(proxySelectorDO.getPluginName());
		proxySelectorData.setType(proxySelectorDO.getType());
		proxySelectorData.setForwardPort(proxySelectorDO.getForwardPort());
		String props = proxySelectorDO.getProps();
		Properties properties = GsonUtils.getInstance().fromJson(props, Properties.class);
		proxySelectorData.setProps(properties);
		return proxySelectorData;
		public ProxySelectorData mapToData(ProxySelectorDO proxySelectorDO) {
		return Optional.ofNullable(proxySelectorDO).map(data -> {
		ProxySelectorData proxySelectorData = new ProxySelectorData();
		proxySelectorData.setId(data.getId());
		proxySelectorData.setName(data.getName());
		proxySelectorData.setPluginName(data.getPluginName());
		proxySelectorData.setType(data.getType());
		proxySelectorData.setForwardPort(data.getForwardPort());
		String props = data.getProps();
		Properties properties = GsonUtils.getInstance().fromJson(props, Properties.class);
		proxySelectorData.setProps(properties);
		return proxySelectorData;
		}).orElse(null);
		}

		/**
Expand All		@@ -234,15 +245,17 @@ public ProxySelectorData mapToData(final ProxySelectorDO proxySelectorDO) {
		* @param proxySelectorDO proxySelectorDO
		* @return ProxySelectorDTO
		*/
		public ProxySelectorDTO mapToDTO(final ProxySelectorDO proxySelectorDO) {
		ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
		proxySelectorDTO.setId(proxySelectorDO.getId());
		proxySelectorDTO.setName(proxySelectorDO.getName());
		proxySelectorDTO.setType(proxySelectorDO.getType());
		proxySelectorDTO.setProps(proxySelectorDO.getProps());
		proxySelectorDTO.setForwardPort(proxySelectorDO.getForwardPort());
		proxySelectorDTO.setPluginName(proxySelectorDO.getPluginName());
		return proxySelectorDTO;
		public ProxySelectorDTO mapToDTO(ProxySelectorDO proxySelectorDO) {
		return Optional.ofNullable(proxySelectorDO).map(data -> {
		ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
		proxySelectorDTO.setId(data.getId());
		proxySelectorDTO.setName(data.getName());
		proxySelectorDTO.setType(data.getType());
		proxySelectorDTO.setProps(data.getProps());
		proxySelectorDTO.setForwardPort(data.getForwardPort());
		proxySelectorDTO.setPluginName(data.getPluginName());
		return proxySelectorDTO;
		}).orElse(null);
		}

		/**
Expand All		@@ -251,14 +264,16 @@ public ProxySelectorDTO mapToDTO(final ProxySelectorDO proxySelectorDO) {
		* @param discoveryHandlerDO discoveryHandlerDO
		* @return DiscoveryHandlerDTO
		*/
		public DiscoveryHandlerDTO mapToDTO(final DiscoveryHandlerDO discoveryHandlerDO) {
		DiscoveryHandlerDTO discoveryHandlerDTO = new DiscoveryHandlerDTO();
		discoveryHandlerDTO.setDiscoveryId(discoveryHandlerDO.getDiscoveryId());
		discoveryHandlerDTO.setHandler(discoveryHandlerDO.getHandler());
		discoveryHandlerDTO.setProps(discoveryHandlerDO.getProps());
		discoveryHandlerDTO.setListenerNode(discoveryHandlerDO.getListenerNode());
		discoveryHandlerDTO.setId(discoveryHandlerDO.getId());
		return discoveryHandlerDTO;
		public DiscoveryHandlerDTO mapToDTO(DiscoveryHandlerDO discoveryHandlerDO) {
		return Optional.ofNullable(discoveryHandlerDO).map(data -> {
		DiscoveryHandlerDTO discoveryHandlerDTO = new DiscoveryHandlerDTO();
		discoveryHandlerDTO.setDiscoveryId(data.getDiscoveryId());
		discoveryHandlerDTO.setHandler(data.getHandler());
		discoveryHandlerDTO.setProps(data.getProps());
		discoveryHandlerDTO.setListenerNode(data.getListenerNode());
		discoveryHandlerDTO.setId(data.getId());
		return discoveryHandlerDTO;
		}).orElse(null);
		}

		/**
Expand All		@@ -285,18 +300,20 @@ public DiscoveryHandlerDO mapToDO(DiscoveryHandlerDTO discoveryHandlerDTO) {
		* @param discoveryUpstreamDO discoveryUpstreamDO
		* @return DiscoveryUpstreamDTO
		*/
		public DiscoveryUpstreamDTO mapToDTO(final DiscoveryUpstreamDO discoveryUpstreamDO) {
		DiscoveryUpstreamDTO discoveryUpstreamDTO = new DiscoveryUpstreamDTO();
		discoveryUpstreamDTO.setProps(discoveryUpstreamDO.getProps());
		discoveryUpstreamDTO.setStatus(discoveryUpstreamDO.getStatus());
		discoveryUpstreamDTO.setUrl(discoveryUpstreamDO.getUrl());
		discoveryUpstreamDTO.setDiscoveryHandlerId(discoveryUpstreamDO.getDiscoveryHandlerId());
		discoveryUpstreamDTO.setProtocol(discoveryUpstreamDO.getProtocol());
		discoveryUpstreamDTO.setId(discoveryUpstreamDO.getId());
		discoveryUpstreamDTO.setWeight(discoveryUpstreamDO.getWeight());
		discoveryUpstreamDTO.setDateCreated(discoveryUpstreamDO.getDateCreated());
		discoveryUpstreamDTO.setDateUpdated(discoveryUpstreamDO.getDateUpdated());
		return discoveryUpstreamDTO;
		public DiscoveryUpstreamDTO mapToDTO(DiscoveryUpstreamDO discoveryUpstreamDO) {
		return Optional.ofNullable(discoveryUpstreamDO).map(data -> {
		DiscoveryUpstreamDTO discoveryUpstreamDTO = new DiscoveryUpstreamDTO();
		discoveryUpstreamDTO.setProps(data.getProps());
		discoveryUpstreamDTO.setStatus(data.getStatus());
		discoveryUpstreamDTO.setUrl(data.getUrl());
		discoveryUpstreamDTO.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
		discoveryUpstreamDTO.setProtocol(data.getProtocol());
		discoveryUpstreamDTO.setId(data.getId());
		discoveryUpstreamDTO.setWeight(data.getWeight());
		discoveryUpstreamDTO.setDateCreated(data.getDateCreated());
		discoveryUpstreamDTO.setDateUpdated(data.getDateUpdated());
		return discoveryUpstreamDTO;
		}).orElse(null);
		}

		}