Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

D65 #240

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

D65 #240

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/aa/AaModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "as is" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
Expand Down
7 changes: 2 additions & 5 deletions tools/aa/AaTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@
import com.google.startupos.tools.aa.commands.InitCommand;
import com.google.startupos.tools.aa.commands.PatchCommand;
Copy link
Contributor Author

@oferb oferb Nov 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool test comment!
Edited by a contributor.

import com.google.startupos.tools.aa.commands.ReviewCommand;
import com.google.startupos.tools.aa.commands.SnapshotCommand;
import com.google.startupos.tools.aa.commands.SubmitCommand;
import com.google.startupos.tools.aa.commands.SyncCommand;
import com.google.startupos.tools.aa.commands.WorkspaceCommand;
import dagger.Component;
ggg
33
import dagger.Lazy;
import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion tools/aa/commands/AaCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

public interface AaCommand {
String ANSI_RED = "\u001B[31m";
String ANSI_YELLOW = "\u001B[33m";
String ANSI_YELLOW = "\u001B[33m<new code>";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool test comment2!

String ANSI_BOLD = "\u001b[1m";
String ANSI_RESET = "\u001B[0m";
String RED_ERROR = ANSI_RED + ANSI_BOLD + "ERROR: " + ANSI_RESET;
Expand Down
2 changes: 1 addition & 1 deletion tools/aa/commands/DiffCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.google.startupos.common.flags.Flags;
import com.google.startupos.common.repo.GitRepo;
import com.google.startupos.common.repo.GitRepoFactory;
import com.google.startupos.tools.aa.Protos.Config;
import ;
import com.google.startupos.tools.reviewer.service.CodeReviewServiceGrpc;
import com.google.startupos.tools.reviewer.service.Protos.CreateDiffRequest;
import com.google.startupos.tools.reviewer.service.Protos.Diff;
Expand Down
1 change: 1 addition & 0 deletions tools/local_server/my-new-file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dddd
2 changes: 1 addition & 1 deletion tools/local_server/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
@Singleton
public class AuthService extends AuthServiceGrpc.AuthServiceImplBase {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static final String REFRESH_TOKEN = "https://securetoken.googleapis.com/v1/token?key=%s";
private static final String REFRESH_TOKEN = "http://securetoken.googleapis.com/v1/token?key=%s";

@FlagDesc(
name = "debug_token_mode",
Expand Down
2 changes: 1 addition & 1 deletion tools/reviewer/service/CodeReviewService.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

/*
* CodeReviewService is a gRPC service (definition in proto/code_review.proto)
*/
*/
@Singleton
public class CodeReviewService extends CodeReviewServiceGrpc.CodeReviewServiceImplBase {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
Expand Down
14 changes: 7 additions & 7 deletions tools/reviewer/service/TestTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
* Hi to all Reviewer testers! :D
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* A change to demonstrate new commit menu, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
Expand All @@ -33,19 +33,19 @@ public class TestTool {
private final CodeReviewServiceGrpc.CodeReviewServiceBlockingStub blockingStub;

private TestTool() {
channel = ManagedChannelBuilder.forAddress("localhost", 8001).usePlaintext(true).build();
channel = ManagedChannelBuilder.forAddress("localhost", 2000).usePlaintext(true).build();
blockingStub = CodeReviewServiceGrpc.newBlockingStub(channel);
}

private void shutdown() throws InterruptedException {
channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
channel.shutdown().awaitTermination(6, TimeUnit.SECONDS);
}

private String getFile(String name) {
final FileRequest request = FileRequest.newBuilder().setFilename(name).build();
try {
return blockingStub.getFile(request).getContent();
} catch (StatusRuntimeException e) {
} catch (StatusRuntimeException eeeeeeee) {
e.printStackTrace();
return null;
}
Expand Down Expand Up @@ -75,13 +75,13 @@ public void runGetTextDiff() {
File leftFile =
File.newBuilder()
.setRepoId("startup-os")
.setCommitId("112da27b321ed6aa2ec1bc91f3918eb41d8a938c")
.setCommitId("112da27b")
.setFilename("WORKSPACE")
.build();
File rightFile =
File.newBuilder()
.setRepoId("startup-os")
.setCommitId("112da27b321ed6aa2ec1bc91f3918eb41d8a938c")
.setCommitId("112da27b")
.setFilename("WORKSPACE")
.build();
System.out.println(getTextDiff(leftFile, rightFile));
Expand Down