Skip to content

Commit

Permalink
Merge branch 'release/2021-05'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivan-gomes committed Jun 7, 2021
2 parents 720185b + d80dbeb commit ab44377
Show file tree
Hide file tree
Showing 12 changed files with 223 additions and 57 deletions.
12 changes: 12 additions & 0 deletions api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,8 @@ components:
Project:
example:
'@type': Project
defaultBranch:
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
name: name
description: description
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
Expand All @@ -1128,6 +1130,8 @@ components:
enum:
- Project
type: string
defaultBranch:
$ref: '#/components/schemas/Project_defaultBranch'
description:
type: string
id:
Expand Down Expand Up @@ -1390,6 +1394,14 @@ components:
error:
type: string
type: object
Project_defaultBranch:
description: Branch
example:
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
properties:
id:
format: uuid
type: string
Branch_head:
description: Commit
example:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'eclipse'
apply plugin: 'java'

group = 'org.omg.sysml'
version = '2021-04'
version = '2021-05'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "org.omg.sysml",
name := "sysml-v2-api-client",
version := "2021-04",
version := "2021-05",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
Expand Down
1 change: 1 addition & 0 deletions docs/Project.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional]
**defaultBranch** | [**ProjectDefaultBranch**](ProjectDefaultBranch.md) | | [optional]
**description** | **String** | | [optional]
**id** | [**UUID**](UUID.md) | | [optional]
**name** | **String** | | [optional]
Expand Down
13 changes: 13 additions & 0 deletions docs/ProjectDefaultBranch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@


# ProjectDefaultBranch

Branch
## Properties

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | [**UUID**](UUID.md) | | [optional]



2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>sysml-v2-api-client</artifactId>
<packaging>jar</packaging>
<name>sysml-v2-api-client</name>
<version>2021-04</version>
<version>2021-05</version>
<url>https://github.com/openapitools/openapi-generator</url>
<description>OpenAPI Java</description>
<scm>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/omg/sysml/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private void init() {
json = new JSON();

// Set default User-Agent.
setUserAgent("OpenAPI-Generator/2021-04/java");
setUserAgent("OpenAPI-Generator/2021-05/java");

authentications = new HashMap<String, Authentication>();
}
Expand Down
32 changes: 31 additions & 1 deletion src/main/java/org/omg/sysml/model/Project.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.util.UUID;
import org.omg.sysml.model.ProjectDefaultBranch;

/**
* Project
Expand Down Expand Up @@ -79,6 +80,10 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException {
@SerializedName(SERIALIZED_NAME_AT_TYPE)
private AtTypeEnum atType;

public static final String SERIALIZED_NAME_DEFAULT_BRANCH = "defaultBranch";
@SerializedName(SERIALIZED_NAME_DEFAULT_BRANCH)
private ProjectDefaultBranch defaultBranch;

public static final String SERIALIZED_NAME_DESCRIPTION = "description";
@SerializedName(SERIALIZED_NAME_DESCRIPTION)
private String description;
Expand Down Expand Up @@ -115,6 +120,29 @@ public void setAtType(AtTypeEnum atType) {
}


public Project defaultBranch(ProjectDefaultBranch defaultBranch) {

this.defaultBranch = defaultBranch;
return this;
}

/**
* Get defaultBranch
* @return defaultBranch
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")

public ProjectDefaultBranch getDefaultBranch() {
return defaultBranch;
}


public void setDefaultBranch(ProjectDefaultBranch defaultBranch) {
this.defaultBranch = defaultBranch;
}


public Project description(String description) {

this.description = description;
Expand Down Expand Up @@ -194,14 +222,15 @@ public boolean equals(java.lang.Object o) {
}
Project project = (Project) o;
return Objects.equals(this.atType, project.atType) &&
Objects.equals(this.defaultBranch, project.defaultBranch) &&
Objects.equals(this.description, project.description) &&
Objects.equals(this.id, project.id) &&
Objects.equals(this.name, project.name);
}

@Override
public int hashCode() {
return Objects.hash(atType, description, id, name);
return Objects.hash(atType, defaultBranch, description, id, name);
}


Expand All @@ -210,6 +239,7 @@ public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class Project {\n");
sb.append(" atType: ").append(toIndentedString(atType)).append("\n");
sb.append(" defaultBranch: ").append(toIndentedString(defaultBranch)).append("\n");
sb.append(" description: ").append(toIndentedString(description)).append("\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
Expand Down
101 changes: 101 additions & 0 deletions src/main/java/org/omg/sysml/model/ProjectDefaultBranch.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* SysML v2 API and Services
* REST/HTTP binding (PSM) for the SysML v2 standard API.
*
* The version of the OpenAPI document: 1.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/


package org.omg.sysml.model;

import java.util.Objects;
import java.util.Arrays;
import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.util.UUID;

/**
* Branch
*/
@ApiModel(description = "Branch")

public class ProjectDefaultBranch {
public static final String SERIALIZED_NAME_ID = "id";
@SerializedName(SERIALIZED_NAME_ID)
private UUID id;


public ProjectDefaultBranch id(UUID id) {

this.id = id;
return this;
}

/**
* Get id
* @return id
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")

public UUID getId() {
return id;
}


public void setId(UUID id) {
this.id = id;
}


@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ProjectDefaultBranch projectDefaultBranch = (ProjectDefaultBranch) o;
return Objects.equals(this.id, projectDefaultBranch.id);
}

@Override
public int hashCode() {
return Objects.hash(id);
}


@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ProjectDefaultBranch {\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}

}

52 changes: 52 additions & 0 deletions src/test/java/org/omg/sysml/model/ProjectDefaultBranchTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* SysML v2 API and Services
* REST/HTTP binding (PSM) for the SysML v2 standard API.
*
* The version of the OpenAPI document: 1.0.0
*
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/


package org.omg.sysml.model;

import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.util.UUID;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;


/**
* Model tests for ProjectDefaultBranch
*/
public class ProjectDefaultBranchTest {
private final ProjectDefaultBranch model = new ProjectDefaultBranch();

/**
* Model tests for ProjectDefaultBranch
*/
@Test
public void testProjectDefaultBranch() {
// TODO: test ProjectDefaultBranch
}

/**
* Test the property 'id'
*/
@Test
public void idTest() {
// TODO: test id
}

}
9 changes: 9 additions & 0 deletions src/test/java/org/omg/sysml/model/ProjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
import java.util.UUID;
import org.omg.sysml.model.ProjectDefaultBranch;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
Expand Down Expand Up @@ -49,6 +50,14 @@ public void atTypeTest() {
// TODO: test atType
}

/**
* Test the property 'defaultBranch'
*/
@Test
public void defaultBranchTest() {
// TODO: test defaultBranch
}

/**
* Test the property 'description'
*/
Expand Down
52 changes: 0 additions & 52 deletions test-sysml-v2-api-java-client.jsh

This file was deleted.

0 comments on commit ab44377

Please sign in to comment.