Skip to content

The Unified and Autonomous Development Platform

updates discord package names to conform OneDev conventions

Vladimir Ziablitskiid01a9eb889e1
diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xml
index 9eeb051840..0403539d65 100644
--- a/server-plugin/server-plugin-sso-discord/pom.xml
+++ b/server-plugin/server-plugin-sso-discord/pom.xml
@@ -8,6 +8,6 @@
<version>7.0.3</version>
</parent>
<properties>
- <moduleClass>org.server.plugin.sso.discord.DiscordModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
similarity index 94%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
index a3558627e9..4fcba6778b 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordAuthorizationCodeResponse.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.discord;
+package io.onedev.server.plugin.sso.discord;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java
similarity index 92%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordConnector.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java
index ede6f9a1e6..c84f92ba75 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordConnector.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.discord;
+package io.onedev.server.plugin.sso.discord;
import java.io.IOException;
import java.net.URI;
@@ -16,16 +16,16 @@ import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.hibernate.validator.constraints.NotEmpty;
import org.json.JSONObject;
-import org.server.plugin.sso.oauth2.discord.AccessTokenResponse;
-import org.server.plugin.sso.oauth2.discord.Request;
-import org.server.plugin.sso.oauth2.discord.UserGuildsResponse;
-import org.server.plugin.sso.oauth2.discord.UserInfoResponse;
import org.json.JSONException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
import io.onedev.server.model.support.administration.sso.SsoConnector;
+import io.onedev.server.plugin.sso.discord.oauth2.AccessTokenResponse;
+import io.onedev.server.plugin.sso.discord.oauth2.Request;
+import io.onedev.server.plugin.sso.discord.oauth2.UserGuildsResponse;
+import io.onedev.server.plugin.sso.discord.oauth2.UserInfoResponse;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
@@ -195,5 +195,4 @@ public class DiscordConnector extends SsoConnector {
return metadata;
}
-
}
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordModule.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordModule.java
similarity index 91%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordModule.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordModule.java
index cda86eb054..ca8a400c00 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/DiscordModule.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordModule.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.discord;
+package io.onedev.server.plugin.sso.discord;
import java.util.Collection;
@@ -30,8 +30,6 @@ public class DiscordModule extends AbstractPluginModule {
public Collection<Class<?>> getImplementations() {
return Sets.newHashSet(DiscordConnector.class);
}
-
});
}
-
}
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/discord.png b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/discord.png
similarity index 100%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/discord/discord.png
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/discord.png
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/AccessTokenResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java
similarity index 93%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/AccessTokenResponse.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java
index 3cea6b3ef4..dc3eb9860f 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/AccessTokenResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/AccessTokenResponse.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.oauth2.discord;
+package io.onedev.server.plugin.sso.discord.oauth2;
import org.apache.commons.lang.StringUtils;
import org.json.JSONException;
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Request.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java
similarity index 95%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Request.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java
index cdeb65d36b..4438c6516d 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Request.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Request.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.oauth2.discord;
+package io.onedev.server.plugin.sso.discord.oauth2;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Response.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Response.java
similarity index 89%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Response.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Response.java
index 25954b5a39..304f58bbc2 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Response.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Response.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.oauth2.discord;
+package io.onedev.server.plugin.sso.discord.oauth2;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/UserGuildsResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java
similarity index 90%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/UserGuildsResponse.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java
index f80e296de1..614350b6f8 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/UserGuildsResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.oauth2.discord;
+package io.onedev.server.plugin.sso.discord.oauth2;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -26,5 +26,4 @@ public class UserGuildsResponse extends Response {
return null;
}
-
}
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/UserInfoResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserInfoResponse.java
similarity index 87%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/UserInfoResponse.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserInfoResponse.java
index cead0f483a..c914be28c9 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/UserInfoResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserInfoResponse.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.oauth2.discord;
+package io.onedev.server.plugin.sso.discord.oauth2;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Utils.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Utils.java
similarity index 91%
rename from server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Utils.java
rename to server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Utils.java
index 92ef0e8ca8..0de8080240 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/org/server/plugin/sso/oauth2/discord/Utils.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/Utils.java
@@ -1,4 +1,4 @@
-package org.server.plugin.sso.oauth2.discord;
+package io.onedev.server.plugin.sso.discord.oauth2;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;