diff --git a/src/main/java/org/octogration/Main.java b/src/main/java/org/octogration/TestExample.java similarity index 85% rename from src/main/java/org/octogration/Main.java rename to src/main/java/org/octogration/TestExample.java index 41fdc92..8424c36 100644 --- a/src/main/java/org/octogration/Main.java +++ b/src/main/java/org/octogration/TestExample.java @@ -1,11 +1,11 @@ package org.octogration; -import org.github.integration.config.GithubClientFactory; -import org.github.integration.config.GithubContext; +import org.octogration.config.GithubClientFactory; +import org.octogration.config.GithubContext; import lombok.extern.slf4j.Slf4j; @Slf4j -public class Main { +public class TestExample { public static void main(String[] args) { try { var githubClient = GithubClientFactory.createGithubClient(); diff --git a/src/main/java/org/octogration/config/GithubClientFactory.java b/src/main/java/org/octogration/config/GithubClientFactory.java index 1c6d17a..3d91197 100644 --- a/src/main/java/org/octogration/config/GithubClientFactory.java +++ b/src/main/java/org/octogration/config/GithubClientFactory.java @@ -1,8 +1,8 @@ package org.octogration.config; -import org.github.integration.rest.client.GithubAppClient; -import org.github.integration.rest.client.GithubClient; -import org.github.integration.rest.client.GithubIssuesClient; +import org.octogration.rest.client.GithubAppClient; +import org.octogration.rest.client.GithubClient; +import org.octogration.rest.client.GithubIssuesClient; import feign.Feign; import feign.gson.GsonDecoder; diff --git a/src/main/java/org/octogration/config/GithubContext.java b/src/main/java/org/octogration/config/GithubContext.java index d50246a..12aeab6 100644 --- a/src/main/java/org/octogration/config/GithubContext.java +++ b/src/main/java/org/octogration/config/GithubContext.java @@ -2,7 +2,7 @@ import java.util.Base64; import java.util.Map; -import org.github.integration.util.StringUtils; +import org.octogration.util.StringUtils; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/org/octogration/rest/client/GithubAppClient.java b/src/main/java/org/octogration/rest/client/GithubAppClient.java index 742d73e..524a2ab 100644 --- a/src/main/java/org/octogration/rest/client/GithubAppClient.java +++ b/src/main/java/org/octogration/rest/client/GithubAppClient.java @@ -1,7 +1,7 @@ package org.octogration.rest.client; import java.util.Map; -import org.github.integration.model.dto.GithubInstallationToken; +import org.octogration.model.dto.GithubInstallationToken; import feign.HeaderMap; import feign.Param; import feign.RequestLine; diff --git a/src/main/java/org/octogration/rest/client/GithubClient.java b/src/main/java/org/octogration/rest/client/GithubClient.java index e023ee2..c304caf 100644 --- a/src/main/java/org/octogration/rest/client/GithubClient.java +++ b/src/main/java/org/octogration/rest/client/GithubClient.java @@ -1,15 +1,15 @@ package org.octogration.rest.client; +import java.io.File; import java.util.List; import java.util.Map; -import org.github.integration.model.dto.Commit; -import org.github.integration.model.dto.CommitSha; -import org.github.integration.model.dto.File; -import org.github.integration.model.dto.GitBranchView; -import org.github.integration.model.dto.GitCollaboratorView; -import org.github.integration.model.dto.GitRepositoryView; -import org.github.integration.model.dto.GithubRateCommon; -import org.github.integration.model.dto.PullRequest; +import org.octogration.model.dto.Commit; +import org.octogration.model.dto.CommitSha; +import org.octogration.model.dto.GitBranchView; +import org.octogration.model.dto.GitCollaboratorView; +import org.octogration.model.dto.GitRepositoryView; +import org.octogration.model.dto.GithubRateCommon; +import org.octogration.model.dto.PullRequest; import feign.HeaderMap; import feign.Param; import feign.QueryMap; diff --git a/src/main/java/org/octogration/rest/client/GithubIssuesClient.java b/src/main/java/org/octogration/rest/client/GithubIssuesClient.java index da4b2dc..d83acb7 100644 --- a/src/main/java/org/octogration/rest/client/GithubIssuesClient.java +++ b/src/main/java/org/octogration/rest/client/GithubIssuesClient.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.Map; -import org.github.integration.model.dto.GitIssue; +import org.octogration.model.dto.GitIssue; import feign.HeaderMap; import feign.Param; import feign.QueryMap; diff --git a/src/main/java/org/octogration/rest/serializer/YearWeekJsonDeserializer.java b/src/main/java/org/octogration/rest/serializer/YearWeekJsonDeserializer.java deleted file mode 100644 index 50601fb..0000000 --- a/src/main/java/org/octogration/rest/serializer/YearWeekJsonDeserializer.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.octogration.rest.serializer; - -import java.io.IOException; -import org.threeten.extra.YearWeek; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.JsonNode; - -public class YearWeekJsonDeserializer extends JsonDeserializer { - - public static final String YEAR_FIELD = "year"; - public static final String WEEK_FIELD = "week"; - - @Override - public YearWeek deserialize(JsonParser jp, DeserializationContext context) throws IOException { - try { - ObjectCodec codec = jp.getCodec(); - JsonNode tree = codec.readTree(jp); - int year = tree.get(YEAR_FIELD).asInt(); - int week = tree.get(WEEK_FIELD).asInt(); - return YearWeek.of(year, week); - } catch (IOException ex) { - throw ex; - } catch (Exception ex) { - throw new JsonMappingException(jp, "Object deserialize error", ex); - } - - } - -} \ No newline at end of file diff --git a/src/main/java/org/octogration/rest/serializer/YearWeekJsonSerializer.java b/src/main/java/org/octogration/rest/serializer/YearWeekJsonSerializer.java deleted file mode 100644 index 963d810..0000000 --- a/src/main/java/org/octogration/rest/serializer/YearWeekJsonSerializer.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.octogration.rest.serializer; - -import java.io.IOException; -import org.threeten.extra.YearWeek; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; - -public class YearWeekJsonSerializer extends JsonSerializer { - - public static final String YEAR_FIELD = "year"; - public static final String WEEK_FIELD = "week"; - - @Override - public final void serialize(YearWeek yearWeek, JsonGenerator jgen, SerializerProvider provider) throws IOException { - try { - jgen.writeStartObject(); - jgen.writeNumberField(YEAR_FIELD, yearWeek.getYear()); - jgen.writeNumberField(WEEK_FIELD, yearWeek.getWeek()); - jgen.writeEndObject(); - } catch (IOException ex) { - throw ex; - } catch (Exception ex) { - throw new JsonMappingException(jgen, "Object serialize error", ex); - } - } - -} \ No newline at end of file diff --git a/src/main/java/org/octogration/util/StringUtils.java b/src/main/java/org/octogration/util/StringUtils.java index 7c08eb3..2a2b45f 100644 --- a/src/main/java/org/octogration/util/StringUtils.java +++ b/src/main/java/org/octogration/util/StringUtils.java @@ -2,8 +2,8 @@ public final class StringUtils { private StringUtils() { - } + public static boolean isEmpty(Object str) { return str == null || "".equals(str); }