Skip to content

prefix all java samples #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
octonato merged 1 commit into from
Sep 15, 2021
Merged

prefix all java samples #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,28 +202,28 @@ jobs:
- run:
name: Customer Registry quickstart
command: |
cd samples/customer-registry-quickstart
cd samples/java-customer-registry-quickstart
echo "Running mvn with SDK version: '$SDK_VERSION'"
# must also compile without the profile!
mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile
mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit
- run:
name: Fibonacci Action
command: |
cd samples/fibonacci-action
cd samples/java-fibonacci-action
echo "Running mvn with SDK version: '$SDK_VERSION'"
mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile
mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit
- run:
name: Doc snippets
command: |
cd samples/doc-snippets
cd samples/java-doc-snippets
echo "Running mvn with SDK version: '$SDK_VERSION'"
mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile
- run:
name: first-service by archetype
command: |
cd samples/first-service
cd samples/java-first-service
echo "Running mvn with SDK version: '$SDK_VERSION'"
mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile
- run:
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
- run:
name: Replicated Entity "Counter" sample
command: |
cd samples/replicatedentity-counter
cd samples/java-replicatedentity-counter
echo "Running mvn with SDK version: '$SDK_VERSION'"
mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile
mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit
Expand All @@ -293,7 +293,7 @@ jobs:
- run:
name: Replicated Entity examples
command: |
cd samples/replicatedentity-examples
cd samples/java-replicatedentity-examples
echo "Running mvn with SDK version: '$SDK_VERSION'"
mvn -Dakkaserverless-sdk.version=$SDK_VERSION test-compile
mvn -Dakkaserverless-sdk.version=$SDK_VERSION verify -Pit
Expand Down
12 changes: 6 additions & 6 deletions docs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ apidocs:

examples:
mkdir -p "${managed_examples}"
rsync -a --exclude-from=.examplesignore ../samples/customer-registry-quickstart/ "${managed_examples}/customer-registry-quickstart/"
rsync -a --exclude-from=.examplesignore ../samples/java-customer-registry-quickstart/ "${managed_examples}/java-customer-registry-quickstart/"
rsync -a --exclude-from=.examplesignore ../samples/java-valueentity-customer-registry/ "${managed_examples}/java-valueentity-customer-registry/"
rsync -a --exclude-from=.examplesignore ../samples/java-eventsourced-customer-registry/ "${managed_examples}/java-eventsourced-customer-registry/"
rsync -a --exclude-from=.examplesignore ../samples/java-eventing-shopping-cart/ "${managed_examples}/java-eventing-shopping-cart/"
rsync -a --exclude-from=.examplesignore ../samples/java-eventsourced-shopping-cart/ "${managed_examples}/java-eventsourced-shopping-cart/"
rsync -a --exclude-from=.examplesignore ../samples/java-replicatedentity-shopping-cart/ "${managed_examples}/java-replicatedentity-shopping-cart/"
rsync -a --exclude-from=.examplesignore ../samples/java-valueentity-shopping-cart/ "${managed_examples}/java-valueentity-shopping-cart/"
rsync -a --exclude-from=.examplesignore ../samples/replicatedentity-examples/ "${managed_examples}/replicatedentity-examples/"
rsync -a --exclude-from=.examplesignore ../samples/java-replicatedentity-examples/ "${managed_examples}/java-replicatedentity-examples/"
rsync -a --exclude-from=.examplesignore ../samples/valueentity-counter/ "${managed_examples}/valueentity-counter/"
rsync -a --exclude-from=.examplesignore ../samples/fibonacci-action/ "${managed_examples}/fibonacci-action/"
rsync -a --exclude-from=.examplesignore ../samples/doc-snippets/ "${managed_examples}/doc-snippets/"
rsync -a --exclude-from=.examplesignore ../samples/first-service/ "${managed_examples}/first-service/"
rsync -a --exclude-from=.examplesignore ../samples/java-fibonacci-action/ "${managed_examples}/java-fibonacci-action/"
rsync -a --exclude-from=.examplesignore ../samples/java-doc-snippets/ "${managed_examples}/java-doc-snippets/"
rsync -a --exclude-from=.examplesignore ../samples/java-first-service/ "${managed_examples}/java-first-service/"

bundles:
bin/bundle.sh --zip "${managed_attachments}/customer-registry-quickstart.zip" ../samples/customer-registry-quickstart
bin/bundle.sh --zip "${managed_attachments}/java-customer-registry-quickstart.zip" ../samples/java-customer-registry-quickstart
Copy link
Copy Markdown
Contributor

@patriknw patriknw Sep 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will probably require an update to the download link from the quickstart adoc page

Copy link
Copy Markdown
Member Author

@octonato octonato Sep 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.
Done in https://github.com/lightbend/akkaserverless-docs/pull/920


dev: clean managed validate-xrefs dev-html

