Skip to content

Commit 7598fd5

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'feature/ST5AS-26'
2 parents 1e6b2bd + e6a6bee commit 7598fd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2176
-1340
lines changed

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ hs_err_pid*
1919
target
2020
.gradle
2121
build
22-
*.iml
23-
.idea

‎.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.4
1+
4.1.3

‎.travis.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎README.md

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# sysml-api-client
1+
# sysml-v2-api-client
22

33
SysML v2 API and Services
44
- API version: 1.0.0
@@ -38,8 +38,8 @@ Add this dependency to your project's POM:
3838
```xml
3939
<dependency>
4040
<groupId>org.omg.sysml</groupId>
41-
<artifactId>sysml-api-client</artifactId>
42-
<version>2019-05</version>
41+
<artifactId>sysml-v2-api-client</artifactId>
42+
<version>2019-09</version>
4343
<scope>compile</scope>
4444
</dependency>
4545
```
@@ -49,7 +49,7 @@ Add this dependency to your project's POM:
4949
Add this dependency to your project's build file:
5050

5151
```groovy
52-
compile "org.omg.sysml:sysml-api-client:2019-05"
52+
compile "org.omg.sysml:sysml-v2-api-client:2019-09"
5353
```
5454

5555
### Others
@@ -62,7 +62,7 @@ mvn clean package
6262

6363
Then manually install the following JARs:
6464

65-
* `target/sysml-api-client-2019-05.jar`
65+
* `target/sysml-v2-api-client-2019-09.jar`
6666
* `target/lib/*.jar`
6767

6868
## Getting Started
@@ -71,28 +71,31 @@ Please follow the [installation](#installation) instruction and execute the foll
7171

7272
```java
7373

74-
import org.omg.sysml.*;
75-
import org.omg.sysml.auth.*;
76-
import org.omg.sysml.model.*;
74+
// Import classes:
75+
import org.omg.sysml.ApiClient;
76+
import org.omg.sysml.ApiException;
77+
import org.omg.sysml.Configuration;
78+
import org.omg.sysml.models.*;
7779
import org.omg.sysml.api.ElementApi;
7880

79-
import java.io.File;
80-
import java.util.*;
81-
82-
public class ElementApiExample {
83-
84-
public static void main(String[] args) {
85-
86-
ElementApi apiInstance = new ElementApi();
87-
Map<String, Object> requestBody = null; // Map<String, Object> |
88-
try {
89-
Element result = apiInstance.createElement(requestBody);
90-
System.out.println(result);
91-
} catch (ApiException e) {
92-
System.err.println("Exception when calling ElementApi#createElement");
93-
e.printStackTrace();
94-
}
81+
public class Example {
82+
public static void main(String[] args) {
83+
ApiClient defaultClient = Configuration.getDefaultApiClient();
84+
defaultClient.setBasePath("http://localhost");
85+
86+
ElementApi apiInstance = new ElementApi(defaultClient);
87+
Map<String, Object> body = null; // Map<String, Object> |
88+
try {
89+
Element result = apiInstance.createElement(body);
90+
System.out.println(result);
91+
} catch (ApiException e) {
92+
System.err.println("Exception when calling ElementApi#createElement");
93+
System.err.println("Status code: " + e.getCode());
94+
System.err.println("Reason: " + e.getResponseBody());
95+
System.err.println("Response headers: " + e.getResponseHeaders());
96+
e.printStackTrace();
9597
}
98+
}
9699
}
97100

98101
```
@@ -124,6 +127,7 @@ Class | Method | HTTP request | Description
124127
- [Identified](docs/Identified.md)
125128
- [Project](docs/Project.md)
126129
- [Relationship](docs/Relationship.md)
130+
- [RelationshipAllOf](docs/RelationshipAllOf.md)
127131

128132

129133
## Documentation for Authorization

‎build.gradle

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
apply plugin: 'idea'
22
apply plugin: 'eclipse'
3+
apply plugin: 'java'
34

45
group = 'org.omg.sysml'
5-
version = '2019-05'
6+
version = '2019-09'
67

78
buildscript {
89
repositories {
10+
mavenCentral()
911
jcenter()
1012
}
1113
dependencies {
@@ -17,7 +19,9 @@ buildscript {
1719
repositories {
1820
jcenter()
1921
}
20-
22+
sourceSets {
23+
main.java.srcDirs = ['src/main/java']
24+
}
2125

2226
if(hasProperty('target') && target == 'android') {
2327

@@ -83,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
8387

8488
install {
8589
repositories.mavenInstaller {
86-
pom.artifactId = 'sysml-api-client'
90+
pom.artifactId = 'sysml-v2-api-client'
8791
}
8892
}
8993

@@ -94,12 +98,17 @@ if(hasProperty('target') && target == 'android') {
9498
}
9599

96100
dependencies {
97-
compile 'io.swagger:swagger-annotations:1.5.17'
98-
compile 'com.squareup.okhttp:okhttp:2.7.5'
99-
compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
100-
compile 'com.google.code.gson:gson:2.8.1'
101-
compile 'io.gsonfire:gson-fire:1.8.0'
102-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1'
101+
compile 'io.swagger:swagger-annotations:1.5.22'
102+
compile "com.google.code.findbugs:jsr305:3.0.2"
103+
compile 'com.squareup.okhttp3:okhttp:3.14.2'
104+
compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
105+
compile 'com.google.code.gson:gson:2.8.5'
106+
compile 'io.gsonfire:gson-fire:1.8.3'
107+
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
103108
compile 'org.threeten:threetenbp:1.3.5'
104109
testCompile 'junit:junit:4.12'
105110
}
111+
112+
javadoc {
113+
options.tags = [ "http.response.details:a:Http Response Details" ]
114+
}

‎build.sbt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
lazy val root = (project in file(".")).
22
settings(
33
organization := "org.omg.sysml",
4-
name := "sysml-api-client",
5-
version := "2019-05",
4+
name := "sysml-v2-api-client",
5+
version := "2019-09",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.17",
13-
"com.squareup.okhttp" % "okhttp" % "2.7.5",
14-
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
15-
"com.google.code.gson" % "gson" % "2.8.1",
12+
"io.swagger" % "swagger-annotations" % "1.5.22",
13+
"com.squareup.okhttp3" % "okhttp" % "3.14.2",
14+
"com.squareup.okhttp3" % "logging-interceptor" % "3.14.2",
15+
"com.google.code.gson" % "gson" % "2.8.5",
16+
"org.apache.commons" % "commons-lang3" % "3.9",
1617
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
17-
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
18+
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
19+
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
1820
"junit" % "junit" % "4.12" % "test",
1921
"com.novocode" % "junit-interface" % "0.10" % "test"
2022
)

‎docs/Element.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

2+
23
# Element
34

45
## Properties
6+
57
Name | Type | Description | Notes
68
------------ | ------------- | ------------- | -------------
79
**atType** | **String** | | [optional]

0 commit comments

Comments
 (0)