Skip to content

Commit e347063

Browse files
committed
Change the artifact identifier for the retrofit2-rx sample
1 parent d60f7d1 commit e347063

File tree

10 files changed

+21
-14
lines changed

10 files changed

+21
-14
lines changed

bin/java-petstore-retrofit2rx.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"library": "retrofit2",
3+
"artifactId": "swagger-petstore-retrofit2-rx"
4+
}

bin/java-petstore-retrofit2rx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ fi
2626

2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29-
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true"
3030

3131
java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ if(hasProperty('target') && target == 'android') {
7171
apply plugin: 'java'
7272
apply plugin: 'maven'
7373
74-
sourceCompatibility = JavaVersion.VERSION_1_7
75-
targetCompatibility = JavaVersion.VERSION_1_7
74+
sourceCompatibility = JavaVersion.VERSION_1_7
75+
targetCompatibility = JavaVersion.VERSION_1_7
7676
7777
install {
7878
repositories.mavenInstaller {

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@
100100
<artifactId>maven-compiler-plugin</artifactId>
101101
<version>2.3.2</version>
102102
<configuration>
103-
<source>1.7</source>
104-
<target>1.7</target>
103+
<source>
104+
1.7</source>
105+
<target>1.7</target>
105106
</configuration>
106107
</plugin>
107108
</plugins>

samples/client/petstore/java/retrofit2rx/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# swagger-petstore-retrofit2
1+
# swagger-petstore-retrofit2-rx
22

33
## Requirements
44

@@ -25,7 +25,7 @@ After the client libarary is installed/deployed, you can use it in your Maven pr
2525
```xml
2626
<dependency>
2727
<groupId>io.swagger</groupId>
28-
<artifactId>swagger-petstore-retrofit2</artifactId>
28+
<artifactId>swagger-petstore-retrofit2-rx</artifactId>
2929
<version>1.0.0</version>
3030
<scope>compile</scope>
3131
</dependency>

samples/client/petstore/java/retrofit2rx/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if(hasProperty('target') && target == 'android') {
7676

7777
install {
7878
repositories.mavenInstaller {
79-
pom.artifactId = 'swagger-petstore-retrofit2'
79+
pom.artifactId = 'swagger-petstore-retrofit2-rx'
8080
}
8181
}
8282

samples/client/petstore/java/retrofit2rx/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.swagger</groupId>
5-
<artifactId>swagger-petstore-retrofit2</artifactId>
5+
<artifactId>swagger-petstore-retrofit2-rx</artifactId>
66
<packaging>jar</packaging>
7-
<name>swagger-petstore-retrofit2</name>
7+
<name>swagger-petstore-retrofit2-rx</name>
88
<version>1.0.0</version>
99
<scm>
1010
<connection>scm:git:[email protected]:swagger-api/swagger-mustache.git</connection>
@@ -100,7 +100,9 @@
100100
<artifactId>maven-compiler-plugin</artifactId>
101101
<version>2.3.2</version>
102102
<configuration>
103-
<source>1.7</source>
103+
<source>
104+
1.7
105+
</source>
104106
<target>1.7</target>
105107
</configuration>
106108
</plugin>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name = "swagger-petstore-retrofit2"
1+
rootProject.name = "swagger-petstore-retrofit2-rx"

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-22T16:44:03.093+01:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-22T16:57:22.418+01:00")
44
public class StringUtil {
55
/**
66
* Check if the given array contains the given value (with case-insensitive comparison).

samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/petstore/test/SkeletonSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* Skeleton subscriber for tests that will fail when onError() is called unexpectedly.
88
*/
9-
public abstract class SkeletonSubscriber<T> extends Subscriber<T>{
9+
public abstract class SkeletonSubscriber<T> extends Subscriber<T> {
1010

1111
public static <T> SkeletonSubscriber<T> failTestOnError() {
1212
return new SkeletonSubscriber<T>() {

0 commit comments

Comments
 (0)