target
stringlengths 20
113k
| src_fm
stringlengths 11
86.3k
| src_fm_fc
stringlengths 21
86.4k
| src_fm_fc_co
stringlengths 30
86.4k
| src_fm_fc_ms
stringlengths 42
86.8k
| src_fm_fc_ms_ff
stringlengths 43
86.8k
|
---|---|---|---|---|---|
@Test void listRemovedRepositories() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<Set<String>> callback = invocation.getArgument(1); callback.onComplete(ImmutableSet.of("repo")); return null; }).when(iface).listRemovedRepositories(any(), any()); assertThat(client.listRemovedRepositories("project").get()).isEqualTo(ImmutableSet.of("repo")); verify(iface).listRemovedRepositories(anyString(), any()); } | @Override public CompletableFuture<Set<String>> listRemovedRepositories(String projectName) { return run(callback -> { validateProjectName(projectName); client.listRemovedRepositories(projectName, callback); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Set<String>> listRemovedRepositories(String projectName) { return run(callback -> { validateProjectName(projectName); client.listRemovedRepositories(projectName, callback); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Set<String>> listRemovedRepositories(String projectName) { return run(callback -> { validateProjectName(projectName); client.listRemovedRepositories(projectName, callback); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Set<String>> listRemovedRepositories(String projectName) { return run(callback -> { validateProjectName(projectName); client.listRemovedRepositories(projectName, callback); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Set<String>> listRemovedRepositories(String projectName) { return run(callback -> { validateProjectName(projectName); client.listRemovedRepositories(projectName, callback); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void normalizeRevision() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<TRevision> callback = invocation.getArgument(3); callback.onComplete(new TRevision(3)); return null; }).when(iface).normalizeRevision(anyString(), anyString(), any(), any()); assertThat(client.normalizeRevision("project", "repo", new Revision(1)).get()) .isEqualTo(new Revision(3)); verify(iface).normalizeRevision(eq("project"), eq("repo"), any(), any()); } | @Override public CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName, Revision revision) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.Revision> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); client.normalizeRevision(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), callback); }); return future.thenApply(RevisionConverter.TO_MODEL::convert); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName, Revision revision) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.Revision> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); client.normalizeRevision(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), callback); }); return future.thenApply(RevisionConverter.TO_MODEL::convert); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName, Revision revision) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.Revision> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); client.normalizeRevision(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), callback); }); return future.thenApply(RevisionConverter.TO_MODEL::convert); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName, Revision revision) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.Revision> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); client.normalizeRevision(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), callback); }); return future.thenApply(RevisionConverter.TO_MODEL::convert); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName, Revision revision) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.Revision> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); client.normalizeRevision(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), callback); }); return future.thenApply(RevisionConverter.TO_MODEL::convert); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void listFiles() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<List<TEntry>> callback = invocation.getArgument(4); final TEntry entry = new TEntry("/a.txt", TEntryType.TEXT); entry.setContent("hello"); callback.onComplete(ImmutableList.of(entry)); return null; }).when(iface).listFiles(anyString(), anyString(), any(), anyString(), any()); assertThat(client.listFiles("project", "repo", new Revision(1), "/a.txt").get()) .isEqualTo(ImmutableMap.of("/a.txt", EntryType.TEXT)); verify(iface).listFiles(anyString(), anyString(), any(), anyString(), any()); } | @Override public CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); validatePathPattern(pathPattern, "pathPattern"); client.listFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), pathPattern, callback); }); return future.thenApply(list -> list.stream().collect(toImmutableMap( com.linecorp.centraldogma.internal.thrift.Entry::getPath, e -> EntryConverter.convertEntryType(e.getType())))); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); validatePathPattern(pathPattern, "pathPattern"); client.listFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), pathPattern, callback); }); return future.thenApply(list -> list.stream().collect(toImmutableMap( com.linecorp.centraldogma.internal.thrift.Entry::getPath, e -> EntryConverter.convertEntryType(e.getType())))); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); validatePathPattern(pathPattern, "pathPattern"); client.listFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), pathPattern, callback); }); return future.thenApply(list -> list.stream().collect(toImmutableMap( com.linecorp.centraldogma.internal.thrift.Entry::getPath, e -> EntryConverter.convertEntryType(e.getType())))); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); validatePathPattern(pathPattern, "pathPattern"); client.listFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), pathPattern, callback); }); return future.thenApply(list -> list.stream().collect(toImmutableMap( com.linecorp.centraldogma.internal.thrift.Entry::getPath, e -> EntryConverter.convertEntryType(e.getType())))); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); validatePathPattern(pathPattern, "pathPattern"); client.listFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), pathPattern, callback); }); return future.thenApply(list -> list.stream().collect(toImmutableMap( com.linecorp.centraldogma.internal.thrift.Entry::getPath, e -> EntryConverter.convertEntryType(e.getType())))); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void getFiles() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<List<TEntry>> callback = invocation.getArgument(4); final TEntry entry = new TEntry("/b.txt", TEntryType.TEXT); entry.setContent("world"); callback.onComplete(ImmutableList.of(entry)); return null; }).when(iface).getFiles(anyString(), anyString(), any(), anyString(), any()); assertThat(client.getFiles("project", "repo", new Revision(1), "path").get()) .isEqualTo(ImmutableMap.of("/b.txt", Entry.ofText(new Revision(1), "/b.txt", "world"))); verify(iface).getFiles(anyString(), anyString(), any(), anyString(), any()); } | @Override public CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validatePathPattern(pathPattern, "pathPattern"); client.getFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), pathPattern, callback); }); return future.thenApply(list -> convertToMap(list, e -> EntryConverter.convert(normRev, e), Entry::path, Function.identity())); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validatePathPattern(pathPattern, "pathPattern"); client.getFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), pathPattern, callback); }); return future.thenApply(list -> convertToMap(list, e -> EntryConverter.convert(normRev, e), Entry::path, Function.identity())); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validatePathPattern(pathPattern, "pathPattern"); client.getFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), pathPattern, callback); }); return future.thenApply(list -> convertToMap(list, e -> EntryConverter.convert(normRev, e), Entry::path, Function.identity())); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validatePathPattern(pathPattern, "pathPattern"); client.getFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), pathPattern, callback); }); return future.thenApply(list -> convertToMap(list, e -> EntryConverter.convert(normRev, e), Entry::path, Function.identity())); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName, Revision revision, String pathPattern) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Entry>> future = run(callback -> { validatePathPattern(pathPattern, "pathPattern"); client.getFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), pathPattern, callback); }); return future.thenApply(list -> convertToMap(list, e -> EntryConverter.convert(normRev, e), Entry::path, Function.identity())); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void getHistory() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<List<TCommit>> callback = invocation.getArgument(5); callback.onComplete(ImmutableList.of(new TCommit( new TRevision(1), new TAuthor("name", "[email protected]"), TIMESTAMP, "summary", new Comment("detail").setMarkup(TMarkup.PLAINTEXT), ImmutableList.of(new TChange("/a.txt", ChangeType.UPSERT_TEXT).setContent("content"))))); return null; }).when(iface).getHistory(any(), any(), any(), any(), any(), any()); assertThat(client.getHistory("project", "repo", new Revision(1), new Revision(3), "path").get()) .isEqualTo(ImmutableList.of(new Commit(new Revision(1), new Author("name", "[email protected]"), Instant.parse(TIMESTAMP).toEpochMilli(), "summary", "detail", Markup.PLAINTEXT))); verify(iface).getHistory(eq("project"), eq("repo"), any(), any(), eq("path"), any()); } | @Override public CompletableFuture<List<Commit>> getHistory(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Commit>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getHistory(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, CommitConverter.TO_MODEL::convert)); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Commit>> getHistory(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Commit>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getHistory(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, CommitConverter.TO_MODEL::convert)); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Commit>> getHistory(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Commit>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getHistory(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, CommitConverter.TO_MODEL::convert)); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Commit>> getHistory(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Commit>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getHistory(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, CommitConverter.TO_MODEL::convert)); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Commit>> getHistory(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Commit>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getHistory(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, CommitConverter.TO_MODEL::convert)); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void getDiffs() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<List<TChange>> callback = invocation.getArgument(5); final TChange change = new TChange("/a.txt", ChangeType.UPSERT_TEXT); change.setContent("content"); callback.onComplete(ImmutableList.of(change)); return null; }).when(iface).getDiffs(any(), any(), any(), any(), any(), any()); assertThat(client.getDiffs("project", "repo", new Revision(1), new Revision(3), "path").get()) .isEqualTo(ImmutableList.of(Change.ofTextUpsert("/a.txt", "content"))); verify(iface).getDiffs(eq("project"), eq("repo"), any(), any(), eq("path"), any()); } | @Override public CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getDiffs(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, ChangeConverter.TO_MODEL::convert)); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getDiffs(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, ChangeConverter.TO_MODEL::convert)); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getDiffs(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, ChangeConverter.TO_MODEL::convert)); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getDiffs(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, ChangeConverter.TO_MODEL::convert)); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName, Revision from, Revision to, String pathPattern) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); validatePathPattern(pathPattern, "pathPattern"); client.getDiffs(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), pathPattern, callback); }); return future.thenApply(list -> convertToList(list, ChangeConverter.TO_MODEL::convert)); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void getPreviewDiffs() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<List<TChange>> callback = invocation.getArgument(4); final TChange change = new TChange("/a.txt", ChangeType.UPSERT_TEXT); change.setContent("content"); callback.onComplete(ImmutableList.of(change)); return null; }).when(iface).getPreviewDiffs(any(), any(), any(), any(), any()); assertThat(client.getPreviewDiffs("project", "repo", new Revision(1), ImmutableList.of(Change.ofTextUpsert("/a.txt", "content"))).get()) .isEqualTo(ImmutableList.of(Change.ofTextUpsert("/a.txt", "content"))); verify(iface).getPreviewDiffs(eq("project"), eq("repo"), any(), any(), any()); } | @Override public CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName, Revision baseRevision, Iterable<? extends Change<?>> changes) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(baseRevision, "baseRevision"); requireNonNull(changes, "changes"); client.getPreviewDiffs( projectName, repositoryName, RevisionConverter.TO_DATA.convert(baseRevision), convertToList(changes, ChangeConverter.TO_DATA::convert), callback); }); return future.thenApply(LegacyCentralDogma::convertToChangesModel); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName, Revision baseRevision, Iterable<? extends Change<?>> changes) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(baseRevision, "baseRevision"); requireNonNull(changes, "changes"); client.getPreviewDiffs( projectName, repositoryName, RevisionConverter.TO_DATA.convert(baseRevision), convertToList(changes, ChangeConverter.TO_DATA::convert), callback); }); return future.thenApply(LegacyCentralDogma::convertToChangesModel); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName, Revision baseRevision, Iterable<? extends Change<?>> changes) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(baseRevision, "baseRevision"); requireNonNull(changes, "changes"); client.getPreviewDiffs( projectName, repositoryName, RevisionConverter.TO_DATA.convert(baseRevision), convertToList(changes, ChangeConverter.TO_DATA::convert), callback); }); return future.thenApply(LegacyCentralDogma::convertToChangesModel); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName, Revision baseRevision, Iterable<? extends Change<?>> changes) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(baseRevision, "baseRevision"); requireNonNull(changes, "changes"); client.getPreviewDiffs( projectName, repositoryName, RevisionConverter.TO_DATA.convert(baseRevision), convertToList(changes, ChangeConverter.TO_DATA::convert), callback); }); return future.thenApply(LegacyCentralDogma::convertToChangesModel); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName, Revision baseRevision, Iterable<? extends Change<?>> changes) { final CompletableFuture<List<com.linecorp.centraldogma.internal.thrift.Change>> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(baseRevision, "baseRevision"); requireNonNull(changes, "changes"); client.getPreviewDiffs( projectName, repositoryName, RevisionConverter.TO_DATA.convert(baseRevision), convertToList(changes, ChangeConverter.TO_DATA::convert), callback); }); return future.thenApply(LegacyCentralDogma::convertToChangesModel); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void push() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<TCommit> callback = invocation.getArgument(7); callback.onComplete(new TCommit( new TRevision(1), new TAuthor("name", "[email protected]"), TIMESTAMP, "summary", new Comment("detail"), ImmutableList.of())); return null; }).when(iface).push(anyString(), anyString(), any(), any(), any(), any(), any(), any()); assertThat(client.push("project", "repo", new Revision(1), new Author("name", "[email protected]"), "summary", "detail", Markup.PLAINTEXT, ImmutableList.of(Change.ofTextUpsert("/a.txt", "hello")) ).get()).isEqualTo(new PushResult(new Revision(1), Instant.parse(TIMESTAMP).toEpochMilli())); verify(iface).push(eq("project"), eq("repo"), any(), any(), eq("summary"), any(), any(), any()); } | @Override public CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision, String summary, String detail, Markup markup, Iterable<? extends Change<?>> changes) { return push(projectName, repositoryName, baseRevision, Author.UNKNOWN, summary, detail, markup, changes); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision, String summary, String detail, Markup markup, Iterable<? extends Change<?>> changes) { return push(projectName, repositoryName, baseRevision, Author.UNKNOWN, summary, detail, markup, changes); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision, String summary, String detail, Markup markup, Iterable<? extends Change<?>> changes) { return push(projectName, repositoryName, baseRevision, Author.UNKNOWN, summary, detail, markup, changes); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision, String summary, String detail, Markup markup, Iterable<? extends Change<?>> changes) { return push(projectName, repositoryName, baseRevision, Author.UNKNOWN, summary, detail, markup, changes); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision, String summary, String detail, Markup markup, Iterable<? extends Change<?>> changes) { return push(projectName, repositoryName, baseRevision, Author.UNKNOWN, summary, detail, markup, changes); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void getFile() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<GetFileResult> callback = invocation.getArgument(4); callback.onComplete(new GetFileResult(TEntryType.TEXT, "content")); return null; }).when(iface).getFile(any(), any(), any(), any(), any()); assertThat(client.getFile("project", "repo", new Revision(1), Query.ofText("/a.txt")).get()) .isEqualTo(Entry.ofText(new Revision(1), "/a.txt", "content")); verify(iface).getFile(eq("project"), eq("repo"), any(), any(), any()); } | @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void testEquals() { final Entry<Void> e = Entry.ofDirectory(new Revision(1), "/foo"); assertThat(e).isNotEqualTo(null); assertThat(e).isNotEqualTo(new Object()); assertThat(e).isEqualTo(e); } | @Override public boolean equals(Object o) { if (this == o) { return true; } if (!(o instanceof Entry)) { return false; } @SuppressWarnings("unchecked") final Entry<T> that = (Entry<T>) o; return type == that.type && revision.equals(that.revision) && path.equals(that.path) && Objects.equals(content, that.content); } | Entry implements ContentHolder<T> { @Override public boolean equals(Object o) { if (this == o) { return true; } if (!(o instanceof Entry)) { return false; } @SuppressWarnings("unchecked") final Entry<T> that = (Entry<T>) o; return type == that.type && revision.equals(that.revision) && path.equals(that.path) && Objects.equals(content, that.content); } } | Entry implements ContentHolder<T> { @Override public boolean equals(Object o) { if (this == o) { return true; } if (!(o instanceof Entry)) { return false; } @SuppressWarnings("unchecked") final Entry<T> that = (Entry<T>) o; return type == that.type && revision.equals(that.revision) && path.equals(that.path) && Objects.equals(content, that.content); } private Entry(Revision revision, String path, EntryType type, @Nullable T content); } | Entry implements ContentHolder<T> { @Override public boolean equals(Object o) { if (this == o) { return true; } if (!(o instanceof Entry)) { return false; } @SuppressWarnings("unchecked") final Entry<T> that = (Entry<T>) o; return type == that.type && revision.equals(that.revision) && path.equals(that.path) && Objects.equals(content, that.content); } private Entry(Revision revision, String path, EntryType type, @Nullable T content); static Entry<Void> ofDirectory(Revision revision, String path); static Entry<JsonNode> ofJson(Revision revision, String path, JsonNode content); static Entry<JsonNode> ofJson(Revision revision, String path, String content); static Entry<String> ofText(Revision revision, String path, String content); static Entry<T> of(Revision revision, String path, EntryType type, @Nullable T content); Revision revision(); String path(); boolean hasContent(); void ifHasContent(Consumer<? super T> consumer); @Override EntryType type(); @Override T content(); @Override String contentAsText(); @Override String contentAsPrettyText(); @Override int hashCode(); @Override boolean equals(Object o); @Override String toString(); } | Entry implements ContentHolder<T> { @Override public boolean equals(Object o) { if (this == o) { return true; } if (!(o instanceof Entry)) { return false; } @SuppressWarnings("unchecked") final Entry<T> that = (Entry<T>) o; return type == that.type && revision.equals(that.revision) && path.equals(that.path) && Objects.equals(content, that.content); } private Entry(Revision revision, String path, EntryType type, @Nullable T content); static Entry<Void> ofDirectory(Revision revision, String path); static Entry<JsonNode> ofJson(Revision revision, String path, JsonNode content); static Entry<JsonNode> ofJson(Revision revision, String path, String content); static Entry<String> ofText(Revision revision, String path, String content); static Entry<T> of(Revision revision, String path, EntryType type, @Nullable T content); Revision revision(); String path(); boolean hasContent(); void ifHasContent(Consumer<? super T> consumer); @Override EntryType type(); @Override T content(); @Override String contentAsText(); @Override String contentAsPrettyText(); @Override int hashCode(); @Override boolean equals(Object o); @Override String toString(); } |
@Test void getFile_path() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<GetFileResult> callback = invocation.getArgument(4); callback.onComplete(new GetFileResult(TEntryType.TEXT, "content")); return null; }).when(iface).getFile(any(), any(), any(), any(), any()); assertThat(client.getFile("project", "repo", new Revision(1), Query.ofText("/a.txt")).get()) .isEqualTo(Entry.ofText(new Revision(1), "/a.txt", "content")); verify(iface).getFile(eq("project"), eq("repo"), any(), any(), any()); } | @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName, Revision revision, Query<T> query) { return maybeNormalizeRevision(projectName, repositoryName, revision).thenCompose(normRev -> { final CompletableFuture<GetFileResult> future = run(callback -> { requireNonNull(query, "query"); client.getFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(normRev), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } return toEntry(query, normRev, query.type(), r.getContent(), r.getType()); }); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void mergeFiles() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<MergedEntry> callback = invocation.getArgument(4); callback.onComplete(new MergedEntry(new TRevision(1), TEntryType.JSON, "{\"foo\": \"bar\"}", ImmutableList.of("/a.json", "/b.json"))); return null; }).when(iface).mergeFiles(any(), any(), any(), any(), any()); assertThat(client.mergeFiles("project", "repo", new Revision(1), MergeQuery.ofJson(ImmutableList.of(MergeSource.ofOptional("/a.json"), MergeSource.ofRequired("/b.json")))) .get()) .isEqualTo(com.linecorp.centraldogma.common.MergedEntry.of( new Revision(1), EntryType.JSON, Jackson.readTree("{\"foo\": \"bar\"}"), ImmutableList.of("/a.json", "/b.json"))); verify(iface).mergeFiles(eq("project"), eq("repo"), any(), any(), any()); } | @Override public <T> CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName, Revision revision, MergeQuery<T> mergeQuery) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.MergedEntry> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); requireNonNull(mergeQuery, "mergeQuery"); client.mergeFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), MergeQueryConverter.TO_DATA.convert(mergeQuery), callback); }); return future.thenApply(entry -> { final EntryType entryType = EntryConverter.convertEntryType(entry.getType()); assert entryType != null; switch (entryType) { case JSON: try { @SuppressWarnings("unchecked") final MergedEntry<T> converted = (MergedEntry<T>) MergedEntry.of( RevisionConverter.TO_MODEL.convert(entry.revision), entryType, Jackson.readTree(entry.content), entry.paths); return converted; } catch (IOException e) { throw new CentralDogmaException( "failed to parse the content: " + entry.content, e); } default: throw new Error("unsupported entry type: " + entryType); } }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName, Revision revision, MergeQuery<T> mergeQuery) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.MergedEntry> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); requireNonNull(mergeQuery, "mergeQuery"); client.mergeFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), MergeQueryConverter.TO_DATA.convert(mergeQuery), callback); }); return future.thenApply(entry -> { final EntryType entryType = EntryConverter.convertEntryType(entry.getType()); assert entryType != null; switch (entryType) { case JSON: try { @SuppressWarnings("unchecked") final MergedEntry<T> converted = (MergedEntry<T>) MergedEntry.of( RevisionConverter.TO_MODEL.convert(entry.revision), entryType, Jackson.readTree(entry.content), entry.paths); return converted; } catch (IOException e) { throw new CentralDogmaException( "failed to parse the content: " + entry.content, e); } default: throw new Error("unsupported entry type: " + entryType); } }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName, Revision revision, MergeQuery<T> mergeQuery) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.MergedEntry> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); requireNonNull(mergeQuery, "mergeQuery"); client.mergeFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), MergeQueryConverter.TO_DATA.convert(mergeQuery), callback); }); return future.thenApply(entry -> { final EntryType entryType = EntryConverter.convertEntryType(entry.getType()); assert entryType != null; switch (entryType) { case JSON: try { @SuppressWarnings("unchecked") final MergedEntry<T> converted = (MergedEntry<T>) MergedEntry.of( RevisionConverter.TO_MODEL.convert(entry.revision), entryType, Jackson.readTree(entry.content), entry.paths); return converted; } catch (IOException e) { throw new CentralDogmaException( "failed to parse the content: " + entry.content, e); } default: throw new Error("unsupported entry type: " + entryType); } }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName, Revision revision, MergeQuery<T> mergeQuery) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.MergedEntry> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); requireNonNull(mergeQuery, "mergeQuery"); client.mergeFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), MergeQueryConverter.TO_DATA.convert(mergeQuery), callback); }); return future.thenApply(entry -> { final EntryType entryType = EntryConverter.convertEntryType(entry.getType()); assert entryType != null; switch (entryType) { case JSON: try { @SuppressWarnings("unchecked") final MergedEntry<T> converted = (MergedEntry<T>) MergedEntry.of( RevisionConverter.TO_MODEL.convert(entry.revision), entryType, Jackson.readTree(entry.content), entry.paths); return converted; } catch (IOException e) { throw new CentralDogmaException( "failed to parse the content: " + entry.content, e); } default: throw new Error("unsupported entry type: " + entryType); } }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName, Revision revision, MergeQuery<T> mergeQuery) { final CompletableFuture<com.linecorp.centraldogma.internal.thrift.MergedEntry> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(revision, "revision"); requireNonNull(mergeQuery, "mergeQuery"); client.mergeFiles(projectName, repositoryName, RevisionConverter.TO_DATA.convert(revision), MergeQueryConverter.TO_DATA.convert(mergeQuery), callback); }); return future.thenApply(entry -> { final EntryType entryType = EntryConverter.convertEntryType(entry.getType()); assert entryType != null; switch (entryType) { case JSON: try { @SuppressWarnings("unchecked") final MergedEntry<T> converted = (MergedEntry<T>) MergedEntry.of( RevisionConverter.TO_MODEL.convert(entry.revision), entryType, Jackson.readTree(entry.content), entry.paths); return converted; } catch (IOException e) { throw new CentralDogmaException( "failed to parse the content: " + entry.content, e); } default: throw new Error("unsupported entry type: " + entryType); } }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void diffFile() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<DiffFileResult> callback = invocation.getArgument(5); callback.onComplete(new DiffFileResult(ChangeType.UPSERT_TEXT, "some_text")); return null; }).when(iface).diffFile(any(), any(), any(), any(), any(), any()); assertThat(client.getDiff("project", "repo", new Revision(1), new Revision(3), Query.ofText("/a.txt")).get()) .isEqualTo(Change.ofTextUpsert("/a.txt", "some_text")); verify(iface).diffFile(eq("project"), eq("repo"), any(), any(), any(), any()); } | @Override public <T> CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName, Revision from, Revision to, Query<T> query) { final CompletableFuture<DiffFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); requireNonNull(query, "query"); client.diffFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Change<T> converted; switch (r.getType()) { case UPSERT_JSON: converted = unsafeCast(Change.ofJsonUpsert(query.path(), r.getContent())); break; case UPSERT_TEXT: converted = unsafeCast(Change.ofTextUpsert(query.path(), r.getContent())); break; case REMOVE: converted = unsafeCast(Change.ofRemoval(query.path())); break; case RENAME: converted = unsafeCast(Change.ofRename(query.path(), r.getContent())); break; case APPLY_JSON_PATCH: converted = unsafeCast(Change.ofJsonPatch(query.path(), r.getContent())); break; case APPLY_TEXT_PATCH: converted = unsafeCast(Change.ofTextPatch(query.path(), r.getContent())); break; default: throw new Error("unknown change type: " + r.getType()); } return converted; }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName, Revision from, Revision to, Query<T> query) { final CompletableFuture<DiffFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); requireNonNull(query, "query"); client.diffFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Change<T> converted; switch (r.getType()) { case UPSERT_JSON: converted = unsafeCast(Change.ofJsonUpsert(query.path(), r.getContent())); break; case UPSERT_TEXT: converted = unsafeCast(Change.ofTextUpsert(query.path(), r.getContent())); break; case REMOVE: converted = unsafeCast(Change.ofRemoval(query.path())); break; case RENAME: converted = unsafeCast(Change.ofRename(query.path(), r.getContent())); break; case APPLY_JSON_PATCH: converted = unsafeCast(Change.ofJsonPatch(query.path(), r.getContent())); break; case APPLY_TEXT_PATCH: converted = unsafeCast(Change.ofTextPatch(query.path(), r.getContent())); break; default: throw new Error("unknown change type: " + r.getType()); } return converted; }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName, Revision from, Revision to, Query<T> query) { final CompletableFuture<DiffFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); requireNonNull(query, "query"); client.diffFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Change<T> converted; switch (r.getType()) { case UPSERT_JSON: converted = unsafeCast(Change.ofJsonUpsert(query.path(), r.getContent())); break; case UPSERT_TEXT: converted = unsafeCast(Change.ofTextUpsert(query.path(), r.getContent())); break; case REMOVE: converted = unsafeCast(Change.ofRemoval(query.path())); break; case RENAME: converted = unsafeCast(Change.ofRename(query.path(), r.getContent())); break; case APPLY_JSON_PATCH: converted = unsafeCast(Change.ofJsonPatch(query.path(), r.getContent())); break; case APPLY_TEXT_PATCH: converted = unsafeCast(Change.ofTextPatch(query.path(), r.getContent())); break; default: throw new Error("unknown change type: " + r.getType()); } return converted; }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName, Revision from, Revision to, Query<T> query) { final CompletableFuture<DiffFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); requireNonNull(query, "query"); client.diffFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Change<T> converted; switch (r.getType()) { case UPSERT_JSON: converted = unsafeCast(Change.ofJsonUpsert(query.path(), r.getContent())); break; case UPSERT_TEXT: converted = unsafeCast(Change.ofTextUpsert(query.path(), r.getContent())); break; case REMOVE: converted = unsafeCast(Change.ofRemoval(query.path())); break; case RENAME: converted = unsafeCast(Change.ofRename(query.path(), r.getContent())); break; case APPLY_JSON_PATCH: converted = unsafeCast(Change.ofJsonPatch(query.path(), r.getContent())); break; case APPLY_TEXT_PATCH: converted = unsafeCast(Change.ofTextPatch(query.path(), r.getContent())); break; default: throw new Error("unknown change type: " + r.getType()); } return converted; }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName, Revision from, Revision to, Query<T> query) { final CompletableFuture<DiffFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(from, "from"); requireNonNull(to, "to"); requireNonNull(query, "query"); client.diffFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(from), RevisionConverter.TO_DATA.convert(to), QueryConverter.TO_DATA.convert(query), callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Change<T> converted; switch (r.getType()) { case UPSERT_JSON: converted = unsafeCast(Change.ofJsonUpsert(query.path(), r.getContent())); break; case UPSERT_TEXT: converted = unsafeCast(Change.ofTextUpsert(query.path(), r.getContent())); break; case REMOVE: converted = unsafeCast(Change.ofRemoval(query.path())); break; case RENAME: converted = unsafeCast(Change.ofRename(query.path(), r.getContent())); break; case APPLY_JSON_PATCH: converted = unsafeCast(Change.ofJsonPatch(query.path(), r.getContent())); break; case APPLY_TEXT_PATCH: converted = unsafeCast(Change.ofTextPatch(query.path(), r.getContent())); break; default: throw new Error("unknown change type: " + r.getType()); } return converted; }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void watchRepository() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<WatchRepositoryResult> callback = invocation.getArgument(5); callback.onComplete(new WatchRepositoryResult().setRevision(new TRevision(42))); return null; }).when(iface).watchRepository(any(), any(), any(), anyString(), anyLong(), any()); assertThat(client.watchRepository("project", "repo", new Revision(1), "/a.txt", 100).get()) .isEqualTo(new Revision(42)); verify(iface).watchRepository(eq("project"), eq("repo"), any(), eq("/a.txt"), eq(100L), any()); } | @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void watchRepositoryTimedOut() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<WatchRepositoryResult> callback = invocation.getArgument(5); callback.onComplete(new WatchRepositoryResult()); return null; }).when(iface).watchRepository(any(), any(), any(), anyString(), anyLong(), any()); assertThat(client.watchRepository("project", "repo", new Revision(1), "/a.txt", 100).get()) .isNull(); verify(iface).watchRepository(eq("project"), eq("repo"), any(), eq("/a.txt"), eq(100L), any()); } | @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public CompletableFuture<Revision> watchRepository(String projectName, String repositoryName, Revision lastKnownRevision, String pathPattern, long timeoutMillis) { final CompletableFuture<WatchRepositoryResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); validatePathPattern(pathPattern, "pathPattern"); client.watchRepository(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), pathPattern, timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } return RevisionConverter.TO_MODEL.convert(r.getRevision()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void watchFile() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<WatchFileResult> callback = invocation.getArgument(5); callback.onComplete(new WatchFileResult().setRevision(new TRevision(42)) .setType(TEntryType.TEXT) .setContent("foo")); return null; }).when(iface).watchFile(any(), any(), any(), any(), anyLong(), any()); assertThat(client.watchFile("project", "repo", new Revision(1), Query.ofText("/a.txt"), 100).get()) .isEqualTo(Entry.ofText(new Revision(42), "/a.txt", "foo")); verify(iface).watchFile(eq("project"), eq("repo"), any(), any(), eq(100L), any()); } | @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void watchFileTimedOut() throws Exception { doAnswer(invocation -> { final AsyncMethodCallback<WatchFileResult> callback = invocation.getArgument(5); callback.onComplete(new WatchFileResult()); return null; }).when(iface).watchFile(any(), any(), any(), any(), anyLong(), any()); assertThat(client.watchFile("project", "repo", new Revision(1), Query.ofText("/a.txt"), 100).get()).isNull(); verify(iface).watchFile(eq("project"), eq("repo"), any(), any(), eq(100L), any()); } | @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } | LegacyCentralDogma extends AbstractCentralDogma { @Override public <T> CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName, Revision lastKnownRevision, Query<T> query, long timeoutMillis) { final CompletableFuture<WatchFileResult> future = run(callback -> { validateProjectAndRepositoryName(projectName, repositoryName); requireNonNull(lastKnownRevision, "lastKnownRevision"); requireNonNull(query, "query"); client.watchFile(projectName, repositoryName, RevisionConverter.TO_DATA.convert(lastKnownRevision), QueryConverter.TO_DATA.convert(query), timeoutMillis, callback); }); return future.thenApply(r -> { if (r == null) { return null; } final Revision revision = RevisionConverter.TO_MODEL.convert(r.getRevision()); if (revision == null) { return null; } return toEntry(query, revision, query.type(), r.getContent(), r.getType()); }); } LegacyCentralDogma(ScheduledExecutorService executor, CentralDogmaService.AsyncIface client); @Override CompletableFuture<Void> createProject(String projectName); @Override CompletableFuture<Void> removeProject(String projectName); @Override CompletableFuture<Void> purgeProject(String projectName); @Override CompletableFuture<Void> unremoveProject(String projectName); @Override CompletableFuture<Set<String>> listProjects(); @Override CompletableFuture<Set<String>> listRemovedProjects(); @Override CompletableFuture<Void> createRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> removeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> purgeRepository(String projectName, String repositoryName); @Override CompletableFuture<Void> unremoveRepository(String projectName, String repositoryName); @Override CompletableFuture<Map<String, RepositoryInfo>> listRepositories(String projectName); @Override CompletableFuture<Set<String>> listRemovedRepositories(String projectName); @Override CompletableFuture<Revision> normalizeRevision(String projectName, String repositoryName,
Revision revision); @Override CompletableFuture<Map<String, EntryType>> listFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<Entry<T>> getFile(String projectName, String repositoryName,
Revision revision, Query<T> query); @Override CompletableFuture<Map<String, Entry<?>>> getFiles(String projectName, String repositoryName,
Revision revision, String pathPattern); @Override CompletableFuture<MergedEntry<T>> mergeFiles(String projectName, String repositoryName,
Revision revision, MergeQuery<T> mergeQuery); @Override CompletableFuture<List<Commit>> getHistory(String projectName,
String repositoryName,
Revision from,
Revision to,
String pathPattern); @Override CompletableFuture<Change<T>> getDiff(String projectName, String repositoryName,
Revision from, Revision to, Query<T> query); @Override CompletableFuture<List<Change<?>>> getDiffs(String projectName, String repositoryName,
Revision from, Revision to, String pathPattern); @Override CompletableFuture<List<Change<?>>> getPreviewDiffs(String projectName, String repositoryName,
Revision baseRevision,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<PushResult> push(String projectName, String repositoryName, Revision baseRevision,
Author author, String summary, String detail, Markup markup,
Iterable<? extends Change<?>> changes); @Override CompletableFuture<Revision> watchRepository(String projectName, String repositoryName,
Revision lastKnownRevision,
String pathPattern,
long timeoutMillis); @Override CompletableFuture<Entry<T>> watchFile(String projectName, String repositoryName,
Revision lastKnownRevision, Query<T> query,
long timeoutMillis); } |
@Test void autoDetection() throws Exception { final ZooKeeperReplicationConfig cfg = Jackson.readValue( '{' + " \"method\": \"ZOOKEEPER\"," + " \"servers\": {" + " \"1\": {" + " \"host\": \"127.0.0.1\"," + " \"quorumPort\": 100," + " \"electionPort\": 101" + " }," + " \"2\": {" + " \"host\": \"255.255.255.255\"," + " \"quorumPort\": 200," + " \"electionPort\": 201" + " }" + " }" + '}', ZooKeeperReplicationConfig.class); assertThat(cfg.serverId()).isEqualTo(1); } | @JsonProperty public int serverId() { return serverId; } | ZooKeeperReplicationConfig implements ReplicationConfig { @JsonProperty public int serverId() { return serverId; } } | ZooKeeperReplicationConfig implements ReplicationConfig { @JsonProperty public int serverId() { return serverId; } ZooKeeperReplicationConfig(int serverId, Map<Integer, ZooKeeperAddress> servers); @VisibleForTesting ZooKeeperReplicationConfig(
int serverId, Map<Integer, ZooKeeperAddress> servers, String secret,
Map<String, String> additionalProperties,
int timeoutMillis, int numWorkers, int maxLogCount, long minLogAgeMillis); @JsonCreator ZooKeeperReplicationConfig(@JsonProperty("serverId") @Nullable Integer serverId,
@JsonProperty(value = "servers", required = true)
@JsonDeserialize(keyAs = Integer.class, contentAs = ZooKeeperAddress.class)
Map<Integer, ZooKeeperAddress> servers,
@JsonProperty("secret") @Nullable String secret,
@JsonProperty("additionalProperties")
@JsonDeserialize(keyAs = String.class, contentAs = String.class)
@Nullable Map<String, String> additionalProperties,
@JsonProperty("timeoutMillis") @Nullable Integer timeoutMillis,
@JsonProperty("numWorkers") @Nullable Integer numWorkers,
@JsonProperty("maxLogCount") @Nullable Integer maxLogCount,
@JsonProperty("minLogAgeMillis") @Nullable Long minLogAgeMillis); } | ZooKeeperReplicationConfig implements ReplicationConfig { @JsonProperty public int serverId() { return serverId; } ZooKeeperReplicationConfig(int serverId, Map<Integer, ZooKeeperAddress> servers); @VisibleForTesting ZooKeeperReplicationConfig(
int serverId, Map<Integer, ZooKeeperAddress> servers, String secret,
Map<String, String> additionalProperties,
int timeoutMillis, int numWorkers, int maxLogCount, long minLogAgeMillis); @JsonCreator ZooKeeperReplicationConfig(@JsonProperty("serverId") @Nullable Integer serverId,
@JsonProperty(value = "servers", required = true)
@JsonDeserialize(keyAs = Integer.class, contentAs = ZooKeeperAddress.class)
Map<Integer, ZooKeeperAddress> servers,
@JsonProperty("secret") @Nullable String secret,
@JsonProperty("additionalProperties")
@JsonDeserialize(keyAs = String.class, contentAs = String.class)
@Nullable Map<String, String> additionalProperties,
@JsonProperty("timeoutMillis") @Nullable Integer timeoutMillis,
@JsonProperty("numWorkers") @Nullable Integer numWorkers,
@JsonProperty("maxLogCount") @Nullable Integer maxLogCount,
@JsonProperty("minLogAgeMillis") @Nullable Long minLogAgeMillis); @Override ReplicationMethod method(); @JsonProperty int serverId(); ZooKeeperAddress serverAddress(); @JsonProperty Map<Integer, ZooKeeperAddress> servers(); String secret(); @JsonProperty Map<String, String> additionalProperties(); @JsonProperty int timeoutMillis(); @JsonProperty int numWorkers(); @JsonProperty int maxLogCount(); @JsonProperty long minLogAgeMillis(); @Override int hashCode(); @Override boolean equals(Object obj); @Override String toString(); } | ZooKeeperReplicationConfig implements ReplicationConfig { @JsonProperty public int serverId() { return serverId; } ZooKeeperReplicationConfig(int serverId, Map<Integer, ZooKeeperAddress> servers); @VisibleForTesting ZooKeeperReplicationConfig(
int serverId, Map<Integer, ZooKeeperAddress> servers, String secret,
Map<String, String> additionalProperties,
int timeoutMillis, int numWorkers, int maxLogCount, long minLogAgeMillis); @JsonCreator ZooKeeperReplicationConfig(@JsonProperty("serverId") @Nullable Integer serverId,
@JsonProperty(value = "servers", required = true)
@JsonDeserialize(keyAs = Integer.class, contentAs = ZooKeeperAddress.class)
Map<Integer, ZooKeeperAddress> servers,
@JsonProperty("secret") @Nullable String secret,
@JsonProperty("additionalProperties")
@JsonDeserialize(keyAs = String.class, contentAs = String.class)
@Nullable Map<String, String> additionalProperties,
@JsonProperty("timeoutMillis") @Nullable Integer timeoutMillis,
@JsonProperty("numWorkers") @Nullable Integer numWorkers,
@JsonProperty("maxLogCount") @Nullable Integer maxLogCount,
@JsonProperty("minLogAgeMillis") @Nullable Long minLogAgeMillis); @Override ReplicationMethod method(); @JsonProperty int serverId(); ZooKeeperAddress serverAddress(); @JsonProperty Map<Integer, ZooKeeperAddress> servers(); String secret(); @JsonProperty Map<String, String> additionalProperties(); @JsonProperty int timeoutMillis(); @JsonProperty int numWorkers(); @JsonProperty int maxLogCount(); @JsonProperty long minLogAgeMillis(); @Override int hashCode(); @Override boolean equals(Object obj); @Override String toString(); } |
@Test void removeMember() { final MetadataService mds = newMetadataService(manager); mds.addRepo(author, project1, repo1, ownerOnly).join(); mds.addMember(author, project1, user1, ProjectRole.MEMBER).join(); mds.addMember(author, project1, user2, ProjectRole.MEMBER).join(); mds.addPerUserPermission(author, project1, repo1, user1, READ_ONLY).join(); mds.addPerUserPermission(author, project1, repo1, user2, READ_ONLY).join(); assertThat(mds.getMember(project1, user1).join().id()).isNotNull(); assertThat(mds.getMember(project1, user2).join().id()).isNotNull(); assertThat(mds.findPermissions(project1, repo1, user1).join()) .containsExactly(Permission.READ); mds.removeMember(author, project1, user1).join(); assertThat(mds.findPermissions(project1, repo1, user1).join()) .containsExactlyElementsOf(NO_PERMISSION); assertThat(mds.findPermissions(project1, repo1, user2).join()) .containsExactly(Permission.READ); } | public CompletableFuture<Revision> removeMember(Author author, String projectName, User member) { requireNonNull(author, "author"); requireNonNull(projectName, "projectName"); requireNonNull(member, "member"); final String commitSummary = "Remove the member '" + member.id() + "' from the project '" + projectName + '\''; return metadataRepo.push( projectName, Project.REPO_DOGMA, author, commitSummary, () -> fetchMetadata(projectName).thenApply( metadataWithRevision -> { final ImmutableList.Builder<JsonPatchOperation> patches = ImmutableList.builder(); metadataWithRevision .object().repos().values() .stream().filter(r -> r.perUserPermissions().containsKey(member.id())) .forEach(r -> patches.add(new RemoveOperation( perUserPermissionPointer(r.name(), member.id())))); patches.add(new RemoveOperation(JsonPointer.compile("/members" + encodeSegment(member.id())))); final Change<JsonNode> change = Change.ofJsonPatch(METADATA_JSON, Jackson.valueToTree(patches.build())); return HolderWithRevision.of(change, metadataWithRevision.revision()); }) ); } | MetadataService { public CompletableFuture<Revision> removeMember(Author author, String projectName, User member) { requireNonNull(author, "author"); requireNonNull(projectName, "projectName"); requireNonNull(member, "member"); final String commitSummary = "Remove the member '" + member.id() + "' from the project '" + projectName + '\''; return metadataRepo.push( projectName, Project.REPO_DOGMA, author, commitSummary, () -> fetchMetadata(projectName).thenApply( metadataWithRevision -> { final ImmutableList.Builder<JsonPatchOperation> patches = ImmutableList.builder(); metadataWithRevision .object().repos().values() .stream().filter(r -> r.perUserPermissions().containsKey(member.id())) .forEach(r -> patches.add(new RemoveOperation( perUserPermissionPointer(r.name(), member.id())))); patches.add(new RemoveOperation(JsonPointer.compile("/members" + encodeSegment(member.id())))); final Change<JsonNode> change = Change.ofJsonPatch(METADATA_JSON, Jackson.valueToTree(patches.build())); return HolderWithRevision.of(change, metadataWithRevision.revision()); }) ); } } | MetadataService { public CompletableFuture<Revision> removeMember(Author author, String projectName, User member) { requireNonNull(author, "author"); requireNonNull(projectName, "projectName"); requireNonNull(member, "member"); final String commitSummary = "Remove the member '" + member.id() + "' from the project '" + projectName + '\''; return metadataRepo.push( projectName, Project.REPO_DOGMA, author, commitSummary, () -> fetchMetadata(projectName).thenApply( metadataWithRevision -> { final ImmutableList.Builder<JsonPatchOperation> patches = ImmutableList.builder(); metadataWithRevision .object().repos().values() .stream().filter(r -> r.perUserPermissions().containsKey(member.id())) .forEach(r -> patches.add(new RemoveOperation( perUserPermissionPointer(r.name(), member.id())))); patches.add(new RemoveOperation(JsonPointer.compile("/members" + encodeSegment(member.id())))); final Change<JsonNode> change = Change.ofJsonPatch(METADATA_JSON, Jackson.valueToTree(patches.build())); return HolderWithRevision.of(change, metadataWithRevision.revision()); }) ); } MetadataService(ProjectManager projectManager, CommandExecutor executor); } | MetadataService { public CompletableFuture<Revision> removeMember(Author author, String projectName, User member) { requireNonNull(author, "author"); requireNonNull(projectName, "projectName"); requireNonNull(member, "member"); final String commitSummary = "Remove the member '" + member.id() + "' from the project '" + projectName + '\''; return metadataRepo.push( projectName, Project.REPO_DOGMA, author, commitSummary, () -> fetchMetadata(projectName).thenApply( metadataWithRevision -> { final ImmutableList.Builder<JsonPatchOperation> patches = ImmutableList.builder(); metadataWithRevision .object().repos().values() .stream().filter(r -> r.perUserPermissions().containsKey(member.id())) .forEach(r -> patches.add(new RemoveOperation( perUserPermissionPointer(r.name(), member.id())))); patches.add(new RemoveOperation(JsonPointer.compile("/members" + encodeSegment(member.id())))); final Change<JsonNode> change = Change.ofJsonPatch(METADATA_JSON, Jackson.valueToTree(patches.build())); return HolderWithRevision.of(change, metadataWithRevision.revision()); }) ); } MetadataService(ProjectManager projectManager, CommandExecutor executor); CompletableFuture<ProjectMetadata> getProject(String projectName); CompletableFuture<Revision> removeProject(Author author, String projectName); CompletableFuture<Revision> restoreProject(Author author, String projectName); CompletableFuture<Member> getMember(String projectName, User user); CompletableFuture<Revision> addMember(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<Revision> removeMember(Author author, String projectName, User member); CompletableFuture<Revision> updateMemberRole(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<RepositoryMetadata> getRepo(String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName,
PerRolePermissions permission); CompletableFuture<Revision> removeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> purgeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> restoreRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> updatePerRolePermissions(Author author,
String projectName, String repoName,
PerRolePermissions perRolePermissions); CompletableFuture<Revision> addToken(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addToken(Author author, String projectName,
String appId, ProjectRole role); CompletableFuture<Revision> removeToken(Author author, String projectName, Token token); CompletableFuture<Revision> removeToken(Author author, String projectName, String appId); CompletableFuture<Revision> updateTokenRole(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addPerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> removePerUserPermission(Author author, String projectName,
String repoName, User member); CompletableFuture<Revision> updatePerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> addPerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Revision> removePerTokenPermission(Author author, String projectName,
String repoName, String appId); CompletableFuture<Revision> updatePerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
User user); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
String appId); CompletableFuture<ProjectRole> findRole(String projectName, User user); CompletableFuture<Tokens> getTokens(); CompletableFuture<Revision> createToken(Author author, String appId); CompletableFuture<Revision> createToken(Author author, String appId, boolean isAdmin); CompletableFuture<Revision> createToken(Author author, String appId, String secret); CompletableFuture<Revision> createToken(Author author, String appId, String secret,
boolean isAdmin); CompletableFuture<Revision> destroyToken(Author author, String appId); CompletableFuture<Revision> activateToken(Author author, String appId); CompletableFuture<Revision> deactivateToken(Author author, String appId); CompletableFuture<Token> findTokenByAppId(String appId); CompletableFuture<Token> findTokenBySecret(String secret); } | MetadataService { public CompletableFuture<Revision> removeMember(Author author, String projectName, User member) { requireNonNull(author, "author"); requireNonNull(projectName, "projectName"); requireNonNull(member, "member"); final String commitSummary = "Remove the member '" + member.id() + "' from the project '" + projectName + '\''; return metadataRepo.push( projectName, Project.REPO_DOGMA, author, commitSummary, () -> fetchMetadata(projectName).thenApply( metadataWithRevision -> { final ImmutableList.Builder<JsonPatchOperation> patches = ImmutableList.builder(); metadataWithRevision .object().repos().values() .stream().filter(r -> r.perUserPermissions().containsKey(member.id())) .forEach(r -> patches.add(new RemoveOperation( perUserPermissionPointer(r.name(), member.id())))); patches.add(new RemoveOperation(JsonPointer.compile("/members" + encodeSegment(member.id())))); final Change<JsonNode> change = Change.ofJsonPatch(METADATA_JSON, Jackson.valueToTree(patches.build())); return HolderWithRevision.of(change, metadataWithRevision.revision()); }) ); } MetadataService(ProjectManager projectManager, CommandExecutor executor); CompletableFuture<ProjectMetadata> getProject(String projectName); CompletableFuture<Revision> removeProject(Author author, String projectName); CompletableFuture<Revision> restoreProject(Author author, String projectName); CompletableFuture<Member> getMember(String projectName, User user); CompletableFuture<Revision> addMember(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<Revision> removeMember(Author author, String projectName, User member); CompletableFuture<Revision> updateMemberRole(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<RepositoryMetadata> getRepo(String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName,
PerRolePermissions permission); CompletableFuture<Revision> removeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> purgeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> restoreRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> updatePerRolePermissions(Author author,
String projectName, String repoName,
PerRolePermissions perRolePermissions); CompletableFuture<Revision> addToken(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addToken(Author author, String projectName,
String appId, ProjectRole role); CompletableFuture<Revision> removeToken(Author author, String projectName, Token token); CompletableFuture<Revision> removeToken(Author author, String projectName, String appId); CompletableFuture<Revision> updateTokenRole(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addPerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> removePerUserPermission(Author author, String projectName,
String repoName, User member); CompletableFuture<Revision> updatePerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> addPerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Revision> removePerTokenPermission(Author author, String projectName,
String repoName, String appId); CompletableFuture<Revision> updatePerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
User user); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
String appId); CompletableFuture<ProjectRole> findRole(String projectName, User user); CompletableFuture<Tokens> getTokens(); CompletableFuture<Revision> createToken(Author author, String appId); CompletableFuture<Revision> createToken(Author author, String appId, boolean isAdmin); CompletableFuture<Revision> createToken(Author author, String appId, String secret); CompletableFuture<Revision> createToken(Author author, String appId, String secret,
boolean isAdmin); CompletableFuture<Revision> destroyToken(Author author, String appId); CompletableFuture<Revision> activateToken(Author author, String appId); CompletableFuture<Revision> deactivateToken(Author author, String appId); CompletableFuture<Token> findTokenByAppId(String appId); CompletableFuture<Token> findTokenBySecret(String secret); static final String METADATA_JSON; } |
@Test void removeToken() { final MetadataService mds = newMetadataService(manager); mds.addRepo(author, project1, repo1, ownerOnly).join(); mds.createToken(author, app1).join(); mds.createToken(author, app2).join(); mds.addToken(author, project1, app1, ProjectRole.MEMBER).join(); mds.addToken(author, project1, app2, ProjectRole.MEMBER).join(); mds.addPerTokenPermission(author, project1, repo1, app1, READ_ONLY).join(); mds.addPerTokenPermission(author, project1, repo1, app2, READ_ONLY).join(); assertThat(mds.findPermissions(project1, repo1, app1).join()) .containsExactly(Permission.READ); mds.removeToken(author, project1, app1).join(); assertThat(mds.findPermissions(project1, repo1, app1).join()) .containsExactlyElementsOf(NO_PERMISSION); assertThat(mds.findPermissions(project1, repo1, app2).join()) .containsExactly(Permission.READ); } | public CompletableFuture<Revision> removeToken(Author author, String projectName, Token token) { return removeToken(author, projectName, requireNonNull(token, "token").appId()); } | MetadataService { public CompletableFuture<Revision> removeToken(Author author, String projectName, Token token) { return removeToken(author, projectName, requireNonNull(token, "token").appId()); } } | MetadataService { public CompletableFuture<Revision> removeToken(Author author, String projectName, Token token) { return removeToken(author, projectName, requireNonNull(token, "token").appId()); } MetadataService(ProjectManager projectManager, CommandExecutor executor); } | MetadataService { public CompletableFuture<Revision> removeToken(Author author, String projectName, Token token) { return removeToken(author, projectName, requireNonNull(token, "token").appId()); } MetadataService(ProjectManager projectManager, CommandExecutor executor); CompletableFuture<ProjectMetadata> getProject(String projectName); CompletableFuture<Revision> removeProject(Author author, String projectName); CompletableFuture<Revision> restoreProject(Author author, String projectName); CompletableFuture<Member> getMember(String projectName, User user); CompletableFuture<Revision> addMember(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<Revision> removeMember(Author author, String projectName, User member); CompletableFuture<Revision> updateMemberRole(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<RepositoryMetadata> getRepo(String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName,
PerRolePermissions permission); CompletableFuture<Revision> removeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> purgeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> restoreRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> updatePerRolePermissions(Author author,
String projectName, String repoName,
PerRolePermissions perRolePermissions); CompletableFuture<Revision> addToken(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addToken(Author author, String projectName,
String appId, ProjectRole role); CompletableFuture<Revision> removeToken(Author author, String projectName, Token token); CompletableFuture<Revision> removeToken(Author author, String projectName, String appId); CompletableFuture<Revision> updateTokenRole(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addPerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> removePerUserPermission(Author author, String projectName,
String repoName, User member); CompletableFuture<Revision> updatePerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> addPerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Revision> removePerTokenPermission(Author author, String projectName,
String repoName, String appId); CompletableFuture<Revision> updatePerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
User user); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
String appId); CompletableFuture<ProjectRole> findRole(String projectName, User user); CompletableFuture<Tokens> getTokens(); CompletableFuture<Revision> createToken(Author author, String appId); CompletableFuture<Revision> createToken(Author author, String appId, boolean isAdmin); CompletableFuture<Revision> createToken(Author author, String appId, String secret); CompletableFuture<Revision> createToken(Author author, String appId, String secret,
boolean isAdmin); CompletableFuture<Revision> destroyToken(Author author, String appId); CompletableFuture<Revision> activateToken(Author author, String appId); CompletableFuture<Revision> deactivateToken(Author author, String appId); CompletableFuture<Token> findTokenByAppId(String appId); CompletableFuture<Token> findTokenBySecret(String secret); } | MetadataService { public CompletableFuture<Revision> removeToken(Author author, String projectName, Token token) { return removeToken(author, projectName, requireNonNull(token, "token").appId()); } MetadataService(ProjectManager projectManager, CommandExecutor executor); CompletableFuture<ProjectMetadata> getProject(String projectName); CompletableFuture<Revision> removeProject(Author author, String projectName); CompletableFuture<Revision> restoreProject(Author author, String projectName); CompletableFuture<Member> getMember(String projectName, User user); CompletableFuture<Revision> addMember(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<Revision> removeMember(Author author, String projectName, User member); CompletableFuture<Revision> updateMemberRole(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<RepositoryMetadata> getRepo(String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName,
PerRolePermissions permission); CompletableFuture<Revision> removeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> purgeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> restoreRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> updatePerRolePermissions(Author author,
String projectName, String repoName,
PerRolePermissions perRolePermissions); CompletableFuture<Revision> addToken(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addToken(Author author, String projectName,
String appId, ProjectRole role); CompletableFuture<Revision> removeToken(Author author, String projectName, Token token); CompletableFuture<Revision> removeToken(Author author, String projectName, String appId); CompletableFuture<Revision> updateTokenRole(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addPerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> removePerUserPermission(Author author, String projectName,
String repoName, User member); CompletableFuture<Revision> updatePerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> addPerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Revision> removePerTokenPermission(Author author, String projectName,
String repoName, String appId); CompletableFuture<Revision> updatePerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
User user); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
String appId); CompletableFuture<ProjectRole> findRole(String projectName, User user); CompletableFuture<Tokens> getTokens(); CompletableFuture<Revision> createToken(Author author, String appId); CompletableFuture<Revision> createToken(Author author, String appId, boolean isAdmin); CompletableFuture<Revision> createToken(Author author, String appId, String secret); CompletableFuture<Revision> createToken(Author author, String appId, String secret,
boolean isAdmin); CompletableFuture<Revision> destroyToken(Author author, String appId); CompletableFuture<Revision> activateToken(Author author, String appId); CompletableFuture<Revision> deactivateToken(Author author, String appId); CompletableFuture<Token> findTokenByAppId(String appId); CompletableFuture<Token> findTokenBySecret(String secret); static final String METADATA_JSON; } |
@Test void testToString() { assertThat(Entry.ofText(new Revision(1), "/a.txt", "a").toString()).isNotEmpty(); } | @Override public String toString() { return MoreObjects.toStringHelper(this).omitNullValues() .add("revision", revision.text()) .add("path", path) .add("type", type) .add("content", hasContent() ? contentAsText() : null) .toString(); } | Entry implements ContentHolder<T> { @Override public String toString() { return MoreObjects.toStringHelper(this).omitNullValues() .add("revision", revision.text()) .add("path", path) .add("type", type) .add("content", hasContent() ? contentAsText() : null) .toString(); } } | Entry implements ContentHolder<T> { @Override public String toString() { return MoreObjects.toStringHelper(this).omitNullValues() .add("revision", revision.text()) .add("path", path) .add("type", type) .add("content", hasContent() ? contentAsText() : null) .toString(); } private Entry(Revision revision, String path, EntryType type, @Nullable T content); } | Entry implements ContentHolder<T> { @Override public String toString() { return MoreObjects.toStringHelper(this).omitNullValues() .add("revision", revision.text()) .add("path", path) .add("type", type) .add("content", hasContent() ? contentAsText() : null) .toString(); } private Entry(Revision revision, String path, EntryType type, @Nullable T content); static Entry<Void> ofDirectory(Revision revision, String path); static Entry<JsonNode> ofJson(Revision revision, String path, JsonNode content); static Entry<JsonNode> ofJson(Revision revision, String path, String content); static Entry<String> ofText(Revision revision, String path, String content); static Entry<T> of(Revision revision, String path, EntryType type, @Nullable T content); Revision revision(); String path(); boolean hasContent(); void ifHasContent(Consumer<? super T> consumer); @Override EntryType type(); @Override T content(); @Override String contentAsText(); @Override String contentAsPrettyText(); @Override int hashCode(); @Override boolean equals(Object o); @Override String toString(); } | Entry implements ContentHolder<T> { @Override public String toString() { return MoreObjects.toStringHelper(this).omitNullValues() .add("revision", revision.text()) .add("path", path) .add("type", type) .add("content", hasContent() ? contentAsText() : null) .toString(); } private Entry(Revision revision, String path, EntryType type, @Nullable T content); static Entry<Void> ofDirectory(Revision revision, String path); static Entry<JsonNode> ofJson(Revision revision, String path, JsonNode content); static Entry<JsonNode> ofJson(Revision revision, String path, String content); static Entry<String> ofText(Revision revision, String path, String content); static Entry<T> of(Revision revision, String path, EntryType type, @Nullable T content); Revision revision(); String path(); boolean hasContent(); void ifHasContent(Consumer<? super T> consumer); @Override EntryType type(); @Override T content(); @Override String contentAsText(); @Override String contentAsPrettyText(); @Override int hashCode(); @Override boolean equals(Object o); @Override String toString(); } |
@Test void destroyToken() { final MetadataService mds = newMetadataService(manager); mds.addRepo(author, project1, repo1, ownerOnly).join(); mds.createToken(author, app1).join(); mds.createToken(author, app2).join(); mds.addToken(author, project1, app1, ProjectRole.MEMBER).join(); mds.addToken(author, project1, app2, ProjectRole.MEMBER).join(); mds.addPerTokenPermission(author, project1, repo1, app1, READ_ONLY).join(); mds.addPerTokenPermission(author, project1, repo1, app2, READ_ONLY).join(); assertThat(mds.findPermissions(project1, repo1, app1).join()) .containsExactly(Permission.READ); mds.destroyToken(author, app1).join(); assertThat(mds.findPermissions(project1, repo1, app1).join()) .containsExactlyElementsOf(NO_PERMISSION); assertThat(mds.findPermissions(project1, repo1, app2).join()) .containsExactly(Permission.READ); } | public CompletableFuture<Revision> destroyToken(Author author, String appId) { requireNonNull(author, "author"); requireNonNull(appId, "appId"); final Collection<Project> projects = new SafeProjectManager(projectManager).list().values(); final CompletableFuture<?>[] futures = new CompletableFuture<?>[projects.size()]; int i = 0; for (final Project p : projects) { futures[i++] = removeToken(p.name(), author, appId, true).toCompletableFuture(); } return CompletableFuture.allOf(futures).thenCompose(unused -> tokenRepo.push( INTERNAL_PROJ, Project.REPO_DOGMA, author, "Remove the token: " + appId, () -> tokenRepo.fetch(INTERNAL_PROJ, Project.REPO_DOGMA, TOKEN_JSON) .thenApply(tokens -> { final Token token = tokens.object().get(appId); final JsonPointer appIdPath = JsonPointer.compile("/appIds" + encodeSegment(appId)); final String secret = token.secret(); assert secret != null; final JsonPointer secretPath = JsonPointer.compile("/secrets" + encodeSegment(secret)); final Change<?> change = Change.ofJsonPatch( TOKEN_JSON, asJsonArray(new RemoveOperation(appIdPath), new RemoveIfExistsOperation(secretPath))); return HolderWithRevision.of(change, tokens.revision()); })) ); } | MetadataService { public CompletableFuture<Revision> destroyToken(Author author, String appId) { requireNonNull(author, "author"); requireNonNull(appId, "appId"); final Collection<Project> projects = new SafeProjectManager(projectManager).list().values(); final CompletableFuture<?>[] futures = new CompletableFuture<?>[projects.size()]; int i = 0; for (final Project p : projects) { futures[i++] = removeToken(p.name(), author, appId, true).toCompletableFuture(); } return CompletableFuture.allOf(futures).thenCompose(unused -> tokenRepo.push( INTERNAL_PROJ, Project.REPO_DOGMA, author, "Remove the token: " + appId, () -> tokenRepo.fetch(INTERNAL_PROJ, Project.REPO_DOGMA, TOKEN_JSON) .thenApply(tokens -> { final Token token = tokens.object().get(appId); final JsonPointer appIdPath = JsonPointer.compile("/appIds" + encodeSegment(appId)); final String secret = token.secret(); assert secret != null; final JsonPointer secretPath = JsonPointer.compile("/secrets" + encodeSegment(secret)); final Change<?> change = Change.ofJsonPatch( TOKEN_JSON, asJsonArray(new RemoveOperation(appIdPath), new RemoveIfExistsOperation(secretPath))); return HolderWithRevision.of(change, tokens.revision()); })) ); } } | MetadataService { public CompletableFuture<Revision> destroyToken(Author author, String appId) { requireNonNull(author, "author"); requireNonNull(appId, "appId"); final Collection<Project> projects = new SafeProjectManager(projectManager).list().values(); final CompletableFuture<?>[] futures = new CompletableFuture<?>[projects.size()]; int i = 0; for (final Project p : projects) { futures[i++] = removeToken(p.name(), author, appId, true).toCompletableFuture(); } return CompletableFuture.allOf(futures).thenCompose(unused -> tokenRepo.push( INTERNAL_PROJ, Project.REPO_DOGMA, author, "Remove the token: " + appId, () -> tokenRepo.fetch(INTERNAL_PROJ, Project.REPO_DOGMA, TOKEN_JSON) .thenApply(tokens -> { final Token token = tokens.object().get(appId); final JsonPointer appIdPath = JsonPointer.compile("/appIds" + encodeSegment(appId)); final String secret = token.secret(); assert secret != null; final JsonPointer secretPath = JsonPointer.compile("/secrets" + encodeSegment(secret)); final Change<?> change = Change.ofJsonPatch( TOKEN_JSON, asJsonArray(new RemoveOperation(appIdPath), new RemoveIfExistsOperation(secretPath))); return HolderWithRevision.of(change, tokens.revision()); })) ); } MetadataService(ProjectManager projectManager, CommandExecutor executor); } | MetadataService { public CompletableFuture<Revision> destroyToken(Author author, String appId) { requireNonNull(author, "author"); requireNonNull(appId, "appId"); final Collection<Project> projects = new SafeProjectManager(projectManager).list().values(); final CompletableFuture<?>[] futures = new CompletableFuture<?>[projects.size()]; int i = 0; for (final Project p : projects) { futures[i++] = removeToken(p.name(), author, appId, true).toCompletableFuture(); } return CompletableFuture.allOf(futures).thenCompose(unused -> tokenRepo.push( INTERNAL_PROJ, Project.REPO_DOGMA, author, "Remove the token: " + appId, () -> tokenRepo.fetch(INTERNAL_PROJ, Project.REPO_DOGMA, TOKEN_JSON) .thenApply(tokens -> { final Token token = tokens.object().get(appId); final JsonPointer appIdPath = JsonPointer.compile("/appIds" + encodeSegment(appId)); final String secret = token.secret(); assert secret != null; final JsonPointer secretPath = JsonPointer.compile("/secrets" + encodeSegment(secret)); final Change<?> change = Change.ofJsonPatch( TOKEN_JSON, asJsonArray(new RemoveOperation(appIdPath), new RemoveIfExistsOperation(secretPath))); return HolderWithRevision.of(change, tokens.revision()); })) ); } MetadataService(ProjectManager projectManager, CommandExecutor executor); CompletableFuture<ProjectMetadata> getProject(String projectName); CompletableFuture<Revision> removeProject(Author author, String projectName); CompletableFuture<Revision> restoreProject(Author author, String projectName); CompletableFuture<Member> getMember(String projectName, User user); CompletableFuture<Revision> addMember(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<Revision> removeMember(Author author, String projectName, User member); CompletableFuture<Revision> updateMemberRole(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<RepositoryMetadata> getRepo(String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName,
PerRolePermissions permission); CompletableFuture<Revision> removeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> purgeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> restoreRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> updatePerRolePermissions(Author author,
String projectName, String repoName,
PerRolePermissions perRolePermissions); CompletableFuture<Revision> addToken(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addToken(Author author, String projectName,
String appId, ProjectRole role); CompletableFuture<Revision> removeToken(Author author, String projectName, Token token); CompletableFuture<Revision> removeToken(Author author, String projectName, String appId); CompletableFuture<Revision> updateTokenRole(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addPerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> removePerUserPermission(Author author, String projectName,
String repoName, User member); CompletableFuture<Revision> updatePerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> addPerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Revision> removePerTokenPermission(Author author, String projectName,
String repoName, String appId); CompletableFuture<Revision> updatePerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
User user); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
String appId); CompletableFuture<ProjectRole> findRole(String projectName, User user); CompletableFuture<Tokens> getTokens(); CompletableFuture<Revision> createToken(Author author, String appId); CompletableFuture<Revision> createToken(Author author, String appId, boolean isAdmin); CompletableFuture<Revision> createToken(Author author, String appId, String secret); CompletableFuture<Revision> createToken(Author author, String appId, String secret,
boolean isAdmin); CompletableFuture<Revision> destroyToken(Author author, String appId); CompletableFuture<Revision> activateToken(Author author, String appId); CompletableFuture<Revision> deactivateToken(Author author, String appId); CompletableFuture<Token> findTokenByAppId(String appId); CompletableFuture<Token> findTokenBySecret(String secret); } | MetadataService { public CompletableFuture<Revision> destroyToken(Author author, String appId) { requireNonNull(author, "author"); requireNonNull(appId, "appId"); final Collection<Project> projects = new SafeProjectManager(projectManager).list().values(); final CompletableFuture<?>[] futures = new CompletableFuture<?>[projects.size()]; int i = 0; for (final Project p : projects) { futures[i++] = removeToken(p.name(), author, appId, true).toCompletableFuture(); } return CompletableFuture.allOf(futures).thenCompose(unused -> tokenRepo.push( INTERNAL_PROJ, Project.REPO_DOGMA, author, "Remove the token: " + appId, () -> tokenRepo.fetch(INTERNAL_PROJ, Project.REPO_DOGMA, TOKEN_JSON) .thenApply(tokens -> { final Token token = tokens.object().get(appId); final JsonPointer appIdPath = JsonPointer.compile("/appIds" + encodeSegment(appId)); final String secret = token.secret(); assert secret != null; final JsonPointer secretPath = JsonPointer.compile("/secrets" + encodeSegment(secret)); final Change<?> change = Change.ofJsonPatch( TOKEN_JSON, asJsonArray(new RemoveOperation(appIdPath), new RemoveIfExistsOperation(secretPath))); return HolderWithRevision.of(change, tokens.revision()); })) ); } MetadataService(ProjectManager projectManager, CommandExecutor executor); CompletableFuture<ProjectMetadata> getProject(String projectName); CompletableFuture<Revision> removeProject(Author author, String projectName); CompletableFuture<Revision> restoreProject(Author author, String projectName); CompletableFuture<Member> getMember(String projectName, User user); CompletableFuture<Revision> addMember(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<Revision> removeMember(Author author, String projectName, User member); CompletableFuture<Revision> updateMemberRole(Author author, String projectName,
User member, ProjectRole projectRole); CompletableFuture<RepositoryMetadata> getRepo(String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> addRepo(Author author, String projectName, String repoName,
PerRolePermissions permission); CompletableFuture<Revision> removeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> purgeRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> restoreRepo(Author author, String projectName, String repoName); CompletableFuture<Revision> updatePerRolePermissions(Author author,
String projectName, String repoName,
PerRolePermissions perRolePermissions); CompletableFuture<Revision> addToken(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addToken(Author author, String projectName,
String appId, ProjectRole role); CompletableFuture<Revision> removeToken(Author author, String projectName, Token token); CompletableFuture<Revision> removeToken(Author author, String projectName, String appId); CompletableFuture<Revision> updateTokenRole(Author author, String projectName,
Token token, ProjectRole role); CompletableFuture<Revision> addPerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> removePerUserPermission(Author author, String projectName,
String repoName, User member); CompletableFuture<Revision> updatePerUserPermission(Author author, String projectName,
String repoName, User member,
Collection<Permission> permission); CompletableFuture<Revision> addPerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Revision> removePerTokenPermission(Author author, String projectName,
String repoName, String appId); CompletableFuture<Revision> updatePerTokenPermission(Author author, String projectName,
String repoName, String appId,
Collection<Permission> permission); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
User user); CompletableFuture<Collection<Permission>> findPermissions(String projectName, String repoName,
String appId); CompletableFuture<ProjectRole> findRole(String projectName, User user); CompletableFuture<Tokens> getTokens(); CompletableFuture<Revision> createToken(Author author, String appId); CompletableFuture<Revision> createToken(Author author, String appId, boolean isAdmin); CompletableFuture<Revision> createToken(Author author, String appId, String secret); CompletableFuture<Revision> createToken(Author author, String appId, String secret,
boolean isAdmin); CompletableFuture<Revision> destroyToken(Author author, String appId); CompletableFuture<Revision> activateToken(Author author, String appId); CompletableFuture<Revision> deactivateToken(Author author, String appId); CompletableFuture<Token> findTokenByAppId(String appId); CompletableFuture<Token> findTokenBySecret(String secret); static final String METADATA_JSON; } |
@Test void migrationWithoutLegacyTokens() { final ProjectManager pm = manager.projectManager(); final CommandExecutor executor = manager.executor(); final MetadataService mds = new MetadataService(pm, executor); MigrationUtil.migrate(pm, executor); final Tokens tokens1 = mds.getTokens().join(); assertThat(tokens1.appIds().isEmpty()).isTrue(); assertThat(tokens1.secrets().isEmpty()).isTrue(); } | public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor); } |
@Test void migration() { final ProjectManager pm = manager.projectManager(); final CommandExecutor executor = manager.executor(); final MetadataService mds = new MetadataService(pm, executor); pm.get(INTERNAL_PROJ).repos().create(LEGACY_TOKEN_REPO, Author.SYSTEM); createProjectWithoutMetadata("legacyProject1"); createProjectWithoutMetadata("legacyProject2"); createProjectWithoutMetadata("legacyProject3"); final LegacyToken legacyToken1 = new LegacyToken("app1", SECRET_PREFIX + "app1", User.DEFAULT, Instant.now()); final LegacyToken legacyToken2 = new LegacyToken("app2", SECRET_PREFIX + "app2", User.DEFAULT, Instant.now()); final Map<String, LegacyToken> legacyTokens = ImmutableMap.of(SECRET_PREFIX + "app1", legacyToken1, SECRET_PREFIX + "app2", legacyToken2); final Change<?> change = Change.ofJsonUpsert(LEGACY_TOKEN_JSON, Jackson.valueToTree(legacyTokens)); executor.execute(Command.push(author, INTERNAL_PROJ, LEGACY_TOKEN_REPO, Revision.HEAD, "", "", Markup.PLAINTEXT, change)).join(); for (int i = 0; i < 2; i++) { MigrationUtil.migrate(pm, executor); final Tokens tokens2 = mds.getTokens().join(); assertThat(tokens2.appIds()).hasSize(2); assertThat(tokens2.appIds().get("app1").secret()).isEqualTo(legacyToken1.secret()); assertThat(tokens2.appIds().get("app2").secret()).isEqualTo(legacyToken2.secret()); final List<ProjectMetadata> metadataList = ImmutableList.of( mds.getProject("legacyProject1").join(), mds.getProject("legacyProject2").join(), mds.getProject("legacyProject3").join()); for (final ProjectMetadata m : metadataList) { assertThat(m.tokens()).hasSize(2); assertThat(m.tokens().get("app1").role()).isEqualTo(ProjectRole.MEMBER); assertThat(m.tokens().get("app2").role()).isEqualTo(ProjectRole.MEMBER); assertThat(m.repo(REPO_FOO).perRolePermissions().owner()) .containsExactly(Permission.READ, Permission.WRITE); assertThat(m.repo("oneMoreThing").perRolePermissions().owner()) .containsExactly(Permission.READ, Permission.WRITE); assertThat(m.repo(REPO_FOO).perRolePermissions().member()) .containsExactly(Permission.READ, Permission.WRITE); assertThat(m.repo("oneMoreThing").perRolePermissions().member()) .containsExactly(Permission.READ, Permission.WRITE); assertThat(m.repo(REPO_FOO).perRolePermissions().guest()) .containsExactly(Permission.READ, Permission.WRITE); assertThat(m.repo("oneMoreThing").perRolePermissions().guest()) .containsExactly(Permission.READ, Permission.WRITE); assertThat(m.repo(REPO_META)).isNotNull(); } } } | public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor); } |
@Test void migrationFrom0_23_0() { final ProjectManager pm = manager.projectManager(); final CommandExecutor executor = manager.executor(); pm.get(INTERNAL_PROJ).repos().create("main", Author.SYSTEM); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Tokens tokens = new Tokens( ImmutableMap.of("app1", new Token("app1", "secret1", false, userAndTimestamp, null)), ImmutableMap.of("secret1", "app1")); executor.execute( Command.push(author, INTERNAL_PROJ, "main", Revision.HEAD, "", "", Markup.PLAINTEXT, Change.ofJsonUpsert(TOKEN_JSON, Jackson.valueToTree(tokens)))).join(); final Project project = createProjectWithoutMetadata("project1"); final ProjectMetadata metadata = new ProjectMetadata(project.name(), ImmutableMap.of(REPO_FOO, new RepositoryMetadata(REPO_FOO, userAndTimestamp, PerRolePermissions.ofPublic())), ImmutableMap.of(), ImmutableMap.of(), userAndTimestamp, null); executor.execute( Command.push(author, project.name(), REPO_META, Revision.HEAD, "", "", Markup.PLAINTEXT, Change.ofJsonUpsert(METADATA_JSON, Jackson.valueToTree(metadata)))).join(); MigrationUtil.migrate(pm, executor); final MetadataService mds = new MetadataService(pm, executor); final ProjectMetadata meta = mds.getProject("project1").join(); assertThat(meta).isNotNull(); assertThat(meta.repo(REPO_FOO)).isNotNull(); assertThat(meta.repo(REPO_META)).isNotNull(); assertThat(meta.creation()).isEqualToComparingFieldByField(userAndTimestamp); assertThat(project.repos().get(REPO_DOGMA) .getOrNull(Revision.HEAD, METADATA_JSON).join()).isNotNull(); assertThat(project.repos().get(REPO_META) .getOrNull(Revision.HEAD, METADATA_JSON).join()).isNull(); final Token token = mds.findTokenByAppId("app1").join(); assertThat(token).isNotNull(); assertThat(token.secret()).isEqualTo("secret1"); assertThat(token.isAdmin()).isFalse(); assertThat(token.isActive()).isTrue(); assertThat(token.creation()).isEqualToComparingFieldByField(userAndTimestamp); assertThat(pm.get(INTERNAL_PROJ).repos() .get(REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join()).isNotNull(); assertThat(pm.get(INTERNAL_PROJ).repos() .get("main") .getOrNull(Revision.HEAD, TOKEN_JSON).join()).isNull(); } | public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor); } | MigrationUtil { public static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor) { requireNonNull(projectManager, "projectManager"); requireNonNull(executor, "executor"); final RepositorySupport<ProjectMetadata> metadataRepo = new RepositorySupport<>(projectManager, executor, entry -> convertWithJackson(entry, ProjectMetadata.class)); final UserAndTimestamp userAndTimestamp = UserAndTimestamp.of(author); final Entry<?> tokenEntry = projectManager.get(INTERNAL_PROJ).repos() .get(Project.REPO_DOGMA) .getOrNull(Revision.HEAD, TOKEN_JSON).join(); final Collection<Token> migratedTokens = tokenEntry == null ? migrateTokens(projectManager, executor) : ImmutableSet.of(); migratedTokens.forEach(token -> logger.info("Token '{}' has been migrated", token.id())); final SafeProjectManager safeProjectManager = new SafeProjectManager(projectManager); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } if (!p.repos().exists(Project.REPO_META)) { return; } try { final ProjectMetadata metadata = metadataRepo.fetch(p.name(), Project.REPO_META, METADATA_JSON).join().object(); metadata.repos().put(Project.REPO_META, new RepositoryMetadata(Project.REPO_META, userAndTimestamp, PerRolePermissions.ofPublic())); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); metadataRepo.push(p.name(), Project.REPO_META, author, "Remove the old metadata file", Change.ofRemoval(METADATA_JSON)).join(); } catch (Throwable cause) { cause = Exceptions.peel(cause); if (!(cause instanceof EntryNotFoundException)) { Exceptions.throwUnsafely(cause); } } }); final UserAndTimestamp creationTime = UserAndTimestamp.of(author); final Map<String, TokenRegistration> registrations = migratedTokens.stream() .map(t -> new TokenRegistration(t.id(), ProjectRole.MEMBER, creationTime)) .collect(toMap(TokenRegistration::id, Function.identity())); safeProjectManager.list().values().forEach(p -> { if (alreadyMigrated(p)) { return; } final Map<String, RepositoryMetadata> repos = p.repos().list().values().stream() .filter(r -> !r.name().equals(Project.REPO_DOGMA)) .map(r -> new RepositoryMetadata(r.name(), userAndTimestamp, PerRolePermissions.ofPublic())) .collect(toMap(RepositoryMetadata::name, Function.identity())); final ProjectMetadata metadata = new ProjectMetadata(p.name(), repos, ImmutableMap.of(), registrations, userAndTimestamp, null); commitProjectMetadata(metadataRepo, executor, p.name(), metadata); }); } private MigrationUtil(); static synchronized void migrate(ProjectManager projectManager, CommandExecutor executor); } |
@Test void backwardCompatibility() throws Exception { final CreateProjectCommand c = (CreateProjectCommand) Jackson.readValue( '{' + " \"type\": \"CREATE_PROJECT\"," + " \"projectName\": \"foo\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); } | @JsonProperty public String projectName() { return projectName; } | CreateProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } } | CreateProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator CreateProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); } | CreateProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator CreateProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } | CreateProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator CreateProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void backwardCompatibility() throws Exception { final PurgeProjectCommand c = (PurgeProjectCommand) Jackson.readValue( '{' + " \"type\": \"PURGE_PROJECT\"," + " \"projectName\": \"foo\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); } | @JsonProperty public String projectName() { return projectName; } | PurgeProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } } | PurgeProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator PurgeProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); } | PurgeProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator PurgeProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } | PurgeProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator PurgeProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void backwardCompatibility() throws Exception { final RemoveProjectCommand c = (RemoveProjectCommand) Jackson.readValue( '{' + " \"type\": \"REMOVE_PROJECT\"," + " \"projectName\": \"foo\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); } | @JsonProperty public String projectName() { return projectName; } | RemoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } } | RemoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator RemoveProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); } | RemoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator RemoveProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } | RemoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator RemoveProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void backwardCompatibility() throws Exception { final PurgeRepositoryCommand c = (PurgeRepositoryCommand) Jackson.readValue( '{' + " \"type\": \"PURGE_REPOSITORY\"," + " \"projectName\": \"foo\"," + " \"repositoryName\": \"bar\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); assertThat(c.repositoryName()).isEqualTo("bar"); } | @JsonProperty public String repositoryName() { return repositoryName; } | PurgeRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } } | PurgeRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator PurgeRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); } | PurgeRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator PurgeRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } | PurgeRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator PurgeRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void backwardCompatibility() throws Exception { final RemoveRepositoryCommand c = (RemoveRepositoryCommand) Jackson.readValue( '{' + " \"type\": \"REMOVE_REPOSITORY\"," + " \"projectName\": \"foo\"," + " \"repositoryName\": \"bar\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); assertThat(c.repositoryName()).isEqualTo("bar"); } | @JsonProperty public String repositoryName() { return repositoryName; } | RemoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } } | RemoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator RemoveRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); } | RemoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator RemoveRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } | RemoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator RemoveRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void backwardCompatibility() throws Exception { final CreateRepositoryCommand c = (CreateRepositoryCommand) Jackson.readValue( '{' + " \"type\": \"CREATE_REPOSITORY\"," + " \"projectName\": \"foo\"," + " \"repositoryName\": \"bar\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); assertThat(c.repositoryName()).isEqualTo("bar"); } | @JsonProperty public String repositoryName() { return repositoryName; } | CreateRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } } | CreateRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator CreateRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); } | CreateRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator CreateRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } | CreateRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator CreateRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void revisionRange() { RevisionRange range = new RevisionRange(2, 4); assertThat(range.isAscending()).isTrue(); assertThat(range.isRelative()).isFalse(); assertThat(range.toAscending()).isSameAs(range); assertThat(range.toDescending()).isEqualTo(new RevisionRange(4, 2)); final Revision revisionTen = new Revision(10); range = new RevisionRange(revisionTen, INIT); assertThat(range.isAscending()).isFalse(); assertThat(range.isRelative()).isFalse(); assertThat(range.toAscending()).isEqualTo(new RevisionRange(INIT, revisionTen)); assertThat(range.toDescending()).isSameAs(range); range = new RevisionRange(revisionTen, revisionTen); assertThat(range.isAscending()).isFalse(); assertThat(range.isRelative()).isFalse(); assertThat(range.toAscending()).isSameAs(range); assertThat(range.toDescending()).isSameAs(range); final Revision revisionNegativeThree = new Revision(-3); final Revision revisionNegativeTen = new Revision(-10); range = new RevisionRange(revisionNegativeTen, revisionNegativeThree); assertThat(range.isAscending()).isTrue(); assertThat(range.isRelative()).isTrue(); assertThat(range.toAscending()).isSameAs(range); assertThat(range.toDescending()).isEqualTo( new RevisionRange(revisionNegativeThree, revisionNegativeTen)); final RevisionRange relativeRange = new RevisionRange(INIT, HEAD); assertThat(relativeRange.isRelative()).isTrue(); assertThat(relativeRange.from()).isSameAs(INIT); assertThat(relativeRange.to()).isSameAs(HEAD); assertThatThrownBy(relativeRange::isAscending) .isExactlyInstanceOf(IllegalStateException.class); assertThatThrownBy(relativeRange::toAscending) .isExactlyInstanceOf(IllegalStateException.class); assertThatThrownBy(relativeRange::toDescending) .isExactlyInstanceOf(IllegalStateException.class); } | public RevisionRange(int from, int to) { this(new Revision(from), new Revision(to)); } | RevisionRange { public RevisionRange(int from, int to) { this(new Revision(from), new Revision(to)); } } | RevisionRange { public RevisionRange(int from, int to) { this(new Revision(from), new Revision(to)); } RevisionRange(int from, int to); RevisionRange(Revision from, Revision to); } | RevisionRange { public RevisionRange(int from, int to) { this(new Revision(from), new Revision(to)); } RevisionRange(int from, int to); RevisionRange(Revision from, Revision to); Revision from(); Revision to(); RevisionRange toAscending(); RevisionRange toDescending(); boolean isAscending(); boolean isRelative(); @Override int hashCode(); @Override boolean equals(Object o); @Override String toString(); } | RevisionRange { public RevisionRange(int from, int to) { this(new Revision(from), new Revision(to)); } RevisionRange(int from, int to); RevisionRange(Revision from, Revision to); Revision from(); Revision to(); RevisionRange toAscending(); RevisionRange toDescending(); boolean isAscending(); boolean isRelative(); @Override int hashCode(); @Override boolean equals(Object o); @Override String toString(); } |
@Test void backwardCompatibility() throws Exception { final UnremoveRepositoryCommand c = (UnremoveRepositoryCommand) Jackson.readValue( '{' + " \"type\": \"UNREMOVE_REPOSITORY\"," + " \"projectName\": \"foo\"," + " \"repositoryName\": \"bar\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); assertThat(c.repositoryName()).isEqualTo("bar"); } | @JsonProperty public String repositoryName() { return repositoryName; } | UnremoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } } | UnremoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator UnremoveRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); } | UnremoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator UnremoveRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } | UnremoveRepositoryCommand extends ProjectCommand<Void> { @JsonProperty public String repositoryName() { return repositoryName; } @JsonCreator UnremoveRepositoryCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName,
@JsonProperty("repositoryName") String repositoryName); @JsonProperty String repositoryName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void backwardCompatibility() throws Exception { final UnremoveProjectCommand c = (UnremoveProjectCommand) Jackson.readValue( '{' + " \"type\": \"UNREMOVE_PROJECT\"," + " \"projectName\": \"foo\"" + '}', Command.class); assertThat(c.author()).isEqualTo(Author.SYSTEM); assertThat(c.timestamp()).isNotZero(); assertThat(c.projectName()).isEqualTo("foo"); } | @JsonProperty public String projectName() { return projectName; } | UnremoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } } | UnremoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator UnremoveProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); } | UnremoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator UnremoveProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } | UnremoveProjectCommand extends RootCommand<Void> { @JsonProperty public String projectName() { return projectName; } @JsonCreator UnremoveProjectCommand(@JsonProperty("timestamp") @Nullable Long timestamp,
@JsonProperty("author") @Nullable Author author,
@JsonProperty("projectName") String projectName); @JsonProperty String projectName(); @Override boolean equals(Object obj); @Override int hashCode(); } |
@Test void createProject() throws IOException { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse aRes = createProject(client, "myPro"); final ResponseHeaders headers = ResponseHeaders.of(aRes.headers()); assertThat(headers.status()).isEqualTo(HttpStatus.CREATED); final String location = headers.get(HttpHeaderNames.LOCATION); assertThat(location).isEqualTo("/api/v1/projects/myPro"); final JsonNode jsonNode = Jackson.readTree(aRes.contentUtf8()); assertThat(jsonNode.get("name").asText()).isEqualTo("myPro"); assertThat(jsonNode.get("createdAt").asText()).isNotNull(); } | @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } |
@Test void createProjectWithSameName() { final WebClient client = dogma.httpClient(); createProject(client, "myNewPro"); final AggregatedHttpResponse res = createProject(client, "myNewPro"); assertThat(ResponseHeaders.of(res.headers()).status()).isEqualTo(HttpStatus.CONFLICT); final String expectedJson = '{' + " \"exception\": \"" + ProjectExistsException.class.getName() + "\"," + " \"message\": \"Project 'myNewPro' exists already.\"" + '}'; assertThatJson(res.contentUtf8()).isEqualTo(expectedJson); } | @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } |
@Test void removeProject() { final WebClient client = dogma.httpClient(); createProject(client, "foo"); final AggregatedHttpResponse aRes = client.delete(PROJECTS_PREFIX + "/foo") .aggregate().join(); final ResponseHeaders headers = ResponseHeaders.of(aRes.headers()); assertThat(ResponseHeaders.of(headers).status()).isEqualTo(HttpStatus.NO_CONTENT); } | @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeProject(Project project, Author author) { return mds.removeProject(author, project.name()) .thenCompose(unused -> execute(Command.removeProject(author, project.name()))) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeProject(Project project, Author author) { return mds.removeProject(author, project.name()) .thenCompose(unused -> execute(Command.removeProject(author, project.name()))) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeProject(Project project, Author author) { return mds.removeProject(author, project.name()) .thenCompose(unused -> execute(Command.removeProject(author, project.name()))) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeProject(Project project, Author author) { return mds.removeProject(author, project.name()) .thenCompose(unused -> execute(Command.removeProject(author, project.name()))) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeProject(Project project, Author author) { return mds.removeProject(author, project.name()) .thenCompose(unused -> execute(Command.removeProject(author, project.name()))) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } |
@Test void purgeProject() { removeProject(); final WebClient client = dogma.httpClient(); final AggregatedHttpResponse aRes = client.delete(PROJECTS_PREFIX + "/foo/removed") .aggregate().join(); final ResponseHeaders headers = ResponseHeaders.of(aRes.headers()); assertThat(ResponseHeaders.of(headers).status()).isEqualTo(HttpStatus.NO_CONTENT); } | @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> purgeProject(@Param String projectName, Author author) { return execute(Command.purgeProject(author, projectName)) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> purgeProject(@Param String projectName, Author author) { return execute(Command.purgeProject(author, projectName)) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> purgeProject(@Param String projectName, Author author) { return execute(Command.purgeProject(author, projectName)) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> purgeProject(@Param String projectName, Author author) { return execute(Command.purgeProject(author, projectName)) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } | ProjectServiceV1 extends AbstractService { @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> purgeProject(@Param String projectName, Author author) { return execute(Command.purgeProject(author, projectName)) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } |
@Test void unremoveProject() { final WebClient client = dogma.httpClient(); createProject(client, "bar"); final String projectPath = PROJECTS_PREFIX + "/bar"; client.delete(projectPath).aggregate().join(); final RequestHeaders headers = RequestHeaders.of(HttpMethod.PATCH, projectPath, HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH); final String unremovePatch = "[{\"op\":\"replace\",\"path\":\"/status\",\"value\":\"active\"}]"; final AggregatedHttpResponse aRes = client.execute(headers, unremovePatch).aggregate().join(); assertThat(ResponseHeaders.of(aRes.headers()).status()).isEqualTo(HttpStatus.OK); final String expectedJson = '{' + " \"name\": \"bar\"," + " \"creator\": {" + " \"name\": \"System\"," + " \"email\": \"[email protected]\"" + " }," + " \"url\": \"/api/v1/projects/bar\"," + " \"createdAt\": \"${json-unit.ignore}\"" + '}'; assertThatJson(aRes.contentUtf8()).isEqualTo(expectedJson); } | @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } | ProjectServiceV1 extends AbstractService { @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) public CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author) { return execute(Command.createProject(author, request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(projectManager().get(request.name())))); } ProjectServiceV1(ProjectManager projectManager, CommandExecutor executor, MetadataService mds); @Get("/projects") CompletableFuture<List<ProjectDto>> listProjects(@Param @Nullable String status); @Post("/projects") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) CompletableFuture<ProjectDto> createProject(CreateProjectRequest request, Author author); @Get("/projects/{projectName}") @RequiresRole(roles = { ProjectRole.OWNER, ProjectRole.MEMBER }) CompletableFuture<ProjectMetadata> getProjectMetadata(
@Param String projectName,
@Param("checkPermissionOnly") @Default("false") boolean isCheckPermissionOnly); @Delete("/projects/{projectName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeProject(Project project, Author author); @Delete("/projects/{projectName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeProject(@Param String projectName, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}") @RequiresAdministrator CompletableFuture<ProjectDto> patchProject(@Param String projectName, JsonNode node, Author author); } |
@Test void status() { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse res = client.get(API_V1_PATH_PREFIX + "status").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.OK); assertThatJson(res.contentUtf8()).isEqualTo( "{ \"writable\": true, \"replicating\": true }"); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void updateStatus_setUnwritable() { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse res = client.execute( RequestHeaders.of(HttpMethod.PATCH, API_V1_PATH_PREFIX + "status", HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH), "[{ \"op\": \"replace\", \"path\": \"/writable\", \"value\": false }]").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.OK); assertThatJson(res.contentUtf8()).isEqualTo( "{ \"writable\": false, \"replicating\": true }"); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void updateStatus_setUnwritableAndNonReplicating() { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse res = client.execute( RequestHeaders.of(HttpMethod.PATCH, API_V1_PATH_PREFIX + "status", HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH), "[{ \"op\": \"replace\", \"path\": \"/writable\", \"value\": false }," + " { \"op\": \"replace\", \"path\": \"/replicating\", \"value\": false }]").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.OK); assertThatJson(res.contentUtf8()).isEqualTo( "{ \"writable\": false, \"replicating\": false }"); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void removingRootReturnsMissingNode() { final JsonNode node = JsonNodeFactory.instance.nullNode(); final JsonPatchOperation op = new RemoveOperation(EMPTY_JSON_POINTER); final JsonNode ret = op.apply(node); assertThat(ret.isMissingNode()).isTrue(); } | @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } ensureExistence(node); final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } | RemoveOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } ensureExistence(node); final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } } | RemoveOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } ensureExistence(node); final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } @JsonCreator RemoveOperation(@JsonProperty("path") final JsonPointer path); } | RemoveOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } ensureExistence(node); final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } @JsonCreator RemoveOperation(@JsonProperty("path") final JsonPointer path); @Override void serialize(final JsonGenerator jgen,
final SerializerProvider provider); @Override void serializeWithType(final JsonGenerator jgen,
final SerializerProvider provider, final TypeSerializer typeSer); @Override String toString(); } | RemoveOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } ensureExistence(node); final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } @JsonCreator RemoveOperation(@JsonProperty("path") final JsonPointer path); @Override void serialize(final JsonGenerator jgen,
final SerializerProvider provider); @Override void serializeWithType(final JsonGenerator jgen,
final SerializerProvider provider, final TypeSerializer typeSer); @Override String toString(); } |
@Test void updateStatus_setWritableAndNonReplicating() { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse res = client.execute( RequestHeaders.of(HttpMethod.PATCH, API_V1_PATH_PREFIX + "status", HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH), "[{ \"op\": \"replace\", \"path\": \"/writable\", \"value\": true }," + " { \"op\": \"replace\", \"path\": \"/replicating\", \"value\": false }]").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.BAD_REQUEST); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void redundantUpdateStatus_Writable() { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse res = client.execute( RequestHeaders.of(HttpMethod.PATCH, API_V1_PATH_PREFIX + "status", HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH), "[{ \"op\": \"replace\", \"path\": \"/writable\", \"value\": true }]").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.NOT_MODIFIED); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void redundantUpdateStatus_Replicating() { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse res = client.execute( RequestHeaders.of(HttpMethod.PATCH, API_V1_PATH_PREFIX + "status", HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH), "[{ \"op\": \"replace\", \"path\": \"/replicating\", \"value\": true }]").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.NOT_MODIFIED); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void updateStatus_leaveReadOnlyMode() { final WebClient client = dogma.httpClient(); updateStatus_setUnwritable(); final AggregatedHttpResponse res = client.execute( RequestHeaders.of(HttpMethod.PATCH, API_V1_PATH_PREFIX + "status", HttpHeaderNames.CONTENT_TYPE, MediaType.JSON_PATCH), "[{ \"op\": \"replace\", \"path\": \"/writable\", \"value\": true }]").aggregate().join(); assertThat(res.status()).isEqualTo(HttpStatus.OK); assertThatJson(res.contentUtf8()).isEqualTo( "{ \"writable\": true, \"replicating\": true }"); } | @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } | AdministrativeService extends AbstractService { @Get("/status") public ServerStatus status() { return new ServerStatus(executor().isWritable(), executor().isStarted()); } AdministrativeService(ProjectManager projectManager, CommandExecutor executor); @Get("/status") ServerStatus status(); @Patch("/status") @Consumes("application/json-patch+json") @RequiresAdministrator CompletableFuture<ServerStatus> updateStatus(ServiceRequestContext ctx,
JsonNode patch); } |
@Test void createRepository() throws IOException { final WebClient client = dogma.httpClient(); final AggregatedHttpResponse aRes = createRepository(client, "myRepo"); final ResponseHeaders headers = ResponseHeaders.of(aRes.headers()); assertThat(headers.status()).isEqualTo(HttpStatus.CREATED); final String location = headers.get(HttpHeaderNames.LOCATION); assertThat(location).isEqualTo("/api/v1/projects/myPro/repos/myRepo"); final JsonNode jsonNode = Jackson.readTree(aRes.contentUtf8()); assertThat(jsonNode.get("name").asText()).isEqualTo("myRepo"); assertThat(jsonNode.get("headRevision").asInt()).isOne(); assertThat(jsonNode.get("createdAt").asText()).isNotNull(); } | @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); @Get("/projects/{projectName}/repos") CompletableFuture<List<RepositoryDto>> listRepositories(ServiceRequestContext ctx, Project project,
@Param @Nullable String status, User user); @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project,
CreateRepositoryRequest request,
Author author); @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeRepository(ServiceRequestContext ctx,
@Param String repoName,
Repository repository,
Author author); @Delete("/projects/{projectName}/repos/{repoName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeRepository(@Param String repoName,
Project project, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> patchRepository(@Param String repoName,
Project project,
JsonNode node,
Author author); @Get("/projects/{projectName}/repos/{repoName}/revision/{revision}") @RequiresReadPermission Map<String, Integer> normalizeRevision(Repository repository, @Param String revision); } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); @Get("/projects/{projectName}/repos") CompletableFuture<List<RepositoryDto>> listRepositories(ServiceRequestContext ctx, Project project,
@Param @Nullable String status, User user); @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project,
CreateRepositoryRequest request,
Author author); @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeRepository(ServiceRequestContext ctx,
@Param String repoName,
Repository repository,
Author author); @Delete("/projects/{projectName}/repos/{repoName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeRepository(@Param String repoName,
Project project, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> patchRepository(@Param String repoName,
Project project,
JsonNode node,
Author author); @Get("/projects/{projectName}/repos/{repoName}/revision/{revision}") @RequiresReadPermission Map<String, Integer> normalizeRevision(Repository repository, @Param String revision); } |
@Test void createRepositoryWithSameName() { final WebClient client = dogma.httpClient(); createRepository(client, "myNewRepo"); final AggregatedHttpResponse aRes = createRepository(client, "myNewRepo"); assertThat(ResponseHeaders.of(aRes.headers()).status()).isEqualTo(HttpStatus.CONFLICT); final String expectedJson = '{' + " \"exception\": \"" + RepositoryExistsException.class.getName() + "\"," + " \"message\": \"Repository 'myPro/myNewRepo' exists already.\"" + '}'; assertThatJson(aRes.contentUtf8()).isEqualTo(expectedJson); } | @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); @Get("/projects/{projectName}/repos") CompletableFuture<List<RepositoryDto>> listRepositories(ServiceRequestContext ctx, Project project,
@Param @Nullable String status, User user); @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project,
CreateRepositoryRequest request,
Author author); @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeRepository(ServiceRequestContext ctx,
@Param String repoName,
Repository repository,
Author author); @Delete("/projects/{projectName}/repos/{repoName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeRepository(@Param String repoName,
Project project, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> patchRepository(@Param String repoName,
Project project,
JsonNode node,
Author author); @Get("/projects/{projectName}/repos/{repoName}/revision/{revision}") @RequiresReadPermission Map<String, Integer> normalizeRevision(Repository repository, @Param String revision); } | RepositoryServiceV1 extends AbstractService { @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project, CreateRepositoryRequest request, Author author) { if (Project.isReservedRepoName(request.name())) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be created."); } return execute(Command.createRepository(author, project.name(), request.name())) .thenCompose(unused -> mds.addRepo(author, project.name(), request.name())) .handle(returnOrThrow(() -> DtoConverter.convert(project.repos().get(request.name())))); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); @Get("/projects/{projectName}/repos") CompletableFuture<List<RepositoryDto>> listRepositories(ServiceRequestContext ctx, Project project,
@Param @Nullable String status, User user); @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project,
CreateRepositoryRequest request,
Author author); @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeRepository(ServiceRequestContext ctx,
@Param String repoName,
Repository repository,
Author author); @Delete("/projects/{projectName}/repos/{repoName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeRepository(@Param String repoName,
Project project, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> patchRepository(@Param String repoName,
Project project,
JsonNode node,
Author author); @Get("/projects/{projectName}/repos/{repoName}/revision/{revision}") @RequiresReadPermission Map<String, Integer> normalizeRevision(Repository repository, @Param String revision); } |
@Test void removeRepository() { final WebClient client = dogma.httpClient(); createRepository(client,"foo"); final AggregatedHttpResponse aRes = client.delete(REPOS_PREFIX + "/foo").aggregate().join(); assertThat(ResponseHeaders.of(aRes.headers()).status()).isEqualTo(HttpStatus.NO_CONTENT); } | @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeRepository(ServiceRequestContext ctx, @Param String repoName, Repository repository, Author author) { if (Project.isReservedRepoName(repoName)) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be removed."); } return execute(Command.removeRepository(author, repository.parent().name(), repository.name())) .thenCompose(unused -> mds.removeRepo(author, repository.parent().name(), repository.name())) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } | RepositoryServiceV1 extends AbstractService { @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeRepository(ServiceRequestContext ctx, @Param String repoName, Repository repository, Author author) { if (Project.isReservedRepoName(repoName)) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be removed."); } return execute(Command.removeRepository(author, repository.parent().name(), repository.name())) .thenCompose(unused -> mds.removeRepo(author, repository.parent().name(), repository.name())) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } } | RepositoryServiceV1 extends AbstractService { @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeRepository(ServiceRequestContext ctx, @Param String repoName, Repository repository, Author author) { if (Project.isReservedRepoName(repoName)) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be removed."); } return execute(Command.removeRepository(author, repository.parent().name(), repository.name())) .thenCompose(unused -> mds.removeRepo(author, repository.parent().name(), repository.name())) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); } | RepositoryServiceV1 extends AbstractService { @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeRepository(ServiceRequestContext ctx, @Param String repoName, Repository repository, Author author) { if (Project.isReservedRepoName(repoName)) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be removed."); } return execute(Command.removeRepository(author, repository.parent().name(), repository.name())) .thenCompose(unused -> mds.removeRepo(author, repository.parent().name(), repository.name())) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); @Get("/projects/{projectName}/repos") CompletableFuture<List<RepositoryDto>> listRepositories(ServiceRequestContext ctx, Project project,
@Param @Nullable String status, User user); @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project,
CreateRepositoryRequest request,
Author author); @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeRepository(ServiceRequestContext ctx,
@Param String repoName,
Repository repository,
Author author); @Delete("/projects/{projectName}/repos/{repoName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeRepository(@Param String repoName,
Project project, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> patchRepository(@Param String repoName,
Project project,
JsonNode node,
Author author); @Get("/projects/{projectName}/repos/{repoName}/revision/{revision}") @RequiresReadPermission Map<String, Integer> normalizeRevision(Repository repository, @Param String revision); } | RepositoryServiceV1 extends AbstractService { @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) public CompletableFuture<Void> removeRepository(ServiceRequestContext ctx, @Param String repoName, Repository repository, Author author) { if (Project.isReservedRepoName(repoName)) { return HttpApiUtil.throwResponse(ctx, HttpStatus.FORBIDDEN, "A reserved repository cannot be removed."); } return execute(Command.removeRepository(author, repository.parent().name(), repository.name())) .thenCompose(unused -> mds.removeRepo(author, repository.parent().name(), repository.name())) .handle(HttpApiUtil::throwUnsafelyIfNonNull); } RepositoryServiceV1(ProjectManager projectManager, CommandExecutor executor,
MetadataService mds); @Get("/projects/{projectName}/repos") CompletableFuture<List<RepositoryDto>> listRepositories(ServiceRequestContext ctx, Project project,
@Param @Nullable String status, User user); @Post("/projects/{projectName}/repos") @StatusCode(201) @ResponseConverter(CreateApiResponseConverter.class) @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> createRepository(ServiceRequestContext ctx, Project project,
CreateRepositoryRequest request,
Author author); @Delete("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> removeRepository(ServiceRequestContext ctx,
@Param String repoName,
Repository repository,
Author author); @Delete("/projects/{projectName}/repos/{repoName}/removed") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<Void> purgeRepository(@Param String repoName,
Project project, Author author); @Consumes("application/json-patch+json") @Patch("/projects/{projectName}/repos/{repoName}") @RequiresRole(roles = ProjectRole.OWNER) CompletableFuture<RepositoryDto> patchRepository(@Param String repoName,
Project project,
JsonNode node,
Author author); @Get("/projects/{projectName}/repos/{repoName}/revision/{revision}") @RequiresReadPermission Map<String, Integer> normalizeRevision(Repository repository, @Param String revision); } |
@Test void convert() throws Exception { final ServiceRequestContext ctx = mock(ServiceRequestContext.class); final String queryString = "path=/foo.json" + '&' + "pa%22th=/foo1.json" + '&' + "optional_path=/foo2.json" + '&' + "path=/foo3.json" + '&' + "jsonpath=$.a" + '&' + "revision=9999"; when(ctx.query()).thenReturn(queryString); @SuppressWarnings("unchecked") final MergeQuery<JsonNode> mergeQuery = (MergeQuery<JsonNode>) converter.convertRequest( ctx, mock(AggregatedHttpRequest.class), null, null); assertThat(mergeQuery).isEqualTo( MergeQuery.ofJsonPath( ImmutableList.of(MergeSource.ofRequired("/foo.json"), MergeSource.ofOptional("/foo2.json"), MergeSource.ofRequired("/foo3.json")), ImmutableList.of("$.a"))); } | @Override public MergeQuery<?> convertRequest( ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType, @Nullable ParameterizedType expectedParameterizedResultType) throws Exception { final String queryString = ctx.query(); if (queryString != null) { final String decodedString = QueryStringDecoder.decodeComponent(queryString); final Iterable<String> queries = querySplitter.split(decodedString); final Builder<MergeSource> mergeSourceBuilder = ImmutableList.builder(); final Builder<String> jsonPathsBuilder = ImmutableList.builder(); for (String query : queries) { final int index = query.indexOf('='); if (index < 0) { continue; } final String key = query.substring(0, index); final String value = query.substring(index + 1); switch (key) { case "path": mergeSourceBuilder.add(MergeSource.ofRequired(value)); break; case "optional_path": mergeSourceBuilder.add(MergeSource.ofOptional(value)); break; case "jsonpath": jsonPathsBuilder.add(value); break; } } return MergeQuery.ofJsonPath(mergeSourceBuilder.build(), jsonPathsBuilder.build()); } return RequestConverterFunction.fallthrough(); } | MergeQueryRequestConverter implements RequestConverterFunction { @Override public MergeQuery<?> convertRequest( ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType, @Nullable ParameterizedType expectedParameterizedResultType) throws Exception { final String queryString = ctx.query(); if (queryString != null) { final String decodedString = QueryStringDecoder.decodeComponent(queryString); final Iterable<String> queries = querySplitter.split(decodedString); final Builder<MergeSource> mergeSourceBuilder = ImmutableList.builder(); final Builder<String> jsonPathsBuilder = ImmutableList.builder(); for (String query : queries) { final int index = query.indexOf('='); if (index < 0) { continue; } final String key = query.substring(0, index); final String value = query.substring(index + 1); switch (key) { case "path": mergeSourceBuilder.add(MergeSource.ofRequired(value)); break; case "optional_path": mergeSourceBuilder.add(MergeSource.ofOptional(value)); break; case "jsonpath": jsonPathsBuilder.add(value); break; } } return MergeQuery.ofJsonPath(mergeSourceBuilder.build(), jsonPathsBuilder.build()); } return RequestConverterFunction.fallthrough(); } } | MergeQueryRequestConverter implements RequestConverterFunction { @Override public MergeQuery<?> convertRequest( ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType, @Nullable ParameterizedType expectedParameterizedResultType) throws Exception { final String queryString = ctx.query(); if (queryString != null) { final String decodedString = QueryStringDecoder.decodeComponent(queryString); final Iterable<String> queries = querySplitter.split(decodedString); final Builder<MergeSource> mergeSourceBuilder = ImmutableList.builder(); final Builder<String> jsonPathsBuilder = ImmutableList.builder(); for (String query : queries) { final int index = query.indexOf('='); if (index < 0) { continue; } final String key = query.substring(0, index); final String value = query.substring(index + 1); switch (key) { case "path": mergeSourceBuilder.add(MergeSource.ofRequired(value)); break; case "optional_path": mergeSourceBuilder.add(MergeSource.ofOptional(value)); break; case "jsonpath": jsonPathsBuilder.add(value); break; } } return MergeQuery.ofJsonPath(mergeSourceBuilder.build(), jsonPathsBuilder.build()); } return RequestConverterFunction.fallthrough(); } } | MergeQueryRequestConverter implements RequestConverterFunction { @Override public MergeQuery<?> convertRequest( ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType, @Nullable ParameterizedType expectedParameterizedResultType) throws Exception { final String queryString = ctx.query(); if (queryString != null) { final String decodedString = QueryStringDecoder.decodeComponent(queryString); final Iterable<String> queries = querySplitter.split(decodedString); final Builder<MergeSource> mergeSourceBuilder = ImmutableList.builder(); final Builder<String> jsonPathsBuilder = ImmutableList.builder(); for (String query : queries) { final int index = query.indexOf('='); if (index < 0) { continue; } final String key = query.substring(0, index); final String value = query.substring(index + 1); switch (key) { case "path": mergeSourceBuilder.add(MergeSource.ofRequired(value)); break; case "optional_path": mergeSourceBuilder.add(MergeSource.ofOptional(value)); break; case "jsonpath": jsonPathsBuilder.add(value); break; } } return MergeQuery.ofJsonPath(mergeSourceBuilder.build(), jsonPathsBuilder.build()); } return RequestConverterFunction.fallthrough(); } @Override MergeQuery<?> convertRequest(
ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType,
@Nullable ParameterizedType expectedParameterizedResultType); } | MergeQueryRequestConverter implements RequestConverterFunction { @Override public MergeQuery<?> convertRequest( ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType, @Nullable ParameterizedType expectedParameterizedResultType) throws Exception { final String queryString = ctx.query(); if (queryString != null) { final String decodedString = QueryStringDecoder.decodeComponent(queryString); final Iterable<String> queries = querySplitter.split(decodedString); final Builder<MergeSource> mergeSourceBuilder = ImmutableList.builder(); final Builder<String> jsonPathsBuilder = ImmutableList.builder(); for (String query : queries) { final int index = query.indexOf('='); if (index < 0) { continue; } final String key = query.substring(0, index); final String value = query.substring(index + 1); switch (key) { case "path": mergeSourceBuilder.add(MergeSource.ofRequired(value)); break; case "optional_path": mergeSourceBuilder.add(MergeSource.ofOptional(value)); break; case "jsonpath": jsonPathsBuilder.add(value); break; } } return MergeQuery.ofJsonPath(mergeSourceBuilder.build(), jsonPathsBuilder.build()); } return RequestConverterFunction.fallthrough(); } @Override MergeQuery<?> convertRequest(
ServiceRequestContext ctx, AggregatedHttpRequest request, Class<?> expectedResultType,
@Nullable ParameterizedType expectedParameterizedResultType); } |
@Test void testLogWatch() throws Exception { final List<Replica> cluster = buildCluster(5, true , ZooKeeperCommandExecutorTest::newMockDelegate); final Replica replica1 = cluster.get(0); final Replica replica2 = cluster.get(1); final Replica replica3 = cluster.get(2); final Replica replica4 = cluster.get(3); replica4.rm.stop().join(); try { final Command<Void> command1 = Command.createRepository(Author.SYSTEM, "project", "repo1"); replica1.rm.execute(command1).join(); final Optional<ReplicationLog<?>> commandResult2 = replica1.rm.loadLog(0, false); assertThat(commandResult2).isPresent(); assertThat(commandResult2.get().command()).isEqualTo(command1); assertThat(commandResult2.get().result()).isNull(); await().untilAsserted(() -> verify(replica1.delegate).apply(eq(command1))); await().untilAsserted(() -> verify(replica2.delegate).apply(eq(command1))); await().untilAsserted(() -> verify(replica3.delegate).apply(eq(command1))); await().until(replica1::existsLocalRevision); await().until(replica2::existsLocalRevision); await().until(replica3::existsLocalRevision); assertThat(replica1.localRevision()).isEqualTo(0L); assertThat(replica2.localRevision()).isEqualTo(0L); assertThat(replica3.localRevision()).isEqualTo(0L); replica3.rm.stop().join(); final Command<?> command2 = Command.createProject(Author.SYSTEM, "foo"); replica1.rm.execute(command2).join(); await().untilAsserted(() -> verify(replica1.delegate).apply(eq(command2))); await().untilAsserted(() -> verify(replica2.delegate).apply(eq(command2))); await().untilAsserted(() -> verify(replica3.delegate, times(0)).apply(eq(command2))); replica3.rm.start().join(); verifyTwoIndependentCommands(replica3, command1, command2); replica4.rm.start().join(); verifyTwoIndependentCommands(replica4, command1, command2); } finally { for (Replica r : cluster) { r.rm.stop(); } } } | @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } ZooKeeperCommandExecutor(ZooKeeperReplicationConfig cfg,
File dataDir, CommandExecutor delegate,
MeterRegistry meterRegistry,
@Nullable Consumer<CommandExecutor> onTakeLeadership,
@Nullable Consumer<CommandExecutor> onReleaseLeadership); } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } ZooKeeperCommandExecutor(ZooKeeperReplicationConfig cfg,
File dataDir, CommandExecutor delegate,
MeterRegistry meterRegistry,
@Nullable Consumer<CommandExecutor> onTakeLeadership,
@Nullable Consumer<CommandExecutor> onReleaseLeadership); @Override int replicaId(); @Override void childEvent(CuratorFramework unused, PathChildrenCacheEvent event); } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } ZooKeeperCommandExecutor(ZooKeeperReplicationConfig cfg,
File dataDir, CommandExecutor delegate,
MeterRegistry meterRegistry,
@Nullable Consumer<CommandExecutor> onTakeLeadership,
@Nullable Consumer<CommandExecutor> onReleaseLeadership); @Override int replicaId(); @Override void childEvent(CuratorFramework unused, PathChildrenCacheEvent event); } |
@Test void testRace() throws Exception { final List<Replica> replicas = buildCluster(NUM_REPLICAS, true , () -> { final AtomicInteger counter = new AtomicInteger(); return command -> completedFuture(new Revision(counter.incrementAndGet())); }); try { final Command<Revision> command = Command.push(Author.SYSTEM, "foo", "bar", Revision.HEAD, "", "", Markup.PLAINTEXT); final int COMMANDS_PER_REPLICA = 7; final List<CompletableFuture<Void>> futures = new ArrayList<>(); for (final Replica r : replicas) { futures.add(CompletableFuture.runAsync(() -> { for (int j = 0; j < COMMANDS_PER_REPLICA; j++) { try { r.rm.execute(command).join(); } catch (Exception e) { throw new Error(e); } } })); } for (CompletableFuture<Void> f : futures) { f.get(); } for (Replica r : replicas) { for (int i = 0; i < COMMANDS_PER_REPLICA * replicas.size(); i++) { @SuppressWarnings("unchecked") final ReplicationLog<Revision> log = (ReplicationLog<Revision>) r.rm.loadLog(i, false).get(); assertThat(log.result().major()).isEqualTo(i + 1); } } } finally { replicas.forEach(r -> r.rm.stop()); } } | @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } ZooKeeperCommandExecutor(ZooKeeperReplicationConfig cfg,
File dataDir, CommandExecutor delegate,
MeterRegistry meterRegistry,
@Nullable Consumer<CommandExecutor> onTakeLeadership,
@Nullable Consumer<CommandExecutor> onReleaseLeadership); } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } ZooKeeperCommandExecutor(ZooKeeperReplicationConfig cfg,
File dataDir, CommandExecutor delegate,
MeterRegistry meterRegistry,
@Nullable Consumer<CommandExecutor> onTakeLeadership,
@Nullable Consumer<CommandExecutor> onReleaseLeadership); @Override int replicaId(); @Override void childEvent(CuratorFramework unused, PathChildrenCacheEvent event); } | ZooKeeperCommandExecutor extends AbstractCommandExecutor implements PathChildrenCacheListener { @VisibleForTesting Optional<ReplicationLog<?>> loadLog(long revision, boolean skipIfSameReplica) { try { createParentNodes(); final String logPath = absolutePath(LOG_PATH) + '/' + pathFromRevision(revision); final LogMeta logMeta = Jackson.readValue(curator.getData().forPath(logPath), LogMeta.class); if (skipIfSameReplica && replicaId() == logMeta.replicaId()) { return Optional.empty(); } final byte[] bytes = new byte[logMeta.size()]; int offset = 0; for (long blockId : logMeta.blocks()) { final String blockPath = absolutePath(LOG_BLOCK_PATH) + '/' + pathFromRevision(blockId); final byte[] b = curator.getData().forPath(blockPath); System.arraycopy(b, 0, bytes, offset, b.length); offset += b.length; } assert logMeta.size() == offset; final ReplicationLog<?> log = Jackson.readValue(bytes, ReplicationLog.class); return Optional.of(log); } catch (Exception e) { logger.error("Failed to load a log at revision {}; entering read-only mode", revision, e); stopLater(); throw new ReplicationException("failed to load a log at revision " + revision, e); } } ZooKeeperCommandExecutor(ZooKeeperReplicationConfig cfg,
File dataDir, CommandExecutor delegate,
MeterRegistry meterRegistry,
@Nullable Consumer<CommandExecutor> onTakeLeadership,
@Nullable Consumer<CommandExecutor> onReleaseLeadership); @Override int replicaId(); @Override void childEvent(CuratorFramework unused, PathChildrenCacheEvent event); } |
@Test void removingRootReturnsMissingNode() { final JsonNode node = JsonNodeFactory.instance.nullNode(); final JsonPatchOperation op = new RemoveIfExistsOperation(EMPTY_JSON_POINTER); final JsonNode ret = op.apply(node); assertThat(ret.isMissingNode()).isTrue(); } | @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } final JsonNode found = node.at(path); if (found.isMissingNode()) { return node; } final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else if (parentNode.isArray()) { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } | RemoveIfExistsOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } final JsonNode found = node.at(path); if (found.isMissingNode()) { return node; } final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else if (parentNode.isArray()) { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } } | RemoveIfExistsOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } final JsonNode found = node.at(path); if (found.isMissingNode()) { return node; } final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else if (parentNode.isArray()) { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } @JsonCreator RemoveIfExistsOperation(@JsonProperty("path") final JsonPointer path); } | RemoveIfExistsOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } final JsonNode found = node.at(path); if (found.isMissingNode()) { return node; } final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else if (parentNode.isArray()) { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } @JsonCreator RemoveIfExistsOperation(@JsonProperty("path") final JsonPointer path); @Override void serialize(final JsonGenerator jgen,
final SerializerProvider provider); @Override void serializeWithType(final JsonGenerator jgen,
final SerializerProvider provider, final TypeSerializer typeSer); @Override String toString(); } | RemoveIfExistsOperation extends JsonPatchOperation { @Override JsonNode apply(final JsonNode node) { if (path.toString().isEmpty()) { return MissingNode.getInstance(); } final JsonNode found = node.at(path); if (found.isMissingNode()) { return node; } final JsonNode parentNode = node.at(path.head()); final String raw = path.last().getMatchingProperty(); if (parentNode.isObject()) { ((ObjectNode) parentNode).remove(raw); } else if (parentNode.isArray()) { ((ArrayNode) parentNode).remove(Integer.parseInt(raw)); } return node; } @JsonCreator RemoveIfExistsOperation(@JsonProperty("path") final JsonPointer path); @Override void serialize(final JsonGenerator jgen,
final SerializerProvider provider); @Override void serializeWithType(final JsonGenerator jgen,
final SerializerProvider provider, final TypeSerializer typeSer); @Override String toString(); } |
@Test void testSchedule() throws InterruptedException { Thread.sleep(10); service.purgeProjectAndRepository(manager.executor(), metadataService); verify(manager.executor()).execute(isA(PurgeProjectCommand.class)); verify(manager.executor()).execute(isA(PurgeRepositoryCommand.class)); } | @VisibleForTesting void purgeProjectAndRepository(CommandExecutor commandExecutor, MetadataService metadataService) { final long minAllowedTimestamp = System.currentTimeMillis() - maxRemovedRepositoryAgeMillis; final Predicate<Instant> olderThanMinAllowed = removedAt -> removedAt.toEpochMilli() < minAllowedTimestamp; purgeProject(commandExecutor, olderThanMinAllowed); purgeRepository(commandExecutor, metadataService, olderThanMinAllowed); } | PurgeSchedulingService { @VisibleForTesting void purgeProjectAndRepository(CommandExecutor commandExecutor, MetadataService metadataService) { final long minAllowedTimestamp = System.currentTimeMillis() - maxRemovedRepositoryAgeMillis; final Predicate<Instant> olderThanMinAllowed = removedAt -> removedAt.toEpochMilli() < minAllowedTimestamp; purgeProject(commandExecutor, olderThanMinAllowed); purgeRepository(commandExecutor, metadataService, olderThanMinAllowed); } } | PurgeSchedulingService { @VisibleForTesting void purgeProjectAndRepository(CommandExecutor commandExecutor, MetadataService metadataService) { final long minAllowedTimestamp = System.currentTimeMillis() - maxRemovedRepositoryAgeMillis; final Predicate<Instant> olderThanMinAllowed = removedAt -> removedAt.toEpochMilli() < minAllowedTimestamp; purgeProject(commandExecutor, olderThanMinAllowed); purgeRepository(commandExecutor, metadataService, olderThanMinAllowed); } PurgeSchedulingService(ProjectManager projectManager, ScheduledExecutorService purgeWorker,
long maxRemovedRepositoryAgeMillis); } | PurgeSchedulingService { @VisibleForTesting void purgeProjectAndRepository(CommandExecutor commandExecutor, MetadataService metadataService) { final long minAllowedTimestamp = System.currentTimeMillis() - maxRemovedRepositoryAgeMillis; final Predicate<Instant> olderThanMinAllowed = removedAt -> removedAt.toEpochMilli() < minAllowedTimestamp; purgeProject(commandExecutor, olderThanMinAllowed); purgeRepository(commandExecutor, metadataService, olderThanMinAllowed); } PurgeSchedulingService(ProjectManager projectManager, ScheduledExecutorService purgeWorker,
long maxRemovedRepositoryAgeMillis); void start(CommandExecutor commandExecutor,
MetadataService metadataService); boolean isStarted(); void stop(); } | PurgeSchedulingService { @VisibleForTesting void purgeProjectAndRepository(CommandExecutor commandExecutor, MetadataService metadataService) { final long minAllowedTimestamp = System.currentTimeMillis() - maxRemovedRepositoryAgeMillis; final Predicate<Instant> olderThanMinAllowed = removedAt -> removedAt.toEpochMilli() < minAllowedTimestamp; purgeProject(commandExecutor, olderThanMinAllowed); purgeRepository(commandExecutor, metadataService, olderThanMinAllowed); } PurgeSchedulingService(ProjectManager projectManager, ScheduledExecutorService purgeWorker,
long maxRemovedRepositoryAgeMillis); void start(CommandExecutor commandExecutor,
MetadataService metadataService); boolean isStarted(); void stop(); } |
@Test void create(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); final Repository repo = m.create(name, Author.SYSTEM); assertThat(repo).isInstanceOf(RepositoryWrapper.class); assertThatThrownBy(() -> m.create(name, Author.SYSTEM)).isInstanceOf(RepositoryExistsException.class); } | @Override public Repository create(String name, long creationTimeMillis, Author author) { return repos.compute( name, (n, v) -> repoWrapper.apply(delegate.create(name, creationTimeMillis, author))); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository create(String name, long creationTimeMillis, Author author) { return repos.compute( name, (n, v) -> repoWrapper.apply(delegate.create(name, creationTimeMillis, author))); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository create(String name, long creationTimeMillis, Author author) { return repos.compute( name, (n, v) -> repoWrapper.apply(delegate.create(name, creationTimeMillis, author))); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository create(String name, long creationTimeMillis, Author author) { return repos.compute( name, (n, v) -> repoWrapper.apply(delegate.create(name, creationTimeMillis, author))); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository create(String name, long creationTimeMillis, Author author) { return repos.compute( name, (n, v) -> repoWrapper.apply(delegate.create(name, creationTimeMillis, author))); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void get(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); final Repository repo = m.create(name, Author.SYSTEM); final Repository repo2 = m.get(name); assertThat(repo).isSameAs(repo2); } | @Override public Repository get(String name) { ensureOpen(); final Repository r = repos.get(name); if (r == null) { throw new RepositoryNotFoundException(name); } return r; } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository get(String name) { ensureOpen(); final Repository r = repos.get(name); if (r == null) { throw new RepositoryNotFoundException(name); } return r; } } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository get(String name) { ensureOpen(); final Repository r = repos.get(name); if (r == null) { throw new RepositoryNotFoundException(name); } return r; } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository get(String name) { ensureOpen(); final Repository r = repos.get(name); if (r == null) { throw new RepositoryNotFoundException(name); } return r; } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository get(String name) { ensureOpen(); final Repository r = repos.get(name); if (r == null) { throw new RepositoryNotFoundException(name); } return r; } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void remove(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); m.create(name, Author.SYSTEM); m.remove(name); assertThat(m.exists(name)).isFalse(); } | @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void remove_failure(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); assertThatThrownBy(() -> m.remove(name)).isInstanceOf(RepositoryNotFoundException.class); } | @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void remove(String name) { repos.compute(name, (n, v) -> { delegate.remove(n); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void unremove_failure(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); assertThatThrownBy(() -> m.unremove(name)).isInstanceOf(RepositoryNotFoundException.class); } | @Override public Repository unremove(String name) { ensureOpen(); return repos.computeIfAbsent(name, n -> repoWrapper.apply(delegate.unremove(n))); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository unremove(String name) { ensureOpen(); return repos.computeIfAbsent(name, n -> repoWrapper.apply(delegate.unremove(n))); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository unremove(String name) { ensureOpen(); return repos.computeIfAbsent(name, n -> repoWrapper.apply(delegate.unremove(n))); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository unremove(String name) { ensureOpen(); return repos.computeIfAbsent(name, n -> repoWrapper.apply(delegate.unremove(n))); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Repository unremove(String name) { ensureOpen(); return repos.computeIfAbsent(name, n -> repoWrapper.apply(delegate.unremove(n))); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void list(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); final int numNames = 10; for (int i = 0; i < numNames; i++) { m.create(name + i, Author.SYSTEM); } final List<String> names = new ArrayList<>(m.list().keySet()); for (int i = 0; i < numNames - 1; i++) { if (names.get(i).compareTo(names.get(i + 1)) > 0) { fail("names is not in ascending order"); } } } | @Override public Map<String, Repository> list() { ensureOpen(); final int estimatedSize = repos.size(); final String[] names = repos.keySet().toArray(new String[estimatedSize]); Arrays.sort(names); final Map<String, Repository> ret = new LinkedHashMap<>(names.length); for (String name : names) { final Repository repo = repos.get(name); if (repo != null) { ret.put(name, repo); } } return Collections.unmodifiableMap(ret); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Map<String, Repository> list() { ensureOpen(); final int estimatedSize = repos.size(); final String[] names = repos.keySet().toArray(new String[estimatedSize]); Arrays.sort(names); final Map<String, Repository> ret = new LinkedHashMap<>(names.length); for (String name : names) { final Repository repo = repos.get(name); if (repo != null) { ret.put(name, repo); } } return Collections.unmodifiableMap(ret); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public Map<String, Repository> list() { ensureOpen(); final int estimatedSize = repos.size(); final String[] names = repos.keySet().toArray(new String[estimatedSize]); Arrays.sort(names); final Map<String, Repository> ret = new LinkedHashMap<>(names.length); for (String name : names) { final Repository repo = repos.get(name); if (repo != null) { ret.put(name, repo); } } return Collections.unmodifiableMap(ret); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Map<String, Repository> list() { ensureOpen(); final int estimatedSize = repos.size(); final String[] names = repos.keySet().toArray(new String[estimatedSize]); Arrays.sort(names); final Map<String, Repository> ret = new LinkedHashMap<>(names.length); for (String name : names) { final Repository repo = repos.get(name); if (repo != null) { ret.put(name, repo); } } return Collections.unmodifiableMap(ret); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public Map<String, Repository> list() { ensureOpen(); final int estimatedSize = repos.size(); final String[] names = repos.keySet().toArray(new String[estimatedSize]); Arrays.sort(names); final Map<String, Repository> ret = new LinkedHashMap<>(names.length); for (String name : names) { final Repository repo = repos.get(name); if (repo != null) { ret.put(name, repo); } } return Collections.unmodifiableMap(ret); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void markForPurge(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); m.create(name, Author.SYSTEM); m.remove(name); m.markForPurge(name); verify(purgeWorker).execute(any()); assertThat(m.listRemoved().keySet()).doesNotContain(name); } | @Override public void markForPurge(String name) { repos.compute(name, (n, v) -> { delegate.markForPurge(name); return null; }); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void markForPurge(String name) { repos.compute(name, (n, v) -> { delegate.markForPurge(name); return null; }); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public void markForPurge(String name) { repos.compute(name, (n, v) -> { delegate.markForPurge(name); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void markForPurge(String name) { repos.compute(name, (n, v) -> { delegate.markForPurge(name); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void markForPurge(String name) { repos.compute(name, (n, v) -> { delegate.markForPurge(name); return null; }); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void purgeMarked(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); final int numNames = 10; for (int i = 0; i < numNames; i++) { final String targetName = name + i; m.create(targetName, Author.SYSTEM); m.remove(targetName); m.markForPurge(targetName); } m.purgeMarked(); for (int i = 0; i < numNames; i++) { final String targetName = name + i; assertThatThrownBy(() -> m.get(targetName)).isInstanceOf(RepositoryNotFoundException.class); } } | @Override public void purgeMarked() { delegate.purgeMarked(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void purgeMarked() { delegate.purgeMarked(); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public void purgeMarked() { delegate.purgeMarked(); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void purgeMarked() { delegate.purgeMarked(); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void purgeMarked() { delegate.purgeMarked(); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void close(TestInfo testInfo) { final String name = TestUtil.normalizedDisplayName(testInfo); m.create(name, Author.SYSTEM); assertThat(m.exists(name)).isTrue(); m.close(ShuttingDownException::new); assertThatThrownBy(() -> m.get(name)).isInstanceOf(ShuttingDownException.class); assertThatThrownBy(() -> m.exists(name)).isInstanceOf(ShuttingDownException.class); assertThatThrownBy(() -> m.remove(name)).isInstanceOf(ShuttingDownException.class); assertThatThrownBy(() -> m.unremove(name)).isInstanceOf(ShuttingDownException.class); assertThatThrownBy(() -> m.list()).isInstanceOf(ShuttingDownException.class); assertThatThrownBy(() -> m.listRemoved()).isInstanceOf(ShuttingDownException.class); } | @Override public void close(Supplier<CentralDogmaException> failureCauseSupplier) { delegate.close(failureCauseSupplier); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void close(Supplier<CentralDogmaException> failureCauseSupplier) { delegate.close(failureCauseSupplier); } } | RepositoryManagerWrapper implements RepositoryManager { @Override public void close(Supplier<CentralDogmaException> failureCauseSupplier) { delegate.close(failureCauseSupplier); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void close(Supplier<CentralDogmaException> failureCauseSupplier) { delegate.close(failureCauseSupplier); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } | RepositoryManagerWrapper implements RepositoryManager { @Override public void close(Supplier<CentralDogmaException> failureCauseSupplier) { delegate.close(failureCauseSupplier); } RepositoryManagerWrapper(RepositoryManager repoManager,
Function<Repository, Repository> repoWrapper); @Override Project parent(); @Override void close(Supplier<CentralDogmaException> failureCauseSupplier); @Override boolean exists(String name); @Override Repository get(String name); @Override Repository create(String name, long creationTimeMillis, Author author); @Override Map<String, Repository> list(); @Override Map<String, Instant> listRemoved(); @Override void remove(String name); @Override Repository unremove(String name); @Override void purgeMarked(); @Override void markForPurge(String name); @Override void ensureOpen(); @Override String toString(); } |
@Test void nullInputsDuringBuildAreRejected() { assertThatNullPointerException() .isThrownBy(() -> JsonPatch.fromJson(null)); } | public static JsonPatch fromJson(final JsonNode node) throws IOException { requireNonNull(node, "node"); try { return Jackson.treeToValue(node, JsonPatch.class); } catch (JsonMappingException e) { throw new JsonPatchException("invalid JSON patch", e); } } | JsonPatch implements JsonSerializable { public static JsonPatch fromJson(final JsonNode node) throws IOException { requireNonNull(node, "node"); try { return Jackson.treeToValue(node, JsonPatch.class); } catch (JsonMappingException e) { throw new JsonPatchException("invalid JSON patch", e); } } } | JsonPatch implements JsonSerializable { public static JsonPatch fromJson(final JsonNode node) throws IOException { requireNonNull(node, "node"); try { return Jackson.treeToValue(node, JsonPatch.class); } catch (JsonMappingException e) { throw new JsonPatchException("invalid JSON patch", e); } } @JsonCreator JsonPatch(final List<JsonPatchOperation> operations); } | JsonPatch implements JsonSerializable { public static JsonPatch fromJson(final JsonNode node) throws IOException { requireNonNull(node, "node"); try { return Jackson.treeToValue(node, JsonPatch.class); } catch (JsonMappingException e) { throw new JsonPatchException("invalid JSON patch", e); } } @JsonCreator JsonPatch(final List<JsonPatchOperation> operations); static JsonPatch fromJson(final JsonNode node); static JsonPatch generate(final JsonNode source, final JsonNode target, ReplaceMode replaceMode); boolean isEmpty(); List<JsonPatchOperation> operations(); JsonNode apply(final JsonNode node); ArrayNode toJson(); @Override String toString(); @Override void serialize(final JsonGenerator jgen, final SerializerProvider provider); @Override void serializeWithType(final JsonGenerator jgen,
final SerializerProvider provider, final TypeSerializer typeSer); } | JsonPatch implements JsonSerializable { public static JsonPatch fromJson(final JsonNode node) throws IOException { requireNonNull(node, "node"); try { return Jackson.treeToValue(node, JsonPatch.class); } catch (JsonMappingException e) { throw new JsonPatchException("invalid JSON patch", e); } } @JsonCreator JsonPatch(final List<JsonPatchOperation> operations); static JsonPatch fromJson(final JsonNode node); static JsonPatch generate(final JsonNode source, final JsonNode target, ReplaceMode replaceMode); boolean isEmpty(); List<JsonPatchOperation> operations(); JsonNode apply(final JsonNode node); ArrayNode toJson(); @Override String toString(); @Override void serialize(final JsonGenerator jgen, final SerializerProvider provider); @Override void serializeWithType(final JsonGenerator jgen,
final SerializerProvider provider, final TypeSerializer typeSer); } |
@Test public void testMultipleStarts() { try { Communicator server = new ServerCommunicator(45756); Communicator client = new ClientCommunicator("0.0.0.0", 45756); server.start(); server.start(); Thread.sleep(100); client.start(); client.start(); server.start(); client.start(); } catch (InterruptedException e) { e.printStackTrace(); } } | @Override public void start() { queue.clear(); try { mainThread.start(); } catch (IllegalThreadStateException e) { if (!mainThread.isAlive()) { mainThread = new Thread(this, getClass().getSimpleName()); mainThread.start(); } else { log("Thread " + mainThread.getName() + " is already running."); } } } | AbstractCommunicator implements Communicator { @Override public void start() { queue.clear(); try { mainThread.start(); } catch (IllegalThreadStateException e) { if (!mainThread.isAlive()) { mainThread = new Thread(this, getClass().getSimpleName()); mainThread.start(); } else { log("Thread " + mainThread.getName() + " is already running."); } } } } | AbstractCommunicator implements Communicator { @Override public void start() { queue.clear(); try { mainThread.start(); } catch (IllegalThreadStateException e) { if (!mainThread.isAlive()) { mainThread = new Thread(this, getClass().getSimpleName()); mainThread.start(); } else { log("Thread " + mainThread.getName() + " is already running."); } } } protected AbstractCommunicator(int port); } | AbstractCommunicator implements Communicator { @Override public void start() { queue.clear(); try { mainThread.start(); } catch (IllegalThreadStateException e) { if (!mainThread.isAlive()) { mainThread = new Thread(this, getClass().getSimpleName()); mainThread.start(); } else { log("Thread " + mainThread.getName() + " is already running."); } } } protected AbstractCommunicator(int port); @Override void run(); @Override void setState(MopedState state); @Override void setValue(MopedDataType type, int value); @Override void addListener(CommunicationListener cl); @Override void start(); @Override void stop(); boolean isRunning(); boolean isLoggingEnabled(); void enableLogging(); void disableLogging(); } | AbstractCommunicator implements Communicator { @Override public void start() { queue.clear(); try { mainThread.start(); } catch (IllegalThreadStateException e) { if (!mainThread.isAlive()) { mainThread = new Thread(this, getClass().getSimpleName()); mainThread.start(); } else { log("Thread " + mainThread.getName() + " is already running."); } } } protected AbstractCommunicator(int port); @Override void run(); @Override void setState(MopedState state); @Override void setValue(MopedDataType type, int value); @Override void addListener(CommunicationListener cl); @Override void start(); @Override void stop(); boolean isRunning(); boolean isLoggingEnabled(); void enableLogging(); void disableLogging(); } |
@Test void addThrottle() { carControl.addThrottle(1); assertEquals(carControl.getLastThrottle(), THROTTLE_VALUE + 1); } | @Override public synchronized void addThrottle(int value) { setThrottle(currentThrottleValue + value); } | CarControlImpl implements CarControl { @Override public synchronized void addThrottle(int value) { setThrottle(currentThrottleValue + value); } } | CarControlImpl implements CarControl { @Override public synchronized void addThrottle(int value) { setThrottle(currentThrottleValue + value); } CarControlImpl(ArduinoCommunicator arduinoInstance); } | CarControlImpl implements CarControl { @Override public synchronized void addThrottle(int value) { setThrottle(currentThrottleValue + value); } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } | CarControlImpl implements CarControl { @Override public synchronized void addThrottle(int value) { setThrottle(currentThrottleValue + value); } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } |
@Test void addSteer() { carControl.addSteer(1); assertEquals(carControl.getLastSteer(), STEER_VALUE + 1); } | @Override public synchronized void addSteer(int value) { setSteerValue(currentSteerValue + value); } | CarControlImpl implements CarControl { @Override public synchronized void addSteer(int value) { setSteerValue(currentSteerValue + value); } } | CarControlImpl implements CarControl { @Override public synchronized void addSteer(int value) { setSteerValue(currentSteerValue + value); } CarControlImpl(ArduinoCommunicator arduinoInstance); } | CarControlImpl implements CarControl { @Override public synchronized void addSteer(int value) { setSteerValue(currentSteerValue + value); } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } | CarControlImpl implements CarControl { @Override public synchronized void addSteer(int value) { setSteerValue(currentSteerValue + value); } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } |
@Test void testOnDataRead() { final String data = "A"; List<String> receivedData = new ArrayList<>(); Consumer c = new Consumer(receivedData); InputStream stream = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)); StreamReader reader = new StreamReader(stream); reader.setOnInputRead(c::stringRecieved); reader.start(); try { reader.join(); } catch (InterruptedException e) { e.printStackTrace(); } assertEquals(receivedData.get(0), data); assertEquals(receivedData.get(1), String.valueOf((char) -1)); } | void setOnInputRead(Consumer<String> consumer) { this.onInputRead = consumer; } | StreamReader extends Thread { void setOnInputRead(Consumer<String> consumer) { this.onInputRead = consumer; } } | StreamReader extends Thread { void setOnInputRead(Consumer<String> consumer) { this.onInputRead = consumer; } StreamReader(InputStream inputStream); } | StreamReader extends Thread { void setOnInputRead(Consumer<String> consumer) { this.onInputRead = consumer; } StreamReader(InputStream inputStream); @Override void run(); } | StreamReader extends Thread { void setOnInputRead(Consumer<String> consumer) { this.onInputRead = consumer; } StreamReader(InputStream inputStream); @Override void run(); } |
@Test public void filterValue() { final int maxQueueSize = 10; QuickChangeFilter filter = new QuickChangeFilter(10,maxQueueSize); double[] dataSet = {1,2,3,17,5,6,-18,8,9,10}; for (int i = 0; i < maxQueueSize; i++) { assertTrue(dataSet[i] == filter.filterValue(dataSet[i])); } } | public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); double filterValue(double unfilteredValue); } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); double filterValue(double unfilteredValue); } |
@Test public void filterValue1() { final int maxQueueSize = 10; QuickChangeFilter filter = new QuickChangeFilter(10,maxQueueSize); double[] dataSet = {1,2,3,50,5,6,-50,8,9,10}; for (int i = 0; i < maxQueueSize; i++) { assertTrue(dataSet[i] == filter.filterValue(dataSet[i])); } for (double d: dataSet) { double filteredValue = filter.filterValue(d); assertTrue(filteredValue<=10 && filteredValue>=1); } } | public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); double filterValue(double unfilteredValue); } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); double filterValue(double unfilteredValue); } |
@Test public void filterValue2(){ final int maxQueueSize = 10; QuickChangeFilter filter = new QuickChangeFilter(10,maxQueueSize); double[] zeroSet = {0,0,0,0,0,0,0,0,0,0}; for(double d: zeroSet){ double filteredValue = filter.filterValue(d); } double[] giantSet = {20,20,20,20,20,20,20,20,20,20}; for (int i = 0; i < maxQueueSize/2 +1; i++){ double filteredValue = filter.filterValue(giantSet[i]); assertTrue(filteredValue == 0); } for (int i = 0; i < maxQueueSize/2 -1; i++){ double filteredValue = filter.filterValue(giantSet[i]); assertTrue(filteredValue == 20); } } | public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); double filterValue(double unfilteredValue); } | QuickChangeFilter implements Filter { public double filterValue(double unfilteredValue){ double averageInput = calculateAverageInput(); if (previousInput.size() < maxQueueSize){ previousInput.addFirst(unfilteredValue); lastReturn = unfilteredValue; return unfilteredValue; } previousInput.addFirst(unfilteredValue); previousInput.removeLast(); if (isAcceptableChange(unfilteredValue, lastReturn)){ lastReturn = unfilteredValue; return unfilteredValue; } if (isAcceptableChange(unfilteredValue, averageInput)){ lastReturn = unfilteredValue; return unfilteredValue; } return lastReturn; } QuickChangeFilter(double acceptedChange, int maxQueueSize); double filterValue(double unfilteredValue); } |
@Test void getDistance(){ sensorInstance.receivedString("1.0\n",new StringBuilder()); assertEquals(0.7,sensorInstance.getDistance(), 0.01); } | @Override public double getDistance() { return currentSensorValue; } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test void getValue(){ sensorInstance.receivedString("1.0\n",new StringBuilder()); assertEquals(0.7,sensorInstance.getValue(), 0.01); } | @Override public double getValue() { return getDistance(); } | DistanceSensorImpl implements DistanceSensor { @Override public double getValue() { return getDistance(); } } | DistanceSensorImpl implements DistanceSensor { @Override public double getValue() { return getDistance(); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { @Override public double getValue() { return getDistance(); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public double getValue() { return getDistance(); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test @DisplayName("should subscribe a consumer") void subscribe() { Consumer<Double> consumer = new ConsumerImpl(); Consumer<Double> consumerSpy = spy(consumer); StringBuilder sb = new StringBuilder(); sensorInstance.subscribe(consumerSpy); sensorInstance.receivedString("0.3\n", sb); verify(consumerSpy, times(1)).accept(any()); } | @Override public void subscribe(Consumer<Double> dataConsumer) { dataConsumers.add(dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public void subscribe(Consumer<Double> dataConsumer) { dataConsumers.add(dataConsumer); } } | DistanceSensorImpl implements DistanceSensor { @Override public void subscribe(Consumer<Double> dataConsumer) { dataConsumers.add(dataConsumer); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { @Override public void subscribe(Consumer<Double> dataConsumer) { dataConsumers.add(dataConsumer); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public void subscribe(Consumer<Double> dataConsumer) { dataConsumers.add(dataConsumer); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test @DisplayName("should unsubscribe a consumer") void unsubscribe() { Consumer<Double> consumer = new ConsumerImpl(); Consumer<Double> consumerSpy = spy(consumer); StringBuilder sb = new StringBuilder(); sensorInstance.subscribe(consumerSpy); sensorInstance.receivedString("0.3\n", sb); verify(consumerSpy, times(1)).accept(any()); sensorInstance.unsubscribe(consumerSpy); sensorInstance.receivedString("0.3\n", sb); verify(consumerSpy, times(1)).accept(any()); } | @Override public void unsubscribe(Consumer<Double> dataConsumer) { dataConsumers.remove(dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public void unsubscribe(Consumer<Double> dataConsumer) { dataConsumers.remove(dataConsumer); } } | DistanceSensorImpl implements DistanceSensor { @Override public void unsubscribe(Consumer<Double> dataConsumer) { dataConsumers.remove(dataConsumer); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { @Override public void unsubscribe(Consumer<Double> dataConsumer) { dataConsumers.remove(dataConsumer); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public void unsubscribe(Consumer<Double> dataConsumer) { dataConsumers.remove(dataConsumer); } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test @DisplayName("should transmit data to receivers") void transmitData() { final int[] called = new int[1]; called[0] = 0; DataReceiver receiver1 = new DataReceiver() { int[] call = called; @Override public void dataReceived(String data) { call[0]++; } }; DataReceiver receiver2 = new DataReceiver() { int[] call = called; @Override public void dataReceived(String data) { call[0]++; } }; DataReceiver receiver3 = new DataReceiver() { int[] call = called; @Override public void dataReceived(String data) { call[0]++; } }; comInstance.subscribe(Direction.INTERNAL, receiver1); comInstance.subscribe(Direction.INTERNAL, receiver2); comInstance.subscribe(Direction.INTERNAL, receiver3); comInstance.transmitData(value, Direction.INTERNAL); assertEquals(3, called[0]); } | @Override public void transmitData(String data, Direction direction) { for (DataReceiver dataReceiver : this.subscribers.get(direction)) { dataReceiver.dataReceived(data); } } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void transmitData(String data, Direction direction) { for (DataReceiver dataReceiver : this.subscribers.get(direction)) { dataReceiver.dataReceived(data); } } } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void transmitData(String data, Direction direction) { for (DataReceiver dataReceiver : this.subscribers.get(direction)) { dataReceiver.dataReceived(data); } } CommunicationsMediatorImpl(); } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void transmitData(String data, Direction direction) { for (DataReceiver dataReceiver : this.subscribers.get(direction)) { dataReceiver.dataReceived(data); } } CommunicationsMediatorImpl(); @Override void transmitData(String data, Direction direction); @Override void subscribe(Direction direction, DataReceiver receiver); @Override void unsubscribe(Direction direction, DataReceiver receiver); } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void transmitData(String data, Direction direction) { for (DataReceiver dataReceiver : this.subscribers.get(direction)) { dataReceiver.dataReceived(data); } } CommunicationsMediatorImpl(); @Override void transmitData(String data, Direction direction); @Override void subscribe(Direction direction, DataReceiver receiver); @Override void unsubscribe(Direction direction, DataReceiver receiver); } |
@Test @DisplayName("should build string from input") void receivedString() { StringBuilder sb = new StringBuilder(); sensorInstance.receivedString("100", sb); assertEquals("100", sb.toString()); } | synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test @DisplayName("should reset the StringBuilder on new line") void receivedString2() { StringBuilder sb = new StringBuilder(); sensorInstance.receivedString("100\n", sb); assertEquals("", sb.toString()); } | synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { synchronized void receivedString(String string, StringBuilder sb) { for (char c : string.toCharArray()) { if (c != 10 && c != 13) { sb.append(c); } else { setCurrentSensorValue(sb.toString()); sb.delete(0, sb.length()); } } } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test void testRecieveData() { CommunicationsMediator cm = new CommunicationsMediator() { private DataReceiver distanceSensor; @Override public void transmitData(String data, Direction direction) { distanceSensor.dataReceived(data); } @Override public void subscribe(Direction direction, DataReceiver receiver) { distanceSensor = receiver; } @Override public void unsubscribe(Direction direction, DataReceiver receiver) { } }; DistanceSensor ds = new DistanceSensorImpl(cm, ardMock, new LowPassFilter(LP_WEIGHT)); cm.transmitData(CAM_TGT_DIST + ",1.0\n", Direction.INTERNAL); assertEquals(0.7, ds.getDistance(),0.01); } | @Override public double getDistance() { return currentSensorValue; } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } | DistanceSensorImpl implements DistanceSensor { @Override public double getDistance() { return currentSensorValue; } DistanceSensorImpl(CommunicationsMediator communicationsMediator,
ArduinoCommunicator arduinoCommunicator,
Filter filter); @Override double getDistance(); @Override double getValue(); @Override void subscribe(Consumer<Double> dataConsumer); @Override void unsubscribe(Consumer<Double> dataConsumer); } |
@Test @DisplayName("should return positive values") void positiveFilterValue() { final double updatedValue = 10; filter.filterValue(updatedValue); double value = filter.filterValue(updatedValue); assertEquals(1.9, value); } | public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } |
@Test @DisplayName("should return negative values") void negativeFilterValue() { filter.filterValue(100); double value = filter.filterValue(1); assertEquals(9.1, value); } | public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } |
@Test @DisplayName("should return values with a set error span") void valueTesting() { for (int i = 0; i < 100; i++) { filter.filterValue(0.3); } filter.filterValue(0.7); for (int i = 0; i < 4; i++) { filter.filterValue(0.3); } double value = filter.filterValue(0.3); assertEquals(0.3,value,0.05); } | public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } |
@Test @DisplayName("should handle noise spikes") void extremeValueTesting() { for (int i = 0; i < 100; i++) { filter.filterValue(0.3); } filter.filterValue(0.7); double value = filter.filterValue(0.3); assertEquals(0.3,value,0.05); } | public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } |
@Test @DisplayName("should balance incoming stream of noise") void noiseControl() { double[] arr = {0.3, 0.35, 0.32, 0.28, 0.77, 0.3, 0.28, 0.34, 0.7}; double temp = 0; for (double v : arr) { temp = filter.filterValue(v); } assertEquals(0.3, temp, 0.05); } | public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } |
@Test @DisplayName("should handle NaN values without fail") void errorProneSensorValue() { double arr[] = { NaN, 0.3, 0.56, 0.34, 0.78, 0.28, NaN, 0.35, NaN }; double value = filter.filterValue(0.37); for (double reading : arr) { value = filter.filterValue(reading); } assertThat(value, not(NaN)); } | public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } | LowPassFilter implements Filter { public double filterValue(double nextRawValue) { double calibratedValue; calibratedValue = Double.isNaN(nextRawValue) ? currentValue : calibrateValue(nextRawValue); currentValue = calibratedValue; return calibratedValue; } LowPassFilter(double weight); double filterValue(double nextRawValue); } |
@Test @DisplayName("should add DataReceiver as a subscriber") void subscribe() { DataReceiver receiver = new DataReceiver() { @Override public void dataReceived(String data) { assertEquals(value, data); } }; comInstance.subscribe(Direction.INTERNAL, receiver); comInstance.transmitData(value, Direction.INTERNAL); } | @Override public void subscribe(Direction direction, DataReceiver receiver) { List<DataReceiver> dataReceivers = this.subscribers.get(direction); if (!dataReceivers.contains(receiver)) { dataReceivers.add(receiver); } } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void subscribe(Direction direction, DataReceiver receiver) { List<DataReceiver> dataReceivers = this.subscribers.get(direction); if (!dataReceivers.contains(receiver)) { dataReceivers.add(receiver); } } } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void subscribe(Direction direction, DataReceiver receiver) { List<DataReceiver> dataReceivers = this.subscribers.get(direction); if (!dataReceivers.contains(receiver)) { dataReceivers.add(receiver); } } CommunicationsMediatorImpl(); } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void subscribe(Direction direction, DataReceiver receiver) { List<DataReceiver> dataReceivers = this.subscribers.get(direction); if (!dataReceivers.contains(receiver)) { dataReceivers.add(receiver); } } CommunicationsMediatorImpl(); @Override void transmitData(String data, Direction direction); @Override void subscribe(Direction direction, DataReceiver receiver); @Override void unsubscribe(Direction direction, DataReceiver receiver); } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void subscribe(Direction direction, DataReceiver receiver) { List<DataReceiver> dataReceivers = this.subscribers.get(direction); if (!dataReceivers.contains(receiver)) { dataReceivers.add(receiver); } } CommunicationsMediatorImpl(); @Override void transmitData(String data, Direction direction); @Override void subscribe(Direction direction, DataReceiver receiver); @Override void unsubscribe(Direction direction, DataReceiver receiver); } |
@Test @DisplayName("should unsubscribe a subscribing receiver") void unsubscribe() { DataReceiver receiver = new DataReceiver() { @Override public void dataReceived(String data) { assert false; } }; comInstance.subscribe(Direction.INTERNAL, receiver); comInstance.unsubscribe(Direction.INTERNAL, receiver); comInstance.transmitData(value, Direction.INTERNAL); } | @Override public void unsubscribe(Direction direction, DataReceiver receiver) { int index = -1; List<DataReceiver> receivers = this.subscribers.get(direction); for (int i = 0; i < receivers.size(); i++) { DataReceiver dataReceiver = receivers.get(i); if (dataReceiver == receiver) { index = i; } } if (index != -1) { receivers.remove(index); } } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void unsubscribe(Direction direction, DataReceiver receiver) { int index = -1; List<DataReceiver> receivers = this.subscribers.get(direction); for (int i = 0; i < receivers.size(); i++) { DataReceiver dataReceiver = receivers.get(i); if (dataReceiver == receiver) { index = i; } } if (index != -1) { receivers.remove(index); } } } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void unsubscribe(Direction direction, DataReceiver receiver) { int index = -1; List<DataReceiver> receivers = this.subscribers.get(direction); for (int i = 0; i < receivers.size(); i++) { DataReceiver dataReceiver = receivers.get(i); if (dataReceiver == receiver) { index = i; } } if (index != -1) { receivers.remove(index); } } CommunicationsMediatorImpl(); } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void unsubscribe(Direction direction, DataReceiver receiver) { int index = -1; List<DataReceiver> receivers = this.subscribers.get(direction); for (int i = 0; i < receivers.size(); i++) { DataReceiver dataReceiver = receivers.get(i); if (dataReceiver == receiver) { index = i; } } if (index != -1) { receivers.remove(index); } } CommunicationsMediatorImpl(); @Override void transmitData(String data, Direction direction); @Override void subscribe(Direction direction, DataReceiver receiver); @Override void unsubscribe(Direction direction, DataReceiver receiver); } | CommunicationsMediatorImpl implements CommunicationsMediator { @Override public void unsubscribe(Direction direction, DataReceiver receiver) { int index = -1; List<DataReceiver> receivers = this.subscribers.get(direction); for (int i = 0; i < receivers.size(); i++) { DataReceiver dataReceiver = receivers.get(i); if (dataReceiver == receiver) { index = i; } } if (index != -1) { receivers.remove(index); } } CommunicationsMediatorImpl(); @Override void transmitData(String data, Direction direction); @Override void subscribe(Direction direction, DataReceiver receiver); @Override void unsubscribe(Direction direction, DataReceiver receiver); } |
@Test public void convertDistanceTest(){ StrToDoubleConverter strToDoubleConverter = new StrToDoubleConverter(); assertEquals(Double.NaN, strToDoubleConverter.convertStringToDouble("ASD"),0.01); assertEquals(-1, strToDoubleConverter.convertStringToDouble("-1"), 0.01); assertEquals(23.3, strToDoubleConverter.convertStringToDouble("23.3"),0.01); } | public double convertStringToDouble(String input) { if (input.matches("[0-9.-]+")) { double convertedDistance = Double.valueOf(input); return convertedDistance; } else { return NaN; } } | StrToDoubleConverter { public double convertStringToDouble(String input) { if (input.matches("[0-9.-]+")) { double convertedDistance = Double.valueOf(input); return convertedDistance; } else { return NaN; } } } | StrToDoubleConverter { public double convertStringToDouble(String input) { if (input.matches("[0-9.-]+")) { double convertedDistance = Double.valueOf(input); return convertedDistance; } else { return NaN; } } } | StrToDoubleConverter { public double convertStringToDouble(String input) { if (input.matches("[0-9.-]+")) { double convertedDistance = Double.valueOf(input); return convertedDistance; } else { return NaN; } } double convertStringToDouble(String input); } | StrToDoubleConverter { public double convertStringToDouble(String input) { if (input.matches("[0-9.-]+")) { double convertedDistance = Double.valueOf(input); return convertedDistance; } else { return NaN; } } double convertStringToDouble(String input); } |
@Test void convertToMotorValue(){ int [] motorValues = {1,2,3,4,5,6,7,8,9,10}; EngineDataConverter EDC = new EngineDataConverter(motorValues); assertEquals(1,EDC.convertToMotorValue(1.2)); assertEquals(1,EDC.convertToMotorValue(-5)); assertEquals(5,EDC.convertToMotorValue(5.4)); assertEquals(7, EDC.convertToMotorValue(6.5)); } | public int convertToMotorValue( double throttle){ double smallestDifference = Double.POSITIVE_INFINITY; int r = 0; for (int i: validMotorValues) { System.out.println(i); double difference = Math.abs(i - throttle); if (smallestDifference > difference){ smallestDifference = difference; r = i; }else if (smallestDifference == difference && throttle < i){ r = i; } } return r; } | EngineDataConverter { public int convertToMotorValue( double throttle){ double smallestDifference = Double.POSITIVE_INFINITY; int r = 0; for (int i: validMotorValues) { System.out.println(i); double difference = Math.abs(i - throttle); if (smallestDifference > difference){ smallestDifference = difference; r = i; }else if (smallestDifference == difference && throttle < i){ r = i; } } return r; } } | EngineDataConverter { public int convertToMotorValue( double throttle){ double smallestDifference = Double.POSITIVE_INFINITY; int r = 0; for (int i: validMotorValues) { System.out.println(i); double difference = Math.abs(i - throttle); if (smallestDifference > difference){ smallestDifference = difference; r = i; }else if (smallestDifference == difference && throttle < i){ r = i; } } return r; } EngineDataConverter(int[] validMotorValues); } | EngineDataConverter { public int convertToMotorValue( double throttle){ double smallestDifference = Double.POSITIVE_INFINITY; int r = 0; for (int i: validMotorValues) { System.out.println(i); double difference = Math.abs(i - throttle); if (smallestDifference > difference){ smallestDifference = difference; r = i; }else if (smallestDifference == difference && throttle < i){ r = i; } } return r; } EngineDataConverter(int[] validMotorValues); int convertToMotorValue( double throttle); } | EngineDataConverter { public int convertToMotorValue( double throttle){ double smallestDifference = Double.POSITIVE_INFINITY; int r = 0; for (int i: validMotorValues) { System.out.println(i); double difference = Math.abs(i - throttle); if (smallestDifference > difference){ smallestDifference = difference; r = i; }else if (smallestDifference == difference && throttle < i){ r = i; } } return r; } EngineDataConverter(int[] validMotorValues); int convertToMotorValue( double throttle); } |
@Test void getLastThrottle() { assertEquals(carControl.getLastThrottle(), THROTTLE_VALUE); } | @Override public int getLastThrottle() { return currentThrottleValue; } | CarControlImpl implements CarControl { @Override public int getLastThrottle() { return currentThrottleValue; } } | CarControlImpl implements CarControl { @Override public int getLastThrottle() { return currentThrottleValue; } CarControlImpl(ArduinoCommunicator arduinoInstance); } | CarControlImpl implements CarControl { @Override public int getLastThrottle() { return currentThrottleValue; } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } | CarControlImpl implements CarControl { @Override public int getLastThrottle() { return currentThrottleValue; } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } |
@Test void getLastSteer() { assertEquals(carControl.getLastSteer(), STEER_VALUE); } | @Override public int getLastSteer() { return currentSteerValue; } | CarControlImpl implements CarControl { @Override public int getLastSteer() { return currentSteerValue; } } | CarControlImpl implements CarControl { @Override public int getLastSteer() { return currentSteerValue; } CarControlImpl(ArduinoCommunicator arduinoInstance); } | CarControlImpl implements CarControl { @Override public int getLastSteer() { return currentSteerValue; } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } | CarControlImpl implements CarControl { @Override public int getLastSteer() { return currentSteerValue; } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } |
@Test void setThrottle() { carControl.setThrottle(THROTTLE_VALUE + 1); assertEquals(carControl.getLastThrottle(), THROTTLE_VALUE + 1); } | @Override public synchronized void setThrottle(int value) { if (value != currentThrottleValue) { currentThrottleValue = constrainInRange(value, MIN_SPEED, MAX_SPEED); } } | CarControlImpl implements CarControl { @Override public synchronized void setThrottle(int value) { if (value != currentThrottleValue) { currentThrottleValue = constrainInRange(value, MIN_SPEED, MAX_SPEED); } } } | CarControlImpl implements CarControl { @Override public synchronized void setThrottle(int value) { if (value != currentThrottleValue) { currentThrottleValue = constrainInRange(value, MIN_SPEED, MAX_SPEED); } } CarControlImpl(ArduinoCommunicator arduinoInstance); } | CarControlImpl implements CarControl { @Override public synchronized void setThrottle(int value) { if (value != currentThrottleValue) { currentThrottleValue = constrainInRange(value, MIN_SPEED, MAX_SPEED); } } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } | CarControlImpl implements CarControl { @Override public synchronized void setThrottle(int value) { if (value != currentThrottleValue) { currentThrottleValue = constrainInRange(value, MIN_SPEED, MAX_SPEED); } } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } |
@Test void setSteerValue() { carControl.setSteerValue(STEER_VALUE + 1); assertEquals(carControl.getLastSteer(), STEER_VALUE + 1); } | @Override public synchronized void setSteerValue(int value) { if (value != currentSteerValue) { currentSteerValue = constrainInRange(value,MIN_STEER,MAX_STEER); } } | CarControlImpl implements CarControl { @Override public synchronized void setSteerValue(int value) { if (value != currentSteerValue) { currentSteerValue = constrainInRange(value,MIN_STEER,MAX_STEER); } } } | CarControlImpl implements CarControl { @Override public synchronized void setSteerValue(int value) { if (value != currentSteerValue) { currentSteerValue = constrainInRange(value,MIN_STEER,MAX_STEER); } } CarControlImpl(ArduinoCommunicator arduinoInstance); } | CarControlImpl implements CarControl { @Override public synchronized void setSteerValue(int value) { if (value != currentSteerValue) { currentSteerValue = constrainInRange(value,MIN_STEER,MAX_STEER); } } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } | CarControlImpl implements CarControl { @Override public synchronized void setSteerValue(int value) { if (value != currentSteerValue) { currentSteerValue = constrainInRange(value,MIN_STEER,MAX_STEER); } } CarControlImpl(ArduinoCommunicator arduinoInstance); @Override int getLastThrottle(); @Override int getLastSteer(); @Override synchronized void setThrottle(int value); @Override synchronized void setSteerValue(int value); @Override synchronized void addThrottle(int value); @Override synchronized void addSteer(int value); } |
@Test public void containsAncestor() { assertTrue(data.remove(new Path("/"))); assertTrue(data.containsAncestor(new Path("/foo/baz"))); assertTrue(data.containsAncestor(new Path("/bar/baz"))); assertTrue(!data.containsAncestor(new Path("/foo"))); assertTrue(!data.containsAncestor(new Path("/baz"))); } | public boolean containsAncestor(Path path) { for (Path p : this) { if (p.isAncestorOf(path)) { return true; } } return false; } | PathSet implements Set<Path> { public boolean containsAncestor(Path path) { for (Path p : this) { if (p.isAncestorOf(path)) { return true; } } return false; } } | PathSet implements Set<Path> { public boolean containsAncestor(Path path) { for (Path p : this) { if (p.isAncestorOf(path)) { return true; } } return false; } PathSet(); PathSet(Set<Path> delegate); } | PathSet implements Set<Path> { public boolean containsAncestor(Path path) { for (Path p : this) { if (p.isAncestorOf(path)) { return true; } } return false; } PathSet(); PathSet(Set<Path> delegate); boolean equals(Object o); int hashCode(); int size(); boolean isEmpty(); boolean contains(Object o); Object[] toArray(); T[] toArray(T[] a); boolean add(Path o); boolean containsAll(Collection<?> c); boolean addAll(Collection<? extends Path> c); boolean retainAll(Collection<?> c); boolean removeAll(Collection<?> c); void clear(); boolean containsAncestor(Path path); boolean containsParent(Path path); boolean removeWithDescendants(Path path); boolean remove(Object o); void removeDescendants(Path path); Iterator<Path> iterator(); } | PathSet implements Set<Path> { public boolean containsAncestor(Path path) { for (Path p : this) { if (p.isAncestorOf(path)) { return true; } } return false; } PathSet(); PathSet(Set<Path> delegate); boolean equals(Object o); int hashCode(); int size(); boolean isEmpty(); boolean contains(Object o); Object[] toArray(); T[] toArray(T[] a); boolean add(Path o); boolean containsAll(Collection<?> c); boolean addAll(Collection<? extends Path> c); boolean retainAll(Collection<?> c); boolean removeAll(Collection<?> c); void clear(); boolean containsAncestor(Path path); boolean containsParent(Path path); boolean removeWithDescendants(Path path); boolean remove(Object o); void removeDescendants(Path path); Iterator<Path> iterator(); } |
@Test public void isDescendantOf() { assertDescendant(new Path("/"), new Path("/foo")); assertDescendant(new Path("/"), new Path("/foo/bar")); assertDescendant(new Path("/foo"), new Path("/foo/bar")); assertNotDescendant(new Path("/foo"), new Path("/bar/foo")); assertNotDescendant(new Path("/foo"), new Path("/")); assertNotDescendant(new Path("/"), new Path("relative")); assertDescendant(new Path("foo/bar"), new Path("foo/bar/baz")); assertNotDescendant(new Path("foo/bar"), new Path("bar")); assertNotDescendant(new Path("/"), new Path("/")); assertNotDescendant(new Path("/foo"), new Path("/foo")); } | public boolean isDescendantOf(Path other) { if (other.isRoot()) { if (isRoot()) { return false; } else if (isAbsolute()) { return true; } else { return false; } } else { return path.startsWith(other.path + SEPARATOR) && path.length() > other.path.length(); } } | Path implements Iterable<String>, Serializable { public boolean isDescendantOf(Path other) { if (other.isRoot()) { if (isRoot()) { return false; } else if (isAbsolute()) { return true; } else { return false; } } else { return path.startsWith(other.path + SEPARATOR) && path.length() > other.path.length(); } } } | Path implements Iterable<String>, Serializable { public boolean isDescendantOf(Path other) { if (other.isRoot()) { if (isRoot()) { return false; } else if (isAbsolute()) { return true; } else { return false; } } else { return path.startsWith(other.path + SEPARATOR) && path.length() > other.path.length(); } } Path(String path); Path(String path, boolean canonize); } | Path implements Iterable<String>, Serializable { public boolean isDescendantOf(Path other) { if (other.isRoot()) { if (isRoot()) { return false; } else if (isAbsolute()) { return true; } else { return false; } } else { return path.startsWith(other.path + SEPARATOR) && path.length() > other.path.length(); } } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); } | Path implements Iterable<String>, Serializable { public boolean isDescendantOf(Path other) { if (other.isRoot()) { if (isRoot()) { return false; } else if (isAbsolute()) { return true; } else { return false; } } else { return path.startsWith(other.path + SEPARATOR) && path.length() > other.path.length(); } } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); static final Path ROOT; static final Comparator<Path> SMALLEST_FIRST_COMPARATOR; static final Comparator<Path> LARGEST_FIRST_COMPARATOR; } |
@Test public void isRoot() { assertTrue(new Path("/").isRoot()); assertTrue(!new Path("foo").isRoot()); assertTrue(!new Path("/foo").isRoot()); } | public boolean isRoot() { return path.equals(SEPARATOR); } | Path implements Iterable<String>, Serializable { public boolean isRoot() { return path.equals(SEPARATOR); } } | Path implements Iterable<String>, Serializable { public boolean isRoot() { return path.equals(SEPARATOR); } Path(String path); Path(String path, boolean canonize); } | Path implements Iterable<String>, Serializable { public boolean isRoot() { return path.equals(SEPARATOR); } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); } | Path implements Iterable<String>, Serializable { public boolean isRoot() { return path.equals(SEPARATOR); } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); static final Path ROOT; static final Comparator<Path> SMALLEST_FIRST_COMPARATOR; static final Comparator<Path> LARGEST_FIRST_COMPARATOR; } |
@Test @SuppressWarnings("unused") public void iterator() { Path path = new Path("/foo/bar/baz"); Set<String> parts = new HashSet<String>(Arrays.asList(new String[]{"foo", "bar", "baz"})); for (String part : path) { assertTrue(parts.remove(part)); } assertTrue(parts.isEmpty()); for (String part : new Path("/")) { fail(); } } | public Iterator<String> iterator() { return new Iterator<String>() { int idx = 0; public boolean hasNext() { return idx < size(); } public String next() { return part(idx++); } public void remove() { throw new UnsupportedOperationException("Path parts iterator is read only"); } }; } | Path implements Iterable<String>, Serializable { public Iterator<String> iterator() { return new Iterator<String>() { int idx = 0; public boolean hasNext() { return idx < size(); } public String next() { return part(idx++); } public void remove() { throw new UnsupportedOperationException("Path parts iterator is read only"); } }; } } | Path implements Iterable<String>, Serializable { public Iterator<String> iterator() { return new Iterator<String>() { int idx = 0; public boolean hasNext() { return idx < size(); } public String next() { return part(idx++); } public void remove() { throw new UnsupportedOperationException("Path parts iterator is read only"); } }; } Path(String path); Path(String path, boolean canonize); } | Path implements Iterable<String>, Serializable { public Iterator<String> iterator() { return new Iterator<String>() { int idx = 0; public boolean hasNext() { return idx < size(); } public String next() { return part(idx++); } public void remove() { throw new UnsupportedOperationException("Path parts iterator is read only"); } }; } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); } | Path implements Iterable<String>, Serializable { public Iterator<String> iterator() { return new Iterator<String>() { int idx = 0; public boolean hasNext() { return idx < size(); } public String next() { return part(idx++); } public void remove() { throw new UnsupportedOperationException("Path parts iterator is read only"); } }; } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); static final Path ROOT; static final Comparator<Path> SMALLEST_FIRST_COMPARATOR; static final Comparator<Path> LARGEST_FIRST_COMPARATOR; } |
@Test public void parent() { assertTrue(new Path("/").parent() == null); assertEquals(new Path("/foo").parent(), new Path("/")); assertEquals(new Path("/foo/bar").parent(), new Path("/foo")); assertEquals(new Path("foo").parent(), new Path(".")); assertEquals(new Path("foo/bar").parent(), new Path("foo")); assertEquals(new Path(".").parent(), new Path("..")); assertEquals(new Path("../foo").parent(), new Path("..")); assertEquals(new Path("..").parent(), new Path("../..")); } | public Path parent() { if (isRoot()) { return null; } else { return new Path(path + "/.."); } } | Path implements Iterable<String>, Serializable { public Path parent() { if (isRoot()) { return null; } else { return new Path(path + "/.."); } } } | Path implements Iterable<String>, Serializable { public Path parent() { if (isRoot()) { return null; } else { return new Path(path + "/.."); } } Path(String path); Path(String path, boolean canonize); } | Path implements Iterable<String>, Serializable { public Path parent() { if (isRoot()) { return null; } else { return new Path(path + "/.."); } } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); } | Path implements Iterable<String>, Serializable { public Path parent() { if (isRoot()) { return null; } else { return new Path(path + "/.."); } } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); static final Path ROOT; static final Comparator<Path> SMALLEST_FIRST_COMPARATOR; static final Comparator<Path> LARGEST_FIRST_COMPARATOR; } |
@Test public void part() { Path path = new Path("/foo/bar/baz"); assertEquals("foo", path.part(0)); assertEquals("bar", path.part(1)); assertEquals("baz", path.part(2)); path = new Path("foo/bar/baz"); assertEquals("foo", path.part(0)); assertEquals("bar", path.part(1)); assertEquals("baz", path.part(2)); } | public String part(int index) { if (index < 0) { throw new IndexOutOfBoundsException(); } int start = isAbsolute() ? 1 : 0; for (int i = 0; i < index; i++) { start = path.indexOf(SEPARATOR, start); if (start < 0) { throw new IndexOutOfBoundsException(); } start++; } int end = path.indexOf(SEPARATOR, start); if (end < 0) { end = path.length(); } return path.substring(start, end); } | Path implements Iterable<String>, Serializable { public String part(int index) { if (index < 0) { throw new IndexOutOfBoundsException(); } int start = isAbsolute() ? 1 : 0; for (int i = 0; i < index; i++) { start = path.indexOf(SEPARATOR, start); if (start < 0) { throw new IndexOutOfBoundsException(); } start++; } int end = path.indexOf(SEPARATOR, start); if (end < 0) { end = path.length(); } return path.substring(start, end); } } | Path implements Iterable<String>, Serializable { public String part(int index) { if (index < 0) { throw new IndexOutOfBoundsException(); } int start = isAbsolute() ? 1 : 0; for (int i = 0; i < index; i++) { start = path.indexOf(SEPARATOR, start); if (start < 0) { throw new IndexOutOfBoundsException(); } start++; } int end = path.indexOf(SEPARATOR, start); if (end < 0) { end = path.length(); } return path.substring(start, end); } Path(String path); Path(String path, boolean canonize); } | Path implements Iterable<String>, Serializable { public String part(int index) { if (index < 0) { throw new IndexOutOfBoundsException(); } int start = isAbsolute() ? 1 : 0; for (int i = 0; i < index; i++) { start = path.indexOf(SEPARATOR, start); if (start < 0) { throw new IndexOutOfBoundsException(); } start++; } int end = path.indexOf(SEPARATOR, start); if (end < 0) { end = path.length(); } return path.substring(start, end); } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); } | Path implements Iterable<String>, Serializable { public String part(int index) { if (index < 0) { throw new IndexOutOfBoundsException(); } int start = isAbsolute() ? 1 : 0; for (int i = 0; i < index; i++) { start = path.indexOf(SEPARATOR, start); if (start < 0) { throw new IndexOutOfBoundsException(); } start++; } int end = path.indexOf(SEPARATOR, start); if (end < 0) { end = path.length(); } return path.substring(start, end); } Path(String path); Path(String path, boolean canonize); Path canonical(); boolean isCanonical(); boolean isRoot(); boolean isAbsolute(); @Override boolean equals(Object obj); @Override int hashCode(); @Override String toString(); Iterator<String> iterator(); String getName(); boolean isAncestorOf(Path other); boolean isDescendantOf(Path other); boolean isParentOf(Path other); boolean isChildOf(Path other); int size(); Path parent(); String part(int index); Path subpath(int idx); Path toAbsolute(); Path append(Path relative); Path toRelative(Path ancestor); static final Path ROOT; static final Comparator<Path> SMALLEST_FIRST_COMPARATOR; static final Comparator<Path> LARGEST_FIRST_COMPARATOR; } |
Subsets and Splits