Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,19 @@
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>version.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/naftiko/Cli.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Command(
name = "naftiko",
mixinStandardHelpOptions = true,
version = "1.0.0-alpha1",
version = "1.0.0-alpha2",
description = "Naftiko CLI",
subcommands = {CreateCommand.class, ValidateCommand.class}
)
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/io/naftiko/cli/FileGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,22 @@
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;

public class FileGenerator {
private static final String VERSION;

static {
try (InputStream versionStream = FileGenerator.class.getClassLoader().getResourceAsStream("version.properties")) {
Properties props = new Properties();
props.load(versionStream);
String v = props.getProperty("version");
VERSION = v.endsWith("-SNAPSHOT") ? v.substring(0, v.length() - "-SNAPSHOT".length()) : v;
} catch (IOException e) {
throw new ExceptionInInitializerError("Could not load version.properties: " + e.getMessage());
}
}

public static void generateCapabilityFile(String capabilityName, FileFormat format, String baseUri, String port) throws IOException {
String templatePath = "templates/capability." + format.pathName + ".mustache";
String outputFileName = capabilityName + ".naftiko." + format.pathName;
Expand All @@ -41,6 +55,7 @@ public static void generateCapabilityFile(String capabilityName, FileFormat form
// Render template and write file.
Template mustache = Mustache.compiler().compile(new InputStreamReader(templateStream));
Map<String, Object> scope = new HashMap<>();
scope.put("version", VERSION);
scope.put("capabilityName", capabilityName);
scope.put("port", port);
scope.put("baseUri", baseUri);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resources": [
{ "pattern": "schemas/.*" },
{ "pattern": "templates/.*" },
{ "pattern": "jsv-messages.*\\.properties" }
{ "pattern": "jsv-messages.*\\.properties" },
{ "pattern": "version\\.properties" }
]
}
4 changes: 2 additions & 2 deletions src/main/resources/schemas/naftiko-schema.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://naftiko.io/schemas/v1.0.0-alpha1/naftiko.json",
"$id": "https://naftiko.io/schemas/v1.0.0-alpha2/naftiko.json",
"name": "Naftiko Specification",
"description": "This Schema should be used to describe and validate Naftiko Capabilities",
"type": "object",
"properties": {
"naftiko": {
"type": "string",
"description": "Version of the Naftiko specification",
"const": "1.0.0-alpha1"
"const": "1.0.0-alpha2"
},
"info": {
"$ref": "#/$defs/Info"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/capability.yaml.mustache
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
naftiko: "1.0.0-alpha1"
naftiko: "{{version}}"
info:
label: "{{capabilityName}}"
description: "business-description-of-your-capability"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/tutorial/shared/legacy-consumes.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
consumes:
- namespace: legacy
type: http
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/tutorial/shared/registry-consumes.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
consumes:
- namespace: registry
type: http
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/tutorial/shared/secrets.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
registry-bearer-token: "dummy-token"
registry-api-version: "1.0.0-alpha1"
registry-api-version: "1.0.0-alpha2"
dockyard-api-key: "dummy-dockyard-key"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# shared/registry-consumes.yaml (final — added get-voyage + cargo resource)
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
consumes:
- namespace: registry
type: http
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
consumes:
- namespace: registry
type: http
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# shared/registry-consumes.yaml (updated — added voyages resource)
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
consumes:
- namespace: registry
type: http
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
consumes:
- namespace: registry
type: http
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

capability:
consumes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

info:
label: "Shipyard Fleet Management"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

capability:
consumes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"

binds:
- namespace: "registry-env"
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/version.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=${project.version}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void setUp() throws Exception {
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertNotNull(capability.getSpec(), "Capability spec should be loaded");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void setUp() throws Exception {
@Test
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko());
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void setUp() throws Exception {
@Test
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko());
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void setUp() throws Exception {
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertNotNull(capability.getSpec(), "Capability spec should be loaded");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko(),
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko(),
"Naftiko version should be 0.5");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void setUp() throws Exception {
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertNotNull(capability.getSpec(), "Capability spec should be loaded");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void setUp() throws Exception {
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertNotNull(capability.getSpec(), "Capability spec should be loaded");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void setUp() throws Exception {
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertNotNull(capability.getSpec(), "Capability spec should be loaded");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko(), "Naftiko version should be 1.0.0-alpha2");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void setUp() throws Exception {
@Test
public void testCapabilityLoaded() {
assertNotNull(capability, "Capability should be initialized");
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko(), "Naftiko version should be 0.5");
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko(), "Naftiko version should be 1.0.0-alpha2");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static void tearDown() throws Exception {
@Test
public void testCapabilityLoaded() {
assertNotNull(capability.getSpec());
assertEquals("1.0.0-alpha1", capability.getSpec().getNaftiko());
assertEquals("1.0.0-alpha2", capability.getSpec().getNaftiko());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void setUp() throws Exception {

@Test
public void testNaftikoVersionLoaded() {
assertEquals("1.0.0-alpha1", naftikoSpec.getNaftiko());
assertEquals("1.0.0-alpha2", naftikoSpec.getNaftiko());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/avro-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "Avro Test Capability"
description: "Test capability for Avro message decoding from API responses"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/baseuri-trailing-slash-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "BaseUri Trailing Slash Regression Test"
description: "Capability intentionally using a trailing-slash baseUri to test strict validation"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/csv-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "CSV Test Capability"
description: "Test capability for CSV parsing from API responses"
Expand Down Expand Up @@ -48,7 +48,7 @@ capability:
inputParameters:
- name: "User-Agent"
in: "header"
value: "Naftiko/1.0.0-alpha1"
value: "Naftiko/1.0.0-alpha2"

resources:
- path: "api/users"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/html-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "HTML Test Capability"
description: "Test capability for HTML table parsing"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/http-body-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
capability:
exposes:
- type: "rest"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/http-forward-value-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "HTTP Forward with Value Field Test"
description: "Test capability for forward spec with value field supporting Mustache templates"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/http-header-query-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
capability:
exposes:
- type: "rest"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/markdown-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "Markdown Test Capability"
description: "Test capability for Markdown parsing"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/mcp-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "MCP Test Capability"
description: "Test capability for MCP Server Adapter deserialization and wiring"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/mcp-hints-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "MCP Hints Test Capability"
description: "Test capability for MCP tool hints (ToolAnnotations) support"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/mcp-resources-prompts-capability.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# yaml-language-server: $schema=../../main/resources/schemas/naftiko-schema.json
---
naftiko: "1.0.0-alpha1"
naftiko: "1.0.0-alpha2"
info:
label: "MCP Resources & Prompts Test Capability"
description: "Test capability for MCP Server Adapter resources and prompts support"
Expand Down
Loading
Loading