Skip to content

Commit

Permalink
[type:fix] fix word spelling error and class name error ,and so on..(#…
Browse files Browse the repository at this point in the history
…5636)(#5639) (#5653)

* �optimize start.sh ,support different jdk configure JAVA_OPTS parameter

�optimize start.sh ,support different jdk configure JAVA_OPTS parameter

* fix start.bat ,support different JDK work and logs dir

* Update start.bat

* fix start.bat(ISSUE#2814)

fix start.bat [shenyu-bootstrap-dist missing agent parameter in start.bat script (Issue #2814)]

* Revert "fix start.bat(ISSUE#2814)"

This reverts commit cf002c9.

* fix start.bat (Issue #2814)

* Update start.bat

* fix stop.sh exxcute failed in macos

* fix stop.sh execute failed in macos (#3187)

* fix stop.sh execute failed in macos (#3187)

* [type:fix] fix class AdminConstants has word spelling error(#5636)

* [type:fix] fix word spelling error and class name error ,and so on..(#5636) (#5639)

---------

Co-authored-by: xiaoyu <xiaoyu@apache.org>
  • Loading branch information
IceFoxs and yu199195 committed Sep 5, 2024
1 parent f87d41b commit ade3ac3
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ public void onProxySelectorChanged(final List<ProxySelectorData> proxySelectorDa
}

@Override
public void onDiscoveryUpstreamChanged(final List<DiscoverySyncData> discoeryUpstreamList, final DataEventTypeEnum eventType) {
public void onDiscoveryUpstreamChanged(final List<DiscoverySyncData> discoveryUpstreamList, final DataEventTypeEnum eventType) {
WebsocketData<DiscoverySyncData> configData =
new WebsocketData<>(ConfigGroupEnum.DISCOVER_UPSTREAM.name(), eventType.name(), discoeryUpstreamList);
new WebsocketData<>(ConfigGroupEnum.DISCOVER_UPSTREAM.name(), eventType.name(), discoveryUpstreamList);
WebsocketCollector.send(GsonUtils.getInstance().toJson(configData), eventType);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class PluginHandleChangedEvent extends AdminDataModelChangedEvent {
* Create a new {@code PluginChangedEvent}.operator is unknown.
*
* @param source Current plugin state
* @param before Before the change plugiin state
* @param before Before the change plugin state
* @param type event type
* @param operator operator
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class MetaDataChangedEvent extends AdminDataModelChangedEvent {
* Create a new {@code PluginChangedEvent}.operator is unknown.
*
* @param source Current plugin state
* @param before Before the change plugiin state
* @param before Before the change plugin state
* @param type event type
* @param operator operator
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public AlertReceiverServiceImpl(final AlertReceiverMapper alertReceiverMapper,

@Override
public void addReceiver(final AlertReceiverDTO alertReceiverDTO) {
AlertReceiverDO receiverDO = AlertTransfer.INSTANCE.mapToAlertReciverDO(alertReceiverDTO);
AlertReceiverDO receiverDO = AlertTransfer.INSTANCE.mapToAlertReceiverDO(alertReceiverDTO);
receiverDO.setId(UUIDUtils.getInstance().generateShortUuid());
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
receiverDO.setDateCreated(currentTime);
Expand All @@ -75,7 +75,7 @@ public void deleteReceiver(final List<String> ids) {

@Override
public void updateReceiver(final AlertReceiverDTO alertReceiverDTO) {
AlertReceiverDO receiverDO = AlertTransfer.INSTANCE.mapToAlertReciverDO(alertReceiverDTO);
AlertReceiverDO receiverDO = AlertTransfer.INSTANCE.mapToAlertReceiverDO(alertReceiverDTO);
alertDispatchService.clearCache();
alertReceiverMapper.updateByPrimaryKey(receiverDO);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public enum AlertTransfer {
* @param alertReceiverDTO the alert receiver dto
* @return the alert receiver do
*/
public AlertReceiverDO mapToAlertReciverDO(final AlertReceiverDTO alertReceiverDTO) {
public AlertReceiverDO mapToAlertReceiverDO(final AlertReceiverDTO alertReceiverDTO) {
return Optional.ofNullable(alertReceiverDTO)
.map(v -> {
AlertReceiverDO alertReceiverDO = new AlertReceiverDO();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void testSendTestMsg() {
}

private AlertReceiverDO buildAlertReceiverDO(final String id) {
AlertReceiverDO alertReceiverDO = AlertTransfer.INSTANCE.mapToAlertReciverDO(buildAlertReceiverDTO(id));
AlertReceiverDO alertReceiverDO = AlertTransfer.INSTANCE.mapToAlertReceiverDO(buildAlertReceiverDTO(id));
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
alertReceiverDO.setDateCreated(now);
alertReceiverDO.setDateUpdated(now);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void setUp() {

@Test
void testMapToEntity() {
AlertReceiverDO entity = AlertTransfer.INSTANCE.mapToAlertReciverDO(alertReceiverDTO);
AlertReceiverDO entity = AlertTransfer.INSTANCE.mapToAlertReceiverDO(alertReceiverDTO);
assertNotNull(entity);
assertEquals(entity.getId(), alertReceiverDTO.getId());
assertEquals(entity.getName(), alertReceiverDTO.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public String getDirectly(final String key) {
* @return value.
*/
public String get(final String key) {
TreeCache cache = findFromcache(key);
TreeCache cache = findFromCache(key);
if (Objects.isNull(cache)) {
return getDirectly(key);
}
Expand Down Expand Up @@ -257,7 +257,7 @@ public List<String> subscribeChildrenChanges(final String key, final CuratorWatc
* @param key key.
* @return cache.
*/
private TreeCache findFromcache(final String key) {
private TreeCache findFromCache(final String key) {
for (Map.Entry<String, TreeCache> cache : caches.entrySet()) {
if (key.startsWith(cache.getKey())) {
return cache.getValue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static synchronized List<PluginJarParser.PluginJar> loadExtendPlugins(fin
}
Sets.SetView<String> removePluginSet = Sets.difference(pluginJarName, currentPaths);
for (String removePath : removePluginSet) {
ShenyuPluginClassloaderHolder.getSingleton().removePluginClassLoader(removePath);
ShenyuPluginClassLoaderHolder.getSingleton().removePluginClassLoader(removePath);
}
pluginJarName = currentPaths;
return uploadPluginJars;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public ShenyuLoaderService(final ShenyuWebHandler webHandler, final CommonPlugin
public void loadExtOrUploadPlugins(final PluginData uploadedJarResource) {
try {
List<ShenyuLoaderResult> plugins = new ArrayList<>();
ShenyuPluginClassloaderHolder singleton = ShenyuPluginClassloaderHolder.getSingleton();
ShenyuPluginClassLoaderHolder singleton = ShenyuPluginClassLoaderHolder.getSingleton();
if (Objects.isNull(uploadedJarResource)) {
List<PluginJarParser.PluginJar> uploadPluginJars = ShenyuExtPathPluginJarLoader.loadExtendPlugins(shenyuConfig.getExtPlugin().getPath());
for (PluginJarParser.PluginJar extPath : uploadPluginJars) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
import java.util.concurrent.ConcurrentHashMap;

/**
* ShenyuPluginClassloaderHolder.
* ShenyuPluginClassLoaderHolder.
*/
public final class ShenyuPluginClassloaderHolder {
public final class ShenyuPluginClassLoaderHolder {

private static final ShenyuPluginClassloaderHolder HOLDER = new ShenyuPluginClassloaderHolder();
private static final ShenyuPluginClassLoaderHolder HOLDER = new ShenyuPluginClassLoaderHolder();

private final Map<String, ShenyuPluginClassLoader> pluginCache = new ConcurrentHashMap<>();

private ShenyuPluginClassloaderHolder() {
private ShenyuPluginClassLoaderHolder() {
}

/**
* getSingleton.
*
* @return ShenyuPluginClassloaderHolder
* @return ShenyuPluginClassLoaderHolder
*/
public static ShenyuPluginClassloaderHolder getSingleton() {
public static ShenyuPluginClassLoaderHolder getSingleton() {
return HOLDER;
}

Expand Down

0 comments on commit ade3ac3

Please sign in to comment.