diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b2711bdbc..91354c172 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,8 +1,8 @@ version: 2 updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - time: "09:00" - open-pull-requests-limit: 10 + - package-ecosystem: maven + directory: "/" + schedule: + interval: daily + time: "09:00" + open-pull-requests-limit: 10 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index a734e49fb..ad99aa3bf 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,5 +1,5 @@ # Contributor Code of Conduct -This project adheres to No Code of Conduct. We are all adults. We accept anyone's contributions. Nothing else matters. +This project adheres to No Code of Conduct. We are all adults. We accept anyone's contributions. Nothing else matters. For more information please visit the [No Code of Conduct](https://github.com/domgetter/NCoC) homepage. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 177e95b01..150b45ca6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,78 +5,92 @@ Below are few **rules, recommendations and best practices** we try to follow whe ## Paperwork ### Committer + * The **commit message**: - * must be written in the **imperative mood** - * must clearly **explain rationale** behind this change (describe _why_ you are doing the change rather than _what_ you are changing) + * must be written in the **imperative mood** + * must clearly **explain rationale** behind this change (describe _why_ you are doing the change rather than _what_ + you are changing) * The **pull request**: - * with non-trivial, non-dependencies change must be **[associated with an issue](https://help.github.com/articles/closing-issues-via-commit-messages/)** + * with non-trivial, non-dependencies change must be * + *[associated with an issue](https://help.github.com/articles/closing-issues-via-commit-messages/)** * Add usage examples of new high level functionality to -[documentation](https://github.com/gooddata/gooddata-java/wiki/Code-Examples). + [documentation](https://github.com/gooddata/gooddata-java/wiki/Code-Examples). ### Reviewer + Ensure pull request and issues are - * **properly labeled** (trivial/bug/enhancement/backward incompatible/...) - * marked with exactly one **milestone version** + +* **properly labeled** (trivial/bug/enhancement/backward incompatible/...) +* marked with exactly one **milestone version** ## Design ### Structure + * **Package names** for DTOs and services should be named in the same manner as REST API. * Don't create single implementation interfaces for services. ### DTOs + * All DTOs which can be updated should be **mutable**. Please keep mutable only the fields which are subject of change, -the rest should be immutable. + the rest should be immutable. * Create method named `String getUri()` to provide **URI string to self**. * Introduce **constant** with URI: - * ```java + * ```java public static final String URI = "/gdc/someresource/{resource-id}"; ``` - * If you need also constants with `UriTemplate`, do not put them into DTOs not to drag Spring dependency into model module. + * If you need also constants with `UriTemplate`, do not put them into DTOs not to drag Spring dependency into model + module. * Put _Jackson_ annotations on getters rather then on fields. * Consider the **visibility** - use `package protected` when DTO is not intended for SDK user, but is needed -in related service. + in related service. * Test all DTOs using _[JsonUnit](https://github.com/lukas-krecan/JsonUnit)_. * **Naming**: - * `Uri` for _URI string_ of some resource - * `Link` for structure containing at least _category_ (e.g. "self") and _URI string_ - (can contain also others like _title_, _summary_, etc.) + * `Uri` for _URI string_ of some resource + * `Link` for structure containing at least _category_ (e.g. "self") and _URI string_ + (can contain also others like _title_, _summary_, etc.) ### Enums + * Use enums sparingly, because they don't work with REST API changes (eg. new value added on the backend) **never use -them when deserializing**. + them when deserializing**. * Where make sense, use overloaded methods with an enum argument as well as `String` argument. ### Services + * When programming client for some polling return [`FutureResult`](src/main/java/com/gooddata/FutureResult.java) -to enable user asynchronous call. + to enable user asynchronous call. * Create custom [`GoodDataException`](src/main/java/com/gooddata/GoodDataException.java) when you feel the case -is specific enough. + is specific enough. * Prefer DTOs to `String` or primitive arguments. * **Method naming**: - * `get*()` when searching form single object (throw exception when no or multiple objects are found, - never return `null`) - * `find*()` when searching for multiple objects (collection of objects, never return `null`) - * `list*()` when listing whole or paged collection of objects (return collection or collection wrapped by DTO) - * `remove*()` (i.e. `remove(Project project)`) instead od `delete*()` -* In addition to unit tests, write also **integration tests** and **acceptance tests** if possible. See "What to test where" in "Best practices" below. + * `get*()` when searching form single object (throw exception when no or multiple objects are found, + never return `null`) + * `find*()` when searching for multiple objects (collection of objects, never return `null`) + * `list*()` when listing whole or paged collection of objects (return collection or collection wrapped by DTO) + * `remove*()` (i.e. `remove(Project project)`) instead od `delete*()` +* In addition to unit tests, write also **integration tests** and **acceptance tests** if possible. See "What to test + where" in "Best practices" below. * Update [documentation](https://github.com/gooddata/gooddata-java/wiki/Code-Examples) with usage examples. ## Best practices + * **What to test where**: - * `*Test` = unit tests - * focus on verifying bussiness logic, corner cases, various input combinations, etc. - * avoid service tests using mocked `RestTemplate` - use integration tests with mocked API responses instead - * `*IT` = integration tests - * focus on verifying all possible outcomes of API calls - * see common ancestor [`AbstractGoodDataIT`](src/test/java/com/gooddata/AbstractGoodDataIT.java) setting up [Jadler](https://github.com/jadler-mocking/jadler/wiki) for API mocking - * `*AT` = acceptance tests - * focus on verifying the happy path against the real backend (so we're sure mocks in ITs are correct) - * see common ancestor [`AbstractGoodDataAT`](src/test/java/com/gooddata/AbstractGoodDataAT.java) setting up GoodData endpoint based on passed environment variables + * `*Test` = unit tests + * focus on verifying bussiness logic, corner cases, various input combinations, etc. + * avoid service tests using mocked `RestTemplate` - use integration tests with mocked API responses instead + * `*IT` = integration tests + * focus on verifying all possible outcomes of API calls + * see common ancestor [`AbstractGoodDataIT`](src/test/java/com/gooddata/AbstractGoodDataIT.java) setting + up [Jadler](https://github.com/jadler-mocking/jadler/wiki) for API mocking + * `*AT` = acceptance tests + * focus on verifying the happy path against the real backend (so we're sure mocks in ITs are correct) + * see common ancestor [`AbstractGoodDataAT`](src/test/java/com/gooddata/AbstractGoodDataAT.java) setting up + GoodData endpoint based on passed environment variables * Everything public should be **documented** using _javadoc_. * When you need some **utility code**, look for handy utilities in used libraries first (e.g. _Spring_ has -its `StreamUtils`, `FileCopyUtils`, ...). When you decide to create new utility class, -use _abstract utility class pattern_. + its `StreamUtils`, `FileCopyUtils`, ...). When you decide to create new utility class, + use _abstract utility class pattern_. ## Release candidates diff --git a/LICENSE.txt b/LICENSE.txt index c2dee2ac8..4c1fba780 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,7 +2,7 @@ GoodData Java SDK BSD License -Copyright (c) 2014-2023, GoodData Corporation +Copyright (c) 2014-2025, GoodData Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -41,67 +41,41 @@ PART 1: SUBCOMPONENTS - AOP alliance (1.0) [public-domain] - Apache Ant Core (1.10.3) [Apache-2.0] - Apache Ant Launcher (1.10.3) [Apache-2.0] -- Apache Commons IO (2.11.0) [Apache-2.0] -- Apache Commons Lang (3.12.0) [Apache-2.0] -- Apache Groovy (3.0.11) [Apache-2.0] -- Apache Groovy (2.5.7) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache Groovy (2.5.4) [Apache-2.0] -- Apache HttpClient (4.5.13) [Apache-2.0] -- Apache HttpCore (4.4.15) [Apache-2.0] -- Byte Buddy (without dependencies) (1.12.1) [BSD-3-Clause, Apache-2.0] -- Byte Buddy agent (1.12.1) [Apache-2.0] -- cglib-nodep (3.3.0) [Apache-2.0] -- EqualsVerifier | release normal jar (3.7.2) [Apache-2.0] -- EqualsVerifier | release normal jar (3.10) [Apache-2.0] -- gooddata-http-client (1.0.0) [BSD-3-Clause] -- gooddata-http-client (1.0.0+java7.fix1) [BSD-3-Clause] -- gooddata-rest-common (2.0.0) [BSD-3-Clause] +- Apache Commons IO (2.21.0) [Apache-2.0] +- Apache Commons Lang (3.20.0) [Apache-2.0] +- Apache Groovy (4.0.28) [Apache-2.0] +- gooddata-http-client (3.0.0-SNAPSHOT) [BSD-3-Clause] +- gooddata-rest-common (3.0.0) [BSD-3-Clause] - Gson (2.3.1) [Apache-2.0] - Guava: Google Core Libraries for Java (17.0) [Apache-2.0, CC0-1.0] - Hamcrest (2.2) [BSD-3-Clause] - Hamcrest Core (2.2) [BSD-3-Clause] - Jackson-annotations (2.13.0) [Apache-2.0] - Jackson-core (2.13.0) [Apache-2.0] -- jackson-databind (2.13.0) [Apache-2.0] -- jackson-databind (2.13.3) [Apache-2.0] +- jackson-databind (2.13.4) [Apache-2.0] - jadler-all (1.3.1) [MIT, Apache-2.0] - jadler-core (1.3.1) [MIT, Apache-2.0] -- javax.inject (1) [Apache-2.0] +- jakarta.inject (1) [Apache-2.0] - jcommander (1.78) [Apache-2.0] - JSON in Java (20090211) [JSON] -- json-unit (2.28.0) [Apache-2.0] -- json-unit (2.35.0) [Apache-2.0] -- json-unit-core (2.28.0) [Apache-2.0] -- json-unit-core (2.35.0) [Apache-2.0] +- json-unit (2.36.0) [Apache-2.0] +- json-unit-core (2.36.0) [Apache-2.0] - JSONassert (1.2.3) [Apache-2.0] - JUnit (4.12) [CPL-1.0] -- Mockito (4.6.1) [MIT, Apache-2.0] -- Mockito (4.1.0) [MIT, Apache-2.0] +- Mockito (5.14.2) [MIT, Apache-2.0] - Objenesis (3.2) [MIT] -- Sardine WebDAV client (5.10) [Apache-2.0] +- Sardine WebDAV client (5.13) [Apache-2.0] - Shazamcrest (0.11) [Apache-2.0] -- SLF4J API Module (2.0.0-alpha7) [MIT] -- SLF4J Simple Binding (2.0.0-alpha7) [MIT] +- SLF4J API Module (2.0.17) [MIT] +- SLF4J Simple Binding (2.0.17) [MIT] - SnakeYAML (1.21) [Apache-2.0, Multi-license: LGPL-2.1-or-later OR GPL-2.0-or-later OR EPL-1.0 OR BSD-3-Clause OR Apache-2.0] -- Spock Framework - Core Module (2.2-M1-groovy-4.0) [Apache-2.0] -- Spock Framework - Core Module (1.3-groovy-2.5) [Apache-2.0] -- Spring Beans (5.3.20) [Apache-2.0] -- Spring Beans (5.3.13) [Apache-2.0] -- Spring Commons Logging Bridge (5.3.13) [Apache-2.0] -- Spring Context (5.3.20) [Apache-2.0] -- Spring Core (5.3.20) [BSD-3-Clause, Apache-2.0] -- Spring Core (5.3.13) [BSD-3-Clause, Apache-2.0] -- Spring Retry (1.3.1) [Apache-2.0] -- Spring Web (5.3.20) [Apache-2.0] -- Spring Web (5.3.13) [Apache-2.0] -- testng (7.3.0) [Apache-2.0, AML] -- testng (7.6.0) [Apache-2.0] +- Spock Framework - Core Module (2.4-M1-groovy-4.0) [Apache-2.0] +- Spring Beans (6.0.15) [Apache-2.0] +- Spring Context (6.0.15) [Apache-2.0] +- Spring Core (6.0.15) [BSD-3-Clause, Apache-2.0] +- Spring Retry (2.0.12) [Apache-2.0] +- Spring Web (6.0.15) [Apache-2.0] +- testng (7.11.0) [Apache-2.0, AML] PART 2: LICENSES APPENDIX Apache 2.0 @@ -2814,7 +2788,7 @@ This program is made available under the terms of the MIT License. -------------------------------------------------------------------------------- -javax.inject (1) +jakarta.inject (1) -------------------------------------------------------------------------------- * Declared Licenses * diff --git a/README.md b/README.md index 5b5ab833b..3153b328c 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,64 @@ # GoodData Java SDK + [![Build Status](https://github.com/gooddata/gooddata-java/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/gooddata/gooddata-java/actions/workflows/build.yml) [![Coverage Status](https://codecov.io/gh/gooddata/gooddata-java/branch/master/graph/badge.svg)](https://app.codecov.io/gh/gooddata/gooddata-java/branch/master) [![Stability: Active](https://masterminds.github.io/stability/active.svg)](https://masterminds.github.io/stability/active.html) [![License](https://img.shields.io/badge/license-BSD-blue.svg)](LICENSE.txt) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fgooddata%2Fgooddata-java.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fgooddata%2Fgooddata-java?ref=badge_shield) -[![Javadocs](http://javadoc.io/badge/com.gooddata/gooddata-java.svg)](http://javadoc.io/doc/com.gooddata/gooddata-java) +[![Javadocs](https://javadoc.io/badge/com.gooddata/gooddata-java.svg)](https://javadoc.io/doc/com.gooddata/gooddata-java) [![Javadocs Model](https://javadoc.io/badge2/com.gooddata/gooddata-java-model/javadoc--model.svg)](https://javadoc.io/doc/com.gooddata/gooddata-java-model) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.gooddata/gooddata-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.gooddata/gooddata-java) -[![Release](https://img.shields.io/github/release/gooddata/gooddata-java.svg?sort=semver)](https://github.com/gooddata/gooddata-java/releases) +[![Maven Central](https://img.shields.io/maven-central/v/com.gooddata/gooddata-java)](https://central.sonatype.com/artifact/com.gooddata/gooddata-java) +[![Release](https://img.shields.io/github/v/release/gooddata/gooddata-java?sort=semver)](https://github.com/gooddata/gooddata-java/releases) The *GoodData Java SDK* encapsulates the REST API of the **GoodData Platform**. **The project is currently NOT in "active development". Meaning that feature request may or may not be implemented. -You are welcomed to [contribute your code](CONTRIBUTING.md) and create an [issue](https://github.com/gooddata/gooddata-java/issues).** +You are welcomed to [contribute your code](CONTRIBUTING.md) and create +an [issue](https://github.com/gooddata/gooddata-java/issues).** The first version was implemented during the [All Data Hackathon](http://hackathon.gooddata.com) April 10 - 11 2014. -It is free and open-source software provided "as-is" under the [BSD License](LICENSE.txt) as an official project by [GoodData Corporation](http://www.gooddata.com). +It is free and open-source software provided "as-is" under the [BSD License](LICENSE.txt) as an official project +by [GoodData Corporation](http://www.gooddata.com). ## Supported versions - -In order to make the user experience with integrating GoodData Java SDK as smooth and secure as possible and to ensure that the SDK is using the latest features of the platform, we only provide support to the most recent major version of Java SDK. - + +In order to make the user experience with integrating GoodData Java SDK as smooth and secure as possible and to ensure +that the SDK is using the latest features of the platform, we only provide support to the most recent major version of +Java SDK. + The most recent major will be supported in the following mode: - -- The latest major version will receive new functionality and bug fixes. These changes will be applied on top of last released version. + +- The latest major version will receive new functionality and bug fixes. These changes will be applied on top of last + released version. - GoodData customer support will provide support for the latest major version only. - The customers are encouraged to always use the latest version of the Java SDK. - In case of using older versions, the user might face API incompatibility, performance or security issues. - -Please follow the [upgrade instructions](https://github.com/gooddata/gooddata-java/wiki/Upgrading) to update to the newest version. + +Please follow the [upgrade instructions](https://github.com/gooddata/gooddata-java/wiki/Upgrading) to update to the +newest version. + +### Version 5.0 Release Notes + +**Version 5.0.0** represents a major modernization release with the following key updates: + +- **Java 17**: Minimum runtime requirement upgraded from Java 11 +- **Spring 6**: Framework upgraded from Spring 5.x to Spring 6.0.15 +- **Apache HTTP Client 5**: Primary HTTP client upgraded from version 4.5.x to 5.5.1 +- **Enhanced Compatibility**: Improved support for modern Java environments and cloud platforms + +This release maintains API compatibility while modernizing the underlying infrastructure for better performance, +security, and future extensibility. ## Modules The *GoodData Java SDK* contains following modules: + * [gooddata-java](./gooddata-java) - The GoodData API client (depends on `gooddata-java-model`). * [gooddata-java-model](./gooddata-java-model) - Lightweight library containing only GoodData API structures. -* [gooddata-java-parent](./pom.xml) - Parent for *GoodData Java SDK* libraries (just a wrapper around `gooddata-java` and `gooddata-java-model`). +* [gooddata-java-parent](./pom.xml) - Parent for *GoodData Java SDK* libraries (just a wrapper around `gooddata-java` + and `gooddata-java-model`). ## Usage @@ -50,7 +71,9 @@ The *GoodData Java SDK* is available in Maven Central Repository, to use it from {MAJOR}.{MINOR}.{PATCH}+api{API} ``` -See [releases page](https://github.com/gooddata/gooddata-java/releases) for information about versions and notable changes, + +See [releases page](https://github.com/gooddata/gooddata-java/releases) for information about versions and notable +changes, the [Upgrading Guide](https://github.com/gooddata/gooddata-java/wiki/Upgrading) will navigate you through changes between major versions. @@ -60,34 +83,143 @@ or [Wiki](https://github.com/gooddata/gooddata-java/wiki) for and [Extensibility How-To](https://github.com/gooddata/gooddata-java/wiki/Extending). ### API version -Since *GoodData Java SDK* version *2.32.0* API versioning is supported. The API version, GoodData Java is compatible with, is marked in artifact version using `+api` suffix (i.e. `2.32.0+api1` is compatible with API version `1`). + +Since *GoodData Java SDK* version *2.32.0* API versioning is supported. The API version, GoodData Java is compatible +with, is marked in artifact version using `+api` suffix (i.e. `2.32.0+api1` is compatible with API version `1`). ### Dependencies The *GoodData Java SDK* uses: -* the [GoodData HTTP client](https://github.com/gooddata/gooddata-http-client) version 0.9.3 or later -* the *Apache HTTP Client* version 4.5 or later (for white-labeled domains at least version 4.3.2 is required) -* the *Spring Framework* version 6.x (compatible with Spring Boot 3.x) -* the *Jackson JSON Processor* version 2.* -* the *Slf4j API* version 2.0.* -* the *Java Development Kit (JDK)* version 17 or later + +* the [GoodData HTTP client](https://github.com/gooddata/gooddata-http-client) version 3.0.0 +* the *Apache HTTP Client* version 5.5.1 +* the *Apache HTTP Client* version 4.5.13 (for compatibility with Sardine WebDAV library) +* the *Spring Framework* version 6.0.15 +* the *Jackson JSON Processor* version 2.13.4 +* the *Slf4j API* version 2.0.17 +* the *Java Development Kit (JDK)* version 17 or later to build + +### Migration from version 4.x to 5.0 + +**Version 5.0 introduces several significant upgrades that may require code changes in your application:** + +#### Breaking Changes + +1. **Java Runtime Requirement**: Minimum Java version is now **Java 17** (previously Java 11) +2. **Spring Framework**: Upgraded from Spring 5.x to **Spring 6.0.15** +3. **Apache HTTP Client**: Primary HTTP client upgraded from version 4.5.x to **version 5.5.1** +4. **SLF4J**: Upgraded from version 1.7.x to **version 2.0.17** + +#### Migration Steps + +**1. Update Java Runtime** +- Ensure your application runs on Java 17 or later +- Update your build tools (Maven/Gradle) to use Java 17 + +**2. Spring Framework Compatibility** +- If your application uses Spring Framework, upgrade to Spring 6.x or later +- Review Spring 6 migration guide for additional breaking changes: https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-6.x +- Update Spring Boot to version 3.0+ if applicable + +**3. Dependency Updates** +Update your `pom.xml` or `build.gradle`: + +```xml + + + com.gooddata + gooddata-java + 5.0.0+api3 + + + + + org.springframework + spring-core + 6.0.15 + + + + + org.slf4j + slf4j-api + 2.0.17 + +``` + +**4. HTTP Client Configuration** +- The SDK now internally uses Apache HTTP Client 5.x +- If you customize HTTP client settings via `GoodDataSettings`, the API remains compatible +- Custom HTTP interceptors or low-level HTTP client configurations may need updates + +**5. Testing** +- Thoroughly test your application after upgrade +- Pay special attention to HTTP client behavior, especially with authentication and connection pooling +- Verify logging functionality works as expected with SLF4J 2.x + +#### Compatibility Notes + +- **API Compatibility**: The public SDK API remains largely backward compatible +- **Internal Changes**: HTTP client implementation has been modernized but SDK interfaces are unchanged +- **Jakarta EE**: Spring 6 uses Jakarta EE namespaces instead of Java EE (affects annotations if you use them directly) + +#### Known Migration Issues and Solutions + +**1. ClassNotFoundException for Apache HTTP Client classes** +If you see errors like `ClassNotFoundException: org.apache.http.impl.client.HttpClientBuilder`: +- Remove any direct dependencies on Apache HTTP Client 4.x from your project +- The SDK now uses HTTP Client 5.x internally, which has different package names + +**2. Spring Boot Applications** +- Ensure you're using Spring Boot 3.0+ which includes Spring 6 +- Update your `@SpringBootApplication` and other Spring annotations if needed +- Check Spring Boot 3.0 migration guide for additional changes + +**3. Logging Configuration** +- SLF4J 2.x has some configuration changes compared to 1.7.x +- Update your `logback.xml` or `log4j2.xml` if you use advanced logging features +- Basic logging configuration should work without changes + +**4. Build Tools** +```xml + + + 17 + 17 + +``` + +```gradle +// Gradle: Ensure Java 17 in your build.gradle +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} +``` + +For additional help, please refer to the [upgrading wiki page](https://github.com/gooddata/gooddata-java/wiki/Upgrading) +or [create an issue](https://github.com/gooddata/gooddata-java/issues) if you encounter problems during migration. ##### Retry of failed API calls -You can retry your failed requests since version *2.34.0*. Turn it on by configuring +You can retry your failed requests since *GoodData Java SDK* version *2.34.0*. Turn it on by configuring [RetrySettings](https://github.com/gooddata/gooddata-java/blob/master/src/main/java/com/gooddata/retry/RetrySettings.java) and add [Spring retry](https://github.com/spring-projects/spring-retry) to your classpath: + ```xml org.springframework.retry spring-retry - ${spring.retry.version} + 2.0.12 ``` +**Note**: Spring Retry 2.0.12 is compatible with Spring 6. If you're upgrading from prior versions of the SDK, +ensure you also upgrade your Spring Retry dependency to version 2.x for compatibility. + ### Logging -The *GoodData Java SDK* logs using `slf4j-api`. Please adjust your logging configuration for +The *GoodData Java SDK* logs using `slf4j-api`. Please adjust your logging configuration for `com.gooddata.sdk.*` loggers or alternatively turn the logging off using following dependency: ```xml @@ -98,6 +230,7 @@ The *GoodData Java SDK* logs using `slf4j-api`. Please adjust your logging confi ``` ### Date/Time + The *GoodData Java SDK* is using Java 8 Date/Time API (JSR 310) for all Date / Time / Zone public facing types. Good SO thread about differences between various types in Java Date/Time API: https://stackoverflow.com/a/32443004 @@ -111,4 +244,5 @@ For releasing see [Releasing How-To](https://github.com/gooddata/gooddata-java/w ## Contribute Found a bug? Please create an [issue](https://github.com/gooddata/gooddata-java/issues). Missing functionality? -[Contribute your code](CONTRIBUTING.md). Any questions about GoodData or this library? Check out [the GoodData community website](http://community.gooddata.com/). +[Contribute your code](CONTRIBUTING.md). Any questions about GoodData or this library? Check +out [the GoodData community website](http://community.gooddata.com/). diff --git a/bugs-exclude.xml b/bugs-exclude.xml new file mode 100644 index 000000000..629a72fe5 --- /dev/null +++ b/bugs-exclude.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/bugs-include.xml b/bugs-include.xml new file mode 100644 index 000000000..5926b1f8b --- /dev/null +++ b/bugs-include.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/findBugsFilter.xml b/findBugsFilter.xml deleted file mode 100644 index aadc37f69..000000000 --- a/findBugsFilter.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/gooddata-java-model/pom.xml b/gooddata-java-model/pom.xml index 0f00be08c..112a2ed15 100644 --- a/gooddata-java-model/pom.xml +++ b/gooddata-java-model/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 gooddata-java-model - ${project.artifactId} gooddata-java-parent com.gooddata - 4.0.4+api3-SNAPSHOT + 5.0.0+api3-SNAPSHOT @@ -43,11 +43,6 @@ mockito-core test - - org.mockito - mockito-junit-jupiter - test - org.hamcrest hamcrest @@ -98,11 +93,6 @@ spring-web test - - org.junit.jupiter - junit-jupiter-api - test - @@ -111,18 +101,6 @@ org.codehaus.gmavenplus gmavenplus-plugin - - org.apache.maven.plugins - maven-dependency-plugin - - false - - com.fasterxml.jackson.core:jackson-core - org.apache.commons:commons-lang3 - com.gooddata:gooddata-rest-common - - - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java index 2cd6a19e1..d0f0b6ae1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Account.java @@ -36,31 +36,23 @@ public class Account { public static final String CURRENT_ID = "current"; private final String login; - + @JsonIgnore + private final Links links; @JsonView(UpdateView.class) private String email; - @JsonView(UpdateView.class) private String password; - @JsonView(UpdateView.class) private String verifyPassword; - @JsonView(UpdateView.class) private String firstName; - @JsonView(UpdateView.class) private String lastName; - @JsonView(UpdateView.class) private List ipWhitelist; - @JsonView(UpdateView.class) private List authenticationModes; - @JsonIgnore - private final Links links; - @JsonCreator private Account( @JsonProperty("login") String login, @@ -100,15 +92,26 @@ public Account(String firstName, String lastName, Links links) { /** * Account creation constructor - * @param email email + * + * @param email email * @param firstName first name - * @param lastName last name - * @param password password + * @param lastName last name + * @param password password */ public Account(String email, String password, String firstName, String lastName) { this(email, email, password, password, firstName, lastName, null, null, null); } + /** + * Extract Account's ID from Account's URI + * + * @param uri Account's URI + * @return Account's ID extracted from URI + */ + public static String getId(String uri) { + return UriHelper.getLastUriPart(uri); + } + public String getLogin() { return login; } @@ -117,22 +120,42 @@ public String getEmail() { return email; } + public void setEmail(final String email) { + this.email = email; + } + public String getPassword() { return password; } + public void setPassword(final String password) { + this.password = password; + } + public String getVerifyPassword() { return verifyPassword; } + public void setVerifyPassword(final String verifyPassword) { + this.verifyPassword = verifyPassword; + } + public String getFirstName() { return firstName; } + public void setFirstName(final String firstName) { + this.firstName = firstName; + } + public String getLastName() { return lastName; } + public void setLastName(final String lastName) { + this.lastName = lastName; + } + @JsonIgnore public String getUri() { return links.getSelf(); @@ -152,36 +175,35 @@ public List getIpWhitelist() { return ipWhitelist; } - public List getAuthenticationModes() { - return authenticationModes; - } - - public void setEmail(final String email) { - this.email = email; - } - - public void setPassword(final String password) { - this.password = password; - } - - public void setVerifyPassword(final String verifyPassword) { - this.verifyPassword = verifyPassword; + public void setIpWhitelist(final List ipWhitelist) { + this.ipWhitelist = ipWhitelist; } - public void setFirstName(final String firstName) { - this.firstName = firstName; + public List getAuthenticationModes() { + return authenticationModes; } - public void setLastName(final String lastName) { - this.lastName = lastName; + public void setAuthenticationModes(final List authenticationModes) { + this.authenticationModes = authenticationModes; } - public void setIpWhitelist(final List ipWhitelist) { - this.ipWhitelist = ipWhitelist; + @Override + public String toString() { + return GoodDataToStringBuilder.defaultToString(this, "password", "verifyPassword"); } - public void setAuthenticationModes(final List authenticationModes) { - this.authenticationModes = authenticationModes; + /** + * Enumeration type representing GoodData authentication mode. + */ + public enum AuthenticationMode { + /** + * User can be authenticated using password + */ + PASSWORD, + /** + * User can be authenticated via SSO + */ + SSO } @JsonIgnoreProperties(ignoreUnknown = true) @@ -204,38 +226,9 @@ public String getProjects() { } } - /** - * Extract Account's ID from Account's URI - * @param uri Account's URI - * @return Account's ID extracted from URI - */ - public static String getId(String uri) { - return UriHelper.getLastUriPart(uri); - } - - @Override - public String toString() { - return GoodDataToStringBuilder.defaultToString(this, "password", "verifyPassword"); - } - /** * Class representing update view of account */ public static class UpdateView { } - - /** - * Enumeration type representing GoodData authentication mode. - */ - public enum AuthenticationMode { - /** - * User can be authenticated using password - */ - PASSWORD, - /** - * User can be authenticated via SSO - */ - SSO - } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Accounts.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Accounts.java index 59b75db0a..82c1a3c78 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Accounts.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/Accounts.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.gooddata.sdk.common.collections.Page; import com.gooddata.sdk.common.collections.Paging; @@ -33,4 +32,3 @@ public class Accounts extends Page { super(items, paging, links); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/AccountsDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/AccountsDeserializer.java index 35995b53c..f03c4b243 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/AccountsDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/AccountsDeserializer.java @@ -22,4 +22,3 @@ protected Accounts createPage(final List items, final Paging paging, fi return new Accounts(items, paging, links); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/SeparatorSettings.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/SeparatorSettings.java index 60bf14a41..3f94eabc3 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/SeparatorSettings.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/account/SeparatorSettings.java @@ -24,10 +24,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class SeparatorSettings implements Serializable { - private static final long serialVersionUID = 446547615105910660L; - public static final String URI = "/gdc/account/profile/{id}/settings/separators"; - + private static final long serialVersionUID = 446547615105910660L; private final String thousand; private final String decimal; private final Links links; @@ -60,7 +58,7 @@ public String toString() { } @JsonIgnoreProperties(ignoreUnknown = true) - private static class Links implements Serializable{ + private static class Links implements Serializable { private final String self; @JsonCreator @@ -74,4 +72,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLog.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLog.java index 7fe2606e3..8bed61789 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLog.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLog.java @@ -94,4 +94,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogs.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogs.java index 3ef125f38..b45655fc8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogs.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogs.java @@ -37,4 +37,3 @@ public AccessLogs(List items, Paging paging, Map link super(items, paging, links); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsDeserializer.java index 988be1f4a..857547c4a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsDeserializer.java @@ -13,11 +13,12 @@ public class AccessLogsDeserializer extends PageDeserializer { - public AccessLogsDeserializer() { super(AccessLog.class); } + public AccessLogsDeserializer() { + super(AccessLog.class); + } @Override protected AccessLogs createPage(List items, Paging paging, Map links) { return new AccessLogs(items, paging, links); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsSerializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsSerializer.java index d425dafed..4c901162c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsSerializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AccessLogsSerializer.java @@ -12,4 +12,3 @@ public AccessLogsSerializer() { super(AccessLogs.ROOT_NODE); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvent.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvent.java index ef98a0c9c..554441574 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvent.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvent.java @@ -35,11 +35,15 @@ public class AuditEvent { private final String userLogin; - /** the time the event occurred */ + /** + * the time the event occurred + */ @ISOZonedDateTime private final ZonedDateTime occurred; - /** the time event was recorded by audit system */ + /** + * the time event was recorded by audit system + */ @ISOZonedDateTime private final ZonedDateTime recorded; @@ -124,4 +128,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvents.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvents.java index a0fc97418..e60324e1c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvents.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEvents.java @@ -33,4 +33,3 @@ public AuditEvents(final List items, final Paging paging, final Map< } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsDeserializer.java index c8dbf523c..4ab1dd022 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsDeserializer.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -class AuditEventsDeserializer extends PageDeserializer{ +class AuditEventsDeserializer extends PageDeserializer { protected AuditEventsDeserializer() { super(AuditEvent.class); @@ -22,4 +22,3 @@ protected AuditEvents createPage(final List items, final Paging pagi return new AuditEvents(items, paging, links); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsSerializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsSerializer.java index e1d4c36e6..8d36cc8b3 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsSerializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/auditevent/AuditEventsSerializer.java @@ -13,4 +13,3 @@ public AuditEventsSerializer() { super(AuditEvents.ROOT_NODE); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ConnectorType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ConnectorType.java index f183b4091..c7b602e25 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ConnectorType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ConnectorType.java @@ -27,4 +27,3 @@ public String getSettingsUrl() { return settingsUrl; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Integration.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Integration.java index 873bcf4aa..4a5040878 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Integration.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Integration.java @@ -26,12 +26,11 @@ public class Integration { public static final String URL = "/gdc/projects/{project}/connectors/{connector}/integration"; - - private String projectTemplate; - private boolean active; private final IntegrationProcessStatus lastFinishedProcess; private final IntegrationProcessStatus lastSuccessfulProcess; private final IntegrationProcessStatus runningProcess; + private String projectTemplate; + private boolean active; public Integration(final String projectTemplate) { this(projectTemplate, true, null, null, null); @@ -85,4 +84,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/IntegrationProcessStatus.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/IntegrationProcessStatus.java index 65baed4fa..df309dcbf 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/IntegrationProcessStatus.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/IntegrationProcessStatus.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.util.UriHelper; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.common.util.ISOZonedDateTime; +import com.gooddata.sdk.model.util.UriHelper; import java.time.ZonedDateTime; import java.util.Map; @@ -96,4 +96,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessExecution.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessExecution.java index 7272208ce..e1ec36c69 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessExecution.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessExecution.java @@ -24,4 +24,3 @@ public interface ProcessExecution { ConnectorType getConnectorType(); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessStatus.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessStatus.java index d89fba21c..a8665cbb6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessStatus.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/ProcessStatus.java @@ -36,4 +36,3 @@ public class ProcessStatus extends IntegrationProcessStatus { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Reload.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Reload.java index 5d87cd919..cc9c46d08 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Reload.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Reload.java @@ -146,4 +146,3 @@ private Optional getLink(final String linkName) { return links != null ? Optional.ofNullable(links.get(linkName)) : Optional.empty(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java index 635380210..a7e2810ba 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Settings.java @@ -24,4 +24,3 @@ public interface Settings { ConnectorType getConnectorType(); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Status.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Status.java index da4a9f2e3..0144b3bb9 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Status.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Status.java @@ -67,6 +67,10 @@ public boolean isFailed() { return ERROR.name().equalsIgnoreCase(code) || USER_ERROR.name().equalsIgnoreCase(code); } + @Override + public String toString() { + return GoodDataToStringBuilder.defaultToString(this); + } /** * Enum of connector process status codes @@ -75,10 +79,4 @@ public enum Code { NEW, SCHEDULED, DOWNLOADING, DOWNLOADED, TRANSFORMING, TRANSFORMED, UPLOADING, UPLOADED, SYNCHRONIZED, ERROR, USER_ERROR } - - @Override - public String toString() { - return GoodDataToStringBuilder.defaultToString(this); - } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4ProcessExecution.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4ProcessExecution.java index e69639163..197be0f1d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4ProcessExecution.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4ProcessExecution.java @@ -17,9 +17,9 @@ import java.util.Map; import java.util.TreeMap; -import static com.gooddata.sdk.model.connector.ConnectorType.ZENDESK4; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.model.connector.ConnectorType.ZENDESK4; /** * Zendesk 4 (Insights) connector process execution (i.e. definition for single ETL run). Serialization only. @@ -110,15 +110,15 @@ public DownloadParams getDownloadParams() { return downloadParams; } + public void setDownloadParams(DownloadParams downloadParams) { + this.downloadParams = downloadParams; + } + @JsonProperty("downloadParams") private DownloadParams getDownloadParamsPlain() { return downloadParams; } - public void setDownloadParams(DownloadParams downloadParams) { - this.downloadParams = downloadParams; - } - @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); @@ -144,7 +144,8 @@ public DownloadParams(Boolean useBackup) { this(useBackup, null, null); } - private DownloadParams() {} + private DownloadParams() { + } @JsonProperty("useBackup") public Boolean getUseBackup() { @@ -179,4 +180,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4Settings.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4Settings.java index 27b55f903..287b69340 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4Settings.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/connector/Zendesk4Settings.java @@ -18,13 +18,12 @@ public class Zendesk4Settings implements Settings { public static final String URL = "/gdc/projects/{project}/connectors/zendesk4/integration/settings"; - - private String apiUrl; - private String zopimUrl; - private String account; private final String type; private final String syncTime; private final String syncTimeZone; + private String apiUrl; + private String zopimUrl; + private String account; public Zendesk4Settings(final String apiUrl) { this(apiUrl, null, null, null, null, null); @@ -86,14 +85,13 @@ public ConnectorType getConnectorType() { return ZENDESK4; } - /** - * Type of Zendesk account. - */ - public enum Zendesk4Type {plus, enterprise} - @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); } -} + /** + * Type of Zendesk account. + */ + public enum Zendesk4Type {plus, enterprise} +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/OutputStage.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/OutputStage.java index d5359b9ab..314e3edee 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/OutputStage.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/OutputStage.java @@ -5,9 +5,15 @@ */ package com.gooddata.sdk.model.dataload; -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.warehouse.WarehouseSchema; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.warehouse.WarehouseSchema; import java.util.Map; @@ -28,11 +34,10 @@ public class OutputStage { private static final String SELF_LINK = "self"; private static final String OUTPUT_STAGE_DIFF = "outputStageDiff"; private static final String DATALOAD_PROCESS = "dataloadProcess"; - + private final Map links; private String schema; private String clientId; private String outputStagePrefix; - private final Map links; @JsonCreator private OutputStage(@JsonProperty("schema") final String schema, @@ -137,4 +142,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/AsyncTask.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/AsyncTask.java index 656a69b15..5d145923d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/AsyncTask.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/AsyncTask.java @@ -56,4 +56,3 @@ public String getPoll() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java index 60eb6778c..689453d40 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcess.java @@ -5,15 +5,23 @@ */ package com.gooddata.sdk.model.dataload.processes; -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.util.UriHelper; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.util.UriHelper; import java.util.Collections; import java.util.Map; import java.util.Set; -import static com.gooddata.sdk.common.util.Validate.*; +import static com.gooddata.sdk.common.util.Validate.notEmpty; +import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.common.util.Validate.notNullState; /** * Dataload process. @@ -32,7 +40,7 @@ public class DataloadProcess { private String name; private String type; private Set executables; - private Map links; + private Map links; private String path; public DataloadProcess(String name, String type) { @@ -43,8 +51,8 @@ public DataloadProcess(String name, String type) { /** * Use this constructor, when you want to deploy process from appstore. * - * @param name name - * @param type type + * @param name name + * @param type type * @param appstorePath valid path to brick in appstore */ public DataloadProcess(String name, String type, String appstorePath) { @@ -58,8 +66,8 @@ public DataloadProcess(String name, ProcessType type) { @JsonCreator private DataloadProcess(@JsonProperty("name") String name, @JsonProperty("type") String type, - @JsonProperty("executables") Set executables, - @JsonProperty("links") Map links) { + @JsonProperty("executables") Set executables, + @JsonProperty("links") Map links) { this(name, type); this.executables = executables != null ? Collections.unmodifiableSet(executables) : null; this.links = links; @@ -69,14 +77,14 @@ public String getName() { return name; } - public String getType() { - return type; - } - public void setName(String name) { this.name = name; } + public String getType() { + return type; + } + public void setType(String type) { this.type = type; } @@ -126,4 +134,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcesses.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcesses.java index ee5a94fbc..307eed7bf 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcesses.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/DataloadProcesses.java @@ -5,9 +5,13 @@ */ package com.gooddata.sdk.model.dataload.processes; -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.account.Account; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.account.Account; import java.util.Collection; import java.util.List; @@ -39,4 +43,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecution.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecution.java index 0a938dd0f..9a8a064f0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecution.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecution.java @@ -5,9 +5,6 @@ */ package com.gooddata.sdk.model.dataload.processes; -import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -17,6 +14,9 @@ import java.util.HashMap; import java.util.Map; +import static com.gooddata.sdk.common.util.Validate.notEmpty; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Dataload process execution. Serialization only. */ @@ -28,8 +28,8 @@ public class ProcessExecution { private final String executionsUri; private final String executable; - private final Map params; - private final Map hiddenParams; + private final Map params; + private final Map hiddenParams; public ProcessExecution(DataloadProcess process, String executable) { this(process, executable, new HashMap<>(), new HashMap<>()); @@ -71,4 +71,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this, "hiddenParams", "executionsUri"); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java index 99c02a7ce..57b9b8c6f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionDetail.java @@ -47,7 +47,7 @@ public class ProcessExecutionDetail { private final ZonedDateTime finished; private final ErrorStructure error; - private final Map links; + private final Map links; @JsonCreator private ProcessExecutionDetail(@JsonProperty("status") String status, @@ -66,6 +66,10 @@ private ProcessExecutionDetail(@JsonProperty("status") String status, this.links = links; } + public static URI uriFromExecutionUri(URI executionUri) { + return URI.create(executionUri.toString() + "/detail"); + } + public String getStatus() { return status; } @@ -110,14 +114,8 @@ public boolean isSuccess() { return STATUS_OK.equals(status); } - - public static URI uriFromExecutionUri(URI executionUri) { - return URI.create(executionUri.toString() + "/detail"); - } - @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java index f33eea1e0..8fe5169ec 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessExecutionTask.java @@ -5,8 +5,6 @@ */ package com.gooddata.sdk.model.dataload.processes; -import static com.gooddata.sdk.common.util.Validate.notNullState; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,6 +13,8 @@ import java.util.Map; +import static com.gooddata.sdk.common.util.Validate.notNullState; + /** * Process execution task. Deserialization only */ @@ -26,7 +26,7 @@ public class ProcessExecutionTask { private static final String POLL_LINK = "poll"; private static final String DETAIL_LINK = "detail"; - private final Map links; + private final Map links; @JsonCreator private ProcessExecutionTask(@JsonProperty("links") Map links) { @@ -41,4 +41,3 @@ public String getDetailUri() { return notNullState(links, "links").get(DETAIL_LINK); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessType.java index 359b03d8d..1d32f2a12 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ProcessType.java @@ -15,4 +15,3 @@ public enum ProcessType { GROOVY, DATALOAD } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedule.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedule.java index 9a19ce438..e7e113c3c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedule.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedule.java @@ -13,9 +13,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.gooddata.sdk.model.util.UriHelper; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.common.util.ISOZonedDateTimeDeserializer; +import com.gooddata.sdk.model.util.UriHelper; import java.time.Duration; import java.time.ZonedDateTime; @@ -46,16 +46,16 @@ public class Schedule { private static final String EXECUTABLE = "EXECUTABLE"; private final String type; + private final ZonedDateTime nextExecutionTime; + private final int consecutiveFailedExecutionCount; + private final Map params; + private final Map links; private String state; private String cron; private String timezone; private Integer reschedule; private String triggerScheduleId; private String name; - private final ZonedDateTime nextExecutionTime; - private final int consecutiveFailedExecutionCount; - private final Map params; - private final Map links; public Schedule(final DataloadProcess process, final String executable, final String cron) { this(process, executable); @@ -187,6 +187,11 @@ public void setTimezone(final String timezone) { this.timezone = timezone; } + @JsonIgnore + public void setTimezone(final ZonedDateTime timezone) { + this.timezone = notNull(timezone, "timezone").getZone().getId(); + } + /** * Duration after a failed execution of the schedule is executed again * @@ -232,11 +237,6 @@ public void setName(final String name) { this.name = name; } - @JsonIgnore - public void setTimezone(final ZonedDateTime timezone) { - this.timezone = notNull(timezone, "timezone").getZone().getId(); - } - @JsonIgnore public ZonedDateTime getNextExecutionTime() { return nextExecutionTime; @@ -267,4 +267,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleExecution.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleExecution.java index d5c29a940..2ff82dd9a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleExecution.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleExecution.java @@ -40,9 +40,10 @@ public class ScheduleExecution { private String trigger; private String processLastDeployedBy; - private Map links; + private Map links; - public ScheduleExecution() {} + public ScheduleExecution() { + } @JsonCreator private ScheduleExecution(@JsonProperty("createdTime") @JsonDeserialize(using = ISOZonedDateTimeDeserializer.class) ZonedDateTime created, @@ -91,4 +92,3 @@ public boolean isFinished() { return FINISHED_STATUSES.contains(getStatus()); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleState.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleState.java index ce7a3ea04..553d6632e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleState.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/ScheduleState.java @@ -11,4 +11,3 @@ public enum ScheduleState { ENABLED, DISABLED } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedules.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedules.java index 320a56f9f..2443ff04e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedules.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/Schedules.java @@ -28,4 +28,3 @@ public class Schedules extends Page { super(items, paging); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/SchedulesDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/SchedulesDeserializer.java index 9585a3408..7c21903e1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/SchedulesDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataload/processes/SchedulesDeserializer.java @@ -22,4 +22,3 @@ protected Schedules createPage(final List items, final Paging paging, return new Schedules(items, paging); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetLinks.java index b60f28131..3b0027c49 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetLinks.java @@ -5,7 +5,8 @@ */ package com.gooddata.sdk.model.dataset; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import com.gooddata.sdk.model.gdc.AboutLinks; import java.util.List; @@ -25,4 +26,3 @@ public DatasetLinks(@JsonProperty("category") String category, @JsonProperty("su } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifest.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifest.java index a42790acd..63563f952 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifest.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifest.java @@ -5,17 +5,17 @@ */ package com.gooddata.sdk.model.dataset; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.common.util.BooleanDeserializer; -import com.gooddata.sdk.common.util.BooleanIntegerSerializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.gooddata.sdk.common.util.BooleanDeserializer; +import com.gooddata.sdk.common.util.BooleanIntegerSerializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.InputStream; @@ -48,6 +48,7 @@ public DatasetManifest(String dataSet) { /** * Create dataset upload manifest. + * * @param dataSet dataset name * @param source source CSV */ @@ -86,6 +87,7 @@ public void setFile(String file) { /** * Set upload mode for all parts of this dataset manifest + * * @param uploadMode upload mode */ public void setUploadMode(final UploadMode uploadMode) { @@ -97,8 +99,9 @@ public void setUploadMode(final UploadMode uploadMode) { /** * Map the given CSV column name to the dataset field + * * @param columnName column name - * @param populates dataset field + * @param populates dataset field */ public void setMapping(final String columnName, final String populates) { notNull(columnName, "columnName"); @@ -144,10 +147,10 @@ public static class Part { @JsonCreator public Part(@JsonProperty("mode") String uploadMode, - @JsonProperty("columnName") String columnName, - @JsonProperty("populates") List populates, - @JsonProperty("referenceKey") @JsonDeserialize(using = BooleanDeserializer.class) Boolean referenceKey, - @JsonProperty("constraints") Map constraints) { + @JsonProperty("columnName") String columnName, + @JsonProperty("populates") List populates, + @JsonProperty("referenceKey") @JsonDeserialize(using = BooleanDeserializer.class) Boolean referenceKey, + @JsonProperty("constraints") Map constraints) { this.uploadMode = uploadMode; this.columnName = columnName; this.populates = populates; @@ -210,4 +213,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifests.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifests.java index 361ae0686..41dade477 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifests.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetManifests.java @@ -22,6 +22,7 @@ public class DatasetManifests { /** * Construct object. + * * @param manifests dataset upload manifests */ @JsonCreator @@ -39,4 +40,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetNotFoundException.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetNotFoundException.java index bb518fde5..32704688a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetNotFoundException.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/DatasetNotFoundException.java @@ -5,10 +5,10 @@ */ package com.gooddata.sdk.model.dataset; -import static java.lang.String.format; - import com.gooddata.sdk.common.GoodDataException; +import static java.lang.String.format; + /** * Represents error when dataset of the given id was not found */ @@ -24,4 +24,3 @@ public DatasetNotFoundException(String dataset, Throwable cause) { super(format(MESSAGE, dataset), cause); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlMode.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlMode.java index be957001c..4299adde8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlMode.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlMode.java @@ -45,4 +45,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlModeType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlModeType.java index 6d8192e9f..8492b9898 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlModeType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/EtlModeType.java @@ -19,4 +19,3 @@ public String getName() { return name(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/LookupMode.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/LookupMode.java index ca8d0609e..2f39b6118 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/LookupMode.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/LookupMode.java @@ -19,4 +19,3 @@ public String getName() { return name().toLowerCase(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/MaqlDml.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/MaqlDml.java index b6a171b69..fac9510fb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/MaqlDml.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/MaqlDml.java @@ -19,4 +19,3 @@ public MaqlDml(final String maql) { super(maql); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Pull.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Pull.java index 5d67ccbc5..56eeaf5b7 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Pull.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Pull.java @@ -35,4 +35,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/PullTask.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/PullTask.java index 135a5f7af..f1aedb205 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/PullTask.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/PullTask.java @@ -5,7 +5,11 @@ */ package com.gooddata.sdk.model.dataset; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; @@ -47,4 +51,3 @@ private Links(@JsonProperty("poll") String uri) { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/TaskState.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/TaskState.java index 0ec18c18e..e65700f15 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/TaskState.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/TaskState.java @@ -57,4 +57,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Upload.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Upload.java index d0a1b8fc9..98c3d38db 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Upload.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Upload.java @@ -37,13 +37,13 @@ public class Upload { private final ZonedDateTime processedAt; Upload(@JsonProperty("msg") String message, - @JsonProperty("progress") Double progress, - @JsonProperty("status") String status, - @JsonProperty("fullUpload") @JsonDeserialize(using = BooleanDeserializer.class) Boolean fullUpload, - @JsonProperty("uri") String uri, - @JsonProperty("createdAt") @JsonDeserialize(using = GDZonedDateTimeDeserializer.class) ZonedDateTime createdAt, - @JsonProperty("fileSize") Integer size, - @JsonProperty("processedAt") @JsonDeserialize(using = GDZonedDateTimeDeserializer.class) ZonedDateTime processedAt) { + @JsonProperty("progress") Double progress, + @JsonProperty("status") String status, + @JsonProperty("fullUpload") @JsonDeserialize(using = BooleanDeserializer.class) Boolean fullUpload, + @JsonProperty("uri") String uri, + @JsonProperty("createdAt") @JsonDeserialize(using = GDZonedDateTimeDeserializer.class) ZonedDateTime createdAt, + @JsonProperty("fileSize") Integer size, + @JsonProperty("processedAt") @JsonDeserialize(using = GDZonedDateTimeDeserializer.class) ZonedDateTime processedAt) { this.uri = uri; this.status = status; @@ -127,4 +127,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadMode.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadMode.java index 13d4348c4..2c0c67d61 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadMode.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadMode.java @@ -61,4 +61,4 @@ public static UploadMode get(String mode) { public String toString() { return this.modeStr; } -} +} \ No newline at end of file diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadStatistics.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadStatistics.java index 61e6c852c..540d76653 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadStatistics.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadStatistics.java @@ -47,4 +47,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Uploads.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Uploads.java index 327c7f8d2..1b44c8735 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Uploads.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/Uploads.java @@ -40,4 +40,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadsInfo.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadsInfo.java index fc29fc972..80b8dcdd8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadsInfo.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/dataset/UploadsInfo.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.gooddata.sdk.model.md.Meta; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Meta; import java.util.Collection; import java.util.HashMap; @@ -70,7 +70,7 @@ public String toString() { *
  • uri to all uploads for the given dataset
    • *
  • last upload
    • * - * + *

    * Deserialization only. */ @JsonIgnoreProperties(ignoreUnknown = true) @@ -137,4 +137,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Execution.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Execution.java index 9c830b95b..807f94382 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Execution.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Execution.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.afm.Afm; import com.gooddata.sdk.model.executeafm.resultspec.ResultSpec; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; /** * Represents structure for triggering execution of contained AFM (Attributes Filters Metrics). @@ -53,4 +53,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/IdentifierObjQualifier.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/IdentifierObjQualifier.java index 91f48c2e3..52305268d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/IdentifierObjQualifier.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/IdentifierObjQualifier.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonRootName; import com.fasterxml.jackson.annotation.JsonValue; -import com.gooddata.sdk.model.md.Obj; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Obj; import java.io.Serializable; import java.util.Objects; @@ -49,4 +49,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/LocalIdentifierQualifier.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/LocalIdentifierQualifier.java index a61858de8..5a49c4dbc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/LocalIdentifierQualifier.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/LocalIdentifierQualifier.java @@ -59,4 +59,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ObjQualifier.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ObjQualifier.java index 5bde9a411..8f125fab9 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ObjQualifier.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ObjQualifier.java @@ -21,10 +21,10 @@ public interface ObjQualifier extends Qualifier { /** * Returns the qualifier in the form of uri. Default implementation throws {@link UnsupportedOperationException} + * * @return uri qualifier */ default String getUri() { throw new UnsupportedOperationException("This qualifier has no URI"); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Qualifier.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Qualifier.java index 1351ca2b9..dda15d711 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Qualifier.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/Qualifier.java @@ -20,4 +20,3 @@ public interface Qualifier { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ResultPage.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ResultPage.java index 750b7c5f1..1839ca11b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ResultPage.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/ResultPage.java @@ -24,8 +24,9 @@ public class ResultPage { /** * Creates new instance + * * @param offsets list of page offsets - * @param limits list of page limits + * @param limits list of page limits */ public ResultPage(final List offsets, final List limits) { this.offsets = notEmpty(offsets, "offsets"); @@ -35,6 +36,10 @@ public ResultPage(final List offsets, final List limits) { } } + private static String toQueryParam(final List list) { + return list.stream().map(String::valueOf).collect(joining("%2C")); + } + /** * @return page offsets joined and URL-encoded to be used as query parameter */ @@ -48,9 +53,4 @@ public String getOffsetsQueryParam() { public String getLimitsQueryParam() { return toQueryParam(limits); } - - private static String toQueryParam(final List list) { - return list.stream().map(String::valueOf).collect(joining("%2C")); - } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/UriObjQualifier.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/UriObjQualifier.java index 161873a33..55944043e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/UriObjQualifier.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/UriObjQualifier.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonRootName; import com.fasterxml.jackson.annotation.JsonValue; -import com.gooddata.sdk.model.md.Obj; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Obj; import java.io.Serializable; import java.util.Objects; @@ -51,4 +51,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/VisualizationExecution.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/VisualizationExecution.java index b0510b633..9ab1be7d6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/VisualizationExecution.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/VisualizationExecution.java @@ -40,14 +40,14 @@ public VisualizationExecution(final String reference) { } /** - * @param reference reference uri to visualization object metadata - * @param filters additional filters which should be merged + * @param reference reference uri to visualization object metadata + * @param filters additional filters which should be merged * @param resultSpec result specification of executed viz. object */ @JsonCreator VisualizationExecution(@JsonProperty("reference") final String reference, - @JsonProperty("filters") final List filters, - @JsonProperty("resultSpec") final ResultSpec resultSpec) { + @JsonProperty("filters") final List filters, + @JsonProperty("resultSpec") final ResultSpec resultSpec) { this.reference = reference; this.resultSpec = resultSpec; this.filters = filters; @@ -65,13 +65,13 @@ public List getFilters() { } /** - * Sets the result specification and returns this instance + * Sets additional filters to this execution. * - * @param resultSpec result specification of executed viz. object + * @param filters additional filters * @return updated execution */ - public VisualizationExecution setResultSpec(final ResultSpec resultSpec) { - this.resultSpec = resultSpec; + public VisualizationExecution setFilters(final List filters) { + this.filters = filters; return this; } @@ -83,14 +83,13 @@ public ResultSpec getResultSpec() { } /** - * Sets additional filters to this execution. + * Sets the result specification and returns this instance * - * @param filters additional filters + * @param resultSpec result specification of executed viz. object * @return updated execution */ - public VisualizationExecution setFilters(final List filters) { - this.filters = filters; + public VisualizationExecution setResultSpec(final ResultSpec resultSpec) { + this.resultSpec = resultSpec; return this; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Afm.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Afm.java index 88e61e327..4bd2bc35b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Afm.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Afm.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.executeafm.afm.filter.CompatibilityFilter; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.afm.filter.CompatibilityFilter; import java.util.ArrayList; import java.util.List; @@ -45,8 +45,15 @@ public Afm(@JsonProperty("attributes") final List attributes, public Afm() { } + private static T getIdentifiable(final List toSearch, final String localIdentifier) { + return Optional.ofNullable(toSearch) + .flatMap(a -> a.stream().filter(i -> Objects.equals(localIdentifier, i.getLocalIdentifier())).findFirst()) + .orElseThrow(() -> new IllegalArgumentException(format("Item of localIdentifier=%s not found", localIdentifier))); + } + /** * Find {@link AttributeItem} within attributes by given localIdentifier + * * @param localIdentifier identifier used for search * @return found attribute or throws exception */ @@ -57,6 +64,7 @@ public AttributeItem getAttribute(final String localIdentifier) { /** * Find {@link MeasureItem} within measures by given localIdentifier + * * @param localIdentifier identifier used for search * @return found measure or throws exception */ @@ -134,11 +142,4 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } - private static T getIdentifiable(final List toSearch, final String localIdentifier) { - return Optional.ofNullable(toSearch) - .flatMap(a -> a.stream().filter(i -> Objects.equals(localIdentifier, i.getLocalIdentifier())).findFirst()) - .orElseThrow(() -> new IllegalArgumentException(format("Item of localIdentifier=%s not found", localIdentifier))); - } - } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Aggregation.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Aggregation.java index 94ae081c1..e30c65bf0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Aggregation.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/Aggregation.java @@ -20,4 +20,3 @@ public String toString() { return name().toLowerCase(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java index 4e4de8824..77fa740c6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ArithmeticMeasureDefinition.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.ObjQualifier; import java.util.Collection; import java.util.Collections; @@ -21,17 +21,16 @@ @JsonRootName(PreviousPeriodMeasureDefinition.NAME) public class ArithmeticMeasureDefinition implements MeasureDefinition { - private static final long serialVersionUID = -2597112924341600780L; - static final String NAME = "arithmeticMeasure"; - + private static final long serialVersionUID = -2597112924341600780L; private final List measureIdentifiers; private final String operator; /** * Constructor of {@link ArithmeticMeasureDefinition} + * * @param measureIdentifiers local identifiers of measures - * @param operator operator used for aggregation, for example sum, difference, multiplication, ratio, growth + * @param operator operator used for aggregation, for example sum, difference, multiplication, ratio, growth */ @JsonCreator public ArithmeticMeasureDefinition( @@ -43,6 +42,7 @@ public ArithmeticMeasureDefinition( /** * no qualifiers are used, only local identifiers are used see {@link ArithmeticMeasureDefinition#getOperator()} + * * @return empty set */ @Override @@ -52,6 +52,7 @@ public Collection getObjQualifiers() { /** * no conversion is done, because this definition uses only local identifiers + * * @return this instance */ @Override @@ -66,6 +67,7 @@ public boolean isAdHoc() { /** * get local identifiers of used measures + * * @return local identifiers of measure */ public List getMeasureIdentifiers() { @@ -74,6 +76,7 @@ public List getMeasureIdentifiers() { /** * get used operator + * * @return used operator */ public String getOperator() { @@ -85,4 +88,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/AttributeItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/AttributeItem.java index c1aad0390..8f49bb864 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/AttributeItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/AttributeItem.java @@ -8,9 +8,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.md.AttributeDisplayForm; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; import java.util.Objects; @@ -29,9 +29,10 @@ public class AttributeItem implements LocallyIdentifiable, Serializable { /** * Creates new instance - * @param displayForm qualifier of {@link AttributeDisplayForm} representing the attribute + * + * @param displayForm qualifier of {@link AttributeDisplayForm} representing the attribute * @param localIdentifier local identifier, unique within {@link Afm} - * @param alias attribute alias + * @param alias attribute alias */ @JsonCreator public AttributeItem(@JsonProperty("displayForm") final ObjQualifier displayForm, @@ -44,7 +45,8 @@ public AttributeItem(@JsonProperty("displayForm") final ObjQualifier displayForm /** * Creates new instance - * @param displayForm qualifier of {@link AttributeDisplayForm} representing the attribute + * + * @param displayForm qualifier of {@link AttributeDisplayForm} representing the attribute * @param localIdentifier local identifier, unique within {@link Afm} */ public AttributeItem(final ObjQualifier displayForm, final String localIdentifier) { @@ -73,6 +75,7 @@ public String getAlias() { /** * Sets attribute alias (used as header in result) + * * @param alias alias */ public void setAlias(final String alias) { @@ -99,4 +102,3 @@ public int hashCode() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java index 36be7b649..365b111da 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/DerivedMeasureDefinition.java @@ -32,11 +32,8 @@ public abstract class DerivedMeasureDefinition implements MeasureDefinition { /** * Create a new instance of {@link DerivedMeasureDefinition}. * - * @param measureIdentifier - * The local identifier of the master measure this derived measure refers to. The parameter must not be null. - * - * @throws IllegalArgumentException - * Thrown when required parameter is null. + * @param measureIdentifier The local identifier of the master measure this derived measure refers to. The parameter must not be null. + * @throws IllegalArgumentException Thrown when required parameter is null. */ DerivedMeasureDefinition(final String measureIdentifier) { this.measureIdentifier = notNull(measureIdentifier, "measureIdentifier"); @@ -65,4 +62,3 @@ public int hashCode() { return Objects.hash(measureIdentifier); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/LocallyIdentifiable.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/LocallyIdentifiable.java index bd61f7957..5c556d91c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/LocallyIdentifiable.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/LocallyIdentifiable.java @@ -14,4 +14,3 @@ public interface LocallyIdentifiable { */ String getLocalIdentifier(); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java index 606ea3e61..e48df6116 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureDefinition.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.gooddata.sdk.model.executeafm.IdentifierObjQualifier; import com.gooddata.sdk.model.executeafm.ObjQualifier; +import com.gooddata.sdk.model.md.Metric; import com.gooddata.sdk.model.md.visualization.VOPopMeasureDefinition; import com.gooddata.sdk.model.md.visualization.VOSimpleMeasureDefinition; -import com.gooddata.sdk.model.md.Metric; import java.io.Serializable; import java.util.Collection; @@ -59,16 +59,12 @@ default String getUri() { * The provided converter must be able to handle the conversion for the qualifiers that are of the {@link IdentifierObjQualifier} type that are used by * this object or its encapsulated child objects. * - * @param objQualifierConverter - * The function that converts identifier qualifiers to the matching URI qualifiers. In case when the object uses the identifier qualifiers, it - * will return a new copy of itself or its encapsulated objects that used URI qualifiers, otherwise the original object is returned. - * The parameter must not be null. - * + * @param objQualifierConverter The function that converts identifier qualifiers to the matching URI qualifiers. In case when the object uses the identifier qualifiers, it + * will return a new copy of itself or its encapsulated objects that used URI qualifiers, otherwise the original object is returned. + * The parameter must not be null. * @return copy of itself with replaced qualifiers in case when some {@link IdentifierObjQualifier} were used, otherwise original object is returned. - * - * @throws IllegalArgumentException - * The exception is thrown when conversion for the identifier qualifier used by this measure definition could not be made by the provided - * converter or when provided converter is null. + * @throws IllegalArgumentException The exception is thrown when conversion for the identifier qualifier used by this measure definition could not be made by the provided + * converter or when provided converter is null. */ MeasureDefinition withObjUriQualifiers(ObjQualifierConverter objQualifierConverter); @@ -78,4 +74,3 @@ default String getUri() { @JsonIgnore boolean isAdHoc(); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureItem.java index f916b9ad4..a22d2c914 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/MeasureItem.java @@ -63,6 +63,7 @@ public String getAlias() { /** * Sets measure alias (will be used as header in result) + * * @param alias alias */ public void setAlias(final String alias) { @@ -78,6 +79,7 @@ public String getFormat() { /** * Sets measure format (used to format measure values in result) + * * @param format */ public void setFormat(final String format) { @@ -103,7 +105,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; MeasureItem that = (MeasureItem) o; return Objects.equals(definition, that.definition) && - Objects.equals(localIdentifier, that.localIdentifier); + Objects.equals(localIdentifier, that.localIdentifier); } @Override @@ -111,4 +113,3 @@ public int hashCode() { return Objects.hash(definition, localIdentifier); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NativeTotalItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NativeTotalItem.java index 9585de2d6..fdb5af35b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NativeTotalItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/NativeTotalItem.java @@ -13,7 +13,6 @@ import java.util.List; import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static java.util.Arrays.asList; /** * Native total definition @@ -24,7 +23,8 @@ public class NativeTotalItem { /** * Native total definition - * @param measureIdentifier measure on which is total defined + * + * @param measureIdentifier measure on which is total defined * @param attributeIdentifiers subset of internal attribute identifiers in AFM defining total placement */ @JsonCreator @@ -37,6 +37,7 @@ public NativeTotalItem( /** * internal identifier of measure in AFM, on which is total defined + * * @return measure */ public String getMeasureIdentifier() { @@ -45,6 +46,7 @@ public String getMeasureIdentifier() { /** * subset of internal attribute identifiers in AFM defining total placement + * * @return list of identifiers (never null) */ public List getAttributeIdentifiers() { @@ -56,4 +58,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjIdentifierUtilities.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjIdentifierUtilities.java index 9500bbb2d..035a5243c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjIdentifierUtilities.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjIdentifierUtilities.java @@ -23,26 +23,18 @@ abstract class ObjIdentifierUtilities { * Copy {@code objectToBeCopied} via provided {@code objectCopyFactory} in case when {@code qualifierForPossibleConversion} is of {@link * IdentifierObjQualifier} type. Otherwise the original object is returned. * - * @param objectToBeCopied - * The object that should be copied in case {@code qualifierForPossibleConversion} is of {@link IdentifierObjQualifier} type. The parameter must - * not be null. - * @param qualifierForPossibleConversion - * The qualifier that defines if {@code objectToBeCopied} will be copied or not. In case when it is of the {@link IdentifierObjQualifier} type, - * it will be converted via {@code qualifierConverter} and used in copy of the {@code objectToBeCopied}. The parameter must not be null. - * @param objectCopyFactory - * The factory method that accepts the result of the {@code qualifierForPossibleConversion} conversion in form of {@link UriObjQualifier} and - * returns new copy of the {@code objectToBeCopied}. The parameter must not be null. - * @param qualifierConverter - * The convert that can convert {@code qualifierForPossibleConversion} into its matching {@link UriObjQualifier} form. The parameter must not be - * null. - * @param - * The type of the object that should be copied. - * + * @param objectToBeCopied The object that should be copied in case {@code qualifierForPossibleConversion} is of {@link IdentifierObjQualifier} type. The parameter must + * not be null. + * @param qualifierForPossibleConversion The qualifier that defines if {@code objectToBeCopied} will be copied or not. In case when it is of the {@link IdentifierObjQualifier} type, + * it will be converted via {@code qualifierConverter} and used in copy of the {@code objectToBeCopied}. The parameter must not be null. + * @param objectCopyFactory The factory method that accepts the result of the {@code qualifierForPossibleConversion} conversion in form of {@link UriObjQualifier} and + * returns new copy of the {@code objectToBeCopied}. The parameter must not be null. + * @param qualifierConverter The convert that can convert {@code qualifierForPossibleConversion} into its matching {@link UriObjQualifier} form. The parameter must not be + * null. + * @param The type of the object that should be copied. * @return Copy of the {@code objectToBeCopied} in case when {@code qualifierForPossibleConversion} was of {@link IdentifierObjQualifier} type. Otherwise * the original object is returned. - * - * @throws IllegalArgumentException - * The exception is thrown when required parameter is null. + * @throws IllegalArgumentException The exception is thrown when required parameter is null. */ static R copyIfNecessary(final R objectToBeCopied, final ObjQualifier qualifierForPossibleConversion, @@ -73,4 +65,3 @@ private static IllegalArgumentException buildExceptionForFailedConversion(final } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjQualifierConverter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjQualifierConverter.java index 01cfa7aae..4196d64fa 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjQualifierConverter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/ObjQualifierConverter.java @@ -19,11 +19,8 @@ public interface ObjQualifierConverter { /** * Convert provided {@link IdentifierObjQualifier} to the matching {@link UriObjQualifier}. * - * @param identifierObjQualifier - * The identifier that must be converted. - * + * @param identifierObjQualifier The identifier that must be converted. * @return The optional matching {@link UriObjQualifier} obtained by the conversion. */ Optional convertToUriQualifier(IdentifierObjQualifier identifierObjQualifier); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodDateAttribute.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodDateAttribute.java index 6a080d932..4c45443fa 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodDateAttribute.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodDateAttribute.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.ObjQualifier; import java.io.Serializable; import java.util.Objects; @@ -28,15 +28,11 @@ public class OverPeriodDateAttribute implements Serializable { /** * Create a new instance of {@link OverPeriodDateAttribute}. * - * @param attribute - * The {@link ObjQualifier} of the attribute from the date data set that defines the PoP period and date data set. The parameter must not be - * null. - * @param periodsAgo - * The number of periods defined by the {@code attribute} about which this period will be shifted about. The positive number shifts the period to - * the past, the negative to the future. The parameter must not be null. - * - * @throws IllegalArgumentException - * Thrown when one of the required parameter is null. + * @param attribute The {@link ObjQualifier} of the attribute from the date data set that defines the PoP period and date data set. The parameter must not be + * null. + * @param periodsAgo The number of periods defined by the {@code attribute} about which this period will be shifted about. The positive number shifts the period to + * the past, the negative to the future. The parameter must not be null. + * @throws IllegalArgumentException Thrown when one of the required parameter is null. */ @JsonCreator public OverPeriodDateAttribute( @@ -84,4 +80,3 @@ public Integer getPeriodsAgo() { return periodsAgo; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java index fc6ad1a3d..0b29a36b3 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/OverPeriodMeasureDefinition.java @@ -8,17 +8,17 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.ObjQualifier; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static com.gooddata.sdk.model.executeafm.afm.OverPeriodMeasureDefinition.NAME; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.model.executeafm.afm.OverPeriodMeasureDefinition.NAME; /** * Definition of the period over period measure that is used for the Same period last year and Same period 2 years back comparisons. @@ -26,22 +26,16 @@ @JsonRootName(NAME) public class OverPeriodMeasureDefinition extends DerivedMeasureDefinition { - private static final long serialVersionUID = -8904516814279504098L; - static final String NAME = "overPeriodMeasure"; - + private static final long serialVersionUID = -8904516814279504098L; private final List dateAttributes; /** * Create a new instance of {@link OverPeriodMeasureDefinition}. * - * @param measureIdentifier - * The local identifier of the measure this PoP measure refers to. The parameter must not be null. - * @param dateAttributes - * The date attributes that defines how this measure will be shifted in time. The parameter must not be null. - * - * @throws IllegalArgumentException - * Thrown when {@code dateAttributes} list is empty or required parameter is null. + * @param measureIdentifier The local identifier of the measure this PoP measure refers to. The parameter must not be null. + * @param dateAttributes The date attributes that defines how this measure will be shifted in time. The parameter must not be null. + * @throws IllegalArgumentException Thrown when {@code dateAttributes} list is empty or required parameter is null. */ @JsonCreator public OverPeriodMeasureDefinition( @@ -117,4 +111,3 @@ public List getDateAttributes() { return dateAttributes; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java index 1eebdc742..966618f1f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PopMeasureDefinition.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.ObjQualifier; import java.util.Collection; import java.util.Collections; @@ -29,20 +29,16 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class PopMeasureDefinition extends DerivedMeasureDefinition { - private static final long serialVersionUID = 1430640153994197345L; - static final String NAME = "popMeasure"; - + private static final long serialVersionUID = 1430640153994197345L; private final ObjQualifier popAttribute; /** * Creates new definition from given measure identifier referencing another measure in {@link Afm} and given attribute qualifier (should qualify date * attribute) * - * @param measureIdentifier - * measure identifier - * @param popAttribute - * "period over period" date attribute + * @param measureIdentifier measure identifier + * @param popAttribute "period over period" date attribute */ @JsonCreator public PopMeasureDefinition(@JsonProperty("measureIdentifier") final String measureIdentifier, @@ -101,4 +97,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodDateDataSet.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodDateDataSet.java index c9066ff71..c00744557 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodDateDataSet.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodDateDataSet.java @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.afm.filter.DateFilter; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; import java.util.Objects; @@ -29,14 +29,10 @@ public class PreviousPeriodDateDataSet implements Serializable { /** * Create a new instance of {@link PreviousPeriodDateDataSet}. * - * @param dataSet - * The {@link ObjQualifier} of the data set that match one of the {@link DateFilter} in the execution. The parameter must not be null. - * @param periodsAgo - * The number of periods defined by the matching date filter which this period will be shifted about. The positive number shifts the period to - * the past, the negative to the future. The parameter must not be null. - * - * @throws IllegalArgumentException - * Thrown when one of the required parameter is null. + * @param dataSet The {@link ObjQualifier} of the data set that match one of the {@link DateFilter} in the execution. The parameter must not be null. + * @param periodsAgo The number of periods defined by the matching date filter which this period will be shifted about. The positive number shifts the period to + * the past, the negative to the future. The parameter must not be null. + * @throws IllegalArgumentException Thrown when one of the required parameter is null. */ @JsonCreator public PreviousPeriodDateDataSet( @@ -84,4 +80,3 @@ public Integer getPeriodsAgo() { return periodsAgo; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinition.java index 95a173d9c..096cb8be1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/PreviousPeriodMeasureDefinition.java @@ -8,17 +8,17 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.ObjQualifier; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static com.gooddata.sdk.model.executeafm.afm.PreviousPeriodMeasureDefinition.NAME; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.model.executeafm.afm.PreviousPeriodMeasureDefinition.NAME; /** * Definition of the period over period measure that is used for the Previous period comparison. @@ -26,22 +26,16 @@ @JsonRootName(NAME) public class PreviousPeriodMeasureDefinition extends DerivedMeasureDefinition { - private static final long serialVersionUID = -4741355657671354062L; - static final String NAME = "previousPeriodMeasure"; - + private static final long serialVersionUID = -4741355657671354062L; private final List dateDataSets; /** * Create a new instance of {@link PreviousPeriodMeasureDefinition}. * - * @param measureIdentifier - * The local identifier of the measure this PoP measure refers to. The parameter must not be null. - * @param dateDataSets - * The date data sets that defines how this measure will be shifted in time. The parameter must not be null. - * - * @throws IllegalArgumentException - * Thrown when {@code attributes} list is empty or required parameter is null. + * @param measureIdentifier The local identifier of the measure this PoP measure refers to. The parameter must not be null. + * @param dateDataSets The date data sets that defines how this measure will be shifted in time. The parameter must not be null. + * @throws IllegalArgumentException Thrown when {@code attributes} list is empty or required parameter is null. */ @JsonCreator public PreviousPeriodMeasureDefinition( @@ -117,4 +111,3 @@ public List getDateDataSets() { return dateDataSets; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java index aad420d79..23eefe764 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/SimpleMeasureDefinition.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.afm.filter.FilterItem; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.ArrayList; import java.util.Collection; @@ -19,8 +19,8 @@ import java.util.List; import java.util.Objects; -import static com.gooddata.sdk.model.executeafm.afm.SimpleMeasureDefinition.NAME; import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.model.executeafm.afm.SimpleMeasureDefinition.NAME; import static java.util.Arrays.asList; /** @@ -30,9 +30,8 @@ @JsonRootName(NAME) public class SimpleMeasureDefinition implements MeasureDefinition { - private static final long serialVersionUID = -385490772711914776L; static final String NAME = "measure"; - + private static final long serialVersionUID = -385490772711914776L; private final ObjQualifier item; private String aggregation; private Boolean computeRatio; @@ -45,14 +44,10 @@ public SimpleMeasureDefinition(final ObjQualifier item) { /** * Creates new definition * - * @param item - * item which is measured, can be attribute, fact or another measure - * @param aggregation - * additional aggregation applied - * @param computeRatio - * whether should be shown as ratio - * @param filters - * additional filters applied + * @param item item which is measured, can be attribute, fact or another measure + * @param aggregation additional aggregation applied + * @param computeRatio whether should be shown as ratio + * @param filters additional filters applied */ @JsonCreator public SimpleMeasureDefinition(@JsonProperty("item") final ObjQualifier item, @@ -68,14 +63,10 @@ public SimpleMeasureDefinition(@JsonProperty("item") final ObjQualifier item, /** * Creates new definition * - * @param item - * item which is measured, can be attribute, fact or another measure - * @param aggregation - * additional aggregation applied - * @param computeRatio - * whether should be shown as ratio - * @param filters - * additional filters applied + * @param item item which is measured, can be attribute, fact or another measure + * @param aggregation additional aggregation applied + * @param computeRatio whether should be shown as ratio + * @param filters additional filters applied */ public SimpleMeasureDefinition(final ObjQualifier item, final Aggregation aggregation, final Boolean computeRatio, final List filters) { @@ -85,14 +76,10 @@ public SimpleMeasureDefinition(final ObjQualifier item, final Aggregation aggreg /** * Creates new definition * - * @param item - * item which is measured, can be attribute, fact or another measure - * @param aggregation - * additional aggregation applied - * @param computeRatio - * whether should be shown as ratio - * @param filters - * additional filters applied + * @param item item which is measured, can be attribute, fact or another measure + * @param aggregation additional aggregation applied + * @param computeRatio whether should be shown as ratio + * @param filters additional filters applied */ public SimpleMeasureDefinition(final ObjQualifier item, final Aggregation aggregation, final Boolean computeRatio, final FilterItem... filters) { this(item, aggregation, computeRatio, asList(filters)); @@ -142,8 +129,7 @@ public String getAggregation() { /** * Set additional aggregation applied * - * @param aggregation - * additional aggregation applied + * @param aggregation additional aggregation applied */ public void setAggregation(final String aggregation) { this.aggregation = aggregation; @@ -152,8 +138,7 @@ public void setAggregation(final String aggregation) { /** * Set additional aggregation applied * - * @param aggregation - * additional aggregation applied + * @param aggregation additional aggregation applied */ public void setAggregation(final Aggregation aggregation) { setAggregation(notNull(aggregation, "aggregation").toString()); @@ -169,8 +154,7 @@ public Boolean getComputeRatio() { /** * Set whether should be shown as ratio * - * @param computeRatio - * whether should be shown as ratio + * @param computeRatio whether should be shown as ratio */ public void setComputeRatio(final Boolean computeRatio) { this.computeRatio = computeRatio; @@ -186,8 +170,7 @@ public List getFilters() { /** * Set additional filters applied * - * @param filters - * additional filters applied + * @param filters additional filters applied */ public void setFilters(final List filters) { this.filters = filters; @@ -196,8 +179,7 @@ public void setFilters(final List filters) { /** * Apply additional filter * - * @param filter - * filter to be applied + * @param filter filter to be applied */ public void addFilter(final FilterItem filter) { if (filters == null) { @@ -249,4 +231,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AbsoluteDateFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AbsoluteDateFilter.java index 827e50601..2e6d87022 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AbsoluteDateFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AbsoluteDateFilter.java @@ -9,10 +9,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.gooddata.sdk.model.executeafm.ObjQualifier; -import com.gooddata.sdk.model.executeafm.UriObjQualifier; import com.gooddata.sdk.common.util.GDLocalDate; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.ObjQualifier; +import com.gooddata.sdk.model.executeafm.UriObjQualifier; import java.time.LocalDate; import java.util.Objects; @@ -23,9 +23,8 @@ @JsonRootName(AbsoluteDateFilter.NAME) public class AbsoluteDateFilter extends DateFilter { - private static final long serialVersionUID = -1857726227400504182L; static final String NAME = "absoluteDateFilter"; - + private static final long serialVersionUID = -1857726227400504182L; @GDLocalDate private final LocalDate from; @GDLocalDate @@ -33,9 +32,10 @@ public class AbsoluteDateFilter extends DateFilter { /** * Creates new filter instance + * * @param dataSet qualifier of date dimension dataset - * @param from date from - * @param to date to + * @param from date from + * @param to date to */ @JsonCreator public AbsoluteDateFilter(@JsonProperty("dataSet") final ObjQualifier dataSet, @@ -89,4 +89,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilter.java index 5ffda0a63..8edd5ff31 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilter.java @@ -22,6 +22,7 @@ public abstract class AttributeFilter implements FilterItem, Serializable { /** * Creates new filter + * * @param displayForm qualifier of attribute's display form to be filtered */ AttributeFilter(final ObjQualifier displayForm) { @@ -54,4 +55,3 @@ public int hashCode() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilterElements.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilterElements.java index 112a12482..1f01f6e81 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilterElements.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/AttributeFilterElements.java @@ -38,6 +38,12 @@ public interface AttributeFilterElements { class Serializer extends JsonSerializer { + private static void serializeWrapped(String name, AttributeFilterElements elements, JsonGenerator jg, SerializerProvider serializerProvider) throws IOException { + jg.writeStartObject(); + serializerProvider.defaultSerializeField(name, elements.getElements(), jg); + jg.writeEndObject(); + } + @Override public void serialize(AttributeFilterElements elements, JsonGenerator jg, SerializerProvider serializerProvider) throws IOException { if (elements instanceof UriAttributeFilterElements) { @@ -48,16 +54,14 @@ public void serialize(AttributeFilterElements elements, JsonGenerator jg, Serial serializerProvider.defaultSerializeValue(elements.getElements(), jg); } } - - private static void serializeWrapped(String name, AttributeFilterElements elements, JsonGenerator jg, SerializerProvider serializerProvider) throws IOException { - jg.writeStartObject(); - serializerProvider.defaultSerializeField(name, elements.getElements(), jg); - jg.writeEndObject(); - } } class Deserializer extends JsonDeserializer { + private static List nodeToElements(JsonNode node) { + return StreamSupport.stream(node.spliterator(), false).map(JsonNode::textValue).collect(Collectors.toList()); + } + @Override public AttributeFilterElements deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { final JsonNode node = jp.readValueAsTree(); @@ -78,12 +82,7 @@ public AttributeFilterElements deserialize(JsonParser jp, DeserializationContext throw from(jp, "Unknown value of type: " + jp.currentToken()); } } - - private static List nodeToElements(JsonNode node) { - return StreamSupport.stream(node.spliterator(), false).map(JsonNode::textValue).collect(Collectors.toList()); - } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonCondition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonCondition.java index bdb2e5743..1de8df6f2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonCondition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonCondition.java @@ -32,9 +32,9 @@ public class ComparisonCondition extends MeasureValueFilterCondition implements @JsonCreator public ComparisonCondition( - @JsonProperty("operator") final String operator, - @JsonProperty("value") final BigDecimal value, - @JsonProperty("treatNullValuesAs") final BigDecimal treatNullValuesAs + @JsonProperty("operator") final String operator, + @JsonProperty("value") final BigDecimal value, + @JsonProperty("treatNullValuesAs") final BigDecimal treatNullValuesAs ) { super(treatNullValuesAs); this.operator = notNull(operator, "operator"); @@ -48,8 +48,8 @@ public ComparisonCondition( * @param value The value of the condition. */ public ComparisonCondition( - final ComparisonConditionOperator operator, - final BigDecimal value + final ComparisonConditionOperator operator, + final BigDecimal value ) { this(notNull(operator, "operator").toString(), value, null); } @@ -62,9 +62,9 @@ public ComparisonCondition( * @param treatNullValuesAs The number that will be used instead of compared values that are null. */ public ComparisonCondition( - final ComparisonConditionOperator operator, - final BigDecimal value, - final BigDecimal treatNullValuesAs + final ComparisonConditionOperator operator, + final BigDecimal value, + final BigDecimal treatNullValuesAs ) { this(notNull(operator, "operator").toString(), value, treatNullValuesAs); } @@ -96,7 +96,7 @@ public boolean equals(final Object o) { if (!super.equals(o)) return false; final ComparisonCondition that = (ComparisonCondition) o; return Objects.equals(operator, that.operator) && - Objects.equals(value, that.value); + Objects.equals(value, that.value); } @Override @@ -109,4 +109,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonConditionOperator.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonConditionOperator.java index eefa30774..76a223612 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonConditionOperator.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ComparisonConditionOperator.java @@ -24,12 +24,6 @@ public enum ComparisonConditionOperator { EQUAL_TO, NOT_EQUAL_TO; - @JsonValue - @Override - public String toString() { - return name(); - } - @JsonCreator public static ComparisonConditionOperator of(String operator) { notNull(operator, "operator"); @@ -37,10 +31,15 @@ public static ComparisonConditionOperator of(String operator) { return ComparisonConditionOperator.valueOf(operator); } catch (IllegalArgumentException e) { throw new UnsupportedOperationException( - format("Unknown value for comparison condition operator: \"%s\", supported values are: [%s]", - operator, stream(ComparisonConditionOperator.values()).map(Enum::name).collect(joining(","))), - e); + format("Unknown value for comparison condition operator: \"%s\", supported values are: [%s]", + operator, stream(ComparisonConditionOperator.values()).map(Enum::name).collect(joining(","))), + e); } } -} + @JsonValue + @Override + public String toString() { + return name(); + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/CompatibilityFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/CompatibilityFilter.java index cd92b12dd..fc1596f8a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/CompatibilityFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/CompatibilityFilter.java @@ -18,4 +18,3 @@ }) public interface CompatibilityFilter { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/DateFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/DateFilter.java index dc06bceaa..84b9e5e52 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/DateFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/DateFilter.java @@ -25,6 +25,7 @@ public abstract class DateFilter implements FilterItem, Serializable { /** * Creates new filter + * * @param dataSet qualifier of date dimension dataSet */ DateFilter(final ObjQualifier dataSet) { @@ -62,4 +63,3 @@ public int hashCode() { return Objects.hash(dataSet); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExpressionFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExpressionFilter.java index a31391ad8..df8b94969 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExpressionFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExpressionFilter.java @@ -22,6 +22,7 @@ public final class ExpressionFilter implements CompatibilityFilter { /** * Creates new instance + * * @param value expression value */ @JsonCreator @@ -53,4 +54,3 @@ public int hashCode() { return Objects.hash(value); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExtendedFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExtendedFilter.java index 5c7043969..ea0726cc4 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExtendedFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ExtendedFilter.java @@ -16,4 +16,3 @@ }) public interface ExtendedFilter { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/FilterItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/FilterItem.java index e79b8ae55..be2525a0b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/FilterItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/FilterItem.java @@ -25,6 +25,7 @@ public interface FilterItem extends CompatibilityFilter, ExtendedFilter { /** * Get qualifier of {@link Obj} to which the filter relates. + * * @return filtered object qualifier */ @JsonIgnore @@ -32,9 +33,9 @@ public interface FilterItem extends CompatibilityFilter, ExtendedFilter { /** * Copy itself using given uri qualifier + * * @param qualifier qualifier to use for the new filter * @return self copy with given qualifier */ FilterItem withObjUriQualifier(UriObjQualifier qualifier); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilter.java index d51739666..e42ef87aa 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilter.java @@ -9,10 +9,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.Qualifier; import com.gooddata.sdk.model.executeafm.UriObjQualifier; -import com.gooddata.sdk.model.md.visualization.Measure; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; import java.util.Objects; @@ -46,7 +45,7 @@ public MeasureValueFilter(final Qualifier measure) { /** * Creates a new {@link MeasureValueFilter} instance. * - * @param measure The qualifier of referenced measure. + * @param measure The qualifier of referenced measure. * @param condition The condition applied to a sliced measure value. (Optional) */ @JsonCreator @@ -61,7 +60,6 @@ public MeasureValueFilter( * Copy itself using given uri qualifier * * @param qualifier qualifier to use for the new filter - * * @return self copy with given qualifier */ public MeasureValueFilter withUriObjQualifier(final UriObjQualifier qualifier) { @@ -101,4 +99,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilterCondition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilterCondition.java index b583381b3..43aa9d4f8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilterCondition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/MeasureValueFilterCondition.java @@ -16,7 +16,7 @@ /** * Covers all the conditions that can be used within {@link MeasureValueFilter}. - * + *

    * Contains shared functionality to set a custom value instead of {@code null} measure * values against the condition's value will be compared to. */ @@ -53,4 +53,3 @@ public int hashCode() { return Objects.hash(treatNullValuesAs); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/NegativeAttributeFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/NegativeAttributeFilter.java index a13513066..909c66d4f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/NegativeAttributeFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/NegativeAttributeFilter.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.UriObjQualifier; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.List; import java.util.Objects; @@ -24,9 +24,8 @@ @JsonRootName(NegativeAttributeFilter.NAME) public class NegativeAttributeFilter extends AttributeFilter { - private static final long serialVersionUID = -6202625318104289333L; static final String NAME = "negativeAttributeFilter"; - + private static final long serialVersionUID = -6202625318104289333L; private final AttributeFilterElements notIn; /** @@ -102,4 +101,3 @@ public int hashCode() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/PositiveAttributeFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/PositiveAttributeFilter.java index a10acbc7a..432870895 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/PositiveAttributeFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/PositiveAttributeFilter.java @@ -8,9 +8,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.UriObjQualifier; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.List; import java.util.Objects; @@ -23,9 +23,8 @@ @JsonRootName(PositiveAttributeFilter.NAME) public class PositiveAttributeFilter extends AttributeFilter { - private static final long serialVersionUID = 1934771670274345290L; static final String NAME = "positiveAttributeFilter"; - + private static final long serialVersionUID = 1934771670274345290L; private final AttributeFilterElements in; /** @@ -91,4 +90,3 @@ public int hashCode() { return Objects.hash(in, super.hashCode()); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeCondition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeCondition.java index 3cb9af3a9..016164c58 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeCondition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeCondition.java @@ -33,10 +33,10 @@ public class RangeCondition extends MeasureValueFilterCondition implements Seria @JsonCreator public RangeCondition( - @JsonProperty("operator") final String operator, - @JsonProperty("from") final BigDecimal from, - @JsonProperty("to") final BigDecimal to, - @JsonProperty("treatNullValuesAs") final BigDecimal treatNullValuesAs) { + @JsonProperty("operator") final String operator, + @JsonProperty("from") final BigDecimal from, + @JsonProperty("to") final BigDecimal to, + @JsonProperty("treatNullValuesAs") final BigDecimal treatNullValuesAs) { super(treatNullValuesAs); this.operator = notNull(operator, "operator"); this.from = notNull(from, "from"); @@ -51,9 +51,9 @@ public RangeCondition( * @param to The right boundary value. */ public RangeCondition( - final RangeConditionOperator operator, - final BigDecimal from, - final BigDecimal to) { + final RangeConditionOperator operator, + final BigDecimal from, + final BigDecimal to) { this(notNull(operator, "operator").toString(), from, to, null); } @@ -66,10 +66,10 @@ public RangeCondition( * @param treatNullValuesAs The number that will be used instead of compared values that are null. */ public RangeCondition( - final RangeConditionOperator operator, - final BigDecimal from, - final BigDecimal to, - final BigDecimal treatNullValuesAs) { + final RangeConditionOperator operator, + final BigDecimal from, + final BigDecimal to, + final BigDecimal treatNullValuesAs) { this(notNull(operator, "operator").toString(), from, to, treatNullValuesAs); } @@ -82,7 +82,9 @@ public RangeConditionOperator getOperator() { } @JsonProperty("operator") - public String getStringOperator() { return this.operator; } + public String getStringOperator() { + return this.operator; + } /** * @return left boundary of the range @@ -105,8 +107,8 @@ public boolean equals(final Object o) { if (!super.equals(o)) return false; final RangeCondition that = (RangeCondition) o; return Objects.equals(operator, that.operator) && - Objects.equals(from, that.from) && - Objects.equals(to, that.to); + Objects.equals(from, that.from) && + Objects.equals(to, that.to); } @Override @@ -119,4 +121,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeConditionOperator.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeConditionOperator.java index ecd2e0c4e..2c895d034 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeConditionOperator.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RangeConditionOperator.java @@ -20,12 +20,6 @@ public enum RangeConditionOperator { BETWEEN, NOT_BETWEEN; - @JsonValue - @Override - public String toString() { - return name(); - } - @JsonCreator public static RangeConditionOperator of(String operator) { notNull(operator, "operator"); @@ -33,10 +27,15 @@ public static RangeConditionOperator of(String operator) { return RangeConditionOperator.valueOf(operator); } catch (IllegalArgumentException e) { throw new UnsupportedOperationException( - format("Unknown value for range condition operator: \"%s\", supported values are: [%s]", - operator, stream(RangeConditionOperator.values()).map(Enum::name).collect(joining(","))), - e); + format("Unknown value for range condition operator: \"%s\", supported values are: [%s]", + operator, stream(RangeConditionOperator.values()).map(Enum::name).collect(joining(","))), + e); } } -} + @JsonValue + @Override + public String toString() { + return name(); + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilter.java index e8e4b6bb7..709a45f2e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilter.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; -import com.gooddata.sdk.common.util.Validate; import com.gooddata.sdk.model.executeafm.IdentifierObjQualifier; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.Qualifier; @@ -47,11 +46,10 @@ public class RankingFilter implements ExtendedFilter, CompatibilityFilter, Seria /** * Creates a new {@link RankingFilter} instance. * - * @param measures measures on which is the ranking applied. Must not be null. + * @param measures measures on which is the ranking applied. Must not be null. * @param attributes attributes that define ranking granularity. Optional, can be null. - * @param operator operator that defines the type of ranking. - * @param value number of requested ranked records. - * + * @param operator operator that defines the type of ranking. + * @param value number of requested ranked records. * @throws NullPointerException thrown when required parameter is not provided. */ @JsonCreator @@ -74,6 +72,10 @@ public RankingFilter( this(measures, attributes, notNull(operator, "operator must not be null!").name(), value); } + private static IllegalArgumentException buildExceptionForFailedConversion(final IdentifierObjQualifier qualifierFailedToConvert) { + return new IllegalArgumentException(format("Supplied converter does not provide conversion for '%s'!", qualifierFailedToConvert)); + } + /** * Returns all the qualifiers used by the ranking filter. *

    @@ -86,9 +88,9 @@ public RankingFilter( @JsonIgnore public Collection getObjQualifiers() { return Stream.concat( - this.measures.stream(), - this.attributes == null ? Stream.empty() : this.attributes.stream() - ) + this.measures.stream(), + this.attributes == null ? Stream.empty() : this.attributes.stream() + ) .filter(ObjQualifier.class::isInstance) .map(ObjQualifier.class::cast) .collect(Collectors.toSet()); @@ -102,15 +104,13 @@ public Collection getObjQualifiers() { * this object or its encapsulated child objects. * * @param objQualifierConverter The function that converts identifier qualifiers to the matching URI qualifiers. In case when the object uses the - * identifier qualifiers, it - * will return a new copy of itself or its encapsulated objects that used URI qualifiers, otherwise the original object is returned. - * The parameter must not be null. - * + * identifier qualifiers, it + * will return a new copy of itself or its encapsulated objects that used URI qualifiers, otherwise the original object is returned. + * The parameter must not be null. * @return copy of itself with replaced qualifiers in case when some {@link IdentifierObjQualifier} were used, otherwise original object is returned. - * * @throws IllegalArgumentException The exception is thrown when conversion for the identifier qualifier used by this ranking filter could not be - * made by the provided - * converter or when provided converter is null. + * made by the provided + * converter or when provided converter is null. */ public RankingFilter withObjUriQualifiers(final ObjQualifierConverter objQualifierConverter) { notNull(objQualifierConverter, "objQualifierConverter"); @@ -138,10 +138,6 @@ private Qualifier translateIdentifierQualifier(final Qualifier qualifier, final return qualifier; } - private static IllegalArgumentException buildExceptionForFailedConversion(final IdentifierObjQualifier qualifierFailedToConvert) { - return new IllegalArgumentException(format("Supplied converter does not provide conversion for '%s'!", qualifierFailedToConvert)); - } - /** * @return measures on which is the ranking applied */ @@ -158,6 +154,7 @@ public List getAttributes() { /** * Get operator as an enum constant for easier programmatic access. + * * @return ranking operator constant */ @JsonIgnore @@ -167,6 +164,7 @@ public RankingFilterOperator getOperator() { /** * Get operator as a string representation of the {@link RankingFilterOperator} enum constant as it was parsed from the JSON. + * * @return string operator provided at the time of the filter instance creation */ @JsonProperty("operator") @@ -202,4 +200,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilterOperator.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilterOperator.java index 4f14897a0..4a532fc70 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilterOperator.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RankingFilterOperator.java @@ -21,12 +21,6 @@ public enum RankingFilterOperator { TOP, BOTTOM; - @JsonValue - @Override - public String toString() { - return name(); - } - @JsonCreator public static RankingFilterOperator of(final String operator) { notNull(operator, "operator"); @@ -39,5 +33,10 @@ operator, stream(RankingFilterOperator.values()).map(Enum::name).collect(joining e); } } -} + @JsonValue + @Override + public String toString() { + return name(); + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RelativeDateFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RelativeDateFilter.java index 86c734377..0cef6d2a7 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RelativeDateFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/RelativeDateFilter.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.UriObjQualifier; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.Objects; @@ -24,19 +24,19 @@ @JsonRootName(RelativeDateFilter.NAME) public class RelativeDateFilter extends DateFilter { - private static final long serialVersionUID = 7257627800833737063L; static final String NAME = "relativeDateFilter"; - + private static final long serialVersionUID = 7257627800833737063L; private final String granularity; private final Integer from; private final Integer to; /** * Creates new instance - * @param dataSet qualifier of date dimension dataSet + * + * @param dataSet qualifier of date dimension dataSet * @param granularity granularity specified as type GDC date attribute type - * @param from from - * @param to to + * @param from from + * @param to to */ @JsonCreator public RelativeDateFilter(@JsonProperty("dataSet") final ObjQualifier dataSet, @@ -91,4 +91,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/SimpleAttributeFilterElements.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/SimpleAttributeFilterElements.java index b17d66650..dce54c676 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/SimpleAttributeFilterElements.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/SimpleAttributeFilterElements.java @@ -34,4 +34,3 @@ public List getElements() { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/UriAttributeFilterElements.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/UriAttributeFilterElements.java index f3af4911b..c7d5aa4dd 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/UriAttributeFilterElements.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/UriAttributeFilterElements.java @@ -19,13 +19,13 @@ */ public final class UriAttributeFilterElements implements AttributeFilterElements, Serializable { - private static final long serialVersionUID = -588170788038973574L; static final String NAME = "uris"; - + private static final long serialVersionUID = -588170788038973574L; private final List uris; /** * Creates new instance of given attribute elements' uris. + * * @param uris elements' uris. */ @JsonCreator @@ -35,6 +35,7 @@ public UriAttributeFilterElements(final List uris) { /** * Creates new instance of given attribute elements' uris. + * * @param uris elements' uris. */ public UriAttributeFilterElements(String... uris) { @@ -68,4 +69,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ValueAttributeFilterElements.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ValueAttributeFilterElements.java index ff556c8b7..d46faa45d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ValueAttributeFilterElements.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/afm/filter/ValueAttributeFilterElements.java @@ -19,13 +19,13 @@ */ public final class ValueAttributeFilterElements implements AttributeFilterElements, Serializable { - private static final long serialVersionUID = 8162844914489089022L; static final String NAME = "values"; - + private static final long serialVersionUID = 8162844914489089022L; private final List values; /** * Creates new instance of given attribute elements' values. + * * @param values elements' values. */ @JsonCreator @@ -35,6 +35,7 @@ public ValueAttributeFilterElements(final List values) { /** * Creates new instance of given attribute elements' values. + * * @param values elements' values. */ public ValueAttributeFilterElements(String... values) { @@ -68,4 +69,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java index 700a1789e..606ea32c8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeHeader.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.afm.Afm; -import com.gooddata.sdk.model.executeafm.afm.LocallyIdentifiable; import com.gooddata.sdk.model.executeafm.afm.AttributeItem; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.afm.LocallyIdentifiable; import java.util.List; @@ -37,11 +37,12 @@ public class AttributeHeader implements Header, LocallyIdentifiable { /** * Creates new header - * @param name name + * + * @param name name * @param localIdentifier local identifier - * @param uri uri - * @param identifier identifier - * @param formOf info about attribute which this header's display form is form of + * @param uri uri + * @param identifier identifier + * @param formOf info about attribute which this header's display form is form of */ public AttributeHeader(final String name, final String localIdentifier, final String uri, final String identifier, final AttributeInHeader formOf) { this(name, localIdentifier, uri, identifier, formOf, null); @@ -49,11 +50,12 @@ public AttributeHeader(final String name, final String localIdentifier, final St /** * Creates new header - * @param name name - * @param localIdentifier local identifier - * @param uri uri - * @param identifier identifier - * @param formOf info about attribute which this header's display form is form of + * + * @param name name + * @param localIdentifier local identifier + * @param uri uri + * @param identifier identifier + * @param formOf info about attribute which this header's display form is form of * @param totalHeaderItems total header items */ public AttributeHeader(@JsonProperty("name") final String name, @@ -67,12 +69,13 @@ public AttributeHeader(@JsonProperty("name") final String name, /** * Creates new header - * @param name name - * @param localIdentifier local identifier - * @param uri uri - * @param identifier identifier - * @param type type - * @param formOf info about attribute which this header's display form is form of + * + * @param name name + * @param localIdentifier local identifier + * @param uri uri + * @param identifier identifier + * @param type type + * @param formOf info about attribute which this header's display form is form of * @param totalHeaderItems total header items */ @JsonCreator @@ -94,6 +97,7 @@ public AttributeHeader(@JsonProperty("name") final String name, /** * Header name, an attribute's display form title, or specified alias. + * * @return header name */ public String getName() { @@ -102,7 +106,8 @@ public String getName() { /** * Local identifier referencing header's {@link AttributeItem} - * within {@link Afm} + * within {@link Afm} + * * @return attribute's local identifier */ @Override @@ -112,6 +117,7 @@ public String getLocalIdentifier() { /** * Uri of attribute's display form + * * @return uri */ public String getUri() { @@ -120,6 +126,7 @@ public String getUri() { /** * Metadata identifier of attribute's display form + * * @return identifier */ public String getIdentifier() { @@ -128,6 +135,7 @@ public String getIdentifier() { /** * Metadata type of attribute's display form + * * @return type */ public String getType() { @@ -140,6 +148,7 @@ public AttributeInHeader getFormOf() { /** * Totals' headers belonging to the same level as this header. + * * @return lists of totals' header */ public List getTotalItems() { @@ -152,4 +161,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeInHeader.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeInHeader.java index 63891dea3..0b5628c61 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeInHeader.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/AttributeInHeader.java @@ -23,8 +23,9 @@ public class AttributeInHeader { /** * Creates new instance - * @param name attribute's title - * @param uri attribute's uri + * + * @param name attribute's title + * @param uri attribute's uri * @param identifier attribute's identifier */ @JsonCreator @@ -82,4 +83,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ExecutionResponse.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ExecutionResponse.java index 2dc944d30..daf20ac38 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ExecutionResponse.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ExecutionResponse.java @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.Execution; import com.gooddata.sdk.model.executeafm.result.ExecutionResult; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.LinkedHashMap; import java.util.List; @@ -22,7 +22,6 @@ import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; import static com.gooddata.sdk.common.util.Validate.notNullState; -import static org.apache.commons.lang3.ArrayUtils.toObject; /** * Represents response on {@link Execution} request. @@ -41,7 +40,8 @@ public class ExecutionResponse { /** * Creates new instance of given dimensions and execution result uri. - * @param dimensions dimensions + * + * @param dimensions dimensions * @param executionResultUri execution result uri */ public ExecutionResponse(final List dimensions, final String executionResultUri) { @@ -58,6 +58,7 @@ private ExecutionResponse(@JsonProperty("dimensions") final List getDimensions() { @@ -66,6 +67,7 @@ public List getDimensions() { /** * Map of response's links. + * * @return links */ public Map getLinks() { @@ -74,6 +76,7 @@ public Map getLinks() { /** * Uri referencing the data result location. + * * @return execution result uri or throws exception in case the link doesn't exist */ @JsonIgnore @@ -87,4 +90,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/Header.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/Header.java index 0d42b342e..6830f752c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/Header.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/Header.java @@ -20,4 +20,3 @@ }) public interface Header { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureGroupHeader.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureGroupHeader.java index 78fa320c1..cd5ad03d6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureGroupHeader.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureGroupHeader.java @@ -24,6 +24,7 @@ public class MeasureGroupHeader implements Header { /** * Creates new header + * * @param items header items */ @JsonCreator @@ -33,6 +34,7 @@ public MeasureGroupHeader(@JsonProperty("items") final List i /** * Header items for particular measures + * * @return header items */ public List getItems() { @@ -44,4 +46,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureHeaderItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureHeaderItem.java index 1a71c78cb..9e89c228e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureHeaderItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/MeasureHeaderItem.java @@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.executeafm.afm.Afm; import com.gooddata.sdk.model.executeafm.afm.LocallyIdentifiable; import com.gooddata.sdk.model.executeafm.afm.MeasureItem; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import static com.gooddata.sdk.common.util.Validate.notEmpty; @@ -52,6 +52,7 @@ public MeasureHeaderItem(@JsonProperty("name") final String name, /** * Header name, can be measure title, or specified alias + * * @return name */ public String getName() { @@ -68,6 +69,7 @@ public String getFormat() { /** * Local identifier, referencing the {@link MeasureItem} * in {@link Afm} + * * @return local identifier */ @Override @@ -82,23 +84,25 @@ public String getUri() { return uri; } - /** - * @return Measure metadata identifier - */ - public String getIdentifier() { - return identifier; - } - /** * Set measure uri + * * @param uri measure uri */ public void setUri(final String uri) { this.uri = uri; } + /** + * @return Measure metadata identifier + */ + public String getIdentifier() { + return identifier; + } + /** * Set measure metadata identifier + * * @param identifier */ public void setIdentifier(final String identifier) { @@ -110,4 +114,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ResultDimension.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ResultDimension.java index f468d3885..a25bfb91d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ResultDimension.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/ResultDimension.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.executeafm.result.ExecutionResult; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.result.ExecutionResult; import java.util.List; @@ -24,6 +24,7 @@ public class ResultDimension { /** * Creates the result dimension of given headers + * * @param headers headers */ @JsonCreator @@ -33,6 +34,7 @@ public ResultDimension(@JsonProperty("headers") final List

    headers) { /** * Creates the result dimension of given headers + * * @param headers headers */ public ResultDimension(final Header... headers) { @@ -51,4 +53,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/TotalHeaderItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/TotalHeaderItem.java index 2aff3956c..5eb38cc67 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/TotalHeaderItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/response/TotalHeaderItem.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.gooddata.sdk.model.md.report.Total; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.report.Total; import static com.gooddata.sdk.common.util.Validate.notNull; @@ -25,6 +25,7 @@ public class TotalHeaderItem { /** * Creates new header + * * @param name total name */ @JsonCreator @@ -34,6 +35,7 @@ public TotalHeaderItem(@JsonProperty("name") final String name) { /** * Creates new header + * * @param total total value */ public TotalHeaderItem(final Total total) { @@ -52,4 +54,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/AttributeHeaderItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/AttributeHeaderItem.java index a5ad67234..8971ded4c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/AttributeHeaderItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/AttributeHeaderItem.java @@ -24,8 +24,9 @@ public class AttributeHeaderItem extends ResultHeaderItem { /** * Creates new header item + * * @param name name of item (usually attribute element title) - * @param uri uri of item (usually attribute element uri) + * @param uri uri of item (usually attribute element uri) */ @JsonCreator public AttributeHeaderItem(@JsonProperty("name") final String name, @JsonProperty("uri") final String uri) { @@ -45,4 +46,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Data.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Data.java index 228ffbd6f..e8638cf83 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Data.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Data.java @@ -104,4 +104,3 @@ public Data getNullValue(final DeserializationContext ctxt) throws JsonMappingEx } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataList.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataList.java index 676978a0e..ba2da8143 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataList.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataList.java @@ -21,6 +21,7 @@ public class DataList extends ArrayList implements Data { /** * Creates new instance of given list of data + * * @param values list to use as values, can't be null */ public DataList(final List values) { @@ -29,6 +30,7 @@ public DataList(final List values) { /** * Creates new instance by transforming the given array to list of simple or null values + * * @param array array of values */ DataList(final String[] array) { @@ -37,6 +39,7 @@ public DataList(final List values) { /** * Creates new instance by transforming the given array to list of data lists of simple or null values + * * @param array array of values */ DataList(final String[][] array) { @@ -73,4 +76,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataValue.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataValue.java index 537228cea..2ed9372bb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataValue.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/DataValue.java @@ -19,6 +19,7 @@ public class DataValue implements Data { /** * Creates new instance of given value. + * * @param value textual value, can't be null */ public DataValue(final String value) { @@ -65,4 +66,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ExecutionResult.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ExecutionResult.java index a4d373108..82a1f656d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ExecutionResult.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ExecutionResult.java @@ -10,8 +10,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.gooddata.sdk.model.executeafm.Execution; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.Execution; import java.util.ArrayList; import java.util.List; @@ -36,7 +36,8 @@ public class ExecutionResult { /** * Creates new result - * @param data result data + * + * @param data result data * @param paging result paging */ public ExecutionResult(final String[] data, final Paging paging) { @@ -46,7 +47,8 @@ public ExecutionResult(final String[] data, final Paging paging) { /** * Creates new result - * @param data result data + * + * @param data result data * @param paging result paging */ public ExecutionResult(final String[][] data, final Paging paging) { @@ -56,10 +58,11 @@ public ExecutionResult(final String[][] data, final Paging paging) { /** * Creates new result - * @param data result data - * @param paging result paging + * + * @param data result data + * @param paging result paging * @param headerItems items for headers, for each header in each dimension, there is a list of header items - * @param totals data of totals, for each total in each dimension, there is a list of total's values + * @param totals data of totals, for each total in each dimension, there is a list of total's values */ @JsonCreator ExecutionResult(@JsonProperty("data") final DataList data, @@ -99,6 +102,7 @@ public List>> getHeaderItems() { /** * Sets header items, for each header in each dimension, there is a list of header items + * * @param headerItems header items */ public void setHeaderItems(final List>> headerItems) { @@ -107,6 +111,7 @@ public void setHeaderItems(final List>> headerItems) /** * Add header items for next dimension (this method will add dimension in header items) + * * @param items header items for one dimension */ public void addHeaderItems(final List> items) { @@ -125,6 +130,7 @@ public List>> getTotals() { /** * Sets total data, for each total in each dimension, there is a list of total's values + * * @param totals totals data */ public void setTotals(final List>> totals) { @@ -163,6 +169,7 @@ public List getWarnings() { /** * Sets warnings for this result + * * @param warnings result's warning */ public void setWarnings(final List warnings) { @@ -174,4 +181,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Paging.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Paging.java index 4c049812f..0443db0c9 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Paging.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Paging.java @@ -31,9 +31,10 @@ public Paging() { /** * Creates new paging - * @param count multiple dimensions count + * + * @param count multiple dimensions count * @param offset multiple dimensions offset - * @param total multiple dimensions total + * @param total multiple dimensions total */ @JsonCreator public Paging(@JsonProperty("count") final List count, @@ -67,6 +68,7 @@ public List getTotal() { /** * Sets count compound of given elements, each element per dimension + * * @param count count elements * @return this */ @@ -77,6 +79,7 @@ public Paging count(final int... count) { /** * Sets size compound of given elements, each element per dimension + * * @param total size elements * @return this */ @@ -87,6 +90,7 @@ public Paging total(final int... total) { /** * Sets size compound of given elements, each element per dimension + * * @param offset size elements * @return this */ @@ -100,4 +104,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultHeaderItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultHeaderItem.java index 2e0a7044d..35ad52a8e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultHeaderItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultHeaderItem.java @@ -40,4 +40,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultMeasureHeaderItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultMeasureHeaderItem.java index 4613950bf..ad33f4482 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultMeasureHeaderItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultMeasureHeaderItem.java @@ -23,7 +23,8 @@ public class ResultMeasureHeaderItem extends ResultHeaderItem { /** * Creates new instance of given header name and order - * @param name header name + * + * @param name header name * @param order measure order within measureGroup */ @JsonCreator @@ -39,4 +40,3 @@ public int getOrder() { return order; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultTotalHeaderItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultTotalHeaderItem.java index f9ae6f052..8eaa8e1dc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultTotalHeaderItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/ResultTotalHeaderItem.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.model.md.report.Total; -import static com.gooddata.sdk.model.executeafm.result.ResultTotalHeaderItem.NAME; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.model.executeafm.result.ResultTotalHeaderItem.NAME; /** * Header item for total. @@ -26,6 +26,7 @@ public class ResultTotalHeaderItem extends ResultHeaderItem { /** * Creates new instance of given total type, type is used for the name as well + * * @param type total type */ public ResultTotalHeaderItem(final String type) { @@ -34,6 +35,7 @@ public ResultTotalHeaderItem(final String type) { /** * Creates new instance of given total type, type is used for the name as well + * * @param type total type */ public ResultTotalHeaderItem(final Total type) { @@ -42,6 +44,7 @@ public ResultTotalHeaderItem(final Total type) { /** * Creates new instance of given header name and total type + * * @param name header name * @param type total type */ @@ -53,6 +56,7 @@ public ResultTotalHeaderItem(@JsonProperty("name") final String name, @JsonPrope /** * Creates new instance of given header name and total type + * * @param name header name * @param type total type */ @@ -68,4 +72,3 @@ public String getType() { return type; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Warning.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Warning.java index 5a93b72e1..33a9b0e47 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Warning.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/result/Warning.java @@ -25,8 +25,9 @@ public class Warning { /** * Creates new instance + * * @param warningCode error code - * @param message message + * @param message message */ public Warning(final String warningCode, final String message) { this(warningCode, message, emptyList()); @@ -34,9 +35,10 @@ public Warning(final String warningCode, final String message) { /** * Creates new instance + * * @param warningCode error code - * @param message message - * @param parameters message's parameters + * @param message message + * @param parameters message's parameters */ @JsonCreator public Warning(@JsonProperty("warningCode") final String warningCode, @@ -93,4 +95,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeLocatorItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeLocatorItem.java index 418d7850a..0f185c2e5 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeLocatorItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeLocatorItem.java @@ -46,4 +46,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortAggregation.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortAggregation.java index abcb8b6d9..7609010d6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortAggregation.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortAggregation.java @@ -22,4 +22,3 @@ public String toString() { return name().toLowerCase(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortItem.java index f6381ee48..cf23e0605 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/AttributeSortItem.java @@ -97,4 +97,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Dimension.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Dimension.java index e173b61ef..dd3f14a95 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Dimension.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Dimension.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.executeafm.afm.Afm; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.afm.Afm; import java.util.Collections; import java.util.HashSet; @@ -37,8 +37,9 @@ public class Dimension { /** * Creates new instance + * * @param itemIdentifiers identifiers referencing attributes from {@link Afm} or {@link Dimension#MEASURE_GROUP} - * @param totals set of totals + * @param totals set of totals */ @JsonCreator public Dimension( @@ -50,6 +51,7 @@ public Dimension( /** * Creates new instance + * * @param itemIdentifiers identifiers referencing attributes from {@link Afm} or {@link Dimension#MEASURE_GROUP} */ public Dimension(final List itemIdentifiers) { @@ -58,6 +60,7 @@ public Dimension(final List itemIdentifiers) { /** * Creates new instance + * * @param itemIdentifiers identifiers referencing attributes from {@link Afm} or {@link Dimension#MEASURE_GROUP} */ public Dimension(final String... itemIdentifiers) { @@ -99,4 +102,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Direction.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Direction.java index 3de9e2762..2fa830757 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Direction.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/Direction.java @@ -17,4 +17,3 @@ public String toString() { return name().toLowerCase(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/LocatorItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/LocatorItem.java index e53a31b52..70654df42 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/LocatorItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/LocatorItem.java @@ -20,4 +20,3 @@ }) public interface LocatorItem { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureLocatorItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureLocatorItem.java index a911a133a..0ca8ad407 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureLocatorItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureLocatorItem.java @@ -35,4 +35,3 @@ public String toString() { return measureIdentifier; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureSortItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureSortItem.java index 31338be92..ea95fef26 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureSortItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/MeasureSortItem.java @@ -55,4 +55,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/ResultSpec.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/ResultSpec.java index 6946ae767..3aebfddff 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/ResultSpec.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/ResultSpec.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.executeafm.afm.Afm; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.executeafm.afm.Afm; import java.util.ArrayList; import java.util.List; @@ -39,14 +39,14 @@ public List getDimensions() { return dimensions; } - public List getSorts() { - return sorts; - } - public void setDimensions(final List dimensions) { this.dimensions = dimensions; } + public List getSorts() { + return sorts; + } + public void setSorts(final List sorts) { this.sorts = sorts; } @@ -73,4 +73,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/SortItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/SortItem.java index 673d5a80e..d6891c73b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/SortItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/SortItem.java @@ -18,4 +18,3 @@ }) public interface SortItem { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalItem.java index 996dea747..b125547a5 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalItem.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.md.report.Total; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.report.Total; import java.util.Objects; @@ -25,8 +25,9 @@ public class TotalItem { /** * Total definition - * @param measureIdentifier measure on which is total defined - * @param type total type + * + * @param measureIdentifier measure on which is total defined + * @param type total type * @param attributeIdentifier internal attribute identifier in AFM defining total placement */ @JsonCreator @@ -44,6 +45,7 @@ public TotalItem(final String measureIdentifier, final Total total, final String /** * total type + * * @return total type */ public String getType() { @@ -52,6 +54,7 @@ public String getType() { /** * internal measure identifier in AFM, on which is total defined + * * @return measure */ public String getMeasureIdentifier() { @@ -60,6 +63,7 @@ public String getMeasureIdentifier() { /** * internal attribute identifier in AFM defining total placement + * * @return identifier (never null) */ public String getAttributeIdentifier() { @@ -86,4 +90,3 @@ public int hashCode() { return Objects.hash(measureIdentifier, type, attributeIdentifier); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalLocatorItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalLocatorItem.java index c3a55a384..8929c5f64 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalLocatorItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/executeafm/resultspec/TotalLocatorItem.java @@ -40,4 +40,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ClientExport.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ClientExport.java index cd51fc4ae..2258a8f0b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ClientExport.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ClientExport.java @@ -32,9 +32,9 @@ public ClientExport(final String goodDataEndpointUri, final String projectUri, f final String tabId) { this(notEmpty(goodDataEndpointUri, "goodDataEndpointUri") + String.format(DASHBOARD_EXPORT_URI, - notNull(projectUri, "projectUri"), - notNull(dashboardUri, "dashboardUri"), - notNull(tabId, "tabId")), + notNull(projectUri, "projectUri"), + notNull(dashboardUri, "dashboardUri"), + notNull(tabId, "tabId")), "export.pdf"); } @@ -51,4 +51,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReport.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReport.java index 04f98371d..e5a8bdddb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReport.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReport.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.md.report.Report; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.report.Report; import static com.gooddata.sdk.common.util.Validate.notNull; @@ -42,4 +42,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReportDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReportDefinition.java index 6116954f9..2efe1ded7 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReportDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExecuteReportDefinition.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.md.report.ReportDefinition; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.report.ReportDefinition; import static com.gooddata.sdk.common.util.Validate.notNull; @@ -42,4 +42,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExportFormat.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExportFormat.java index 80edee7e7..2351381ca 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExportFormat.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ExportFormat.java @@ -14,14 +14,13 @@ public enum ExportFormat { PDF, XLS, PNG, CSV, HTML, XLSX; - public String getValue() { - return name().toLowerCase(); - } - public static String[] arrayToStringArray(final ExportFormat... formats) { return Stream.of(formats) .map(ExportFormat::getValue) .toArray(String[]::new); } -} + public String getValue() { + return name().toLowerCase(); + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ReportRequest.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ReportRequest.java index e7b00bf19..a45308ee8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ReportRequest.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/export/ReportRequest.java @@ -22,4 +22,4 @@ public abstract class ReportRequest { public static final String URI = "/gdc/xtab2/executor3"; -} +} \ No newline at end of file diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlag.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlag.java index 288bc80de..484ff016a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlag.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlag.java @@ -5,10 +5,10 @@ */ package com.gooddata.sdk.model.featureflag; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Feature flag is a boolean flag used for enabling / disabling some specific feature of GoodData platform. * It can be used in various scopes (per project, per project group, per user, global etc.). @@ -56,4 +56,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java index 53b7a3ab2..9d81c3811 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/FeatureFlags.java @@ -5,10 +5,18 @@ */ package com.gooddata.sdk.model.featureflag; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; -import java.util.*; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; @@ -93,4 +101,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlag.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlag.java index ffd5abf91..664034e8d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlag.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlag.java @@ -5,7 +5,13 @@ */ package com.gooddata.sdk.model.featureflag; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import static com.gooddata.sdk.common.util.Validate.notEmpty; @@ -25,10 +31,9 @@ public class ProjectFeatureFlag { public static final String PROJECT_FEATURE_FLAG_URI = ProjectFeatureFlags.PROJECT_FEATURE_FLAGS_URI + "/{featureFlag}"; private final String name; - private boolean enabled; - @JsonIgnore private final Links links; + private boolean enabled; /** * Creates new project feature flag which is by default enabled (true). @@ -42,7 +47,7 @@ public ProjectFeatureFlag(String name) { /** * Creates new project feature flag with given value. * - * @param name unique name of feature flag + * @param name unique name of feature flag * @param enabled true (flag enabled) or false (flag disabled) */ public ProjectFeatureFlag(String name, boolean enabled) { @@ -126,4 +131,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlags.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlags.java index 30db6451a..bcd2cd37b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlags.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/featureflag/ProjectFeatureFlags.java @@ -5,9 +5,13 @@ */ package com.gooddata.sdk.model.featureflag; -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.project.Project; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.project.Project; import java.util.Iterator; import java.util.LinkedList; @@ -59,4 +63,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java index 29b8d0992..14e57a9b0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AboutLinks.java @@ -5,7 +5,12 @@ */ package com.gooddata.sdk.model.gdc; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.Collection; @@ -109,4 +114,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AbstractMaql.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AbstractMaql.java index e8f775c0d..0ebff076d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AbstractMaql.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AbstractMaql.java @@ -37,4 +37,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AsyncTask.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AsyncTask.java index 2c95ee793..8fd0f34b9 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AsyncTask.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/AsyncTask.java @@ -55,4 +55,3 @@ public String getPoll() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java index 69f819a1f..3324c8177 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/LinkEntries.java @@ -60,4 +60,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java index 83c9c0b8f..fed0c3402 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/RootLinks.java @@ -237,4 +237,4 @@ private enum LinkCategory { } } -} +} \ No newline at end of file diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/TaskStatus.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/TaskStatus.java index cbd1ae4a5..b9d70dc1b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/TaskStatus.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/TaskStatus.java @@ -71,4 +71,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/UriResponse.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/UriResponse.java index 79680f59c..0aa2201ad 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/UriResponse.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/gdc/UriResponse.java @@ -39,4 +39,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItem.java index 6eeefa568..aec37382b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItem.java @@ -5,12 +5,23 @@ */ package com.gooddata.sdk.model.hierarchicalconfig; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNullState; -import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.*; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.CLIENT; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.DATA_PRODUCT; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.DOMAIN; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.PROJECT; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.PROJECT_GROUP; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.SEGMENT; /** * Contains information about hierarchical configuration object aka platform setting aka feature flag. @@ -30,14 +41,14 @@ public class ConfigItem { public static final String PROJECT_GROUP_CONFIG_ITEM_URI = PROJECT_GROUP.getApiUri() + "/{configName}"; private final String key; - private String value; private final String source; private final Links links; + private String value; /** * Creates new config item with given key/name and value. * - * @param key unique key/name of config item + * @param key unique key/name of config item * @param value value of config item */ public ConfigItem(String key, String value) { @@ -74,6 +85,10 @@ public String getValue() { return value; } + public void setValue(String value) { + this.value = value; + } + @JsonIgnore public String getSource() { return source; @@ -84,12 +99,9 @@ public Links getLinks() { return links; } - public void setValue(String value) { - this.value = value; - } - /** * Conversion method from String to Boolean type. + * * @return returns converted value: true or false */ @JsonIgnore @@ -103,6 +115,7 @@ public void setEnabled(Boolean value) { /** * Conversion method from source to SourceType enum. + * * @return returns SourceType or null, if source is not recognized */ @JsonIgnore @@ -165,4 +178,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItems.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItems.java index 7d3ded8e5..e09b1b0c7 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItems.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/ConfigItems.java @@ -5,7 +5,11 @@ */ package com.gooddata.sdk.model.hierarchicalconfig; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.ArrayList; @@ -13,7 +17,12 @@ import java.util.List; import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.*; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.CLIENT; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.DATA_PRODUCT; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.DOMAIN; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.PROJECT; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.PROJECT_GROUP; +import static com.gooddata.sdk.model.hierarchicalconfig.SourceType.SEGMENT; /** * Contains collection of config items aka feature flags aka hierarchical config. @@ -82,4 +91,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/SourceType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/SourceType.java index 4da3888f0..4a3a1b0eb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/SourceType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/hierarchicalconfig/SourceType.java @@ -55,7 +55,7 @@ public enum SourceType { private final String apiUri; /** - * @param name source of config item + * @param name source of config item * @param apiUri api uri in case that config item is manageable */ SourceType(String name, String apiUri) { @@ -63,14 +63,6 @@ public enum SourceType { this.apiUri = apiUri; } - public String getName() { - return name; - } - - public String getApiUri() { - return apiUri; - } - /** * Get source type by string. * @@ -81,9 +73,16 @@ public static SourceType get(String source) { return lookup.get(source); } + public String getName() { + return name; + } + + public String getApiUri() { + return apiUri; + } + @Override public String toString() { return this.name; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntities.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntities.java index 033f817cf..30dd48279 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntities.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntities.java @@ -61,4 +61,3 @@ protected LcmEntities createPage(final List items, final Paging pagin } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntity.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntity.java index e36839faa..17f060ddb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntity.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntity.java @@ -10,19 +10,19 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.project.Project; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.project.Project; import java.util.Map; import java.util.Objects; +import static com.gooddata.sdk.common.util.Validate.notEmpty; +import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.common.util.Validate.notNullState; import static com.gooddata.sdk.model.lcm.LcmEntity.LinkCategory.CLIENT; import static com.gooddata.sdk.model.lcm.LcmEntity.LinkCategory.DATA_PRODUCT; import static com.gooddata.sdk.model.lcm.LcmEntity.LinkCategory.PROJECT; import static com.gooddata.sdk.model.lcm.LcmEntity.LinkCategory.SEGMENT; -import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static com.gooddata.sdk.common.util.Validate.notNull; -import static com.gooddata.sdk.common.util.Validate.notNullState; /** * Single Life Cycle Management entity representing the relation between {@link Project}, @@ -41,9 +41,10 @@ public class LcmEntity { /** * Creates new instance of given project id and title - * @param projectId id of the project + * + * @param projectId id of the project * @param projectTitle title of the project - * @param links links + * @param links links */ public LcmEntity(final String projectId, final String projectTitle, final Map links) { this(projectId, projectTitle, null, null, null, links); @@ -143,4 +144,3 @@ public static class LinkCategory { public static final String DATA_PRODUCT = "dataProduct"; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntityFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntityFilter.java index fef502350..3d04a01ac 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntityFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/lcm/LcmEntityFilter.java @@ -33,6 +33,7 @@ public LcmEntityFilter() { /** * Adds given data product to this filter. + * * @param dataProduct data product id - must not be empty. * @return this filter */ @@ -45,6 +46,7 @@ public LcmEntityFilter withDataProduct(final String dataProduct) { /** * Adds given segment to this filter. + * * @param segment segment id - must not be empty. * @return this filter */ @@ -57,6 +59,7 @@ public LcmEntityFilter withSegment(final String segment) { /** * Adds given client to this filter. + * * @param client client id - must not be empty. * @return this filter */ @@ -81,6 +84,7 @@ public String getClient() { /** * This filter in the form of query parameters map. + * * @return filter as query params map */ public Map> asQueryParams() { @@ -97,4 +101,3 @@ public Map> asQueryParams() { return params; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AbstractObj.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AbstractObj.java index 33a12e74b..44e9bde7d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AbstractObj.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AbstractObj.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.util.UriHelper; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.util.UriHelper; import java.io.Serializable; import java.time.ZonedDateTime; @@ -30,6 +30,23 @@ protected AbstractObj(@JsonProperty("meta") Meta meta) { this.meta = meta; } + /** + * Get list of URIs of the given {@link Obj}s + * + * @param objs metadata objects + * @param Obj type + * @return list of URIs + */ + @SafeVarargs + protected static String[] uris(T... objs) { + noNullElements(objs, "objs"); + final String[] uris = new String[objs.length]; + for (int i = 0; i < objs.length; i++) { + uris[i] = objs[i].getUri(); + } + return uris; + } + /** * Returns internally generated ID of the object (that's part of the object URI). * @@ -169,27 +186,9 @@ public void setFlags(final Set flags) { meta.setFlags(flags); } - /** - * Get list of URIs of the given {@link Obj}s - * - * @param objs metadata objects - * @param Obj type - * @return list of URIs - */ - @SafeVarargs - protected static String[] uris(T... objs) { - noNullElements(objs, "objs"); - final String[] uris = new String[objs.length]; - for (int i = 0; i < objs.length; i++) { - uris[i] = objs[i].getUri(); - } - return uris; - } - @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attachment.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attachment.java index 0bae6b090..2dba335f2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attachment.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attachment.java @@ -35,7 +35,9 @@ protected Attachment(@JsonProperty("uri") String uri) { this.uri = uri; } - public String getUri() { return uri; } + public String getUri() { + return uri; + } @Override public boolean equals(Object o) { @@ -57,4 +59,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attribute.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attribute.java index 1fa3acdf1..d19b54908 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attribute.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Attribute.java @@ -5,8 +5,6 @@ */ package com.gooddata.sdk.model.md; -import static java.util.Arrays.asList; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,6 +13,8 @@ import java.util.Collections; +import static java.util.Arrays.asList; + /** * Attribute of GoodData project dataset */ @@ -30,8 +30,7 @@ private Attribute(@JsonProperty("meta") Meta meta, @JsonProperty("content") Nest /* Just for serialization test */ Attribute(String title, Key primaryKey, Key foreignKey) { - this(new Meta(title), new Content(asList(primaryKey), asList(foreignKey), Collections.emptyList(), null, null, null, null, null, + this(new Meta(title), new Content(asList(primaryKey), asList(foreignKey), Collections.emptyList(), null, null, null, null, null, null, null, null, null, null, null)); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java index f7ad94a43..d86dcd7e6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeDisplayForm.java @@ -5,7 +5,12 @@ */ package com.gooddata.sdk.model.md; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.gooddata.sdk.common.util.BooleanDeserializer; @@ -27,7 +32,7 @@ public class AttributeDisplayForm extends DisplayForm implements Updatable { @JsonCreator private AttributeDisplayForm(@JsonProperty("meta") Meta meta, @JsonProperty("content") AttributeContent content, - @JsonProperty("links") Links links) { + @JsonProperty("links") Links links) { super(meta, content, links); this.attributeContent = content; } @@ -73,4 +78,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElement.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElement.java index 024c92fc3..ffd105b3e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElement.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElement.java @@ -58,4 +58,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElements.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElements.java index db883c124..025b141de 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElements.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeElements.java @@ -5,7 +5,12 @@ */ package com.gooddata.sdk.model.md; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.List; @@ -58,4 +63,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java index d76d9875a..a4d7d8838 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/AttributeSort.java @@ -5,9 +5,6 @@ */ package com.gooddata.sdk.model.md; -import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -22,6 +19,9 @@ import java.io.IOException; import java.io.Serializable; +import static com.gooddata.sdk.common.util.Validate.notEmpty; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Internal representation of attribute sort field. Which can be either plain text value or structure pointing to display form. */ @@ -29,10 +29,9 @@ @JsonSerialize(using = AttributeSort.Serializer.class) class AttributeSort implements Serializable { - private static final long serialVersionUID = -7415504020870223701L; static final String PK = "pk"; static final String BY_USED_DF = "byUsedDF"; - + private static final long serialVersionUID = -7415504020870223701L; private final String value; private final boolean linkType; @@ -91,4 +90,3 @@ public void serialize(AttributeSort value, JsonGenerator gen, SerializerProvider } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGet.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGet.java index 7c49f1b84..7ca9401fc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGet.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGet.java @@ -42,4 +42,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGetUris.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGetUris.java index 71aba90cc..17086a66b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGetUris.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/BulkGetUris.java @@ -56,4 +56,3 @@ public int hashCode() { return items.hashCode(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Column.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Column.java index fbd1a85a1..ced161e41 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Column.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Column.java @@ -22,16 +22,15 @@ @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) public class Column extends AbstractObj implements Queryable { - private static final long serialVersionUID = 8235010456787885263L; public static final String TYPE_PK = "pk"; public static final String TYPE_INPUT_PK = "inputpk"; public static final String TYPE_FK = "fk"; public static final String TYPE_FACT = "fact"; public static final String TYPE_DISPLAY_FORM = "displayForm"; - + private static final long serialVersionUID = 8235010456787885263L; private final Content content; - private Column(@JsonProperty("meta") Meta meta, @JsonProperty("content")Content content) { + private Column(@JsonProperty("meta") Meta meta, @JsonProperty("content") Content content) { super(meta); this.content = content; } @@ -107,7 +106,7 @@ private static class Content implements Serializable { @JsonCreator private Content(@JsonProperty("table") String table, @JsonProperty("columnDBName") String columnDBName, - @JsonProperty("columnType") String columnType) { + @JsonProperty("columnType") String columnType) { this.table = table; this.columnDBName = columnDBName; this.columnType = columnType; @@ -131,4 +130,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DashboardAttachment.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DashboardAttachment.java index a136e1513..49eb19acd 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DashboardAttachment.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DashboardAttachment.java @@ -27,18 +27,24 @@ protected DashboardAttachment( @JsonProperty("allTabs") Integer allTabs, @JsonProperty("executionContext") String executionContext, @JsonProperty("tabs") String... tabs - ) { + ) { super(uri); this.allTabs = allTabs; this.tabs = Arrays.asList(tabs); this.executionContext = executionContext; } - public Integer getAllTabs() { return allTabs; } + public Integer getAllTabs() { + return allTabs; + } - public Collection getTabs() { return tabs; } + public Collection getTabs() { + return tabs; + } - public String getExecutionContext() { return executionContext; } + public String getExecutionContext() { + return executionContext; + } @Override public boolean equals(final Object o) { @@ -69,4 +75,3 @@ public String toString() { return new GoodDataToStringBuilder(this).append("uri", getUri()).toString(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DataLoadingColumn.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DataLoadingColumn.java index 8e0924d55..55f0421e6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DataLoadingColumn.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DataLoadingColumn.java @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.gooddata.sdk.model.gdc.UriResponse; import com.gooddata.sdk.common.util.BooleanDeserializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.gdc.UriResponse; import java.io.Serializable; @@ -81,15 +81,15 @@ public boolean isNullable() { } public String getSynchronizeType() { - return content.getColumnSynchronize() != null ? content.getColumnSynchronize().getType() : null; + return content.getColumnSynchronize() != null ? content.getColumnSynchronize().getType() : null; } public Integer getSynchronizeLength() { - return content.getColumnSynchronize() != null ? content.getColumnSynchronize().getLength() : null; + return content.getColumnSynchronize() != null ? content.getColumnSynchronize().getLength() : null; } public Integer getSynchronizePrecision() { - return content.getColumnSynchronize() != null ? content.getColumnSynchronize().getPrecision() : null; + return content.getColumnSynchronize() != null ? content.getColumnSynchronize().getPrecision() : null; } @Override @@ -110,10 +110,10 @@ private static class Content implements Serializable { private final ColumnSynchronize columnSynchronize; private Content(@JsonProperty("column") UriResponse columnUri, @JsonProperty("columnName") String columnName, @JsonProperty("type") String columnType, - @JsonProperty("length") Integer columnLength, @JsonProperty("precision") Integer columnPrecision, - @JsonProperty("columnUnique") @JsonDeserialize(using = BooleanDeserializer.class) boolean columnUnique, - @JsonProperty("columnNull") @JsonDeserialize(using = BooleanDeserializer.class) boolean columnNull, - @JsonProperty("columnSynchronize") ColumnSynchronize columnSynchronize) { + @JsonProperty("length") Integer columnLength, @JsonProperty("precision") Integer columnPrecision, + @JsonProperty("columnUnique") @JsonDeserialize(using = BooleanDeserializer.class) boolean columnUnique, + @JsonProperty("columnNull") @JsonDeserialize(using = BooleanDeserializer.class) boolean columnNull, + @JsonProperty("columnSynchronize") ColumnSynchronize columnSynchronize) { this.columnUri = columnUri; this.columnName = columnName; this.columnType = columnType; @@ -169,7 +169,7 @@ private static class ColumnSynchronize implements Serializable { @JsonCreator private ColumnSynchronize(@JsonProperty("columnType") String type, @JsonProperty("columnLength") Integer length, - @JsonProperty("columnPrecision") Integer precision) { + @JsonProperty("columnPrecision") Integer precision) { this.type = type; this.length = length; this.precision = precision; @@ -193,4 +193,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java index db41e0a0d..d320b2c66 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dataset.java @@ -5,18 +5,16 @@ */ package com.gooddata.sdk.model.md; -import static com.gooddata.sdk.common.util.Validate.notNullState; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.common.util.BooleanDeserializer; -import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.gooddata.sdk.common.util.BooleanDeserializer; +import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; @@ -24,6 +22,8 @@ import java.util.List; import java.util.Map; +import static com.gooddata.sdk.common.util.Validate.notNullState; + /** * Represents metadata dataset */ @@ -44,7 +44,7 @@ public class Dataset extends AbstractObj implements Queryable, Updatable { @JsonCreator private Dataset(@JsonProperty("meta") Meta meta, @JsonProperty("content") Content content, - @JsonProperty("links") Map links) { + @JsonProperty("links") Map links) { super(meta); this.content = content; this.links = links; @@ -114,11 +114,11 @@ private static class Content implements Serializable { @JsonCreator private Content(@JsonProperty("ties") List ties, - @JsonProperty("mode") String mode, - @JsonProperty("facts") List facts, - @JsonProperty("dataLoadingColumns") List dataLoadingColumns, - @JsonProperty("attributes") List attributes, - @JsonProperty("hasUploadConfiguration") @JsonDeserialize(using = BooleanDeserializer.class) Boolean hasUploadConfiguration) { + @JsonProperty("mode") String mode, + @JsonProperty("facts") List facts, + @JsonProperty("dataLoadingColumns") List dataLoadingColumns, + @JsonProperty("attributes") List attributes, + @JsonProperty("hasUploadConfiguration") @JsonDeserialize(using = BooleanDeserializer.class) Boolean hasUploadConfiguration) { this.ties = ties; this.mode = mode; this.facts = facts; @@ -159,4 +159,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dimension.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dimension.java index bc3554907..a8331fee1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dimension.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Dimension.java @@ -73,4 +73,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java index 38d1707c6..06c314136 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/DisplayForm.java @@ -31,7 +31,7 @@ public class DisplayForm extends AbstractObj { @JsonCreator protected DisplayForm(@JsonProperty("meta") Meta meta, @JsonProperty("content") Content content, - @JsonProperty("links") Links links) { + @JsonProperty("links") Links links) { super(meta); this.content = content; this.links = links; @@ -131,4 +131,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java index a84e8c23c..0de1741cc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Entry.java @@ -12,14 +12,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.gooddata.sdk.model.util.TagsDeserializer; -import com.gooddata.sdk.model.util.TagsSerializer; -import com.gooddata.sdk.model.util.UriHelper; import com.gooddata.sdk.common.util.BooleanDeserializer; import com.gooddata.sdk.common.util.BooleanIntegerSerializer; import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.gooddata.sdk.common.util.GDZonedDateTime; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.util.TagsDeserializer; +import com.gooddata.sdk.model.util.TagsSerializer; +import com.gooddata.sdk.model.util.UriHelper; import java.time.ZonedDateTime; import java.util.Set; @@ -78,6 +78,7 @@ public Entry(@JsonProperty("link") String uri, /** * Returns internally generated ID of the object (that's part of the object URI). + * * @return internal ID of the object */ @JsonIgnore @@ -125,6 +126,7 @@ public Boolean getDeprecated() { /** * Returns user-specified identifier of the object. + * * @return user-specified object identifier */ public String getIdentifier() { @@ -175,4 +177,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Expression.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Expression.java index c6c9bf495..a3676f6b2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Expression.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Expression.java @@ -43,4 +43,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Fact.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Fact.java index 3c945f54e..678ae2e8b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Fact.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Fact.java @@ -50,6 +50,7 @@ public Collection getExpressions() { /** * URIs of folders containing this object + * * @return collection of URIs or null */ @JsonIgnore @@ -93,4 +94,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierAndUri.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierAndUri.java index a93c2c0f0..643dd93c2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierAndUri.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierAndUri.java @@ -37,4 +37,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierToUri.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierToUri.java index 5dabb1329..db0cd64ab 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierToUri.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifierToUri.java @@ -15,7 +15,7 @@ /** * Structure with list of symbolic names (identifiers) to be expanded to list of URIs. * Serialization only. - * + *

    * See also {@link UriToIdentifier}. */ public class IdentifierToUri { @@ -54,4 +54,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifiersAndUris.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifiersAndUris.java index 8fa00d21e..d4fbc6ba7 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifiersAndUris.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/IdentifiersAndUris.java @@ -73,4 +73,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/InUseMany.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/InUseMany.java index a7f1e675e..6886c24d8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/InUseMany.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/InUseMany.java @@ -5,16 +5,16 @@ */ package com.gooddata.sdk.model.md; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.common.util.BooleanDeserializer; -import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.gooddata.sdk.common.util.BooleanDeserializer; +import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.Collection; @@ -45,8 +45,8 @@ public class InUseMany { @JsonCreator InUseMany(@JsonProperty("uris") Collection uris, - @JsonProperty("nearest") @JsonDeserialize(using = BooleanDeserializer.class) boolean nearest, - @JsonProperty("types") Set types) { + @JsonProperty("nearest") @JsonDeserialize(using = BooleanDeserializer.class) boolean nearest, + @JsonProperty("types") Set types) { this.uris = notEmpty(uris, "uris"); this.types = types; @@ -58,7 +58,7 @@ public InUseMany(Collection uris, boolean nearest, Class. this.uris = notNull(uris, "uris"); noNullElements(type, "type"); this.types = new HashSet<>(); - for (Class t: type) { + for (Class t : type) { this.types.add(decapitalize(t.getSimpleName())); } this.nearest = nearest; @@ -102,4 +102,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Key.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Key.java index a0af6e459..d9c9b2024 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Key.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Key.java @@ -43,4 +43,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/MaqlAst.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/MaqlAst.java index 8de1e483f..9b9be2384 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/MaqlAst.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/MaqlAst.java @@ -93,4 +93,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java index c6c0e844c..790efcf58 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Meta.java @@ -12,14 +12,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.gooddata.sdk.model.util.TagsDeserializer; -import com.gooddata.sdk.model.util.TagsSerializer; -import com.gooddata.sdk.model.util.UriHelper; import com.gooddata.sdk.common.util.BooleanDeserializer; import com.gooddata.sdk.common.util.BooleanIntegerSerializer; import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.gooddata.sdk.common.util.GDZonedDateTime; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.util.TagsDeserializer; +import com.gooddata.sdk.model.util.TagsSerializer; +import com.gooddata.sdk.model.util.UriHelper; import java.io.Serializable; import java.time.ZonedDateTime; @@ -308,4 +308,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Metric.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Metric.java index 1f55f8dcf..ccea81426 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Metric.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Metric.java @@ -58,6 +58,7 @@ public MaqlAst getMaqlAst() { /** * URIs of folders containing this object + * * @return collection of URIs or null */ @JsonIgnore @@ -75,15 +76,12 @@ private static class Content implements Serializable { private static final long serialVersionUID = 7959588028233637749L; private final String expression; - + private final Collection folders; @JsonProperty("format") private String format; - @JsonProperty("tree") private MaqlAst maqlAst; - private final Collection folders; - @JsonCreator public Content(@JsonProperty("expression") String expression, @JsonProperty("folders") Collection folders) { this.expression = expression; @@ -100,22 +98,22 @@ public String getExpression() { return expression; } - public void setFormat(final String format) { - this.format = format; - } - public String getFormat() { return format; } - public void setMaqlAst(final MaqlAst maqlAst) { - this.maqlAst = maqlAst; + public void setFormat(final String format) { + this.format = format; } public MaqlAst getMaqlAst() { return maqlAst; } + public void setMaqlAst(final MaqlAst maqlAst) { + this.maqlAst = maqlAst; + } + public Collection getFolders() { return folders; } @@ -126,4 +124,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java index e1a99032f..487844dcb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/NestedAttribute.java @@ -5,7 +5,11 @@ */ package com.gooddata.sdk.model.md; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; @@ -131,6 +135,7 @@ public String getLinkedDisplayFormUri() { /** * URIs of folders containing this object + * * @return collection of URIs or null */ @JsonIgnore @@ -265,4 +270,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Obj.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Obj.java index 0f48fdcb6..90bf5e414 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Obj.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Obj.java @@ -43,4 +43,3 @@ public interface Obj { String getUri(); } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ProjectDashboard.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ProjectDashboard.java index 8e411a800..6db262a7e 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ProjectDashboard.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ProjectDashboard.java @@ -5,9 +5,6 @@ */ package com.gooddata.sdk.model.md; -import static com.gooddata.sdk.common.util.Validate.notNull; -import static java.util.Arrays.asList; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -22,6 +19,9 @@ import java.util.Collections; import java.util.Objects; +import static com.gooddata.sdk.common.util.Validate.notNull; +import static java.util.Arrays.asList; + /** * Project Dashboard of GoodData project.
    * Deserialization only. This object is not complete representation of real 'projectDashboard' object. @@ -55,8 +55,7 @@ public Collection getTabs() { * If tab with such name doesn't exist, returns {@code null}. * * @param name tab name - * @return - *

      + * @return
        *
      • dashboard tab with the given name
        • *
      • {@code null} if tab doesn't exist
        • *
      @@ -140,4 +139,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Query.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Query.java index 6c2835c09..306757d3c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Query.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Query.java @@ -91,4 +91,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Queryable.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Queryable.java index a3955f414..aeb88f367 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Queryable.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Queryable.java @@ -10,4 +10,3 @@ */ public interface Queryable extends Obj { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ReportAttachment.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ReportAttachment.java index 7e96b6756..acca59898 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ReportAttachment.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ReportAttachment.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.export.ExportFormat; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.export.ExportFormat; import java.util.Arrays; import java.util.Collection; @@ -27,7 +27,7 @@ protected ReportAttachment( @JsonProperty("uri") String uri, @JsonProperty("exportOptions") Map exportOptions, @JsonProperty("formats") String... formats - ) { + ) { super(uri); this.exportOptions = exportOptions; this.formats = Arrays.asList(formats); @@ -38,9 +38,9 @@ protected ReportAttachment(String uri, Map exportOptions, Export } /** - * Options which modify default export behavior. Due to variety of - * export formats options only work for explicitly listed - * format types. + * Options which modify default export behavior. Due to variety of + * export formats options only work for explicitly listed + * format types. * *
        *
      • pageOrientation @@ -98,9 +98,13 @@ protected ReportAttachment(String uri, Map exportOptions, Export * * @return map of export options */ - public Map getExportOptions() { return exportOptions; } + public Map getExportOptions() { + return exportOptions; + } - public Collection getFormats() { return formats; } + public Collection getFormats() { + return formats; + } @Override public boolean equals(Object o) { @@ -129,4 +133,3 @@ public String toString() { return new GoodDataToStringBuilder(this).append("uri", getUri()).toString(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Restriction.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Restriction.java index ac6c50884..9d6aa3972 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Restriction.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Restriction.java @@ -25,14 +25,6 @@ private Restriction(Type type, String value) { this.value = notNull(value, "value"); } - public Type getType() { - return type; - } - - public String getValue() { - return value; - } - /** * Construct a new instance with restriction type identifier and given value. * @@ -63,6 +55,14 @@ public static Restriction summary(String value) { return new Restriction(Type.SUMMARY, value); } + public Type getType() { + return type; + } + + public String getValue() { + return value; + } + @Override public boolean equals(final Object o) { if (this == o) return true; @@ -86,4 +86,3 @@ public enum Type { IDENTIFIER, TITLE, SUMMARY } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java index 154d44e6e..9e03136e0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMail.java @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.export.ExportFormat; import com.gooddata.sdk.model.md.report.ReportDefinition; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; import java.time.LocalDate; @@ -62,7 +62,7 @@ private ScheduledMail(String title, String summary, Set tags, boolean de /** * Creates an almost empty instance of the object. It's up to the user's responsibility to call all the necessary setters. * - * @param title the title of the MD object + * @param title the title of the MD object * @param summary the summary of the MD object */ public ScheduledMail(String title, String summary) { @@ -74,16 +74,16 @@ public ScheduledMail(String title, String summary) { /** * Creates full, safe mail schedule object. * - * @param title the title of the MD object - * @param summary the summary of the MD object - * @param recurrency schedule in format defined in schedule - * @param startDate schedule starting date - * @param timeZone time zone of the starting date - * @param toAddresses collection of email addresses to send the mail to + * @param title the title of the MD object + * @param summary the summary of the MD object + * @param recurrency schedule in format defined in schedule + * @param startDate schedule starting date + * @param timeZone time zone of the starting date + * @param toAddresses collection of email addresses to send the mail to * @param bccAddresses collection of blind copy addresses to send the mail to - * @param subject the subject of the scheduled mail - * @param body the text body of the scheduled mail - * @param attachments reports and dashboards to send in the scheduled email + * @param subject the subject of the scheduled mail + * @param body the text body of the scheduled mail + * @param attachments reports and dashboards to send in the scheduled email */ public ScheduledMail(String title, String summary, String recurrency, LocalDate startDate, String timeZone, Collection toAddresses, Collection bccAddresses, String subject, String body, @@ -92,6 +92,109 @@ public ScheduledMail(String title, String summary, String recurrency, LocalDate bccAddresses, subject, body, attachments); } + @JsonIgnore + public ScheduledMailWhen getWhen() { + return content.getScheduledMailWhen(); + } + + @JsonIgnore + public Collection getToAddresses() { + return content.getToAddresses(); + } + + @JsonIgnore + public Collection getBccAddresses() { + return content.getBccAddresses(); + } + + @JsonIgnore + public String getSubject() { + return content.getSubject(); + } + + public ScheduledMail setSubject(String subject) { + this.content.setSubject(subject); + return this; + } + + @JsonIgnore + public String getBody() { + return content.getBody(); + } + + public ScheduledMail setBody(String body) { + this.content.setBody(body); + return this; + } + + @JsonIgnore + public Collection getAttachments() { + return content.getAttachments(); + } + + public ScheduledMail setAttachments(List attachments) { + this.content.setAttachments(attachments); + return this; + } + + public ScheduledMail setRecurrency(String recurrency) { + this.content.getScheduledMailWhen().setRecurrency(recurrency); + return this; + } + + public ScheduledMail setStartDate(LocalDate startDate) { + this.content.getScheduledMailWhen().setStartDate(startDate); + return this; + } + + public ScheduledMail setTimeZone(String timeZone) { + this.content.getScheduledMailWhen().setTimeZone(timeZone); + return this; + } + + public ScheduledMail setTo(Collection toAddresses) { + this.content.setToAddress(toAddresses); + return this; + } + + public ScheduledMail setBcc(Collection bccAddresses) { + this.content.setBccAddress(bccAddresses); + return this; + } + + public ScheduledMail addToAddress(String toAdd) { + this.content.getToAddresses().add(toAdd); + return this; + } + + public ScheduledMail addBccAddress(String bccAdd) { + this.content.getBccAddresses().add(bccAdd); + return this; + } + + public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map exportOptions, String... formats) { + notNull(formats, "formats"); + ReportAttachment ra = new ReportAttachment(reportDefinition.getUri(), exportOptions, formats); + this.content.getAttachments().add(ra); + return this; + } + + public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map exportOptions, ExportFormat... formats) { + return addReportAttachment(reportDefinition, exportOptions, ExportFormat.arrayToStringArray(formats)); + } + + public ScheduledMail addDashboardAttachment(String uri, Integer allTabs, String executionContext, String... tabs) { + notNull(tabs, "tabs"); + DashboardAttachment da = new DashboardAttachment(uri, allTabs, executionContext, tabs); + this.content.getAttachments().add(da); + return this; + } + + @Override + public String toString() { + return GoodDataToStringBuilder.defaultToString(this); + } + /** * Mail schedule MD object payload. */ @@ -142,139 +245,59 @@ public Content() { } @JsonIgnore - public ScheduledMailWhen getScheduledMailWhen() { return scheduledMailWhen; } - - @JsonIgnore - public Collection getToAddresses() { return toAddress; } - - @JsonIgnore - public Collection getBccAddresses() { return bccAddress; } - - public String getSubject() { return subject; } - - public String getBody() { return body; } - - public Collection getAttachments() { return attachments; } + public ScheduledMailWhen getScheduledMailWhen() { + return scheduledMailWhen; + } public void setScheduledMailWhen(ScheduledMailWhen scheduledMailWhen) { this.scheduledMailWhen = scheduledMailWhen; } - public void setToAddress(Collection toAddress) { - this.toAddress = toAddress; + @JsonIgnore + public Collection getToAddresses() { + return toAddress; } - public void setBccAddress(Collection bccAddress) { - this.bccAddress = bccAddress; + @JsonIgnore + public Collection getBccAddresses() { + return bccAddress; + } + + public String getSubject() { + return subject; } public void setSubject(String subject) { this.subject = subject; } + public String getBody() { + return body; + } + public void setBody(String body) { this.body = body; } + public Collection getAttachments() { + return attachments; + } + public void setAttachments(Collection attachments) { this.attachments = attachments; } + public void setToAddress(Collection toAddress) { + this.toAddress = toAddress; + } + + public void setBccAddress(Collection bccAddress) { + this.bccAddress = bccAddress; + } + @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - - @JsonIgnore - public ScheduledMailWhen getWhen() { return content.getScheduledMailWhen(); } - - @JsonIgnore - public Collection getToAddresses() { return content.getToAddresses(); } - - @JsonIgnore - public Collection getBccAddresses() { return content.getBccAddresses(); } - - @JsonIgnore - public String getSubject() { return content.getSubject(); } - - @JsonIgnore - public String getBody() { return content.getBody(); } - - @JsonIgnore - public Collection getAttachments() { return content.getAttachments(); } - - public ScheduledMail setRecurrency(String recurrency) { - this.content.getScheduledMailWhen().setRecurrency(recurrency); - return this; - } - - public ScheduledMail setStartDate(LocalDate startDate) { - this.content.getScheduledMailWhen().setStartDate(startDate); - return this; - } - - public ScheduledMail setTimeZone(String timeZone) { - this.content.getScheduledMailWhen().setTimeZone(timeZone); - return this; - } - - public ScheduledMail setTo(Collection toAddresses) { - this.content.setToAddress(toAddresses); - return this; - } - - public ScheduledMail setBcc(Collection bccAddresses) { - this.content.setBccAddress(bccAddresses); - return this; - } - - public ScheduledMail setSubject(String subject) { - this.content.setSubject(subject); - return this; - } - - public ScheduledMail setBody(String body) { - this.content.setBody(body); - return this; - } - - public ScheduledMail setAttachments(List attachments) { - this.content.setAttachments(attachments); - return this; - } - - public ScheduledMail addToAddress(String toAdd) { - this.content.getToAddresses().add(toAdd); - return this; - } - - public ScheduledMail addBccAddress(String bccAdd) { - this.content.getBccAddresses().add(bccAdd); - return this; - } - - public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map exportOptions, String... formats) { - notNull(formats, "formats"); - ReportAttachment ra = new ReportAttachment(reportDefinition.getUri(), exportOptions, formats); - this.content.getAttachments().add(ra); - return this; - } - - public ScheduledMail addReportAttachment(ReportDefinition reportDefinition, Map exportOptions, ExportFormat... formats) { - return addReportAttachment(reportDefinition, exportOptions, ExportFormat.arrayToStringArray(formats)); - } - - public ScheduledMail addDashboardAttachment(String uri, Integer allTabs, String executionContext, String... tabs) { - notNull(tabs, "tabs"); - DashboardAttachment da = new DashboardAttachment(uri, allTabs, executionContext, tabs); - this.content.getAttachments().add(da); - return this; - } - - @Override - public String toString() { - return GoodDataToStringBuilder.defaultToString(this); - } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMailWhen.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMailWhen.java index 015c3490d..106c5e93b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMailWhen.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/ScheduledMailWhen.java @@ -40,13 +40,32 @@ protected ScheduledMailWhen(@JsonProperty("recurrency") String recurrency, this.timeZone = timeZone; } - public ScheduledMailWhen() {} + public ScheduledMailWhen() { + } - public String getRecurrency() { return recurrency; } + public String getRecurrency() { + return recurrency; + } - public LocalDate getStartDate() { return startDate; } + public void setRecurrency(String recurrency) { + this.recurrency = recurrency; + } - public String getTimeZone() { return timeZone; } + public LocalDate getStartDate() { + return startDate; + } + + public void setStartDate(LocalDate startDate) { + this.startDate = startDate; + } + + public String getTimeZone() { + return timeZone; + } + + public void setTimeZone(String timeZone) { + this.timeZone = timeZone; + } @Override public boolean equals(Object o) { @@ -55,8 +74,10 @@ public boolean equals(Object o) { ScheduledMailWhen scheduledMailWhen = (ScheduledMailWhen) o; - if (recurrency != null ? !recurrency.equals(scheduledMailWhen.recurrency) : scheduledMailWhen.recurrency != null) return false; - if (startDate != null ? !startDate.equals(scheduledMailWhen.startDate) : scheduledMailWhen.startDate != null) return false; + if (recurrency != null ? !recurrency.equals(scheduledMailWhen.recurrency) : scheduledMailWhen.recurrency != null) + return false; + if (startDate != null ? !startDate.equals(scheduledMailWhen.startDate) : scheduledMailWhen.startDate != null) + return false; return !(timeZone != null ? !timeZone.equals(scheduledMailWhen.timeZone) : scheduledMailWhen.timeZone != null); } @@ -69,21 +90,8 @@ public int hashCode() { return result; } - public void setRecurrency(String recurrency) { - this.recurrency = recurrency; - } - - public void setStartDate(LocalDate startDate) { - this.startDate = startDate; - } - - public void setTimeZone(String timeZone) { - this.timeZone = timeZone; - } - @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Service.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Service.java index 6d72f44f1..e5db880b5 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Service.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Service.java @@ -5,7 +5,12 @@ */ package com.gooddata.sdk.model.md; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; @@ -42,4 +47,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Table.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Table.java index 58d192524..514353859 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Table.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Table.java @@ -76,7 +76,7 @@ private static class Content implements Serializable { @JsonCreator private Content(@JsonProperty("tableDBName") String tableDBName, @JsonProperty("activeDataLoad") String activeDataLoad, - @JsonProperty("tableDataLoad") Collection tableDataLoads, @JsonProperty("weight") Integer weight) { + @JsonProperty("tableDataLoad") Collection tableDataLoads, @JsonProperty("weight") Integer weight) { this.tableDBName = tableDBName; this.activeDataLoad = activeDataLoad; this.tableDataLoads = tableDataLoads; @@ -105,4 +105,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/TableDataLoad.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/TableDataLoad.java index ef665f4b1..f5b9c22c5 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/TableDataLoad.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/TableDataLoad.java @@ -22,10 +22,9 @@ @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) public class TableDataLoad extends AbstractObj implements Queryable { - private static final long serialVersionUID = -5209417147612785042L; public static final String TYPE_FULL = "full"; public static final String TYPE_INCREMENTAL = "incremental"; - + private static final long serialVersionUID = -5209417147612785042L; private final Content content; @JsonCreator @@ -94,4 +93,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Updatable.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Updatable.java index 5ff04a920..13aa0f5c3 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Updatable.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Updatable.java @@ -10,4 +10,3 @@ */ public interface Updatable extends Obj { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UriToIdentifier.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UriToIdentifier.java index 1fbd5d8e6..f97a97de7 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UriToIdentifier.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UriToIdentifier.java @@ -15,7 +15,7 @@ /** * Structure with list of URIs to be expanded to list of symbolic names (identifiers). * Serialization only. - * + *

        * See also {@link IdentifierToUri}. */ public class UriToIdentifier { @@ -54,4 +54,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Usage.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Usage.java index 2b3a81b89..1a68c9746 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Usage.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/Usage.java @@ -20,7 +20,8 @@ public class Usage { /** * Constructs object. - * @param uri object URI + * + * @param uri object URI * @param usedBy using objects */ public Usage(final String uri, final Collection usedBy) { @@ -41,4 +42,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseMany.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseMany.java index 4305ae4ed..5dc8b3175 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseMany.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseMany.java @@ -38,4 +38,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseManyEntries.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseManyEntries.java index 2997f7009..0ae541db6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseManyEntries.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/UseManyEntries.java @@ -41,4 +41,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/AnalyticalDashboard.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/AnalyticalDashboard.java index cc5eb4794..4ef5337f9 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/AnalyticalDashboard.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/AnalyticalDashboard.java @@ -6,8 +6,6 @@ package com.gooddata.sdk.model.md.dashboard; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -23,6 +21,8 @@ import java.util.Collections; import java.util.List; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Represents analytical dashboard configuration. */ @@ -38,8 +38,8 @@ public class AnalyticalDashboard extends AbstractObj implements Queryable, Updat /** * Constructor. * - * @param title dashboard title - * @param widgetUris URIs of widgets located on dashboard + * @param title dashboard title + * @param widgetUris URIs of widgets located on dashboard * @param filtersContextUri URI of filters context applied to this dashboard (optional) */ public AnalyticalDashboard(final String title, final List widgetUris, final String filtersContextUri) { @@ -100,4 +100,3 @@ private String getFilterContext() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/Kpi.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/Kpi.java index d3ab1e1c8..ff8427969 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/Kpi.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/Kpi.java @@ -6,9 +6,6 @@ package com.gooddata.sdk.model.md.dashboard; -import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -26,6 +23,9 @@ import java.util.Collections; import java.util.List; +import static com.gooddata.sdk.common.util.Validate.notEmpty; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Represents KPI (key performance indicator) for analytical dashboard. */ @@ -42,15 +42,16 @@ public class Kpi extends AbstractObj implements Queryable, Updatable { /** * Creates new KPI for a given metric with some date filter and comparison - * @param title title of KPI - * @param metricUri URI of the KPI metric - * @param comparisonType KPI comparison type (e.g. {@code "lastYear"}) - * @param comparisonDirection KPI comparison direction (e.g. {@code "growIsGood"}) + * + * @param title title of KPI + * @param metricUri URI of the KPI metric + * @param comparisonType KPI comparison type (e.g. {@code "lastYear"}) + * @param comparisonDirection KPI comparison direction (e.g. {@code "growIsGood"}) * @param ignoreDashboardFilters list of filters which should be ignored for this KPI (can be empty) - * @param dateDatasetUri KPI date filter dataset URI (optional) + * @param dateDatasetUri KPI date filter dataset URI (optional) */ public Kpi(final String title, final String metricUri, final String comparisonType, final String comparisonDirection, - final List ignoreDashboardFilters, final String dateDatasetUri) { + final List ignoreDashboardFilters, final String dateDatasetUri) { this(new Meta(title), new Content( notEmpty(metricUri, "metricUri"), notEmpty(comparisonType, "comparisonType"), @@ -60,6 +61,12 @@ public Kpi(final String title, final String metricUri, final String comparisonTy notNull(ignoreDashboardFilters, "ignoreDashboardFilters"))); } + @JsonCreator + private Kpi(@JsonProperty("meta") final Meta meta, @JsonProperty("content") final Content content) { + super(meta); + this.content = content; + } + private static String checkDirection(final String comparisonType, final String comparisonDirection) { if (NONE_COMPARISON_TYPE.equalsIgnoreCase(notEmpty(comparisonType, "comparisonType"))) { return notEmpty(comparisonDirection, "comparisonDirection"); @@ -68,12 +75,6 @@ private static String checkDirection(final String comparisonType, final String c } } - @JsonCreator - private Kpi(@JsonProperty("meta") final Meta meta, @JsonProperty("content") final Content content) { - super(meta); - this.content = content; - } - /** * @return KPI metric URI string */ @@ -177,4 +178,3 @@ public List getIgnoreDashboardFilters() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/KpiAlert.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/KpiAlert.java index 0b10abf79..91a762dc5 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/KpiAlert.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/KpiAlert.java @@ -6,8 +6,6 @@ package com.gooddata.sdk.model.md.dashboard; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -21,6 +19,8 @@ import java.io.Serializable; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Represents KPI alert set for some KPI on analytical dashboard. */ @@ -36,10 +36,10 @@ public class KpiAlert extends AbstractObj implements Queryable, Updatable { /** * Constructor. * - * @param title KPI alert title - * @param kpiUri URI of the KPI for which the alert is defined - * @param dashboardUri URI of the KPI where the KPI alert is located - * @param threshold KPI alert threshold + * @param title KPI alert title + * @param kpiUri URI of the KPI for which the alert is defined + * @param dashboardUri URI of the KPI where the KPI alert is located + * @param threshold KPI alert threshold * @param triggerCondition condition for triggering KPI alert * @param filterContextUri URI of filter context used for computation of KPI alert (optional) */ @@ -182,4 +182,3 @@ public String getKpi() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/AttributeFilterReference.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/AttributeFilterReference.java index 51c62bea9..b56af6159 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/AttributeFilterReference.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/AttributeFilterReference.java @@ -6,14 +6,14 @@ package com.gooddata.sdk.model.md.dashboard.filter; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Reference for attribute filter for ignoring particular filter in {@link com.gooddata.sdk.model.md.dashboard.Kpi}. * Is not standalone metadata object - must be part of {@link com.gooddata.sdk.model.md.dashboard.Kpi}. @@ -23,14 +23,13 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class AttributeFilterReference implements FilterReference { - private static final long serialVersionUID = -7882622280867466659L; - static final String NAME = "attributeFilterReference"; - + private static final long serialVersionUID = -7882622280867466659L; private final String displayFormUri; /** * Constructor. + * * @param displayFormUri display form URI of filter */ @JsonCreator @@ -46,4 +45,3 @@ public String getDisplayFormUri() { return displayFormUri; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardAttributeFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardAttributeFilter.java index 0c9708fa3..db70fc40c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardAttributeFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardAttributeFilter.java @@ -6,8 +6,6 @@ package com.gooddata.sdk.model.md.dashboard.filter; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -19,6 +17,8 @@ import java.util.Collections; import java.util.List; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Attribute filter located on analytical dashboard. * Is not standalone metadata object - always must be part of {@link DashboardFilterContext}. @@ -37,8 +37,8 @@ public class DashboardAttributeFilter implements DashboardFilter { /** * Constructor. * - * @param displayForm display form of an attribute where this filter is applied - * @param negativeSelection if the negative selection of filter elements is applied + * @param displayForm display form of an attribute where this filter is applied + * @param negativeSelection if the negative selection of filter elements is applied * @param attributeElementUris list of attribute element URIs applied in filter */ @JsonCreator @@ -67,7 +67,6 @@ public boolean isNegativeSelection() { /** * @return list of attribute element URI strings which should be included or excluded in filter - * * @see #isNegativeSelection() */ @JsonIgnore @@ -85,4 +84,3 @@ public String toString() { return GoodDataToStringBuilder.toString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardDateFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardDateFilter.java index 14b4c1c99..7dcf10db1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardDateFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardDateFilter.java @@ -6,9 +6,6 @@ package com.gooddata.sdk.model.md.dashboard.filter; -import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -21,6 +18,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import static com.gooddata.sdk.common.util.Validate.notEmpty; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Date filter located on analytical dashboard. * Is not standalone metadata object - always must be part of {@link DashboardFilterContext}. @@ -34,11 +34,8 @@ public class DashboardDateFilter implements DashboardFilter { public static final String RELATIVE_FILTER_TYPE = "relative"; public static final String ABSOLUTE_FILTER_TYPE = "absolute"; public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ISO_LOCAL_DATE; - - private static final String ABSOLUTE_DATE_FILTER_GRANULARITY = "GDC.time.date"; - static final String NAME = "dateFilter"; - + private static final String ABSOLUTE_DATE_FILTER_GRANULARITY = "GDC.time.date"; private final String from; private final String to; private final String granularity; @@ -62,10 +59,10 @@ private DashboardDateFilter( /** * Creates relative date filter with the given interval and granularity. * - * @param from interval from - * @param to interval to + * @param from interval from + * @param to interval to * @param granularity granularity (e.g. {@code GDC.time.year}) - * @param datasetUri date dataset URI (optional) + * @param datasetUri date dataset URI (optional) * @return created filter */ @JsonIgnore @@ -81,8 +78,8 @@ public static DashboardDateFilter relativeDateFilter(final int from, final int t /** * Creates absolute date filter with the given interval * - * @param from interval from - * @param to interval to + * @param from interval from + * @param to interval to * @param datasetUri date dataset URI (optional) * @return created filter */ @@ -148,4 +145,3 @@ public String toString() { return GoodDataToStringBuilder.toString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilter.java index 4ec8d69fe..ad08662b1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilter.java @@ -21,4 +21,3 @@ }) public interface DashboardFilter extends Serializable { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilterContext.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilterContext.java index a6877ba9f..e55ddd92c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilterContext.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DashboardFilterContext.java @@ -6,24 +6,24 @@ package com.gooddata.sdk.model.md.dashboard.filter; -import static com.gooddata.sdk.common.util.Validate.notNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.md.AbstractObj; import com.gooddata.sdk.model.md.Meta; import com.gooddata.sdk.model.md.Queryable; import com.gooddata.sdk.model.md.Updatable; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; import java.util.Collections; import java.util.List; +import static com.gooddata.sdk.common.util.Validate.notNull; + /** * Class encapsulates list of filters on analytical dashboard. * Currently can contain {@link DashboardDateFilter}s and {@link DashboardAttributeFilter}s. @@ -33,10 +33,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class DashboardFilterContext extends AbstractObj implements Updatable, Queryable { - private static final long serialVersionUID = -4572881756272497057L; - static final String NAME = "filterContext"; - + private static final long serialVersionUID = -4572881756272497057L; private final Content content; /** @@ -93,4 +91,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DateFilterReference.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DateFilterReference.java index 1f6cc914d..34520d7c3 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DateFilterReference.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/DateFilterReference.java @@ -6,14 +6,14 @@ package com.gooddata.sdk.model.md.dashboard.filter; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Reference for date filter for ignoring particular filter in {@link com.gooddata.sdk.model.md.dashboard.Kpi}. * Is not standalone metadata object - must be part of {@link com.gooddata.sdk.model.md.dashboard.Kpi}. @@ -23,14 +23,13 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class DateFilterReference implements FilterReference { - private static final long serialVersionUID = 6016252592161989340L; - static final String NAME = "dateFilterReference"; - + private static final long serialVersionUID = 6016252592161989340L; private final String datasetUri; /** * Constructor. + * * @param datasetUri date dataset URI */ @JsonCreator @@ -46,4 +45,3 @@ public String getDatasetUri() { return datasetUri; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/FilterReference.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/FilterReference.java index a9add2d3f..c2693917f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/FilterReference.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/dashboard/filter/FilterReference.java @@ -21,4 +21,3 @@ }) public interface FilterReference extends Serializable { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProject.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProject.java index d31fc3951..0128479e2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProject.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProject.java @@ -12,12 +12,6 @@ import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; -import java.util.Collection; -import java.util.HashSet; - -import static com.gooddata.sdk.common.util.Validate.notEmpty; -import static java.util.Arrays.asList; - /** * Complete project export configuration structure. * Serialization only. @@ -46,11 +40,11 @@ public ExportProject() { /** * Creates new ExportProject. * - * @param exportUsers whether to add necessary data to be able to clone attribute properties - * @param exportData whether to add necessary data to be able to clone attribute properties - * @param excludeSchedules whether to add necessary data to be able to clone attribute properties + * @param exportUsers whether to add necessary data to be able to clone attribute properties + * @param exportData whether to add necessary data to be able to clone attribute properties + * @param excludeSchedules whether to add necessary data to be able to clone attribute properties * @param crossDataCenterExport whether export should be usable in any Data Center - * @param authorizedUsers comma-separated list of email addresses of users authorized to import the project, surround email addresses with double quotes + * @param authorizedUsers comma-separated list of email addresses of users authorized to import the project, surround email addresses with double quotes */ public ExportProject(final boolean exportUsers, final boolean exportData, final boolean excludeSchedules, final boolean crossDataCenterExport, final String authorizedUsers) { this.exportUsers = exportUsers; @@ -89,4 +83,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectArtifact.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectArtifact.java index ebbb6dc9d..2f756a50f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectArtifact.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectArtifact.java @@ -23,4 +23,3 @@ public ExportProjectArtifact(@JsonProperty("status") UriResponse status, @JsonPr super(status, token); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectToken.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectToken.java index 046cf7f54..3710b44d5 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectToken.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/ExportProjectToken.java @@ -41,4 +41,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdArtifact.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdArtifact.java index 395e6a27c..51338b6c2 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdArtifact.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdArtifact.java @@ -5,9 +5,14 @@ */ package com.gooddata.sdk.model.md.maintenance; -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.gdc.UriResponse; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.gdc.UriResponse; /** * Partial metadata export result structure. @@ -46,4 +51,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExport.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExport.java index cad798a97..4a65887f4 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExport.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExport.java @@ -55,8 +55,8 @@ public PartialMdExport(Collection mdObjectsUris) { * Creates new PartialMdExport. At least one uri should be given. * * @param exportAttributeProperties whether to add necessary data to be able to clone attribute properties - * @param crossDataCenterExport whether export should be usable in any Data Center - * @param mdObjectsUris list of uris to metadata objects which should be exported + * @param crossDataCenterExport whether export should be usable in any Data Center + * @param mdObjectsUris list of uris to metadata objects which should be exported */ public PartialMdExport(boolean exportAttributeProperties, boolean crossDataCenterExport, String... mdObjectsUris) { this(exportAttributeProperties, crossDataCenterExport, new HashSet<>(asList(mdObjectsUris))); @@ -66,8 +66,8 @@ public PartialMdExport(boolean exportAttributeProperties, boolean crossDataCente * Creates new PartialMdExport. At least one uri should be given. * * @param exportAttributeProperties whether to add necessary data to be able to clone attribute properties - * @param crossDataCenterExport whether export should be usable in any Data Center - * @param mdObjectsUris list of uris to metadata objects which should be exported + * @param crossDataCenterExport whether export should be usable in any Data Center + * @param mdObjectsUris list of uris to metadata objects which should be exported */ public PartialMdExport(boolean exportAttributeProperties, boolean crossDataCenterExport, Collection mdObjectsUris) { notEmpty(mdObjectsUris, "uris"); @@ -93,4 +93,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExportToken.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExportToken.java index a6ae1aa0c..9f267a6c9 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExportToken.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/maintenance/PartialMdExportToken.java @@ -51,7 +51,7 @@ public PartialMdExportToken(String token) { *

      • updateLDMObjects - default false
        • *
      * - * @param token token identifying metadata partially exported from another project + * @param token token identifying metadata partially exported from another project * @param importAttributeProperties see {@link #setImportAttributeProperties(boolean)} */ public PartialMdExportToken(String token, boolean importAttributeProperties) { @@ -69,14 +69,6 @@ public boolean isOverwriteNewer() { return overwriteNewer; } - public boolean isUpdateLDMObjects() { - return updateLDMObjects; - } - - public boolean isImportAttributeProperties() { - return importAttributeProperties; - } - /** * Sets the flag {@code overwriteNewer}. * If {@code true}, UDM/ADM objects are overwritten without checking modification time. @@ -87,6 +79,10 @@ public void setOverwriteNewer(boolean overwriteNewer) { this.overwriteNewer = overwriteNewer; } + public boolean isUpdateLDMObjects() { + return updateLDMObjects; + } + /** * Sets the flag {@code updateLDMObjects}. * If {@code true}, related LDM objects name, description and tags are overwritten @@ -97,6 +93,10 @@ public void setUpdateLDMObjects(boolean updateLDMObjects) { this.updateLDMObjects = updateLDMObjects; } + public boolean isImportAttributeProperties() { + return importAttributeProperties; + } + /** * Sets the flag {@code importAttributeProperties}. * If {@code true}, following attribute properties are cloned: @@ -118,4 +118,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java index 1ebc8b12e..47a418433 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/AttributeInGrid.java @@ -12,9 +12,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.md.Attribute; import com.gooddata.sdk.model.md.DisplayForm; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.io.Serializable; import java.util.ArrayList; @@ -47,7 +47,8 @@ public class AttributeInGrid implements GridElement, Serializable { /** * Creates new instance. - * @param uri uri of displayForm of attribute to be in grid + * + * @param uri uri of displayForm of attribute to be in grid * @param alias alias used to label the attribute */ public AttributeInGrid(String uri, String alias) { @@ -56,8 +57,9 @@ public AttributeInGrid(String uri, String alias) { /** * Creates new instance. - * @param uri uri of displayForm of attribute to be in grid - * @param alias alias used to label the attribute + * + * @param uri uri of displayForm of attribute to be in grid + * @param alias alias used to label the attribute * @param totals totals for metrics used in grid - for each {@link MetricElement} in grid, there can be list * of totals. The totals are evaluated in given order. */ @@ -73,6 +75,7 @@ public AttributeInGrid(String uri, String alias, List> totals) { /** * Creates new AttributeInGrid using given DisplayForm's uri and it's title as alias. + * * @param displayForm displayForm to create AttributeInGrid from */ public AttributeInGrid(final DisplayForm displayForm) { @@ -81,8 +84,9 @@ public AttributeInGrid(final DisplayForm displayForm) { /** * Creates new AttributeInGrid using given DisplayForm's uri and given alias. + * * @param displayForm displayForm to create AttributeInGrid from - * @param alias alias used to label the attribute + * @param alias alias used to label the attribute */ public AttributeInGrid(final DisplayForm displayForm, final String alias) { this(notNull(notNull(displayForm, "displayForm").getUri(), "uri"), alias); @@ -90,6 +94,7 @@ public AttributeInGrid(final DisplayForm displayForm, final String alias) { /** * Creates new AttributeInGrid using given Attribute's default DisplayForm's uri and Attribute's title as alias. + * * @param attribute attribute to create AttributeInGrid from */ public AttributeInGrid(final Attribute attribute) { @@ -98,8 +103,9 @@ public AttributeInGrid(final Attribute attribute) { /** * Creates new AttributeInGrid using given Attribute's default DisplayForm's uri and given alias. + * * @param attribute attribute to create AttributeInGrid from - * @param alias alias used to label the attribute + * @param alias alias used to label the attribute */ public AttributeInGrid(final Attribute attribute, final String alias) { this(notNull(attribute, "attribute").getDefaultDisplayForm(), alias); @@ -107,7 +113,7 @@ public AttributeInGrid(final Attribute attribute, final String alias) { @JsonProperty("totals") public List> getStringTotals() { - return totals; + return totals; } @JsonIgnore @@ -134,4 +140,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Filter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Filter.java index f9171374f..d66f42d46 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Filter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Filter.java @@ -39,4 +39,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Grid.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Grid.java index 1439451cc..b1da3b11a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Grid.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Grid.java @@ -36,19 +36,19 @@ public class Grid implements Serializable { /** * Creates new instance. - * @param columns report's definition columns - * @param rows report's definition rows - * @param metrics report's definition metrics - * @param sort report's sort definition - * @param columnWidths report columns' widths definition * + * @param columns report's definition columns + * @param rows report's definition rows + * @param metrics report's definition metrics + * @param sort report's sort definition + * @param columnWidths report columns' widths definition * @since 2.0.0 */ @JsonCreator public Grid(@JsonProperty("columns") @JsonDeserialize(contentUsing = GridElementDeserializer.class) - List columns, - @JsonProperty("rows") @JsonDeserialize(contentUsing = GridElementDeserializer.class) - List rows, + List columns, + @JsonProperty("rows") @JsonDeserialize(contentUsing = GridElementDeserializer.class) + List rows, @JsonProperty("metrics") List metrics, @JsonProperty("sort") Map> sort, @JsonProperty("columnWidths") Collection> columnWidths) { @@ -96,4 +96,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElement.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElement.java index f1909b2a0..7fd1e3b2f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElement.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElement.java @@ -12,4 +12,3 @@ */ public interface GridElement { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java index fdf9a8c8b..ec4856d41 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementDeserializer.java @@ -37,4 +37,3 @@ public GridElement deserialize(JsonParser jp, DeserializationContext ctxt) throw } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementSerializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementSerializer.java index 99b54bb31..58276c1ab 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementSerializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridElementSerializer.java @@ -28,4 +28,3 @@ public void serialize(GridElement value, JsonGenerator gen, SerializerProvider s } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridReportDefinitionContent.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridReportDefinitionContent.java index e6f792407..44a0998eb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridReportDefinitionContent.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/GridReportDefinitionContent.java @@ -5,10 +5,10 @@ */ package com.gooddata.sdk.model.md.report; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.model.md.Meta; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.gooddata.sdk.model.md.Meta; import java.util.Collection; import java.util.Collections; @@ -20,8 +20,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class GridReportDefinitionContent extends ReportDefinitionContent { - private static final long serialVersionUID = 1296467241365069724L; public static final String FORMAT = "grid"; + private static final long serialVersionUID = 1296467241365069724L; @JsonCreator private GridReportDefinitionContent( @@ -39,10 +39,6 @@ private GridReportDefinitionContent( this(grid, Collections.emptyList()); } - public String getFormat() { - return FORMAT; - } - public static ReportDefinition create(String title, List columns, List rows, List metrics) { return create(title, columns, rows, metrics, Collections.emptyList()); @@ -52,5 +48,8 @@ public static ReportDefinition create(String title, List List metrics, Collection filters) { return new ReportDefinition(new Meta(title), new GridReportDefinitionContent(new Grid(columns, rows, metrics), filters)); } -} + public String getFormat() { + return FORMAT; + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java index 5837e74bb..b2889f52f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricElement.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.gooddata.sdk.model.md.Metric; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Metric; import java.io.Serializable; @@ -81,4 +81,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricGroup.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricGroup.java index 8488d5269..398f06b50 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricGroup.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/MetricGroup.java @@ -15,19 +15,13 @@ public final class MetricGroup implements GridElement, Serializable { private static final long serialVersionUID = -2971228185501817988L; private static final String JSON_VALUE = "metricGroup"; - - private final String value; - public static final MetricGroup METRIC_GROUP = new MetricGroup(JSON_VALUE); + private final String value; private MetricGroup(String value) { this.value = value; } - public String getValue() { - return value; - } - /** * @param string string to compare whether is metricGroup * @return true when the {@link #METRIC_GROUP}'s string value equals to the argument, false otherwise @@ -36,6 +30,10 @@ public static boolean equals(String string) { return METRIC_GROUP.getValue().equals(string); } + public String getValue() { + return value; + } + @Override public boolean equals(Object o) { return this == o; @@ -51,4 +49,3 @@ public String toString() { return getValue(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/OneNumberReportDefinitionContent.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/OneNumberReportDefinitionContent.java index d728495f9..543535218 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/OneNumberReportDefinitionContent.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/OneNumberReportDefinitionContent.java @@ -5,10 +5,10 @@ */ package com.gooddata.sdk.model.md.report; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.model.md.Meta; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.gooddata.sdk.model.md.Meta; import java.io.Serializable; import java.util.Collection; @@ -21,9 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class OneNumberReportDefinitionContent extends ReportDefinitionContent { - private static final long serialVersionUID = 5479509323034916986L; public static final String FORMAT = "oneNumber"; - + private static final long serialVersionUID = 5479509323034916986L; private final OneNumberVisualization oneNumber; @JsonCreator @@ -40,6 +39,17 @@ private OneNumberReportDefinitionContent(@JsonProperty("format") String format, oneNumber = new OneNumberVisualization(new OneNumberLabels(description)); } + public static ReportDefinition create(String title, List columns, List rows, + List metrics) { + return create(title, columns, rows, metrics, Collections.emptyList()); + } + + public static ReportDefinition create(String title, List columns, List rows, + List metrics, Collection filters) { + return new ReportDefinition(new Meta(title), new OneNumberReportDefinitionContent( + new Grid(columns, rows, metrics), title, filters)); + } + public String getFormat() { return FORMAT; } @@ -79,16 +89,4 @@ public String getDescription() { return description; } } - - public static ReportDefinition create(String title, List columns, List rows, - List metrics) { - return create(title, columns, rows, metrics, Collections.emptyList()); - } - - public static ReportDefinition create(String title, List columns, List rows, - List metrics, Collection filters) { - return new ReportDefinition(new Meta(title), new OneNumberReportDefinitionContent( - new Grid(columns, rows, metrics), title, filters)); - } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Report.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Report.java index 5c1cff638..a1b4ff81c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Report.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Report.java @@ -5,17 +5,17 @@ */ package com.gooddata.sdk.model.md.report; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.model.md.AbstractObj; -import com.gooddata.sdk.model.md.Meta; -import com.gooddata.sdk.model.md.Queryable; -import com.gooddata.sdk.model.md.Updatable; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.AbstractObj; +import com.gooddata.sdk.model.md.Meta; +import com.gooddata.sdk.model.md.Queryable; +import com.gooddata.sdk.model.md.Updatable; import java.io.Serializable; import java.util.Arrays; @@ -44,7 +44,8 @@ private Report(@JsonProperty("meta") Meta meta, @JsonProperty("content") Content /** * Creates new report with given title and definitions - * @param title report title + * + * @param title report title * @param definitions report definitions */ public Report(String title, ReportDefinition... definitions) { @@ -94,4 +95,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java index 0713352d0..9ab2ed74c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinition.java @@ -5,22 +5,22 @@ */ package com.gooddata.sdk.model.md.report; -import static com.gooddata.sdk.common.util.Validate.notNullState; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.model.md.AbstractObj; -import com.gooddata.sdk.model.md.Meta; -import com.gooddata.sdk.model.md.Queryable; -import com.gooddata.sdk.model.md.Updatable; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.AbstractObj; +import com.gooddata.sdk.model.md.Meta; +import com.gooddata.sdk.model.md.Queryable; +import com.gooddata.sdk.model.md.Updatable; import java.util.Map; +import static com.gooddata.sdk.common.util.Validate.notNullState; + /** * Report definition */ @@ -76,4 +76,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinitionContent.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinitionContent.java index 4a4712463..4a993006f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinitionContent.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/ReportDefinitionContent.java @@ -56,4 +56,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Total.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Total.java index 5333ee9fc..04ee28a92 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Total.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/report/Total.java @@ -27,12 +27,6 @@ public enum Total { NAT, MED; - @JsonValue - @Override - public String toString() { - return name().toLowerCase(); - } - @JsonCreator public static Total of(String total) { notNull(total, "total"); @@ -54,5 +48,10 @@ total, stream(Total.values()).map(Enum::name).collect(joining(","))), public static List orderedValues() { return Arrays.asList(SUM, MAX, MIN, AVG, MED, NAT); } -} + @JsonValue + @Override + public String toString() { + return name().toLowerCase(); + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Bucket.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Bucket.java index afd516398..0757f9fdd 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Bucket.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Bucket.java @@ -14,7 +14,6 @@ import com.gooddata.sdk.model.executeafm.resultspec.TotalItem; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -37,7 +36,7 @@ public class Bucket implements Serializable, LocallyIdentifiable { * @param items list of {@link BucketItem}s for this bucket */ public Bucket(@JsonProperty("localIdentifier") final String localIdentifier, - @JsonProperty("items") final List items) { + @JsonProperty("items") final List items) { this(localIdentifier, items, null); } @@ -50,8 +49,8 @@ public Bucket(@JsonProperty("localIdentifier") final String localIdentifier, */ @JsonCreator public Bucket(@JsonProperty("localIdentifier") final String localIdentifier, - @JsonProperty("items") final List items, - @JsonProperty("totals") List totals) { + @JsonProperty("items") final List items, + @JsonProperty("totals") List totals) { this.localIdentifier = localIdentifier; this.items = items; this.totals = totals; @@ -107,4 +106,3 @@ public int hashCode() { return Objects.hash(localIdentifier, items, totals); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/BucketItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/BucketItem.java index 48325429e..c61170c3c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/BucketItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/BucketItem.java @@ -20,6 +20,6 @@ }) @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_NULL) -public interface BucketItem {} - +public interface BucketItem { +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/CollectionType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/CollectionType.java index df718ef9a..fc6d05502 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/CollectionType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/CollectionType.java @@ -18,4 +18,3 @@ boolean isValueOf(final String type) { return name().toLowerCase().equals(type.toLowerCase()); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java index 253dde4da..0c396cd75 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/Measure.java @@ -20,14 +20,14 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class Measure extends MeasureItem implements BucketItem { - private static final long serialVersionUID = -6311373783004640731L; static final String NAME = "measure"; - + private static final long serialVersionUID = -6311373783004640731L; private String title; /** * Creates new instance of measure for use in {@link VisualizationObject} - * @param definition measure definition + * + * @param definition measure definition * @param localIdentifier local identifier */ public Measure(final MeasureDefinition definition, final String localIdentifier) { @@ -36,11 +36,12 @@ public Measure(final MeasureDefinition definition, final String localIdentifier) /** * Creates new instance of measure for use in {@link VisualizationObject} - * @param definition measure definition + * + * @param definition measure definition * @param localIdentifier local identifier - * @param alias alias for measure title - * @param title default name given to measure - * @param format format of measure to be computed + * @param alias alias for measure title + * @param title default name given to measure + * @param format format of measure to be computed */ @JsonCreator public Measure(@JsonProperty("definition") final MeasureDefinition definition, @@ -97,4 +98,3 @@ public int hashCode() { return Objects.hash(super.hashCode()); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java index cc5f155de..63a53e4cd 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOPopMeasureDefinition.java @@ -25,8 +25,8 @@ @JsonRootName(NAME) public class VOPopMeasureDefinition extends PopMeasureDefinition { - private static final long serialVersionUID = -2727004914980057124L; public static final String NAME = "popMeasureDefinition"; + private static final long serialVersionUID = -2727004914980057124L; /** * Creates instance of Period over Period measure definition to be used in {@link VisualizationObject} @@ -41,4 +41,3 @@ public VOPopMeasureDefinition(@JsonProperty("measureIdentifier") final String me } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java index 3493ae5a7..3b117b507 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VOSimpleMeasureDefinition.java @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonRootName; import com.gooddata.sdk.model.executeafm.ObjQualifier; import com.gooddata.sdk.model.executeafm.afm.Aggregation; -import com.gooddata.sdk.model.executeafm.afm.filter.FilterItem; import com.gooddata.sdk.model.executeafm.afm.MeasureDefinition; import com.gooddata.sdk.model.executeafm.afm.SimpleMeasureDefinition; +import com.gooddata.sdk.model.executeafm.afm.filter.FilterItem; import java.util.List; @@ -30,8 +30,8 @@ @JsonRootName(NAME) public class VOSimpleMeasureDefinition extends SimpleMeasureDefinition { - private static final long serialVersionUID = 8467311354259963694L; public static final String NAME = "measureDefinition"; + private static final long serialVersionUID = 8467311354259963694L; /** * Creates instance of simple measure definition to be used in {@link VisualizationObject} @@ -78,4 +78,3 @@ public VOSimpleMeasureDefinition(ObjQualifier item, Aggregation aggregation, Boo super(item, aggregation, computeRatio, filters); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationAttribute.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationAttribute.java index 732e90572..d0b74a437 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationAttribute.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationAttribute.java @@ -19,13 +19,13 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class VisualizationAttribute extends AttributeItem implements BucketItem { - private static final long serialVersionUID = -5144496152695494774L; static final String NAME = "visualizationAttribute"; + private static final long serialVersionUID = -5144496152695494774L; /** * Creates new instance of visualization attribute for use in {@link Bucket} * - * @param displayForm display form of attribute + * @param displayForm display form of attribute * @param localIdentifier local identifier of attribute */ public VisualizationAttribute(final UriObjQualifier displayForm, final String localIdentifier) { @@ -35,9 +35,9 @@ public VisualizationAttribute(final UriObjQualifier displayForm, final String lo /** * Creates new instance of visualization attribute for use in {@link Bucket} * - * @param displayForm display form of attribute + * @param displayForm display form of attribute * @param localIdentifier local identifier of attribute - * @param alias alias of attribute + * @param alias alias of attribute */ @JsonCreator public VisualizationAttribute(@JsonProperty("displayForm") final UriObjQualifier displayForm, @@ -59,4 +59,3 @@ public int hashCode() { return Objects.hash(super.hashCode()); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationClass.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationClass.java index a57b21641..497c37195 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationClass.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationClass.java @@ -32,12 +32,11 @@ @JsonInclude(JsonInclude.Include.NON_NULL) public class VisualizationClass extends AbstractObj implements Queryable, Updatable { - private static final long serialVersionUID = -72785788784079208L; static final String NAME = "visualizationClass"; - + private static final long serialVersionUID = -72785788784079208L; private Content content; - private VisualizationClass(@JsonProperty("content") final Content content, @JsonProperty("meta") final Meta meta ) { + private VisualizationClass(@JsonProperty("content") final Content content, @JsonProperty("meta") final Meta meta) { super(meta); this.content = notNull(content); } @@ -92,7 +91,7 @@ public VisualizationType getVisualizationType() { String uriParts[] = getContent().getUrl().split(":"); if (uriParts.length > 0 && isLocal()) { - String derivedType = uriParts[uriParts.length-1]; + String derivedType = uriParts[uriParts.length - 1]; visualizationType = VisualizationType.of(derivedType); } @@ -105,7 +104,7 @@ private boolean isLocal() { return getContent().getChecksum().equals("local"); } - private Content getContent() { + private Content getContent() { return content; } @@ -118,10 +117,10 @@ private static class Content implements Serializable { @JsonCreator private Content(@JsonProperty("url") String url, - @JsonProperty("icon") String icon, - @JsonProperty("iconSelected") String iconSelected, - @JsonProperty("checksum") String checksum, - @JsonProperty("orderIndex") Float orderIndex) { + @JsonProperty("icon") String icon, + @JsonProperty("iconSelected") String iconSelected, + @JsonProperty("checksum") String checksum, + @JsonProperty("orderIndex") Float orderIndex) { this.url = notNull(url); this.icon = notNull(icon); this.iconSelected = notNull(iconSelected); @@ -150,4 +149,3 @@ public Float getOrderIndex() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationConverter.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationConverter.java index a8ff5a3c0..b02e5b7aa 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationConverter.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationConverter.java @@ -11,16 +11,16 @@ import com.gooddata.sdk.model.executeafm.Execution; import com.gooddata.sdk.model.executeafm.afm.Afm; import com.gooddata.sdk.model.executeafm.afm.AttributeItem; +import com.gooddata.sdk.model.executeafm.afm.MeasureItem; import com.gooddata.sdk.model.executeafm.afm.NativeTotalItem; +import com.gooddata.sdk.model.executeafm.afm.SimpleMeasureDefinition; import com.gooddata.sdk.model.executeafm.afm.filter.CompatibilityFilter; import com.gooddata.sdk.model.executeafm.afm.filter.DateFilter; import com.gooddata.sdk.model.executeafm.afm.filter.ExtendedFilter; import com.gooddata.sdk.model.executeafm.afm.filter.FilterItem; -import com.gooddata.sdk.model.executeafm.afm.MeasureItem; import com.gooddata.sdk.model.executeafm.afm.filter.MeasureValueFilter; import com.gooddata.sdk.model.executeafm.afm.filter.NegativeAttributeFilter; import com.gooddata.sdk.model.executeafm.afm.filter.PositiveAttributeFilter; -import com.gooddata.sdk.model.executeafm.afm.SimpleMeasureDefinition; import com.gooddata.sdk.model.executeafm.afm.filter.RankingFilter; import com.gooddata.sdk.model.executeafm.resultspec.Dimension; import com.gooddata.sdk.model.executeafm.resultspec.ResultSpec; @@ -34,9 +34,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static com.gooddata.sdk.model.executeafm.resultspec.Dimension.MEASURE_GROUP; import static com.gooddata.sdk.common.util.Validate.isTrue; import static com.gooddata.sdk.common.util.Validate.notNull; +import static com.gooddata.sdk.model.executeafm.resultspec.Dimension.MEASURE_GROUP; import static java.util.stream.Collectors.toList; /** @@ -50,14 +50,14 @@ public abstract class VisualizationConverter { *

      * NOTE: totals are not included in this conversion * - * @param visualizationObject which will be converted to {@link Execution} + * @param visualizationObject which will be converted to {@link Execution} * @param visualizationClassGetter {@link Function} for fetching VisualizationClass, * which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object * @see #convertToExecution(VisualizationObject, VisualizationClass) */ public static Execution convertToExecution(final VisualizationObject visualizationObject, - final Function visualizationClassGetter) { + final Function visualizationClassGetter) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClassGetter, "visualizationClassGetter"); return convertToExecution(visualizationObject, @@ -70,13 +70,13 @@ public static Execution convertToExecution(final VisualizationObject visualizati * NOTE: totals are not included in this conversion * * @param visualizationObject which will be converted to {@link Execution} - * @param visualizationClass visualizationClass, which is necessary for correct generation of {@link ResultSpec} + * @param visualizationClass visualizationClass, which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object * @see #convertToAfm(VisualizationObject) * @see #convertToResultSpec(VisualizationObject, VisualizationClass) */ public static Execution convertToExecution(final VisualizationObject visualizationObject, - final VisualizationClass visualizationClass) { + final VisualizationClass visualizationClass) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClass, "visualizationClass"); ResultSpec resultSpec = convertToResultSpec(visualizationObject, visualizationClass); @@ -87,14 +87,14 @@ public static Execution convertToExecution(final VisualizationObject visualizati /** * Generate Execution from Visualization object with totals included. * - * @param visualizationObject which will be converted to {@link Execution} + * @param visualizationObject which will be converted to {@link Execution} * @param visualizationClassGetter {@link Function} for fetching VisualizationClass, * which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object * @see #convertToExecutionWithTotals(VisualizationObject, VisualizationClass) */ public static Execution convertToExecutionWithTotals(final VisualizationObject visualizationObject, - final Function visualizationClassGetter) { + final Function visualizationClassGetter) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClassGetter, "visualizationClassGetter"); return convertToExecutionWithTotals(visualizationObject, @@ -105,13 +105,13 @@ public static Execution convertToExecutionWithTotals(final VisualizationObject v * Generate Execution from Visualization object with totals included. * * @param visualizationObject which will be converted to {@link Execution} - * @param visualizationClass visualizationClass, which is necessary for correct generation of {@link ResultSpec} + * @param visualizationClass visualizationClass, which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object * @see #convertToAfmWithNativeTotals(VisualizationObject) * @see #convertToResultSpecWithTotals(VisualizationObject, VisualizationClass) */ public static Execution convertToExecutionWithTotals(final VisualizationObject visualizationObject, - final VisualizationClass visualizationClass) { + final VisualizationClass visualizationClass) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClass, "visualizationClass"); ResultSpec resultSpec = convertToResultSpecWithTotals(visualizationObject, visualizationClass); @@ -155,13 +155,13 @@ public static Afm convertToAfmWithNativeTotals(final VisualizationObject visuali *

      * NOTE: totals are not included in this conversion * - * @param visualizationObject which will be converted to {@link Execution} + * @param visualizationObject which will be converted to {@link Execution} * @param visualizationClassGetter {@link Function} for fetching VisualizationClass, * which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object */ public static ResultSpec convertToResultSpec(final VisualizationObject visualizationObject, - final Function visualizationClassGetter) { + final Function visualizationClassGetter) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClassGetter, "visualizationClassGetter"); return convertToResultSpec(visualizationObject, @@ -175,11 +175,11 @@ public static ResultSpec convertToResultSpec(final VisualizationObject visualiza * NOTE: totals are not included in this conversion * * @param visualizationObject which will be converted to {@link Execution} - * @param visualizationClass VisualizationClass, which is necessary for correct generation of {@link ResultSpec} + * @param visualizationClass VisualizationClass, which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object */ public static ResultSpec convertToResultSpec(final VisualizationObject visualizationObject, - final VisualizationClass visualizationClass) { + final VisualizationClass visualizationClass) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClass, "visualizationClass"); final VisualizationObject visualizationObjectWithoutTotals = removeTotals(visualizationObject); @@ -190,13 +190,13 @@ public static ResultSpec convertToResultSpec(final VisualizationObject visualiza * Generate ResultSpec from Visualization object with totals included. Currently {@link ResultSpec}'s {@link Dimension}s * can be generated for table and four types of chart: bar, column, line and pie. * - * @param visualizationObject which will be converted to {@link Execution} + * @param visualizationObject which will be converted to {@link Execution} * @param visualizationClassGetter {@link Function} for fetching VisualizationClass, * which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object */ public static ResultSpec convertToResultSpecWithTotals(final VisualizationObject visualizationObject, - final Function visualizationClassGetter) { + final Function visualizationClassGetter) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClassGetter, "visualizationClassGetter"); return convertToResultSpecWithTotals(visualizationObject, @@ -208,11 +208,11 @@ public static ResultSpec convertToResultSpecWithTotals(final VisualizationObject * can be generated for table and four types of chart: bar, column, line and pie. * * @param visualizationObject which will be converted to {@link Execution} - * @param visualizationClass VisualizationClass, which is necessary for correct generation of {@link ResultSpec} + * @param visualizationClass VisualizationClass, which is necessary for correct generation of {@link ResultSpec} * @return {@link Execution} object */ public static ResultSpec convertToResultSpecWithTotals(final VisualizationObject visualizationObject, - final VisualizationClass visualizationClass) { + final VisualizationClass visualizationClass) { notNull(visualizationObject, "visualizationObject"); notNull(visualizationClass, "visualizationClass"); isTrue(visualizationObject.getVisualizationClassUri().equals(visualizationClass.getUri()), @@ -225,11 +225,12 @@ public static ResultSpec convertToResultSpecWithTotals(final VisualizationObject static List getSorting(final VisualizationObject visualizationObject) { try { - List sorts = parseSorting(visualizationObject.getProperties()); - if (sorts != null) { - return sorts; - } - } catch (Exception ignored) {} + List sorts = parseSorting(visualizationObject.getProperties()); + if (sorts != null) { + return sorts; + } + } catch (Exception ignored) { + } return null; } @@ -237,7 +238,8 @@ static List getSorting(final VisualizationObject visualizationObject) static List parseSorting(final String properties) throws Exception { JsonNode jsonProperties = parseProperties(properties); JsonNode nodeSortItems = jsonProperties.get("sortItems"); - TypeReference> mapType = new TypeReference>() {}; + TypeReference> mapType = new TypeReference>() { + }; return MAPPER.convertValue(nodeSortItems, mapType); } @@ -387,7 +389,7 @@ private static Measure removeFormat(final Measure measure) { private static MeasureItem getAfmMeasure(final Measure measure) { String alias = measure.getAlias(); String usedTitle = alias; - if(alias == null || alias.isEmpty()) { + if (alias == null || alias.isEmpty()) { if (measure.getTitle() != null) { usedTitle = measure.getTitle(); } @@ -414,8 +416,8 @@ private static MeasureItem convertMeasureFilters(final MeasureItem measure) { private static List getCompatibilityFilters(final List filters) { return filters.stream() - .map(CompatibilityFilter.class::cast) - .collect(toList()); + .map(CompatibilityFilter.class::cast) + .collect(toList()); } private static List removeIrrelevantFilters(final List filters) { @@ -472,4 +474,3 @@ private static boolean isNativeTotal(TotalItem totalItem) { return totalItem.getType() != null && Total.NAT.name().equals(totalItem.getType().toUpperCase()); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java index daacfb5c1..dea99a829 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationObject.java @@ -12,24 +12,17 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; -import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; -import static org.apache.commons.lang3.Validate.notEmpty; -import static org.apache.commons.lang3.Validate.notNull; - +import com.gooddata.sdk.model.executeafm.Execution; import com.gooddata.sdk.model.executeafm.UriObjQualifier; import com.gooddata.sdk.model.executeafm.afm.Afm; -import com.gooddata.sdk.model.executeafm.Execution; import com.gooddata.sdk.model.executeafm.afm.filter.ExtendedFilter; import com.gooddata.sdk.model.executeafm.resultspec.ResultSpec; import com.gooddata.sdk.model.executeafm.resultspec.TotalItem; import com.gooddata.sdk.model.md.AbstractObj; import com.gooddata.sdk.model.md.Meta; +import com.gooddata.sdk.model.md.Obj; import com.gooddata.sdk.model.md.Queryable; import com.gooddata.sdk.model.md.Updatable; -import com.gooddata.sdk.model.md.*; import java.io.Serializable; import java.util.ArrayList; @@ -38,6 +31,13 @@ import java.util.Map; import java.util.function.Function; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; +import static java.util.Collections.emptyList; +import static java.util.stream.Collectors.toList; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; + /** * Complete information about new visualization object that can be stored as MD object (see {@link Obj}) * to md server. @@ -58,7 +58,7 @@ public class VisualizationObject extends AbstractObj implements Queryable, Updat /** * Constructor. * - * @param title title of visualization object + * @param title title of visualization object * @param visualizationClassUri uri to the {@link VisualizationClass} */ public VisualizationObject(final String title, final String visualizationClassUri) { @@ -89,6 +89,7 @@ public List getTotals() { /** * Get measure by local identifier or null if not found + * * @param localIdentifier of measure * @return measure or null */ @@ -130,6 +131,7 @@ public VisualizationAttribute getAttribute(final String localIdentifier) { /** * Returns attribute from collection bucket, if and only if bucket contains exactly one item of type * {@link VisualizationAttribute}, null otherwise + * * @param type of collection which we want to get, stored as local identifier in each bucket * @return attribute from collection bucket */ @@ -157,6 +159,7 @@ public boolean hasDerivedMeasure() { /** * Method to get uri to requested local identifier from reference items + * * @param id of item * @return uri of requested item */ @@ -355,10 +358,10 @@ private Content(final String visualizationClassUri, final List buckets) @JsonCreator private Content(@JsonProperty("visualizationClass") final UriObjQualifier visualizationClass, - @JsonProperty("buckets") final List buckets, - @JsonProperty("filters") final List filters, - @JsonProperty("properties") final String properties, - @JsonProperty("references") final Map referenceItems) { + @JsonProperty("buckets") final List buckets, + @JsonProperty("filters") final List filters, + @JsonProperty("properties") final String properties, + @JsonProperty("references") final Map referenceItems) { this.visualizationClass = notNull(visualizationClass); this.buckets = notNull(buckets); @@ -371,6 +374,10 @@ public List getBuckets() { return buckets; } + public void setBuckets(List buckets) { + this.buckets = buckets; + } + @JsonIgnore public List getAttributes() { return buckets.stream() @@ -380,26 +387,6 @@ public List getAttributes() { .collect(toList()); } - public void setVisualizationClass(UriObjQualifier visualizationClass) { - this.visualizationClass = visualizationClass; - } - - public void setBuckets(List buckets) { - this.buckets = buckets; - } - - public void setFilters(List filters) { - this.filters = filters; - } - - public void setProperties(String properties) { - this.properties = properties; - } - - public void setReferenceItems(Map referenceItems) { - this.referenceItems = referenceItems; - } - @JsonIgnore public List getMeasures() { return buckets.stream() @@ -430,19 +417,35 @@ public List getFilters() { return filters; } + public void setFilters(List filters) { + this.filters = filters; + } + public String getProperties() { return properties; } + public void setProperties(String properties) { + this.properties = properties; + } + public UriObjQualifier getVisualizationClass() { return visualizationClass; } + public void setVisualizationClass(UriObjQualifier visualizationClass) { + this.visualizationClass = visualizationClass; + } + @JsonProperty("references") public Map getReferenceItems() { return referenceItems; } + public void setReferenceItems(Map referenceItems) { + this.referenceItems = referenceItems; + } + /** * @return a new copy of this {@link Content} with the specified buckets */ @@ -458,4 +461,3 @@ public Content withBuckets(List buckets) { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationType.java index 81799d243..c9d9794ee 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/md/visualization/VisualizationType.java @@ -31,4 +31,3 @@ type, stream(VisualizationType.values()).map(Enum::name).collect(joining(","))), } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Channel.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Channel.java index 58a4bf920..73c98949d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Channel.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Channel.java @@ -5,10 +5,14 @@ */ package com.gooddata.sdk.model.notification; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import com.gooddata.sdk.model.account.Account; import com.gooddata.sdk.model.md.Meta; -import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import static com.gooddata.sdk.common.util.Validate.notEmpty; import static com.gooddata.sdk.common.util.Validate.notNull; @@ -56,4 +60,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Configuration.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Configuration.java index 207dbda3e..e470fa1c1 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Configuration.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Configuration.java @@ -11,11 +11,10 @@ /** * Interface for configurations of channel */ -@JsonTypeInfo(use=JsonTypeInfo.Id.NAME, - include=JsonTypeInfo.As.WRAPPER_OBJECT) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.WRAPPER_OBJECT) @JsonSubTypes({ - @JsonSubTypes.Type(value=EmailConfiguration.class, name="emailConfiguration"), + @JsonSubTypes.Type(value = EmailConfiguration.class, name = "emailConfiguration"), }) public interface Configuration { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/EmailConfiguration.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/EmailConfiguration.java index 87376bafe..3828c2e9a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/EmailConfiguration.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/EmailConfiguration.java @@ -5,8 +5,6 @@ */ package com.gooddata.sdk.model.notification; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,6 +12,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Email configuration of channel */ @@ -37,4 +37,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/MessageTemplate.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/MessageTemplate.java index 3136b9dd0..b7141cb1b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/MessageTemplate.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/MessageTemplate.java @@ -5,8 +5,6 @@ */ package com.gooddata.sdk.model.notification; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,6 +12,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Template of notification message */ @@ -38,4 +38,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/ProjectEvent.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/ProjectEvent.java index 7bf7e303a..2cad800a0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/ProjectEvent.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/ProjectEvent.java @@ -18,7 +18,7 @@ /** * Project event. - * + *

      * Serialization only. */ @JsonTypeName("projectEvent") @@ -43,7 +43,8 @@ public ProjectEvent(final String type, final Map parameters) { /** * Set the parameter with given key and value, overwriting the preceding value of the same key (if any). - * @param key parameter key + * + * @param key parameter key * @param value parameter value */ public void setParameter(final String key, final String value) { @@ -85,4 +86,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Subscription.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Subscription.java index f9fdf2d64..456b08a4b 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Subscription.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Subscription.java @@ -5,22 +5,22 @@ */ package com.gooddata.sdk.model.notification; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; -import static org.apache.commons.lang3.Validate.notEmpty; -import static org.apache.commons.lang3.Validate.notNull; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.gooddata.sdk.model.md.Meta; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Meta; import java.util.List; import java.util.stream.Collectors; +import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; +import static org.apache.commons.lang3.Validate.notEmpty; +import static org.apache.commons.lang3.Validate.notNull; + /** * Subscription for notifications */ @@ -43,11 +43,11 @@ public class Subscription { /** * Creates Subscription * - * @param triggers triggers of subscription - * @param channels list of {@link Channel} - * @param condition condition under which this subscription activates + * @param triggers triggers of subscription + * @param channels list of {@link Channel} + * @param condition condition under which this subscription activates * @param messageTemplate of message - * @param title name of subscription + * @param title name of subscription */ public Subscription(final List triggers, final List channels, @@ -60,12 +60,12 @@ public Subscription(final List triggers, /** * Creates Subscription * - * @param triggers triggers of subscription - * @param channels list of {@link Channel} - * @param condition condition under which this subscription activates + * @param triggers triggers of subscription + * @param channels list of {@link Channel} + * @param condition condition under which this subscription activates * @param messageTemplate of message * @param subjectTemplate of message - * @param title name of subscription + * @param title name of subscription */ public Subscription(final List triggers, final List channels, @@ -130,4 +130,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TimerEvent.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TimerEvent.java index 32c2c6525..3c42b9eee 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TimerEvent.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TimerEvent.java @@ -5,8 +5,6 @@ */ package com.gooddata.sdk.model.notification; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,6 +12,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Time based trigger */ @@ -38,4 +38,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Trigger.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Trigger.java index ee97cf589..42da4afd4 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Trigger.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/Trigger.java @@ -18,4 +18,3 @@ }) public interface Trigger { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TriggerCondition.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TriggerCondition.java index 71b51ff00..5bfe26932 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TriggerCondition.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/notification/TriggerCondition.java @@ -5,14 +5,14 @@ */ package com.gooddata.sdk.model.notification; -import static com.gooddata.sdk.common.util.Validate.notEmpty; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; +import static com.gooddata.sdk.common.util.Validate.notEmpty; + /** * Condition of trigger */ @@ -32,4 +32,3 @@ public String getExpression() { return expression; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/CreatedInvitations.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/CreatedInvitations.java index 7f53591a7..aa2f7e613 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/CreatedInvitations.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/CreatedInvitations.java @@ -38,6 +38,7 @@ private CreatedInvitations(@JsonProperty("uri") List invitationUris, /** * List of successful invitations + * * @return list of URIs (never null) */ public List getInvitationUris() { @@ -46,6 +47,7 @@ public List getInvitationUris() { /** * List of emails which can't be invited to the project because their users belongs to a different domain + * * @return list of emails (never null) */ public List getDomainMismatchEmails() { @@ -54,6 +56,7 @@ public List getDomainMismatchEmails() { /** * List of emails which can't be invited to the project because they are already members of the project + * * @return list of emails (never null) */ public List getAlreadyInProjectEmails() { @@ -66,4 +69,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Environment.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Environment.java index dba287726..a30b12a5c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Environment.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Environment.java @@ -10,11 +10,16 @@ * Default value is {@link #PRODUCTION} which is also environment for all currently existing projects or warehouses. */ public enum Environment { - /** Default value, projects or warehouses are backed-up and archived. */ + /** + * Default value, projects or warehouses are backed-up and archived. + */ PRODUCTION, - /** no meaning yet and behavior is the same as for {@link #PRODUCTION} projects or warehouses. */ + /** + * no meaning yet and behavior is the same as for {@link #PRODUCTION} projects or warehouses. + */ DEVELOPMENT, - /** 'TESTING' projects or warehouses are not backed-up and archived. */ + /** + * 'TESTING' projects or warehouses are not backed-up and archived. + */ TESTING } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitation.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitation.java index efe5781a0..d496ba39c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitation.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitation.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.gooddata.sdk.model.md.Meta; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Meta; import static com.gooddata.sdk.common.util.Validate.notEmpty; @@ -77,4 +77,4 @@ public String toString() { } } -} +} \ No newline at end of file diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitations.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitations.java index 9c02cb010..d53621f37 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitations.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Invitations.java @@ -38,4 +38,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java index ff608460f..65e870ef0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Project.java @@ -13,11 +13,11 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.gooddata.sdk.model.md.Meta; -import com.gooddata.sdk.model.util.UriHelper; import com.gooddata.sdk.common.util.BooleanDeserializer; import com.gooddata.sdk.common.util.GDZonedDateTimeDeserializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Meta; +import com.gooddata.sdk.model.util.UriHelper; import java.time.ZonedDateTime; import java.util.HashSet; @@ -91,6 +91,16 @@ public String getDriver() { return content.getDriver(); } + public void setDriver(String driver) { + notEmpty(driver, "driver"); + content.setDriver(driver); + } + + public void setDriver(ProjectDriver driver) { + notNull(driver, "driver"); + setDriver(driver.getValue()); + } + @JsonIgnore public String getGuidedNavigation() { return content.getGuidedNavigation(); @@ -235,16 +245,6 @@ public boolean isEnabled() { return "ENABLED".equals(getState()); } - public void setDriver(String driver) { - notEmpty(driver, "driver"); - content.setDriver(driver); - } - - public void setDriver(ProjectDriver driver) { - notNull(driver, "driver"); - setDriver(driver.getValue()); - } - @JsonIgnore public String getEnvironment() { return content.getEnvironment(); @@ -276,13 +276,10 @@ private static class ProjectContent { @JsonProperty("authorizationToken") private final String authorizationToken; - - @JsonProperty("driver") - private String driver; - @JsonProperty("guidedNavigation") private final String guidedNavigation; - + @JsonProperty("driver") + private String driver; @JsonIgnore private String cluster; @@ -330,6 +327,10 @@ public String getDriver() { return driver; } + public void setDriver(String driver) { + this.driver = driver; + } + public String getGuidedNavigation() { return guidedNavigation; } @@ -342,10 +343,6 @@ public String getIsPublic() { return isPublic; } - public void setDriver(String driver) { - this.driver = driver; - } - public String getEnvironment() { return environment; } @@ -538,4 +535,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectDriver.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectDriver.java index 08aadba8d..cea08b357 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectDriver.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectDriver.java @@ -22,4 +22,3 @@ public String getValue() { return value; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectEnvironment.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectEnvironment.java index 10da1757b..f12a4ec4c 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectEnvironment.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectEnvironment.java @@ -11,11 +11,16 @@ * Preffer {@link Environment} if possible. */ public enum ProjectEnvironment { - /** Default value, projects are backed-up and archived. */ + /** + * Default value, projects are backed-up and archived. + */ PRODUCTION, - /** no meaning yet and behavior is the same as for {@link #PRODUCTION} projects*/ + /** + * no meaning yet and behavior is the same as for {@link #PRODUCTION} projects + */ DEVELOPMENT, - /** 'TESTING' projects are not backed-up and archived. */ + /** + * 'TESTING' projects are not backed-up and archived. + */ TESTING } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplate.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplate.java index 1c137ebcf..c1b877d09 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplate.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplate.java @@ -50,4 +50,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplates.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplates.java index a45055c05..5a85c1932 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplates.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectTemplates.java @@ -37,4 +37,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectUsersUpdateResult.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectUsersUpdateResult.java index 31c56e44c..a3ff57711 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectUsersUpdateResult.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectUsersUpdateResult.java @@ -49,4 +49,3 @@ public List getFailed() { return failed; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResult.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResult.java index f6ee00f19..a7bb18a28 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResult.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResult.java @@ -19,14 +19,12 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class ProjectValidationResult { + private static final String LEVEL_WARNING = "WARN"; + private static final String LEVEL_ERROR = "ERROR"; private final String category; private final String level; private final String message; private final List params; - - private static final String LEVEL_WARNING = "WARN"; - private static final String LEVEL_ERROR = "ERROR"; - private ProjectValidationType validation; @JsonCreator @@ -101,4 +99,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java index 67675a0b8..a9e8056ee 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultGdcTimeElParam.java @@ -52,4 +52,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultItem.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultItem.java index 17d0f3466..82410caa6 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultItem.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultItem.java @@ -57,4 +57,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultObjectParam.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultObjectParam.java index c907ca002..aca9cb899 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultObjectParam.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultObjectParam.java @@ -58,4 +58,3 @@ public int hashCode() { return result; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultParam.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultParam.java index 16c35e4ff..cd8dc6a38 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultParam.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultParam.java @@ -22,4 +22,3 @@ }) public abstract class ProjectValidationResultParam { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultSliElParam.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultSliElParam.java index c17075abf..9849fa8fc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultSliElParam.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultSliElParam.java @@ -5,8 +5,6 @@ */ package com.gooddata.sdk.model.project; -import static java.lang.String.format; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +15,8 @@ import java.util.List; import java.util.Map; +import static java.lang.String.format; + @JsonTypeName("sli_el") @JsonIgnoreProperties(ignoreUnknown = true) public class ProjectValidationResultSliElParam extends ProjectValidationResultParam { @@ -43,7 +43,6 @@ public List getIds() { /** * @return list of values. Values have only informative character and are connected to IDs. - * * @see #getIds() */ public List getVals() { @@ -58,14 +57,13 @@ public List getVals() { *

    • ID and it's corresponding value are on the same index.
      • *
    * - * @see #getIds() - * @see #getVals() - * * @return {@code null} when ids are {@code null} or map of tuples * @throws IllegalStateException
      - *
    • when ids are not {@code null} and vals are {@code null}
      • - *
    • when sizes of ids and vals lists are not equal
      • - *
    + *
  • when ids are not {@code null} and vals are {@code null}
    • + *
  • when sizes of ids and vals lists are not equal
    • + * + * @see #getIds() + * @see #getVals() */ public Map asMap() { if (ids == null) { @@ -111,4 +109,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultStringParam.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultStringParam.java index 665ac161f..7be9c85cb 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultStringParam.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResultStringParam.java @@ -49,4 +49,3 @@ public int hashCode() { return value != null ? value.hashCode() : 0; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResults.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResults.java index 6ebd524a7..ce8515b56 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResults.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationResults.java @@ -5,13 +5,13 @@ */ package com.gooddata.sdk.model.project; -import com.gooddata.sdk.common.util.BooleanDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.gooddata.sdk.common.util.BooleanDeserializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.LinkedList; @@ -19,7 +19,7 @@ /** * Results of project validation. - * + *

    * Deserialization only. */ @JsonTypeName("projectValidateResult") @@ -57,6 +57,7 @@ private ProjectValidationResults(@JsonProperty("error_found") @JsonDeserialize(u /** * True if validation found some error + * * @return true in case of validation error, false otherwise */ public boolean isError() { @@ -65,6 +66,7 @@ public boolean isError() { /** * True in case some part of validation crashed (not executed at all) + * * @return true if validation crashed, false otherwise */ public boolean isFatalError() { @@ -73,6 +75,7 @@ public boolean isFatalError() { /** * True if some warning was found during validation. + * * @return true if some warning was found during validation, false otherwise */ public boolean isWarning() { @@ -81,15 +84,17 @@ public boolean isWarning() { /** * True if no warning or error is in the validation results. + * * @return true if no warning or error is in the validation results, false otherwise */ public boolean isValid() { - return ! (error || fatalError || warning); + return !(error || fatalError || warning); } /** * Get validation results, describing output of all validations executed. * Can return empty list, in case the validation had no error or warning (is valid)- + * * @return validation results list */ public List getResults() { @@ -101,4 +106,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationType.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationType.java index 46f8f4a28..45c2e94aa 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationType.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidationType.java @@ -14,8 +14,6 @@ */ public class ProjectValidationType { - private final String value; - public static final ProjectValidationType PDM_VS_DWH = new ProjectValidationType("pdm::pdm_vs_dwh"); public static final ProjectValidationType METRIC_FILTER = new ProjectValidationType("metric_filter"); public static final ProjectValidationType PDM_TRANSITIVITY = new ProjectValidationType("pdm::transitivity"); @@ -23,6 +21,7 @@ public class ProjectValidationType { public static final ProjectValidationType INVALID_OBJECTS = new ProjectValidationType("invalid_objects"); public static final ProjectValidationType PDM_ELEM = new ProjectValidationType("pdm::elem_validation"); public static final ProjectValidationType PDM_PK_FK_CONSISTENCY = new ProjectValidationType("pdm::pk_fk_consistency"); + private final String value; @JsonCreator public ProjectValidationType(String value) { @@ -54,4 +53,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidations.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidations.java index 93bf6d13c..e9c2e5ecc 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidations.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/ProjectValidations.java @@ -48,4 +48,3 @@ public String toString() { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Projects.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Projects.java index 5b76a8e93..f0dec6442 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Projects.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Projects.java @@ -36,18 +36,6 @@ public class Projects extends Page { static final String ROOT_NODE = "projects"; - static class Deserializer extends PageDeserializer { - - protected Deserializer() { - super(Project.class); - } - - @Override - protected Projects createPage(final List items, final Paging paging, final Map links) { - return new Projects(items, paging); - } - } - public Projects(List items, Paging paging) { super(items, paging); } @@ -67,5 +55,16 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } -} + static class Deserializer extends PageDeserializer { + + protected Deserializer() { + super(Project.class); + } + + @Override + protected Projects createPage(final List items, final Paging paging, final Map links) { + return new Projects(items, paging); + } + } +} diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Role.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Role.java index 7769750e5..b10e3639a 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Role.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Role.java @@ -5,13 +5,19 @@ */ package com.gooddata.sdk.model.project; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.gooddata.sdk.model.md.Meta; import com.gooddata.sdk.common.util.BooleanDeserializer; import com.gooddata.sdk.common.util.BooleanStringSerializer; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.md.Meta; import java.util.Collections; import java.util.HashMap; @@ -85,6 +91,11 @@ public String getIdentifier() { return meta.getIdentifier(); } + @JsonIgnore + public String getUri() { + return links.get(SELF_LINK); + } + /** * Allows service to set self link as it is not provided by REST API. *

    @@ -94,11 +105,6 @@ public void setUri(final String uri) { links.put(SELF_LINK, uri); } - @JsonIgnore - public String getUri() { - return links.get(SELF_LINK); - } - @Override public boolean equals(final Object o) { if (this == o) return true; @@ -123,4 +129,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Roles.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Roles.java index 89b971aa2..03b4aeda4 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Roles.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Roles.java @@ -5,7 +5,11 @@ */ package com.gooddata.sdk.model.project; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; import java.util.Set; @@ -35,4 +39,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/User.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/User.java index c363ec887..d94da7aa0 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/User.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/User.java @@ -5,9 +5,15 @@ */ package com.gooddata.sdk.model.project; -import com.fasterxml.jackson.annotation.*; -import com.gooddata.sdk.model.account.Account; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import com.gooddata.sdk.common.util.GoodDataToStringBuilder; +import com.gooddata.sdk.model.account.Account; import java.util.Arrays; import java.util.List; @@ -15,6 +21,7 @@ /** * User in project + * * @see Account */ @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) @@ -55,6 +62,10 @@ public String getStatus() { return content.getStatus(); } + public void setStatus(final String status) { + this.content.status = status; + } + @JsonIgnore public String getLastName() { return content.getLastName(); @@ -84,10 +95,6 @@ public Links getLinks() { return links; } - public void setStatus(final String status) { - this.content.status = status; - } - @Override public String toString() { return GoodDataToStringBuilder.defaultToString(this); @@ -189,4 +196,3 @@ public String getSelf() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Users.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Users.java index 2d5998893..43c33ab88 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Users.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/Users.java @@ -40,4 +40,3 @@ public Users(final User... users) { this(asList(users), null); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersDeserializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersDeserializer.java index 13c1a6ef8..a30318c9d 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersDeserializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersDeserializer.java @@ -22,4 +22,3 @@ protected Users createPage(final List items, final Paging paging, final Ma return new Users(items, paging); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersSerializer.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersSerializer.java index d014d7317..5eb007cf8 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersSerializer.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/UsersSerializer.java @@ -25,7 +25,7 @@ public void serialize(final Users users, final JsonGenerator jgen, final Seriali jgen.writeStartArray(); final ObjectCodec codec = jgen.getCodec(); - for (Object item: users.getPageItems()) { + for (Object item : users.getPageItems()) { codec.writeValue(jgen, item); } jgen.writeEndArray(); @@ -33,4 +33,3 @@ public void serialize(final Users users, final JsonGenerator jgen, final Seriali jgen.writeEndObject(); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/DiffRequest.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/DiffRequest.java index 744aa3954..230ada541 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/DiffRequest.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/DiffRequest.java @@ -40,6 +40,7 @@ public DiffRequest(String targetModel) { /** * Returns desired target state of project model + * * @return desired target state of project model */ public String getTargetModel() { @@ -51,4 +52,3 @@ public String toString() { return GoodDataToStringBuilder.defaultToString(this); } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdl.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdl.java index 7656ba11f..dcd4a6342 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdl.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdl.java @@ -20,4 +20,3 @@ public MaqlDdl(final String maql) { } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java index f10914254..4cd3c7caf 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/MaqlDdlLinks.java @@ -5,11 +5,11 @@ */ package com.gooddata.sdk.model.project.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gooddata.sdk.model.gdc.LinkEntries; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.gooddata.sdk.model.gdc.LinkEntries; import java.util.List; @@ -38,4 +38,3 @@ public String getStatusUri() { return null; } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/ModelDiff.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/ModelDiff.java index 2efec61c5..9f8d2601f 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/ModelDiff.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/project/model/ModelDiff.java @@ -124,7 +124,7 @@ public static class UpdateScript { * * @param preserveData true if data should be preserved, false if they should be truncated * @param cascadeDrops true if related objects should be also dropped, false if not - * @param maqlChunks MAQL strings + * @param maqlChunks MAQL strings */ @JsonCreator UpdateScript(@JsonProperty("preserveData") Boolean preserveData, @@ -140,7 +140,7 @@ public static class UpdateScript { * * @param preserveData true if data should be preserved, false if they should be truncated * @param cascadeDrops true if related objects should be also dropped, false if not - * @param maqlChunks MAQL strings + * @param maqlChunks MAQL strings */ UpdateScript(boolean preserveData, boolean cascadeDrops, String... maqlChunks) { this(preserveData, cascadeDrops, asList(maqlChunks)); @@ -179,4 +179,3 @@ public String toString() { } } } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Template.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Template.java index 53be6da03..87ac0b942 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Template.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Template.java @@ -39,8 +39,8 @@ public class Template { @JsonCreator private Template(@JsonProperty("link") String uri, @JsonProperty("urn") String urn, @JsonProperty("version") String version, - @JsonProperty("hidden") @JsonDeserialize(using = BooleanDeserializer.class) Boolean hidden, - @JsonProperty("content") Content content, @JsonProperty("meta") Meta meta) { + @JsonProperty("hidden") @JsonDeserialize(using = BooleanDeserializer.class) Boolean hidden, + @JsonProperty("content") Content content, @JsonProperty("meta") Meta meta) { this.uri = uri; this.urn = urn; this.version = version; @@ -192,4 +192,3 @@ public String getUri() { } - diff --git a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Templates.java b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Templates.java index a7b5b2e7d..a23116889 100644 --- a/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Templates.java +++ b/gooddata-java-model/src/main/java/com/gooddata/sdk/model/projecttemplate/Templates.java @@ -35,4 +35,3 @@ public List