Expand Down
8 changes: 4 additions & 4 deletions docs/src/modules/java/pages/actions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ next number in the Fibonacci series.
[source,protobuf,indent=0]
.src/main/proto/actions/fibonacci.proto
----
include::example$fibonacci-action/src/main/proto/actions/fibonacci.proto[tag=actions]
include::example$java-fibonacci-action/src/main/proto/actions/fibonacci.proto[tag=actions]
----
<1> Any classes generated from this protobuf file will be in the Java package `com.example.fibonacci`.
<2> Import the Akka Serverless protobuf annotations, or options.
Expand All @@ -37,7 +37,7 @@ implement the methods required by `AbstractFibonacciAction`.
[source,java,indent=0]
.src/main/java/com/example/fibonacci/FibonacciAction.java
----
include::example$fibonacci-action/src/main/java/com/example/fibonacci/FibonacciActionGenerated.java[tag=generated-action]
include::example$java-fibonacci-action/src/main/java/com/example/fibonacci/FibonacciActionGenerated.java[tag=generated-action]
----

<1> Extends the generated `AbstractFibonacciAction`, which extends link:{attachmentsdir}/api/com/akkaserverless/javasdk/action/Action.html[`Action` {tab-icon}, window="new"].
Expand All @@ -48,7 +48,7 @@ Next we can implement `nextNumber` method to complete our Action.
[source,java,indent=0]
.src/main/java/com/example/fibonacci/FibonacciAction.java
----
include::example$fibonacci-action/src/main/java/com/example/fibonacci/FibonacciAction.java[tag=implemented-action]
include::example$java-fibonacci-action/src/main/java/com/example/fibonacci/FibonacciAction.java[tag=implemented-action]
----

<1> We add two private methods to support the computation. `isFibonacci` checks if a number is a Fibonacci number and
Expand Down Expand Up @@ -77,7 +77,7 @@ From the code-generation, the registration gets automatically inserted in the ge
[source,java]
./src/main/java/com/example/Main.java
----
include::java:example$fibonacci-action/src/main/java/com/example/Main.java[]
include::java:example$java-fibonacci-action/src/main/java/com/example/Main.java[]
----

By default, the generated constructor has a `ActionCreationContext` parameter, but you can change this to accept other parameters.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/java/pages/index.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ JSON formatted logging is enabled by default in the projects created by the xref
.src/main/resources/logback.xml
[source,java]
----
include::example$first-service/src/main/resources/logback.xml[]
include::example$java-first-service/src/main/resources/logback.xml[]
----

In the `logback.xml` you may want to adjust the log level for different loggers (typically a package or class name).
Expand Down
12 changes: 6 additions & 6 deletions docs/src/modules/java/pages/quickstart-java-maven.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Default API protobuf file::
--
[source,protobuf]
----
include::example$first-service/src/main/proto/value-entities/counter_api.proto[]
include::example$java-first-service/src/main/proto/value-entities/counter_api.proto[]
----
--
Default domain protobuf file::
Expand All @@ -99,7 +99,7 @@ Default domain protobuf file::
--
[source,protobuf]
----
include::example$first-service/src/main/proto/value-entities/counter_domain.proto[]
include::example$java-first-service/src/main/proto/value-entities/counter_domain.proto[]
----
--

Expand All @@ -116,15 +116,15 @@ On the first build, the plugin creates a Value Entity implementation class where
.src/main/java/com/example/domain/Counter.java
[source,java]
----
include::example$first-service/src/main/java/com/example/domain/Counter.java[]
include::example$java-first-service/src/main/java/com/example/domain/Counter.java[]
----

The Maven plugin provides the `Main` class implementation that registers service components with Akka Serverless.

.src/main/java/com/example/Main.java
[source,java]
----
include::example$first-service/src/main/java/com/example/Main.java[]
include::example$java-first-service/src/main/java/com/example/Main.java[]
----

This class is the entry point for running Akka Serverless within the container.
Expand All @@ -138,7 +138,7 @@ The Akka Serverless Maven plugin creates a unit test stub for the Entity. Use th
.src/test/java/com/example/domain/CounterTest.java
[source,java]
----
include::example$first-service/src/test/java/com/example/domain/CounterTest.java[]
include::example$java-first-service/src/test/java/com/example/domain/CounterTest.java[]
----

Use the `verify` command to run all unit tests.
Expand All @@ -155,7 +155,7 @@ The Maven plugin also provides you with an initial setup for integration tests b
.src/it/java/com/example/domain/CounterIntegrationTest.java
[source,java]
----
include::example$first-service/src/it/java/com/example/domain/CounterIntegrationTest.java[]
include::example$java-first-service/src/it/java/com/example/domain/CounterIntegrationTest.java[]
----

The Maven failsafe plugin runs the integration tests when the `it` profile is enabled via `-Pit`.
Expand Down
Loading