diff --git a/pom.xml b/pom.xml index b8e9908..1c48943 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.imgfloat + dev.kruhlmann imgfloat 0.0.1-SNAPSHOT Imgfloat diff --git a/src/main/java/com/imgfloat/app/ImgfloatApplication.java b/src/main/java/dev/kruhlmann/imgfloat/ImgfloatApplication.java similarity index 90% rename from src/main/java/com/imgfloat/app/ImgfloatApplication.java rename to src/main/java/dev/kruhlmann/imgfloat/ImgfloatApplication.java index e9f180b..477fe67 100644 --- a/src/main/java/com/imgfloat/app/ImgfloatApplication.java +++ b/src/main/java/dev/kruhlmann/imgfloat/ImgfloatApplication.java @@ -1,4 +1,4 @@ -package com.imgfloat.app; +package dev.kruhlmann.imgfloat; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/imgfloat/app/config/OAuth2RestTemplateFactory.java b/src/main/java/dev/kruhlmann/imgfloat/config/OAuth2RestTemplateFactory.java similarity index 96% rename from src/main/java/com/imgfloat/app/config/OAuth2RestTemplateFactory.java rename to src/main/java/dev/kruhlmann/imgfloat/config/OAuth2RestTemplateFactory.java index 562491f..e64d9ad 100644 --- a/src/main/java/com/imgfloat/app/config/OAuth2RestTemplateFactory.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/OAuth2RestTemplateFactory.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import java.util.Arrays; diff --git a/src/main/java/com/imgfloat/app/config/OpenApiConfig.java b/src/main/java/dev/kruhlmann/imgfloat/config/OpenApiConfig.java similarity index 97% rename from src/main/java/com/imgfloat/app/config/OpenApiConfig.java rename to src/main/java/dev/kruhlmann/imgfloat/config/OpenApiConfig.java index 0d873d2..c961e0c 100644 --- a/src/main/java/com/imgfloat/app/config/OpenApiConfig.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/OpenApiConfig.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Components; diff --git a/src/main/java/com/imgfloat/app/config/SchemaMigration.java b/src/main/java/dev/kruhlmann/imgfloat/config/SchemaMigration.java similarity index 99% rename from src/main/java/com/imgfloat/app/config/SchemaMigration.java rename to src/main/java/dev/kruhlmann/imgfloat/config/SchemaMigration.java index bd3f1b9..c59fade 100644 --- a/src/main/java/com/imgfloat/app/config/SchemaMigration.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/SchemaMigration.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/imgfloat/app/config/SecurityConfig.java b/src/main/java/dev/kruhlmann/imgfloat/config/SecurityConfig.java similarity index 98% rename from src/main/java/com/imgfloat/app/config/SecurityConfig.java rename to src/main/java/dev/kruhlmann/imgfloat/config/SecurityConfig.java index 0418d91..ca0de07 100644 --- a/src/main/java/com/imgfloat/app/config/SecurityConfig.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/imgfloat/app/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java similarity index 98% rename from src/main/java/com/imgfloat/app/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java rename to src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java index cc3e53a..b8f8f37 100644 --- a/src/main/java/com/imgfloat/app/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverter.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import java.net.URI; import java.util.ArrayList; diff --git a/src/main/java/com/imgfloat/app/config/TwitchClientRegistrationConfig.java b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchClientRegistrationConfig.java similarity index 99% rename from src/main/java/com/imgfloat/app/config/TwitchClientRegistrationConfig.java rename to src/main/java/dev/kruhlmann/imgfloat/config/TwitchClientRegistrationConfig.java index 373662e..2b073fa 100644 --- a/src/main/java/com/imgfloat/app/config/TwitchClientRegistrationConfig.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchClientRegistrationConfig.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/imgfloat/app/config/TwitchCredentialsValidator.java b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchCredentialsValidator.java similarity index 96% rename from src/main/java/com/imgfloat/app/config/TwitchCredentialsValidator.java rename to src/main/java/dev/kruhlmann/imgfloat/config/TwitchCredentialsValidator.java index 1e1a606..28405de 100644 --- a/src/main/java/com/imgfloat/app/config/TwitchCredentialsValidator.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchCredentialsValidator.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/imgfloat/app/config/TwitchOAuth2ErrorResponseErrorHandler.java b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2ErrorResponseErrorHandler.java similarity index 99% rename from src/main/java/com/imgfloat/app/config/TwitchOAuth2ErrorResponseErrorHandler.java rename to src/main/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2ErrorResponseErrorHandler.java index 74ad11b..37cf694 100644 --- a/src/main/java/com/imgfloat/app/config/TwitchOAuth2ErrorResponseErrorHandler.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2ErrorResponseErrorHandler.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import java.io.IOException; import java.io.ByteArrayInputStream; diff --git a/src/main/java/com/imgfloat/app/config/TwitchOAuth2UserService.java b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2UserService.java similarity index 99% rename from src/main/java/com/imgfloat/app/config/TwitchOAuth2UserService.java rename to src/main/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2UserService.java index d94da1a..f7a8073 100644 --- a/src/main/java/com/imgfloat/app/config/TwitchOAuth2UserService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2UserService.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/imgfloat/app/config/WebSocketConfig.java b/src/main/java/dev/kruhlmann/imgfloat/config/WebSocketConfig.java similarity index 95% rename from src/main/java/com/imgfloat/app/config/WebSocketConfig.java rename to src/main/java/dev/kruhlmann/imgfloat/config/WebSocketConfig.java index f2879f3..e63d29d 100644 --- a/src/main/java/com/imgfloat/app/config/WebSocketConfig.java +++ b/src/main/java/dev/kruhlmann/imgfloat/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; diff --git a/src/main/java/com/imgfloat/app/controller/ChannelApiController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java similarity index 97% rename from src/main/java/com/imgfloat/app/controller/ChannelApiController.java rename to src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java index 641be4c..4ae5311 100644 --- a/src/main/java/com/imgfloat/app/controller/ChannelApiController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java @@ -1,14 +1,14 @@ -package com.imgfloat.app.controller; +package dev.kruhlmann.imgfloat.controller; -import com.imgfloat.app.model.AdminRequest; -import com.imgfloat.app.model.AssetView; -import com.imgfloat.app.model.CanvasSettingsRequest; -import com.imgfloat.app.model.PlaybackRequest; -import com.imgfloat.app.model.TransformRequest; -import com.imgfloat.app.model.TwitchUserProfile; -import com.imgfloat.app.model.VisibilityRequest; -import com.imgfloat.app.service.ChannelDirectoryService; -import com.imgfloat.app.service.TwitchUserLookupService; +import dev.kruhlmann.imgfloat.model.AdminRequest; +import dev.kruhlmann.imgfloat.model.AssetView; +import dev.kruhlmann.imgfloat.model.CanvasSettingsRequest; +import dev.kruhlmann.imgfloat.model.PlaybackRequest; +import dev.kruhlmann.imgfloat.model.TransformRequest; +import dev.kruhlmann.imgfloat.model.TwitchUserProfile; +import dev.kruhlmann.imgfloat.model.VisibilityRequest; +import dev.kruhlmann.imgfloat.service.ChannelDirectoryService; +import dev.kruhlmann.imgfloat.service.TwitchUserLookupService; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import jakarta.validation.Valid; import org.slf4j.Logger; diff --git a/src/main/java/com/imgfloat/app/controller/ChannelDirectoryApiController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelDirectoryApiController.java similarity index 88% rename from src/main/java/com/imgfloat/app/controller/ChannelDirectoryApiController.java rename to src/main/java/dev/kruhlmann/imgfloat/controller/ChannelDirectoryApiController.java index d1ee528..db8c2da 100644 --- a/src/main/java/com/imgfloat/app/controller/ChannelDirectoryApiController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelDirectoryApiController.java @@ -1,6 +1,6 @@ -package com.imgfloat.app.controller; +package dev.kruhlmann.imgfloat.controller; -import com.imgfloat.app.service.ChannelDirectoryService; +import dev.kruhlmann.imgfloat.service.ChannelDirectoryService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/com/imgfloat/app/controller/ViewController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java similarity index 90% rename from src/main/java/com/imgfloat/app/controller/ViewController.java rename to src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java index 4c27139..86708f3 100644 --- a/src/main/java/com/imgfloat/app/controller/ViewController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java @@ -1,7 +1,7 @@ -package com.imgfloat.app.controller; +package dev.kruhlmann.imgfloat.controller; -import com.imgfloat.app.service.ChannelDirectoryService; -import com.imgfloat.app.service.GitVersionService; +import dev.kruhlmann.imgfloat.service.ChannelDirectoryService; +import dev.kruhlmann.imgfloat.service.VersionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; @@ -15,11 +15,11 @@ import static org.springframework.http.HttpStatus.FORBIDDEN; public class ViewController { private static final Logger LOG = LoggerFactory.getLogger(ViewController.class); private final ChannelDirectoryService channelDirectoryService; - private final GitVersionService gitVersionService; + private final VersionService versionService; - public ViewController(ChannelDirectoryService channelDirectoryService, GitVersionService gitVersionService) { + public ViewController(ChannelDirectoryService channelDirectoryService, VersionService versionService) { this.channelDirectoryService = channelDirectoryService; - this.gitVersionService = gitVersionService; + this.versionService = versionService; } @org.springframework.web.bind.annotation.GetMapping("/") @@ -32,7 +32,7 @@ public class ViewController { model.addAttribute("adminChannels", channelDirectoryService.adminChannelsFor(login)); return "dashboard"; } - model.addAttribute("gitVersion", gitVersionService.getVersion()); + model.addAttribute("version", versionService.getVersion()); return "index"; } diff --git a/src/main/java/com/imgfloat/app/model/AdminRequest.java b/src/main/java/dev/kruhlmann/imgfloat/model/AdminRequest.java similarity index 87% rename from src/main/java/com/imgfloat/app/model/AdminRequest.java rename to src/main/java/dev/kruhlmann/imgfloat/model/AdminRequest.java index edf2186..5416be7 100644 --- a/src/main/java/com/imgfloat/app/model/AdminRequest.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/AdminRequest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/imgfloat/app/model/Asset.java b/src/main/java/dev/kruhlmann/imgfloat/model/Asset.java similarity index 99% rename from src/main/java/com/imgfloat/app/model/Asset.java rename to src/main/java/dev/kruhlmann/imgfloat/model/Asset.java index 620f340..63b6a43 100644 --- a/src/main/java/com/imgfloat/app/model/Asset.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/Asset.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/imgfloat/app/model/AssetEvent.java b/src/main/java/dev/kruhlmann/imgfloat/model/AssetEvent.java similarity index 98% rename from src/main/java/com/imgfloat/app/model/AssetEvent.java rename to src/main/java/dev/kruhlmann/imgfloat/model/AssetEvent.java index 71b1134..10ef66d 100644 --- a/src/main/java/com/imgfloat/app/model/AssetEvent.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/AssetEvent.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; public class AssetEvent { public enum Type { diff --git a/src/main/java/com/imgfloat/app/model/AssetPatch.java b/src/main/java/dev/kruhlmann/imgfloat/model/AssetPatch.java similarity index 97% rename from src/main/java/com/imgfloat/app/model/AssetPatch.java rename to src/main/java/dev/kruhlmann/imgfloat/model/AssetPatch.java index f08bb10..6381a1c 100644 --- a/src/main/java/com/imgfloat/app/model/AssetPatch.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/AssetPatch.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; /** * Represents a partial update for an {@link Asset}. Only the fields that changed diff --git a/src/main/java/com/imgfloat/app/model/AssetView.java b/src/main/java/dev/kruhlmann/imgfloat/model/AssetView.java similarity index 97% rename from src/main/java/com/imgfloat/app/model/AssetView.java rename to src/main/java/dev/kruhlmann/imgfloat/model/AssetView.java index 0d0bdb8..aaa70d9 100644 --- a/src/main/java/com/imgfloat/app/model/AssetView.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/AssetView.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; import java.time.Instant; diff --git a/src/main/java/com/imgfloat/app/model/CanvasSettingsRequest.java b/src/main/java/dev/kruhlmann/imgfloat/model/CanvasSettingsRequest.java similarity index 94% rename from src/main/java/com/imgfloat/app/model/CanvasSettingsRequest.java rename to src/main/java/dev/kruhlmann/imgfloat/model/CanvasSettingsRequest.java index 187e9dd..99e7fd7 100644 --- a/src/main/java/com/imgfloat/app/model/CanvasSettingsRequest.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/CanvasSettingsRequest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; import jakarta.validation.constraints.Positive; diff --git a/src/main/java/com/imgfloat/app/model/Channel.java b/src/main/java/dev/kruhlmann/imgfloat/model/Channel.java similarity index 98% rename from src/main/java/com/imgfloat/app/model/Channel.java rename to src/main/java/dev/kruhlmann/imgfloat/model/Channel.java index 3d3f7c8..4818604 100644 --- a/src/main/java/com/imgfloat/app/model/Channel.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/Channel.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; import jakarta.persistence.CollectionTable; import jakarta.persistence.Column; diff --git a/src/main/java/com/imgfloat/app/model/PlaybackRequest.java b/src/main/java/dev/kruhlmann/imgfloat/model/PlaybackRequest.java similarity index 85% rename from src/main/java/com/imgfloat/app/model/PlaybackRequest.java rename to src/main/java/dev/kruhlmann/imgfloat/model/PlaybackRequest.java index 0d5c73d..b3d4495 100644 --- a/src/main/java/com/imgfloat/app/model/PlaybackRequest.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/PlaybackRequest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; public class PlaybackRequest { private Boolean play; diff --git a/src/main/java/com/imgfloat/app/model/TransformRequest.java b/src/main/java/dev/kruhlmann/imgfloat/model/TransformRequest.java similarity index 98% rename from src/main/java/com/imgfloat/app/model/TransformRequest.java rename to src/main/java/dev/kruhlmann/imgfloat/model/TransformRequest.java index 7cddb3f..f66adc0 100644 --- a/src/main/java/com/imgfloat/app/model/TransformRequest.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/TransformRequest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; diff --git a/src/main/java/com/imgfloat/app/model/TwitchUserProfile.java b/src/main/java/dev/kruhlmann/imgfloat/model/TwitchUserProfile.java similarity index 89% rename from src/main/java/com/imgfloat/app/model/TwitchUserProfile.java rename to src/main/java/dev/kruhlmann/imgfloat/model/TwitchUserProfile.java index 72fe233..4cb4d18 100644 --- a/src/main/java/com/imgfloat/app/model/TwitchUserProfile.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/TwitchUserProfile.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; /** * Minimal Twitch user details used for rendering avatars and display names. diff --git a/src/main/java/com/imgfloat/app/model/VisibilityRequest.java b/src/main/java/dev/kruhlmann/imgfloat/model/VisibilityRequest.java similarity index 84% rename from src/main/java/com/imgfloat/app/model/VisibilityRequest.java rename to src/main/java/dev/kruhlmann/imgfloat/model/VisibilityRequest.java index 04852a2..2afac76 100644 --- a/src/main/java/com/imgfloat/app/model/VisibilityRequest.java +++ b/src/main/java/dev/kruhlmann/imgfloat/model/VisibilityRequest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.model; +package dev.kruhlmann.imgfloat.model; public class VisibilityRequest { private boolean hidden; diff --git a/src/main/java/com/imgfloat/app/repository/AssetRepository.java b/src/main/java/dev/kruhlmann/imgfloat/repository/AssetRepository.java similarity index 76% rename from src/main/java/com/imgfloat/app/repository/AssetRepository.java rename to src/main/java/dev/kruhlmann/imgfloat/repository/AssetRepository.java index 416bd49..65ee5dd 100644 --- a/src/main/java/com/imgfloat/app/repository/AssetRepository.java +++ b/src/main/java/dev/kruhlmann/imgfloat/repository/AssetRepository.java @@ -1,6 +1,6 @@ -package com.imgfloat.app.repository; +package dev.kruhlmann.imgfloat.repository; -import com.imgfloat.app.model.Asset; +import dev.kruhlmann.imgfloat.model.Asset; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/imgfloat/app/repository/ChannelRepository.java b/src/main/java/dev/kruhlmann/imgfloat/repository/ChannelRepository.java similarity index 75% rename from src/main/java/com/imgfloat/app/repository/ChannelRepository.java rename to src/main/java/dev/kruhlmann/imgfloat/repository/ChannelRepository.java index 6f96f35..17b7e11 100644 --- a/src/main/java/com/imgfloat/app/repository/ChannelRepository.java +++ b/src/main/java/dev/kruhlmann/imgfloat/repository/ChannelRepository.java @@ -1,6 +1,6 @@ -package com.imgfloat.app.repository; +package dev.kruhlmann.imgfloat.repository; -import com.imgfloat.app.model.Channel; +import dev.kruhlmann.imgfloat.model.Channel; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/imgfloat/app/service/AssetStorageService.java b/src/main/java/dev/kruhlmann/imgfloat/service/AssetStorageService.java similarity index 98% rename from src/main/java/com/imgfloat/app/service/AssetStorageService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/AssetStorageService.java index 74554c2..247cadb 100644 --- a/src/main/java/com/imgfloat/app/service/AssetStorageService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/AssetStorageService.java @@ -1,6 +1,6 @@ -package com.imgfloat.app.service; +package dev.kruhlmann.imgfloat.service; -import com.imgfloat.app.service.media.AssetContent; +import dev.kruhlmann.imgfloat.service.media.AssetContent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/imgfloat/app/service/ChannelDirectoryService.java b/src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java similarity index 95% rename from src/main/java/com/imgfloat/app/service/ChannelDirectoryService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java index e02900e..cc30d9a 100644 --- a/src/main/java/com/imgfloat/app/service/ChannelDirectoryService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java @@ -1,16 +1,16 @@ -package com.imgfloat.app.service; +package dev.kruhlmann.imgfloat.service; -import com.imgfloat.app.model.Asset; -import com.imgfloat.app.model.AssetEvent; -import com.imgfloat.app.model.AssetPatch; -import com.imgfloat.app.model.Channel; -import com.imgfloat.app.model.AssetView; -import com.imgfloat.app.model.CanvasSettingsRequest; -import com.imgfloat.app.model.PlaybackRequest; -import com.imgfloat.app.model.TransformRequest; -import com.imgfloat.app.model.VisibilityRequest; -import com.imgfloat.app.repository.AssetRepository; -import com.imgfloat.app.repository.ChannelRepository; +import dev.kruhlmann.imgfloat.model.Asset; +import dev.kruhlmann.imgfloat.model.AssetEvent; +import dev.kruhlmann.imgfloat.model.AssetPatch; +import dev.kruhlmann.imgfloat.model.Channel; +import dev.kruhlmann.imgfloat.model.AssetView; +import dev.kruhlmann.imgfloat.model.CanvasSettingsRequest; +import dev.kruhlmann.imgfloat.model.PlaybackRequest; +import dev.kruhlmann.imgfloat.model.TransformRequest; +import dev.kruhlmann.imgfloat.model.VisibilityRequest; +import dev.kruhlmann.imgfloat.repository.AssetRepository; +import dev.kruhlmann.imgfloat.repository.ChannelRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.messaging.simp.SimpMessagingTemplate; @@ -26,10 +26,10 @@ import java.util.List; import java.util.Locale; import java.util.Optional; -import com.imgfloat.app.service.media.AssetContent; -import com.imgfloat.app.service.media.MediaDetectionService; -import com.imgfloat.app.service.media.MediaOptimizationService; -import com.imgfloat.app.service.media.OptimizedAsset; +import dev.kruhlmann.imgfloat.service.media.AssetContent; +import dev.kruhlmann.imgfloat.service.media.MediaDetectionService; +import dev.kruhlmann.imgfloat.service.media.MediaOptimizationService; +import dev.kruhlmann.imgfloat.service.media.OptimizedAsset; import static org.springframework.http.HttpStatus.BAD_REQUEST; diff --git a/src/main/java/com/imgfloat/app/service/TwitchUserLookupService.java b/src/main/java/dev/kruhlmann/imgfloat/service/TwitchUserLookupService.java similarity index 98% rename from src/main/java/com/imgfloat/app/service/TwitchUserLookupService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/TwitchUserLookupService.java index 73a2686..281b2a4 100644 --- a/src/main/java/com/imgfloat/app/service/TwitchUserLookupService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/TwitchUserLookupService.java @@ -1,6 +1,6 @@ -package com.imgfloat.app.service; +package dev.kruhlmann.imgfloat.service; -import com.imgfloat.app.model.TwitchUserProfile; +import dev.kruhlmann.imgfloat.model.TwitchUserProfile; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import org.slf4j.Logger; diff --git a/src/main/java/com/imgfloat/app/service/GitVersionService.java b/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java similarity index 84% rename from src/main/java/com/imgfloat/app/service/GitVersionService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java index 59fb8d8..f429aa1 100644 --- a/src/main/java/com/imgfloat/app/service/GitVersionService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.service; +package dev.kruhlmann.imgfloat.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,11 +9,11 @@ import java.io.IOException; import java.io.InputStreamReader; @Component -public class GitVersionService { - private static final Logger LOG = LoggerFactory.getLogger(GitVersionService.class); +public class VersionService { + private static final Logger LOG = LoggerFactory.getLogger(VersionService.class); private final String version; - public GitVersionService() { + public VersionService() { this.version = resolveVersion(); } @@ -22,20 +22,20 @@ public class GitVersionService { } private String resolveVersion() { - String gitDescribeVersion = tryGitDescribe(); - if (gitDescribeVersion != null) { - return gitDescribeVersion; - } - String manifestVersion = getClass().getPackage().getImplementationVersion(); if (manifestVersion != null && !manifestVersion.isBlank()) { return manifestVersion; } + String gitDescribeVersion = getGitVersionString(); + if (gitDescribeVersion != null) { + return "git-" + gitDescribeVersion; + } + return "unknown"; } - private String tryGitDescribe() { + private String getGitVersionString() { Process process = null; try { process = new ProcessBuilder("git", "describe", "--tags", "--always") diff --git a/src/main/java/com/imgfloat/app/service/media/AssetContent.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java similarity index 58% rename from src/main/java/com/imgfloat/app/service/media/AssetContent.java rename to src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java index aacd42e..ab2180d 100644 --- a/src/main/java/com/imgfloat/app/service/media/AssetContent.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java @@ -1,3 +1,3 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; public record AssetContent(byte[] bytes, String mediaType) { } diff --git a/src/main/java/com/imgfloat/app/service/media/MediaDetectionService.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaDetectionService.java similarity index 97% rename from src/main/java/com/imgfloat/app/service/media/MediaDetectionService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/media/MediaDetectionService.java index ce11ab3..ac25609 100644 --- a/src/main/java/com/imgfloat/app/service/media/MediaDetectionService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaDetectionService.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/imgfloat/app/service/media/MediaOptimizationService.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java similarity index 99% rename from src/main/java/com/imgfloat/app/service/media/MediaOptimizationService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java index 2f62cae..02351d9 100644 --- a/src/main/java/com/imgfloat/app/service/media/MediaOptimizationService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; import org.jcodec.api.FrameGrab; import org.jcodec.api.JCodecException; diff --git a/src/main/java/com/imgfloat/app/service/media/MediaPreviewService.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaPreviewService.java similarity index 97% rename from src/main/java/com/imgfloat/app/service/media/MediaPreviewService.java rename to src/main/java/dev/kruhlmann/imgfloat/service/media/MediaPreviewService.java index e645bd7..a83acac 100644 --- a/src/main/java/com/imgfloat/app/service/media/MediaPreviewService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaPreviewService.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; import org.jcodec.api.FrameGrab; import org.jcodec.api.JCodecException; diff --git a/src/main/java/com/imgfloat/app/service/media/OptimizedAsset.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java similarity index 70% rename from src/main/java/com/imgfloat/app/service/media/OptimizedAsset.java rename to src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java index 0397bc6..21a4a6b 100644 --- a/src/main/java/com/imgfloat/app/service/media/OptimizedAsset.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java @@ -1,3 +1,3 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; public record OptimizedAsset(byte[] bytes, String mediaType, int width, int height, byte[] previewBytes) { } diff --git a/src/main/node/package.json b/src/main/node/package.json index aaa98d4..01af957 100644 --- a/src/main/node/package.json +++ b/src/main/node/package.json @@ -9,7 +9,7 @@ "dist:mac": "electron-builder --mac" }, "build": { - "appId": "com.imgfloat.overlay", + "appId": "dev.kruhlmann.imgfloat.overlay", "productName": "Imgfloat", "files": [ "app.js" diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f8b4770..b46b099 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -32,7 +32,7 @@ diff --git a/src/test/java/com/imgfloat/app/ChannelApiIntegrationTest.java b/src/test/java/dev/kruhlmann/imgfloat/ChannelApiIntegrationTest.java similarity index 98% rename from src/test/java/com/imgfloat/app/ChannelApiIntegrationTest.java rename to src/test/java/dev/kruhlmann/imgfloat/ChannelApiIntegrationTest.java index 15badc8..9166ec3 100644 --- a/src/test/java/com/imgfloat/app/ChannelApiIntegrationTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/ChannelApiIntegrationTest.java @@ -1,7 +1,7 @@ -package com.imgfloat.app; +package dev.kruhlmann.imgfloat; import com.fasterxml.jackson.databind.ObjectMapper; -import com.imgfloat.app.model.VisibilityRequest; +import dev.kruhlmann.imgfloat.model.VisibilityRequest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; diff --git a/src/test/java/com/imgfloat/app/ChannelDirectoryApiIntegrationTest.java b/src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryApiIntegrationTest.java similarity index 92% rename from src/test/java/com/imgfloat/app/ChannelDirectoryApiIntegrationTest.java rename to src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryApiIntegrationTest.java index e80ca8e..39e478c 100644 --- a/src/test/java/com/imgfloat/app/ChannelDirectoryApiIntegrationTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryApiIntegrationTest.java @@ -1,7 +1,7 @@ -package com.imgfloat.app; +package dev.kruhlmann.imgfloat; -import com.imgfloat.app.model.Channel; -import com.imgfloat.app.repository.ChannelRepository; +import dev.kruhlmann.imgfloat.model.Channel; +import dev.kruhlmann.imgfloat.repository.ChannelRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/imgfloat/app/ChannelDirectoryServiceTest.java b/src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryServiceTest.java similarity index 92% rename from src/test/java/com/imgfloat/app/ChannelDirectoryServiceTest.java rename to src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryServiceTest.java index 3b6e280..65d6c9d 100644 --- a/src/test/java/com/imgfloat/app/ChannelDirectoryServiceTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryServiceTest.java @@ -1,17 +1,17 @@ -package com.imgfloat.app; +package dev.kruhlmann.imgfloat; -import com.imgfloat.app.model.TransformRequest; -import com.imgfloat.app.model.VisibilityRequest; -import com.imgfloat.app.model.Asset; -import com.imgfloat.app.model.AssetView; -import com.imgfloat.app.model.Channel; -import com.imgfloat.app.repository.AssetRepository; -import com.imgfloat.app.repository.ChannelRepository; -import com.imgfloat.app.service.ChannelDirectoryService; -import com.imgfloat.app.service.AssetStorageService; -import com.imgfloat.app.service.media.MediaDetectionService; -import com.imgfloat.app.service.media.MediaOptimizationService; -import com.imgfloat.app.service.media.MediaPreviewService; +import dev.kruhlmann.imgfloat.model.TransformRequest; +import dev.kruhlmann.imgfloat.model.VisibilityRequest; +import dev.kruhlmann.imgfloat.model.Asset; +import dev.kruhlmann.imgfloat.model.AssetView; +import dev.kruhlmann.imgfloat.model.Channel; +import dev.kruhlmann.imgfloat.repository.AssetRepository; +import dev.kruhlmann.imgfloat.repository.ChannelRepository; +import dev.kruhlmann.imgfloat.service.ChannelDirectoryService; +import dev.kruhlmann.imgfloat.service.AssetStorageService; +import dev.kruhlmann.imgfloat.service.media.MediaDetectionService; +import dev.kruhlmann.imgfloat.service.media.MediaOptimizationService; +import dev.kruhlmann.imgfloat.service.media.MediaPreviewService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/src/test/java/com/imgfloat/app/TwitchEnvironmentValidationTest.java b/src/test/java/dev/kruhlmann/imgfloat/TwitchEnvironmentValidationTest.java similarity index 96% rename from src/test/java/com/imgfloat/app/TwitchEnvironmentValidationTest.java rename to src/test/java/dev/kruhlmann/imgfloat/TwitchEnvironmentValidationTest.java index f74f7e0..7c0198e 100644 --- a/src/test/java/com/imgfloat/app/TwitchEnvironmentValidationTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/TwitchEnvironmentValidationTest.java @@ -1,6 +1,6 @@ -package com.imgfloat.app; +package dev.kruhlmann.imgfloat; -import com.imgfloat.app.config.TwitchCredentialsValidator; +import dev.kruhlmann.imgfloat.config.TwitchCredentialsValidator; import org.junit.jupiter.api.Test; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; diff --git a/src/test/java/com/imgfloat/app/config/TwitchAuthorizationCodeGrantRequestEntityConverterTest.java b/src/test/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverterTest.java similarity index 98% rename from src/test/java/com/imgfloat/app/config/TwitchAuthorizationCodeGrantRequestEntityConverterTest.java rename to src/test/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverterTest.java index 0ac1645..db6706e 100644 --- a/src/test/java/com/imgfloat/app/config/TwitchAuthorizationCodeGrantRequestEntityConverterTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/config/TwitchAuthorizationCodeGrantRequestEntityConverterTest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import org.junit.jupiter.api.Test; import org.springframework.http.RequestEntity; diff --git a/src/test/java/com/imgfloat/app/config/TwitchOAuth2ErrorResponseErrorHandlerTest.java b/src/test/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2ErrorResponseErrorHandlerTest.java similarity index 98% rename from src/test/java/com/imgfloat/app/config/TwitchOAuth2ErrorResponseErrorHandlerTest.java rename to src/test/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2ErrorResponseErrorHandlerTest.java index f9a84de..400e3f9 100644 --- a/src/test/java/com/imgfloat/app/config/TwitchOAuth2ErrorResponseErrorHandlerTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2ErrorResponseErrorHandlerTest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import java.net.URI; diff --git a/src/test/java/com/imgfloat/app/config/TwitchOAuth2UserServiceTest.java b/src/test/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2UserServiceTest.java similarity index 98% rename from src/test/java/com/imgfloat/app/config/TwitchOAuth2UserServiceTest.java rename to src/test/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2UserServiceTest.java index 34e8936..bd1dd06 100644 --- a/src/test/java/com/imgfloat/app/config/TwitchOAuth2UserServiceTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/config/TwitchOAuth2UserServiceTest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.config; +package dev.kruhlmann.imgfloat.config; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; diff --git a/src/test/java/com/imgfloat/app/service/AssetStorageServiceTest.java b/src/test/java/dev/kruhlmann/imgfloat/service/AssetStorageServiceTest.java similarity index 94% rename from src/test/java/com/imgfloat/app/service/AssetStorageServiceTest.java rename to src/test/java/dev/kruhlmann/imgfloat/service/AssetStorageServiceTest.java index 4659779..b3fc7c2 100644 --- a/src/test/java/com/imgfloat/app/service/AssetStorageServiceTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/service/AssetStorageServiceTest.java @@ -1,6 +1,6 @@ -package com.imgfloat.app.service; +package dev.kruhlmann.imgfloat.service; -import com.imgfloat.app.service.media.AssetContent; +import dev.kruhlmann.imgfloat.service.media.AssetContent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/imgfloat/app/service/media/MediaDetectionServiceTest.java b/src/test/java/dev/kruhlmann/imgfloat/service/media/MediaDetectionServiceTest.java similarity index 96% rename from src/test/java/com/imgfloat/app/service/media/MediaDetectionServiceTest.java rename to src/test/java/dev/kruhlmann/imgfloat/service/media/MediaDetectionServiceTest.java index a0eba87..6b3fa53 100644 --- a/src/test/java/com/imgfloat/app/service/media/MediaDetectionServiceTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/service/media/MediaDetectionServiceTest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockMultipartFile; diff --git a/src/test/java/com/imgfloat/app/service/media/MediaOptimizationServiceTest.java b/src/test/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationServiceTest.java similarity index 97% rename from src/test/java/com/imgfloat/app/service/media/MediaOptimizationServiceTest.java rename to src/test/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationServiceTest.java index 7ad523e..25e7a33 100644 --- a/src/test/java/com/imgfloat/app/service/media/MediaOptimizationServiceTest.java +++ b/src/test/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationServiceTest.java @@ -1,4 +1,4 @@ -package com.imgfloat.app.service.media; +package dev.kruhlmann.imgfloat.service.media; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;