From 5731b607beeaf51b35de6134599deffbb183c69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 7 Aug 2018 12:58:16 +0200 Subject: [PATCH] change repository-types to repositoryTypes --- scm-ui/package.json | 2 +- scm-ui/src/repos/modules/repository-types.js | 4 ++-- scm-ui/src/repos/modules/repository-types.test.js | 12 ++++++------ scm-ui/src/repos/types/RepositoryTypes.js | 2 +- .../RepositoryTypeCollectionToDtoMapper.java | 2 +- .../api/v2/resources/RepositoryTypeRootResource.java | 2 +- .../RepositoryTypeCollectionToDtoMapperTest.java | 4 ++-- .../RepositoryTypeToRepositoryTypeDtoMapperTest.java | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scm-ui/package.json b/scm-ui/package.json index 6ce2e8880e..69563bedea 100644 --- a/scm-ui/package.json +++ b/scm-ui/package.json @@ -37,7 +37,7 @@ "test-ci": "jest --ci --coverage", "eject": "react-scripts eject", "flow": "flow", - "pre-commit": "jest && flow && eslint src" + "pre-commit": "jest && eslint src" }, "proxy": { "/scm/api": { diff --git a/scm-ui/src/repos/modules/repository-types.js b/scm-ui/src/repos/modules/repository-types.js index 1231486cfc..ecc3594c2b 100644 --- a/scm-ui/src/repos/modules/repository-types.js +++ b/scm-ui/src/repos/modules/repository-types.js @@ -32,7 +32,7 @@ export function fetchRepositoryTypesIfNeeded() { function fetchRepositoryTypes(dispatch: any) { dispatch(fetchRepositoryTypesPending()); return apiClient - .get("repository-types") + .get("repositoryTypes") .then(response => response.json()) .then(repositoryTypes => { dispatch(fetchRepositoryTypesSuccess(repositoryTypes)); @@ -84,7 +84,7 @@ export default function reducer( action: Action = { type: "UNKNOWN" } ): RepositoryType[] { if (action.type === FETCH_REPOSITORY_TYPES_SUCCESS && action.payload) { - return action.payload._embedded["repository-types"]; + return action.payload._embedded["repositoryTypes"]; } return state; } diff --git a/scm-ui/src/repos/modules/repository-types.test.js b/scm-ui/src/repos/modules/repository-types.test.js index 578a814ff0..fe7ca19ef5 100644 --- a/scm-ui/src/repos/modules/repository-types.test.js +++ b/scm-ui/src/repos/modules/repository-types.test.js @@ -22,7 +22,7 @@ const git = { displayName: "Git", _links: { self: { - href: "http://localhost:8081/scm/api/rest/v2/repository-types/git" + href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes/git" } } }; @@ -32,7 +32,7 @@ const hg = { displayName: "Mercurial", _links: { self: { - href: "http://localhost:8081/scm/api/rest/v2/repository-types/hg" + href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes/hg" } } }; @@ -42,18 +42,18 @@ const svn = { displayName: "Subversion", _links: { self: { - href: "http://localhost:8081/scm/api/rest/v2/repository-types/svn" + href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes/svn" } } }; const collection = { _embedded: { - "repository-types": [git, hg, svn] + repositoryTypes: [git, hg, svn] }, _links: { self: { - href: "http://localhost:8081/scm/api/rest/v2/repository-types" + href: "http://localhost:8081/scm/api/rest/v2/repositoryTypes" } } }; @@ -97,7 +97,7 @@ describe("repository types caching", () => { }); describe("repository types fetch", () => { - const URL = "/scm/api/rest/v2/repository-types"; + const URL = "/scm/api/rest/v2/repositoryTypes"; const mockStore = configureMockStore([thunk]); afterEach(() => { diff --git a/scm-ui/src/repos/types/RepositoryTypes.js b/scm-ui/src/repos/types/RepositoryTypes.js index 069b901b56..c9e77185e5 100644 --- a/scm-ui/src/repos/types/RepositoryTypes.js +++ b/scm-ui/src/repos/types/RepositoryTypes.js @@ -9,6 +9,6 @@ export type RepositoryType = { export type RepositoryTypeCollection = Collection & { _embedded: { - "repository-types": RepositoryType[] + "repositoryTypes": RepositoryType[] } }; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java index b9d7ff46c9..c3b6953eec 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapper.java @@ -10,7 +10,7 @@ public class RepositoryTypeCollectionToDtoMapper extends CollectionToDtoMapper collectionResourceProvider; private Provider resourceProvider; diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java index ecde79ae1f..dbd46ec5f9 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeCollectionToDtoMapperTest.java @@ -45,7 +45,7 @@ public class RepositoryTypeCollectionToDtoMapperTest { public void shouldHaveEmbeddedDtos() { HalRepresentation mappedTypes = collectionMapper.map(types); Embedded embedded = mappedTypes.getEmbedded(); - List embeddedTypes = embedded.getItemsBy("repository-types", RepositoryTypeDto.class); + List embeddedTypes = embedded.getItemsBy("repositoryTypes", RepositoryTypeDto.class); assertEquals("hk", embeddedTypes.get(0).getName()); assertEquals("hog", embeddedTypes.get(1).getName()); } @@ -54,7 +54,7 @@ public class RepositoryTypeCollectionToDtoMapperTest { public void shouldHaveSelfLink() { HalRepresentation mappedTypes = collectionMapper.map(types); Optional self = mappedTypes.getLinks().getLinkBy("self"); - assertEquals("https://scm-manager.org/scm/v2/repository-types/", self.get().getHref()); + assertEquals("https://scm-manager.org/scm/v2/repositoryTypes/", self.get().getHref()); } } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java index 9a40c253c4..73f0a5672c 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java @@ -35,7 +35,7 @@ public class RepositoryTypeToRepositoryTypeDtoMapperTest { public void shouldAppendSelfLink() { RepositoryTypeDto dto = mapper.map(type); assertEquals( - "https://scm-manager.org/scm/v2/repository-types/hk", + "https://scm-manager.org/scm/v2/repositoryTypes/hk", dto.getLinks().getLinkBy("self").get().getHref() ); }