fix: Move filtered Constants to hawkeye-core (#88)

This closes #85.

Signed-off-by: tison <wander4096@gmail.com>

.github/workflows/ci.yml

@@ -116,7 +116,9 @@ jobs:
  tags: ${{matrix.name}}:ci
  outputs: type=docker
  - name: Sanity check
- run: docker run --rm -v $(pwd):/github/workspace ${{matrix.name}}:ci check
+ run: |
+ docker run --rm -v $(pwd):/github/workspace ${{matrix.name}}:ci -V
+ docker run --rm -v $(pwd):/github/workspace ${{matrix.name}}:ci check
 
  required:
  name: Required

hawkeye-command/pom.xml

@@ -54,13 +54,4 @@
  <artifactId>slf4j-simple</artifactId>
  </dependency>
  </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
 </project>

hawkeye-command/src/main/java/io/korandoru/hawkeye/command/CommandOptions.java

@@ -23,5 +23,4 @@
 public class CommandOptions {
  @CommandLine.Option(names = "--config", description = "path to the config file", defaultValue = "licenserc.toml")
  public File config;
-
 }

hawkeye-command/src/main/java/io/korandoru/hawkeye/command/HawkEyeVersionProvider.java

@@ -16,11 +16,12 @@
 
 package io.korandoru.hawkeye.command;
 
+import io.korandoru.hawkeye.core.Constants;
 import picocli.CommandLine;
 
 public class HawkEyeVersionProvider implements CommandLine.IVersionProvider {
  @Override
  public String[] getVersion() {
- return new String[] { CommandConstants.VERSION };
+ return new String[] { Constants.VERSION };
  }
 }

hawkeye-core/pom.xml

@@ -47,4 +47,16 @@
  </dependency>
  </dependencies>
 
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources-filtered</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </build>
 </project>

hawkeye-command/src/main/java/io/korandoru/hawkeye/command/CommandConstants.java → hawkeye-core/src/main/java/io/korandoru/hawkeye/core/Constants.java

@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-package io.korandoru.hawkeye.command;
+package io.korandoru.hawkeye.core;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.util.Properties;
+import lombok.experimental.UtilityClass;
 
-public final class CommandConstants {
+@UtilityClass
+public class Constants {
  public static final String UNKNOWN = "<unknown>";
  public static final String VERSION;
 
  static {
- ClassLoader classLoader = CommandConstants.class.getClassLoader();
+ ClassLoader classLoader = Constants.class.getClassLoader();
  try (InputStream is = classLoader.getResourceAsStream("hawkeye.properties")) {
  final Properties properties = new Properties();
  properties.load(is);

hawkeye-core/src/main/resources/META-INF/native-image/io.korandoru.hawkeye/hawkeye-core/resource-config.json

@@ -3,6 +3,9 @@
  "includes": [
  {
  "pattern": ".*\\.txt"
+ },
+ {
+ "pattern": "hawkeye.properties"
  }
  ]
  }

hawkeye-core/src/test/java/io/korandoru/hawkeye/core/ConstantsTest.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2023 Korandoru Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.korandoru.hawkeye.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
+class ConstantsTest {
+ @Test
+ void testVersion() {
+ assertThat(Constants.VERSION).isNotEqualTo(Constants.UNKNOWN);
+ }
+}